10:13 a.m.
Author: yzhishko
Date: 2010-01-20 11:13:50 -0500 (Wed, 20 Jan 2010)
New Revision: 19827
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/5692/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/5692/test1.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/5692/test2.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/5692/test3.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/PreferencesForEditors_JBIDE5692.java
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/MessageResolutionInPreviewTabTest.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditor.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xpl/CustomSashForm.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5692 - fixed
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/5692/test1.jsp
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/5692/test1.jsp
(rev 0)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/5692/test1.jsp 2010-01-20
16:13:50 UTC (rev 19827)
@@ -0,0 +1,12 @@
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<html>
+ <head>
+ <title></title>
+ </head>
+ <body>
+ <f:view>
+ test1
+ </f:view>
+ </body>
+</html>
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/5692/test2.jsp
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/5692/test2.jsp
(rev 0)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/5692/test2.jsp 2010-01-20
16:13:50 UTC (rev 19827)
@@ -0,0 +1,12 @@
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<html>
+ <head>
+ <title></title>
+ </head>
+ <body>
+ <f:view>
+ test2
+ </f:view>
+ </body>
+</html>
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/5692/test3.jsp
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/5692/test3.jsp
(rev 0)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/5692/test3.jsp 2010-01-20
16:13:50 UTC (rev 19827)
@@ -0,0 +1,12 @@
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<html>
+ <head>
+ <title></title>
+ </head>
+ <body>
+ <f:view>
+ test3
+ </f:view>
+ </body>
+</html>
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2010-01-20
15:11:52 UTC (rev 19826)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2010-01-20
16:13:50 UTC (rev 19827)
@@ -71,6 +71,7 @@
import org.jboss.tools.jsf.vpe.jsf.test.jbide.OpenOnInJarPackageFragment_JBIDE5682;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.OpenOnJsf20Test_JBIDE5382;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.OpenOnTLDPackedInJar_JBIDE5693;
+import org.jboss.tools.jsf.vpe.jsf.test.jbide.PreferencesForEditors_JBIDE5692;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.TaglibXMLUnformatedDTD_JBIDE5642;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.TestFViewLocaleAttribute_JBIDE5218;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE675Test;
@@ -194,6 +195,7 @@
suite.addTestSuite(OpenOnInJarPackageFragment_JBIDE5682.class);
suite.addTestSuite(MessageResolutionInPreviewTabTest.class);
suite.addTestSuite(OpenOnTLDPackedInJar_JBIDE5693.class);
+ suite.addTestSuite(PreferencesForEditors_JBIDE5692.class);
// $JUnit-END$
// added by Max Areshkau
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/MessageResolutionInPreviewTabTest.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/MessageResolutionInPreviewTabTest.java 2010-01-20
15:11:52 UTC (rev 19826)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/MessageResolutionInPreviewTabTest.java 2010-01-20
16:13:50 UTC (rev 19827)
@@ -30,6 +30,8 @@
*/
public class MessageResolutionInPreviewTabTest extends VpeTest {
+ JSPMultiPageEditor part;
+
public MessageResolutionInPreviewTabTest(String name) {
super(name);
}
@@ -41,9 +43,8 @@
IEditorInput input = new FileEditorInput(file);
assertNotNull("Editor input is null", input); //$NON-NLS-1$
// open and get editor
- JSPMultiPageEditor part = openEditor(input);
+ part = openEditor(input);
part.pageChange(part.getPreviewIndex());
- part.setPreviewIndex(2);
MozillaPreview mozillaPreview = (MozillaPreview)
part.getVisualEditor().getPreviewWebBrowser();
//here we wait for preview initialization, but it's should be less then 1 second
@@ -60,5 +61,11 @@
throw getException();
}
}
+
+ @Override
+ protected void tearDown() throws Exception {
+ part.pageChange(part.getVisualSourceIndex());
+ super.tearDown();
+ }
}
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/PreferencesForEditors_JBIDE5692.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/PreferencesForEditors_JBIDE5692.java
(rev 0)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/PreferencesForEditors_JBIDE5692.java 2010-01-20
16:13:50 UTC (rev 19827)
@@ -0,0 +1,79 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.jsf.vpe.jsf.test.jbide;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.part.FileEditorInput;
+import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests;
+import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
+import org.jboss.tools.vpe.ui.test.TestUtil;
+import org.jboss.tools.vpe.ui.test.VpeTest;
+
+/**
+ *
+ * @author yzhishko
+ *
+ */
+
+public class PreferencesForEditors_JBIDE5692 extends VpeTest {
+
+ private JSPMultiPageEditor part1;
+ private JSPMultiPageEditor part2;
+ private JSPMultiPageEditor part3;
+
+ public PreferencesForEditors_JBIDE5692(String name) {
+ super(name);
+ }
+
+ public void testPreferencesForEditors() throws Throwable {
+ setException(null);
+ openFirstTestPage();
+ openSecondTestPage();
+ openThirdTestPage();
+ }
+
+ private void openFirstTestPage() throws Throwable{
+ IFile file = (IFile) TestUtil.getComponentPath("JBIDE/5692/test1.jsp",
//$NON-NLS-1$
+ JsfAllTests.IMPORT_PROJECT_NAME);
+ IEditorInput input = new FileEditorInput(file);
+ assertNotNull("Editor input is null", input); //$NON-NLS-1$
+ // open and get editor
+ part1 = openEditor(input);
+ part1.pageChange(part1.getPreviewIndex());
+ }
+
+ private void openSecondTestPage() throws Throwable{
+ IFile file = (IFile) TestUtil.getComponentPath("JBIDE/5692/test2.jsp",
//$NON-NLS-1$
+ JsfAllTests.IMPORT_PROJECT_NAME);
+ IEditorInput input = new FileEditorInput(file);
+ assertNotNull("Editor input is null", input); //$NON-NLS-1$
+ // open and get editor
+ part2 = openEditor(input);
+ checkOpenedTab(2,part2.getSelectedPageIndex());
+ part2.pageChange(part2.getVisualSourceIndex());
+ }
+
+ private void openThirdTestPage() throws Throwable{
+ IFile file = (IFile) TestUtil.getComponentPath("JBIDE/5692/test3.jsp",
//$NON-NLS-1$
+ JsfAllTests.IMPORT_PROJECT_NAME);
+ IEditorInput input = new FileEditorInput(file);
+ assertNotNull("Editor input is null", input); //$NON-NLS-1$
+ // open and get editor
+ part3 = openEditor(input);
+ checkOpenedTab(0,part3.getSelectedPageIndex());
+ }
+
+ private void checkOpenedTab(int expected, int actual){
+ assertEquals("Tab index is incorrect ", expected, actual); //$NON-NLS-1$
+ }
+
+}
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditor.java
===================================================================
---
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditor.java 2010-01-20
15:11:52 UTC (rev 19826)
+++
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditor.java 2010-01-20
16:13:50 UTC (rev 19827)
@@ -100,7 +100,7 @@
private IVisualEditor visualEditor;
private int visualSourceIndex;
-
+
private JSPTextEditor sourceEditor;
private int sourceIndex;
@@ -222,7 +222,12 @@
}
}
superPageChange(newPageIndex);
+ JspEditorPlugin.getDefault().getPreferenceStore().
+ setValue(IVpePreferencesPage.DEFAULT_VPE_TAB, selectedPageIndex);
+ }
+ public int getSelectedPageIndex() {
+ return selectedPageIndex;
}
public void setInput(IEditorInput input) {
@@ -811,6 +816,14 @@
this.previewIndex = previewIndex;
}
+ public void setVisualSourceIndex(int visualSourceIndex) {
+ this.visualSourceIndex = visualSourceIndex;
+ }
+
+ public int getVisualSourceIndex() {
+ return visualSourceIndex;
+ }
+
}
class ResourceChangeListener implements IResourceChangeListener {
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java
===================================================================
---
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java 2010-01-20
15:11:52 UTC (rev 19826)
+++
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java 2010-01-20
16:13:50 UTC (rev 19827)
@@ -87,6 +87,7 @@
import org.jboss.tools.vpe.editor.xpl.CustomSashForm;
import org.jboss.tools.vpe.editor.xpl.EditorSettings;
import org.jboss.tools.vpe.editor.xpl.SashSetting;
+import org.jboss.tools.vpe.editor.xpl.CustomSashForm.ICustomSashFormListener;
import org.jboss.tools.vpe.messages.VpeUIMessages;
import org.jboss.tools.vpe.selbar.SelectionBar;
import org.jboss.tools.vpe.selbar.VisibilityEvent;
@@ -321,39 +322,6 @@
}
}
- protected int[] loadSplitterPosition() {
- int[] sizes = new int[3];
- try {
- IEditorInput input = getEditorInput();
- if (!(input instanceof IFileEditorInput))
- return null;
-
- IFile file = ((IFileEditorInput) input).getFile();
- String s = file.getPersistentProperty(SPLITTER_POSITION_KEY1);
- if (s != null) {
- sizes[0] = Integer.parseInt(s);
- } else
- return null;
-
- s = file.getPersistentProperty(SPLITTER_POSITION_KEY2);
- if (s != null) {
- sizes[1] = Integer.parseInt(s);
- } else
- return null;
-
- s = file.getPersistentProperty(SPLITTER_POSITION_KEY3);
- if (s != null) {
- sizes[2] = Integer.parseInt(s);
- } else
- return null;
-
- } catch (CoreException e) {
- VpePlugin.getPluginLog().logError(e);
- return null;
- }
- return sizes;
- }
-
public void setVisualMode(int type) {
switch (type) {
case VISUALSOURCE_MODE:
@@ -576,10 +544,6 @@
super.safelySanityCheckState(input);
}
};
- int[] weights = loadSplitterPosition();
- if (weights != null) {
- container.setWeights(weights);
- }
container.setSashBorders(new boolean[] { true, true, true });
controlListener = new ControlListener() {
@@ -768,6 +732,12 @@
return null;
}
};
+ container.addCustomSashFormListener(new ICustomSashFormListener() {
+ public void dividerMoved(int firstControlWeight, int secondControlWeight) {
+ JspEditorPlugin.getDefault().getPreferenceStore().
+ setValue(IVpePreferencesPage.VISUAL_SOURCE_EDITORS_WEIGHTS, secondControlWeight);
+ }
+ });
}
/**
@@ -1209,12 +1179,7 @@
selectionBar.setVisible(presfShowSelectionBar);
doVisualRefresh = true;
}
- /*
- * Commented to fix https://jira.jboss.org/jira/browse/JBIDE-4941 Do
- * not update VPE splitting, weights, tabs for current page, do it
- * for newly opened ones only.
- */
-// fillContainer(false, null);
+
boolean prefsShowNonVisualTags = JspEditorPlugin.getDefault()
.getPreferenceStore().getBoolean(
IVpePreferencesPage.SHOW_NON_VISUAL_TAGS);
@@ -1224,6 +1189,7 @@
prefsShowNonVisualTags);
doVisualRefresh = true;
}
+
boolean prefsShowBundlesAsEL = JspEditorPlugin
.getDefault()
.getPreferenceStore()
@@ -1241,6 +1207,7 @@
if (doVisualRefresh) {
getController().visualRefresh();
}
+ fillContainer(false, null);
}
}
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java
===================================================================
---
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java 2010-01-20
15:11:52 UTC (rev 19826)
+++
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java 2010-01-20
16:13:50 UTC (rev 19827)
@@ -330,7 +330,8 @@
* to redraw CustomSashForm with new layout.
*/
getController().getPageContext().getEditPart().fillContainer(true, newOrientation);
-
+ JspEditorPlugin.getDefault().getPreferenceStore().
+ setValue(IVpePreferencesPage.VISUAL_SOURCE_EDITORS_SPLITTING, newOrientation);
}
};
rotateEditorsAction.setImageDescriptor(ImageDescriptor.createFromFile(MozillaEditor.class,
@@ -354,6 +355,8 @@
* Update VPE
*/
controller.visualRefresh();
+ JspEditorPlugin.getDefault().getPreferenceStore().
+ setValue(IVpePreferencesPage.SHOW_BORDER_FOR_UNKNOWN_TAGS, this.isChecked());
}
};
showBorderAction.setImageDescriptor(ImageDescriptor.createFromFile(MozillaEditor.class,
@@ -378,6 +381,8 @@
* Update VPE
*/
controller.visualRefresh();
+ JspEditorPlugin.getDefault().getPreferenceStore().
+ setValue(IVpePreferencesPage.SHOW_NON_VISUAL_TAGS, this.isChecked());
}
};
showNonVisualTagsAction.setImageDescriptor(ImageDescriptor.createFromFile(MozillaEditor.class,
@@ -396,6 +401,8 @@
* Update Selection Bar
*/
controller.getPageContext().getEditPart().updateSelectionBar(this.isChecked());
+ JspEditorPlugin.getDefault().getPreferenceStore().
+ setValue(IVpePreferencesPage.SHOW_SELECTION_TAG_BAR, this.isChecked());
}
};
showSelectionBarAction.setImageDescriptor(ImageDescriptor.createFromFile(MozillaEditor.class,
@@ -414,6 +421,8 @@
* Update Text Formatting Bar
*/
vpeToolBarManager.setToolbarVisibility(this.isChecked());
+ JspEditorPlugin.getDefault().getPreferenceStore().
+ setValue(IVpePreferencesPage.SHOW_TEXT_FORMATTING, this.isChecked());
}
};
showTextFormattingAction.setImageDescriptor(ImageDescriptor.createFromFile(MozillaEditor.class,
@@ -433,6 +442,8 @@
*/
controller.getPageContext().getBundle().updateShowBundleUsageAsEL(this.isChecked());
controller.visualRefresh();
+ JspEditorPlugin.getDefault().getPreferenceStore().
+ setValue(IVpePreferencesPage.SHOW_RESOURCE_BUNDLES_USAGE_AS_EL, this.isChecked());
}
};
showBundleAsELAction.setImageDescriptor(ImageDescriptor.createFromFile(MozillaEditor.class,
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xpl/CustomSashForm.java
===================================================================
---
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xpl/CustomSashForm.java 2010-01-20
15:11:52 UTC (rev 19826)
+++
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xpl/CustomSashForm.java 2010-01-20
16:13:50 UTC (rev 19827)
@@ -1131,7 +1131,7 @@
protected void fireDividerMoved(){
if(customSashFormListeners!=null && customSashFormListeners.size()>0){
int[] weights = getWeights();
- if(weights!=null && weights.length==2){
+ if(weights!=null && weights.length==3){
int firstControlWeight = weights[0];
int secondControlWeight = weights[1];
for (Iterator<ICustomSashFormListener> listenerItr =
customSashFormListeners.iterator(); listenerItr.hasNext();) {