Author: dmaliarevich Date: 2010-08-18 07:47:55 -0400 (Wed, 18 Aug 2010) New Revision: 24258 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.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/selbar/SelectionBar.java Log: https://jira.jboss.org/browse/JBIDE-6832 , Selection bar visibility has been fixed. Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2010-08-18 11:03:33 UTC (rev 24257) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2010-08-18 11:47:55 UTC (rev 24258) @@ -2521,8 +2521,8 @@ } /* - * https://jira.jboss.org/jira/browse/JBIDE-4968 Updating VPE toolbar on - * selection bar changes. + * https://jira.jboss.org/jira/browse/JBIDE-4968 + * Updating VPE toolbar icon on selection bar changes. */ public void updateVpeToolbar() { visualEditor.updateShowSelectionBarItem(selectionBar.isVisible()); 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-08-18 11:03:33 UTC (rev 24257) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java 2010-08-18 11:47:55 UTC (rev 24258) @@ -312,6 +312,10 @@ public void setVisualMode(int type) { switch (type) { case VISUALSOURCE_MODE: + /* + * https://jira.jboss.org/browse/JBIDE-6832 + * Restore the state after switching from Preview, for example. + */ selectionBar.setVisible(selectionBar.getAlwaysVisibleOption()); setVerticalToolbarVisible(true); /* @@ -649,9 +653,9 @@ public void nodeChanged(XModelTreeEvent event) { /* - * 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. + * Fixes 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()); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/selbar/SelectionBar.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/selbar/SelectionBar.java 2010-08-18 11:03:33 UTC (rev 24257) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/selbar/SelectionBar.java 2010-08-18 11:47:55 UTC (rev 24258) @@ -132,7 +132,6 @@ .getShell(), VpeUIMessages.CONFIRM_SELECTION_BAR_DIALOG_TITLE, VpeUIMessages.CONFIRM_SELECTION_BAR_DIALOG_MESSAGE, -// VpeUIMessages.CONFIRM_SELECTION_BAR_DIALOG_TOGGLE_MESSAGE, VpeUIMessages.ASK_CONFIRMATION_ON_CLOSING_SELECTION_BAR, askConfirmationOnClosingSelectionBar(), null, null); if (dialog.getReturnCode() != IDialogConstants.OK_ID) { @@ -140,8 +139,18 @@ } setAskConfirmationOnClosingSelectionBar(dialog.getToggleState()); } - + /* + * Hide the selection bar + */ setVisible(false); + /* + * https://jira.jboss.org/browse/JBIDE-6832 + * Store the state to the preferences. + * Later this property will be used to restore + * selection bar visibility after tabs' switching. + */ + JspEditorPlugin.getDefault().getPreferenceStore(). + setValue(IVpePreferencesPage.SHOW_SELECTION_TAG_BAR, false); } }; @@ -201,7 +210,7 @@ this.visible = visible; /* * https://jira.jboss.org/jira/browse/JBIDE-4968 - * Updating VPE toolbar on selection bar changes. + * Updating VPE toolbar icon on selection bar changes. */ if (vpeController != null) { vpeController.updateVpeToolbar();