From jbosstools-commits at lists.jboss.org Wed Jan 20 11:13:51 2010 Content-Type: multipart/mixed; boundary="===============6703970322520685483==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r19827 - in trunk: jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/5692 and 6 other directories. Date: Wed, 20 Jan 2010 11:13:51 -0500 Message-ID: <201001201613.o0KGDpn6017498@svn01.web.mwc.hst.phx2.redhat.com> --===============6703970322520685483== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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/WebCo= ntent/pages/JBIDE/5692/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo= ntent/pages/JBIDE/5692/test1.jsp trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo= ntent/pages/JBIDE/5692/test2.jsp trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo= ntent/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/js= peditor/JSPMultiPageEditor.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/Vpe= EditorPart.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/moz= illa/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/W= ebContent/pages/JBIDE/5692/test1.jsp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebC= ontent/pages/JBIDE/5692/test1.jsp (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebC= ontent/pages/JBIDE/5692/test1.jsp 2010-01-20 16:13:50 UTC (rev 19827) @@ -0,0 +1,12 @@ +<%@ taglib uri=3D"http://java.sun.com/jsf/html" prefix=3D"h" %> +<%@ taglib uri=3D"http://java.sun.com/jsf/core" prefix=3D"f" %> + + + + + + + test1 + + = + = Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/W= ebContent/pages/JBIDE/5692/test2.jsp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebC= ontent/pages/JBIDE/5692/test2.jsp (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebC= ontent/pages/JBIDE/5692/test2.jsp 2010-01-20 16:13:50 UTC (rev 19827) @@ -0,0 +1,12 @@ +<%@ taglib uri=3D"http://java.sun.com/jsf/html" prefix=3D"h" %> +<%@ taglib uri=3D"http://java.sun.com/jsf/core" prefix=3D"f" %> + + + + + + + test2 + + = + = Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/W= ebContent/pages/JBIDE/5692/test3.jsp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebC= ontent/pages/JBIDE/5692/test3.jsp (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebC= ontent/pages/JBIDE/5692/test3.jsp 2010-01-20 16:13:50 UTC (rev 19827) @@ -0,0 +1,12 @@ +<%@ taglib uri=3D"http://java.sun.com/jsf/html" prefix=3D"h" %> +<%@ taglib uri=3D"http://java.sun.com/jsf/core" prefix=3D"f" %> + + + + + + + test3 + + = + = Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/to= ols/jsf/vpe/jsf/test/JsfAllTests.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js= f/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/js= f/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_J= BIDE5682; import org.jboss.tools.jsf.vpe.jsf.test.jbide.OpenOnJsf20Test_JBIDE5382; import org.jboss.tools.jsf.vpe.jsf.test.jbide.OpenOnTLDPackedInJar_JBIDE56= 93; +import org.jboss.tools.jsf.vpe.jsf.test.jbide.PreferencesForEditors_JBIDE5= 692; import org.jboss.tools.jsf.vpe.jsf.test.jbide.TaglibXMLUnformatedDTD_JBIDE= 5642; import org.jboss.tools.jsf.vpe.jsf.test.jbide.TestFViewLocaleAttribute_JBI= DE5218; 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/to= ols/jsf/vpe/jsf/test/jbide/MessageResolutionInPreviewTabTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js= f/vpe/jsf/test/jbide/MessageResolutionInPreviewTabTest.java 2010-01-20 15:1= 1:52 UTC (rev 19826) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js= f/vpe/jsf/test/jbide/MessageResolutionInPreviewTabTest.java 2010-01-20 16:1= 3: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 =3D new FileEditorInput(file); assertNotNull("Editor input is null", input); //$NON-NLS-1$ // open and get editor - JSPMultiPageEditor part =3D openEditor(input); + part =3D openEditor(input); part.pageChange(part.getPreviewIndex()); - part.setPreviewIndex(2); = MozillaPreview mozillaPreview =3D (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 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js= f/vpe/jsf/test/jbide/PreferencesForEditors_JBIDE5692.java = (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js= f/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 =3D (IFile) TestUtil.getComponentPath("JBIDE/5692/test1.jsp",= //$NON-NLS-1$ + JsfAllTests.IMPORT_PROJECT_NAME); + IEditorInput input =3D new FileEditorInput(file); + assertNotNull("Editor input is null", input); //$NON-NLS-1$ + // open and get editor + part1 =3D openEditor(input); + part1.pageChange(part1.getPreviewIndex()); + } + = + private void openSecondTestPage() throws Throwable{ + IFile file =3D (IFile) TestUtil.getComponentPath("JBIDE/5692/test2.jsp",= //$NON-NLS-1$ + JsfAllTests.IMPORT_PROJECT_NAME); + IEditorInput input =3D new FileEditorInput(file); + assertNotNull("Editor input is null", input); //$NON-NLS-1$ + // open and get editor + part2 =3D openEditor(input); + checkOpenedTab(2,part2.getSelectedPageIndex()); + part2.pageChange(part2.getVisualSourceIndex()); + } + = + private void openThirdTestPage() throws Throwable{ + IFile file =3D (IFile) TestUtil.getComponentPath("JBIDE/5692/test3.jsp",= //$NON-NLS-1$ + JsfAllTests.IMPORT_PROJECT_NAME); + IEditorInput input =3D new FileEditorInput(file); + assertNotNull("Editor input is null", input); //$NON-NLS-1$ + // open and get editor + part3 =3D 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 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/j= speditor/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/j= speditor/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 =3D previewIndex; } = + public void setVisualSourceIndex(int visualSourceIndex) { + this.visualSourceIndex =3D visualSourceIndex; + } + + public int getVisualSourceIndex() { + return visualSourceIndex; + } + = } = class ResourceChangeListener implements IResourceChangeListener { Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/edi= tor/VpeEditorPart.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/Vp= eEditorPart.java 2010-01-20 15:11:52 UTC (rev 19826) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/Vp= eEditorPart.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.ICustomSashFormListen= er; 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 =3D new int[3]; - try { - IEditorInput input =3D getEditorInput(); - if (!(input instanceof IFileEditorInput)) - return null; - - IFile file =3D ((IFileEditorInput) input).getFile(); - String s =3D file.getPersistentProperty(SPLITTER_POSITION_KEY1); - if (s !=3D null) { - sizes[0] =3D Integer.parseInt(s); - } else - return null; - - s =3D file.getPersistentProperty(SPLITTER_POSITION_KEY2); - if (s !=3D null) { - sizes[1] =3D Integer.parseInt(s); - } else - return null; - - s =3D file.getPersistentProperty(SPLITTER_POSITION_KEY3); - if (s !=3D null) { - sizes[2] =3D 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 =3D loadSplitterPosition(); - if (weights !=3D null) { - container.setWeights(weights); - } container.setSashBorders(new boolean[] { true, true, true }); = controlListener =3D new ControlListener() { @@ -768,6 +732,12 @@ return null; } }; + container.addCustomSashFormListener(new ICustomSashFormListener() { + public void dividerMoved(int firstControlWeight, int secondControlWeigh= t) { + JspEditorPlugin.getDefault().getPreferenceStore(). + setValue(IVpePreferencesPage.VISUAL_SOURCE_EDITORS_WEIGHTS, secondCont= rolWeight); + } + }); } = /** @@ -1209,12 +1179,7 @@ selectionBar.setVisible(presfShowSelectionBar); doVisualRefresh =3D 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 =3D JspEditorPlugin.getDefault() .getPreferenceStore().getBoolean( IVpePreferencesPage.SHOW_NON_VISUAL_TAGS); @@ -1224,6 +1189,7 @@ prefsShowNonVisualTags); doVisualRefresh =3D true; } + = boolean prefsShowBundlesAsEL =3D 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/edi= tor/mozilla/MozillaEditor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mo= zilla/MozillaEditor.java 2010-01-20 15:11:52 UTC (rev 19826) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mo= zilla/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, new= Orientation); - = + JspEditorPlugin.getDefault().getPreferenceStore(). + setValue(IVpePreferencesPage.VISUAL_SOURCE_EDITORS_SPLITTING, newOrie= ntation); } }; rotateEditorsAction.setImageDescriptor(ImageDescriptor.createFromFile(Mo= zillaEditor.class, @@ -354,6 +355,8 @@ * Update VPE */ controller.visualRefresh(); + JspEditorPlugin.getDefault().getPreferenceStore(). + setValue(IVpePreferencesPage.SHOW_BORDER_FOR_UNKNOWN_TAGS, this.isChec= ked()); } }; showBorderAction.setImageDescriptor(ImageDescriptor.createFromFile(Mozil= laEditor.class, @@ -378,6 +381,8 @@ * Update VPE */ controller.visualRefresh(); + JspEditorPlugin.getDefault().getPreferenceStore(). + setValue(IVpePreferencesPage.SHOW_NON_VISUAL_TAGS, this.isChecked()); } }; showNonVisualTagsAction.setImageDescriptor(ImageDescriptor.createFromFil= e(MozillaEditor.class, @@ -396,6 +401,8 @@ * Update Selection Bar = */ controller.getPageContext().getEditPart().updateSelectionBar(this.isCh= ecked()); + 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.createFromFi= le(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.i= sChecked()); } }; showBundleAsELAction.setImageDescriptor(ImageDescriptor.createFromFile(M= ozillaEditor.class, Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/edi= tor/xpl/CustomSashForm.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xp= l/CustomSashForm.java 2010-01-20 15:11:52 UTC (rev 19826) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xp= l/CustomSashForm.java 2010-01-20 16:13:50 UTC (rev 19827) @@ -1131,7 +1131,7 @@ protected void fireDividerMoved(){ if(customSashFormListeners!=3Dnull && customSashFormListeners.size()>0){ int[] weights =3D getWeights(); - if(weights!=3Dnull && weights.length=3D=3D2){ + if(weights!=3Dnull && weights.length=3D=3D3){ int firstControlWeight =3D weights[0]; int secondControlWeight =3D weights[1]; for (Iterator listenerItr =3D customSashFormL= isteners.iterator(); listenerItr.hasNext();) { --===============6703970322520685483==--