Author: dmaliarevich Date: 2009-10-02 10:12:11 -0400 (Fri, 02 Oct 2009) New Revision: 17873 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/VpePreferencesInitializer.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/bundle/BundleMap.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/preferences/VpePreferencesPage.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties Log: https://jira.jboss.org/jira/browse/JBIDE-4941, separating applying of VPE preferences for current page and newly opened page, UI messages were updated, default value for "Show border for unknown tags" was set to true. Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/VpePreferencesInitializer.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/VpePreferencesInitializer.java 2009-10-02 13:59:51 UTC (rev 17872) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/VpePreferencesInitializer.java 2009-10-02 14:12:11 UTC (rev 17873) @@ -22,7 +22,7 @@ public void initializeDefaultPreferences() { IEclipsePreferences defaultPreferences = ((IScopeContext) new DefaultScope()).getNode(JspEditorPlugin.PLUGIN_ID); - defaultPreferences.putBoolean(IVpePreferencesPage.SHOW_BORDER_FOR_UNKNOWN_TAGS, false); + defaultPreferences.putBoolean(IVpePreferencesPage.SHOW_BORDER_FOR_UNKNOWN_TAGS, true); defaultPreferences.putBoolean(IVpePreferencesPage.SHOW_NON_VISUAL_TAGS, false); defaultPreferences.putBoolean(IVpePreferencesPage.SHOW_SELECTION_TAG_BAR, true); defaultPreferences.putBoolean(IVpePreferencesPage.SHOW_TEXT_FORMATTING, true); 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 2009-10-02 13:59:51 UTC (rev 17872) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java 2009-10-02 14:12:11 UTC (rev 17873) @@ -689,7 +689,12 @@ listener = new XModelTreeListener() { public void nodeChanged(XModelTreeEvent event) { - fillContainer(false, null); + /* + * 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); selectionBar.setVisible(selectionBar.getAlwaysVisibleOption()); } @@ -1162,20 +1167,51 @@ /* * Update MozillaEditor's toolbar items */ - visualEditor.setDefaultToolBarItems(); - /* - * When switching from Source view to Visual/Source - * controller could be null. - */ - if (getController() != null) { - selectionBar.setVisible(JspEditorPlugin.getDefault() - .getPreferenceStore().getBoolean( - IVpePreferencesPage.SHOW_SELECTION_TAG_BAR)); - fillContainer(false, null); - getController().getVisualBuilder().setShowInvisibleTags(JspEditorPlugin.getDefault().getPreferenceStore().getBoolean( - IVpePreferencesPage.SHOW_NON_VISUAL_TAGS)); - getController().getPageContext().getBundle().updateShowBundleUsageAsEL(); - getController().visualRefresh(); + visualEditor.updateToolbarItemsAccordingToPreferences(); + /* + * When switching from Source view to Visual/Source controller could be null. + */ + if (getController() != null) { + boolean doVisualRefresh = false; + boolean presfShowSelectionBar = JspEditorPlugin.getDefault() + .getPreferenceStore().getBoolean( + IVpePreferencesPage.SHOW_SELECTION_TAG_BAR); + if (presfShowSelectionBar != selectionBar.isVisible()) { + 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); + if (prefsShowNonVisualTags != getController().getVisualBuilder() + .isShowInvisibleTags()) { + getController().getVisualBuilder().setShowInvisibleTags( + prefsShowNonVisualTags); + doVisualRefresh = true; + } + boolean prefsShowBundlesAsEL = JspEditorPlugin + .getDefault() + .getPreferenceStore() + .getBoolean( + IVpePreferencesPage.SHOW_RESOURCE_BUNDLES_USAGE_AS_EL); + if (prefsShowBundlesAsEL != getController().getPageContext() + .getBundle().isShowBundleUsageAsEL()) { + getController().getPageContext().getBundle() + .updateShowBundleUsageAsEL(prefsShowBundlesAsEL); + doVisualRefresh = true; + } + /* + * Visual refresh is only needed when some options have changed. + */ + if (doVisualRefresh) { + getController().visualRefresh(); + } } } @@ -1183,7 +1219,7 @@ if (selectionBar != null) { selectionBar.setVisible(isSelectionBarVisible); } else { - VpePlugin.getDefault().logError("VPE Selection Bar is not initialized."); + VpePlugin.getDefault().logError("VPE Selection Bar is not initialized."); //$NON-NLS-1$ } } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/bundle/BundleMap.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/bundle/BundleMap.java 2009-10-02 13:59:51 UTC (rev 17872) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/bundle/BundleMap.java 2009-10-02 14:12:11 UTC (rev 17873) @@ -67,7 +67,8 @@ boolean isShowBundleUsageAsEL = JspEditorPlugin.getDefault().getPreferenceStore().getBoolean( IVpePreferencesPage.SHOW_RESOURCE_BUNDLES_USAGE_AS_EL); - XModelTreeListener modelListener = new ML(); + + XModelTreeListener modelListener = new ML(); public void init(StructuredTextEditor editor){ this.editor = editor; @@ -106,6 +107,10 @@ PreferenceModelUtilities.getPreferenceModel().removeModelTreeListener(modelListener); } + public boolean isShowBundleUsageAsEL() { + return isShowBundleUsageAsEL; + } + private static final String[] JSF_PROJECT_NATURES = { WebProject.JSF_NATURE_ID }; 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 2009-10-02 13:59:51 UTC (rev 17872) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java 2009-10-02 14:12:11 UTC (rev 17873) @@ -1148,28 +1148,40 @@ rotateEditorsItem.setToolTipText(layoutNames.get(newOrientation)); } - public void setDefaultToolBarItems() { - String newOrientation = JspEditorPlugin + public void updateToolbarItemsAccordingToPreferences() { + String prefsOrientation = JspEditorPlugin .getDefault().getPreferenceStore().getString( IVpePreferencesPage.VISUAL_SOURCE_EDITORS_SPLITTING); - currentOrientationIndex = layoutValues.indexOf(newOrientation); - updateRotateEditorsItem(newOrientation); - - showNonVisualTags = JspEditorPlugin.getDefault().getPreferenceStore() + int prefsOrientationIndex = layoutValues.indexOf(prefsOrientation); + boolean prefsShowNonVisualTags = JspEditorPlugin.getDefault().getPreferenceStore() .getBoolean(IVpePreferencesPage.SHOW_NON_VISUAL_TAGS); - updateShowNonVisualTagsItem(showNonVisualTags); - - showSelectionBar = JspEditorPlugin.getDefault().getPreferenceStore() + boolean prefsShowSelectionBar = JspEditorPlugin.getDefault().getPreferenceStore() .getBoolean(IVpePreferencesPage.SHOW_SELECTION_TAG_BAR); - updateShowSelectionBarItem(showSelectionBar); - - showBundlesAsEL = JspEditorPlugin.getDefault().getPreferenceStore() + boolean prefsShowBundlesAsEL = JspEditorPlugin.getDefault().getPreferenceStore() .getBoolean( IVpePreferencesPage.SHOW_RESOURCE_BUNDLES_USAGE_AS_EL); - updateShowBundlesAsELItem(showBundlesAsEL); + boolean prefsShowTextFormatting = JspEditorPlugin.getDefault().getPreferenceStore() + .getBoolean(IVpePreferencesPage.SHOW_TEXT_FORMATTING); - showTextFormatting = JspEditorPlugin.getDefault().getPreferenceStore() - .getBoolean(IVpePreferencesPage.SHOW_TEXT_FORMATTING); - updateShowTextFormattingItem(showTextFormatting); + if (currentOrientationIndex != prefsOrientationIndex) { + currentOrientationIndex = prefsOrientationIndex; + updateRotateEditorsItem(prefsOrientation); + } + if (showNonVisualTags != prefsShowNonVisualTags) { + showNonVisualTags = prefsShowNonVisualTags; + updateShowNonVisualTagsItem(showNonVisualTags); + } + if (showSelectionBar != prefsShowSelectionBar) { + showSelectionBar = prefsShowSelectionBar; + updateShowSelectionBarItem(showSelectionBar); + } + if (showBundlesAsEL != prefsShowBundlesAsEL) { + showBundlesAsEL = prefsShowBundlesAsEL; + updateShowBundlesAsELItem(showBundlesAsEL); + } + if (showTextFormatting != prefsShowTextFormatting) { + showTextFormatting = prefsShowTextFormatting; + updateShowTextFormattingItem(showTextFormatting); + } } } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/VpePreferencesPage.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/VpePreferencesPage.java 2009-10-02 13:59:51 UTC (rev 17872) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/VpePreferencesPage.java 2009-10-02 14:12:11 UTC (rev 17873) @@ -169,8 +169,11 @@ vep.updatePartAccordingToPreferences(); /* * Change selected tab + * Commented to fix https://jira.jboss.org/jira/browse/JBIDE-4941 + * Do not update VPE splitting, weights, tabs for current page, + * only for newly opened. */ - mpe.updatePartAccordingToPreferences(); +// mpe.updatePartAccordingToPreferences(); } } } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties 2009-10-02 13:59:51 UTC (rev 17872) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties 2009-10-02 14:12:11 UTC (rev 17873) @@ -105,12 +105,12 @@ SHOW_BUNDLES_AS_MESSAGES=Show bundle's messages explicitly ASK_TAG_ATTRIBUTES_ON_TAG_INSERT=Ask for tag attributes during tag insert ASK_CONFIRMATION_ON_CLOSING_SELECTION_BAR=Ask for confirmation when closing Selection Bar -DEFAULT_VPE_TAB=Select the default active editor's tab for files that haven't been previously opened in the VPE +DEFAULT_VPE_TAB=Select the default active editor's tab VISUAL_SOURCE_EDITORS_SPLITTING=Visual/Source editors splitting VISUAL_SOURCE_EDITORS_WEIGHTS=Size of the Visual Editor pane (0-100%) VISUAL_APPEARANCE_GROUP_TITLE=Visual appearance CONFIRMATION_GROUP_TITLE=Confirmation and details -TABS_GROUP_TITLE=Tabs +TABS_GROUP_TITLE=Default tab, splitting and editor's weights to start VPE with # Visual Page Editor Preference Page List Items DEFAULT_VPE_TAB_VISUAL_SOURCE=Visual/Source