[jbosstools-commits] JBoss Tools SVN: r39762 - in trunk: jst/plugins/org.jboss.tools.jst.jsp/META-INF and 10 other directories.

Author: dmaliarevich Date: 2012-03-22 07:57:55 -0400 (Thu, 22 Mar 2012) New Revision: 39762 Added: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/selbar.gif Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/META-INF/MANIFEST.MF trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.properties trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/bundle/BundleMapUtil.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/editor/IVisualEditor.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/IVpePreferencesPage.java 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/selection/bar/SelectionBar.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar/SelectionBarHandler.java trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml 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/preferences/VpePreferencesPage.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties Log: https://issues.jboss.org/browse/JBIDE-11302 - "Toggle selection tag bar" icon was added to the VPE toolbar. Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/META-INF/MANIFEST.MF =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/META-INF/MANIFEST.MF 2012-03-22 11:26:51 UTC (rev 39761) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/META-INF/MANIFEST.MF 2012-03-22 11:57:55 UTC (rev 39762) @@ -23,6 +23,7 @@ org.jboss.tools.jst.jsp.outline.css, org.jboss.tools.jst.jsp.preferences, org.jboss.tools.jst.jsp.selection, + org.jboss.tools.jst.jsp.selection.bar, org.jboss.tools.jst.jsp.support.kb, org.jboss.tools.jst.jsp.text, org.jboss.tools.jst.jsp.ui.action, Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.properties =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.properties 2012-03-22 11:26:51 UTC (rev 39761) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.properties 2012-03-22 11:57:55 UTC (rev 39762) @@ -16,10 +16,10 @@ proposalCategory.xmlEL= JBoss JSF EL Proposals proposalCategory.xmlTag= JBoss JSF Tag Proposals -Toggle.Selection.Bar=Toggle Selection Bar +Toggle.Selection.Bar=Toggle selection tag bar Externalize.Selected.Property=Externalize selected string... -vpe.toolbar.name=VPE Toolbar +vpe.toolbar.name=JBoss Visual Page Editor toolbar ContentType_JBossToolsINC=JBoss Tools JSP Include ContentType_JBossPHPSource=JBoss Tools PHP Source \ No newline at end of file Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml 2012-03-22 11:26:51 UTC (rev 39761) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml 2012-03-22 11:57:55 UTC (rev 39762) @@ -738,7 +738,7 @@ <command categoryId="org.jboss.tools.jst.jsp.commands.category" id="org.jboss.tools.jst.jsp.commands.showSelectionBar" - name="Show Selection Bar"> + name="%Toggle.Selection.Bar"> <state class="org.eclipse.ui.handlers.RegistryToggleState:true" id="org.eclipse.ui.commands.toggleState"> Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/bundle/BundleMapUtil.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/bundle/BundleMapUtil.java 2012-03-22 11:26:51 UTC (rev 39761) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/bundle/BundleMapUtil.java 2012-03-22 11:57:55 UTC (rev 39762) @@ -22,7 +22,7 @@ */ public class BundleMapUtil { - private static final String elPattern = "(?s:(.*)[#\\$]\\{(.+)\\}(.*))"; //$NON-NLS-1$ + private static final String EL_PATTERN = "(?s:(.*)[#\\$]\\{(.+)\\}(.*))"; //$NON-NLS-1$ /** * Checks if node contains text information from resource bundle * @param pageContext @@ -85,6 +85,6 @@ * @return */ public static boolean isContainsEl(final String value) { - return value.matches(elPattern); + return value.matches(EL_PATTERN); } } Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/editor/IVisualEditor.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/editor/IVisualEditor.java 2012-03-22 11:26:51 UTC (rev 39761) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/editor/IVisualEditor.java 2012-03-22 11:57:55 UTC (rev 39762) @@ -14,11 +14,11 @@ import org.eclipse.ui.texteditor.ITextEditor; public interface IVisualEditor extends IReusableEditor { + /* + * VPE tab indexes + */ public static final int VISUALSOURCE_MODE = 0; - //public static final int VISUAL_MODE = 1; public static final int SOURCE_MODE = 1; - - /** PREVIEW_MODE */ public static final int PREVIEW_MODE = 2; public void setVisualMode(int mode); @@ -29,5 +29,4 @@ public void createVisualEditor(); public void maximizeSource(); public void maximizeVisual(); - -} +} \ No newline at end of file Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/IVpePreferencesPage.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/IVpePreferencesPage.java 2012-03-22 11:26:51 UTC (rev 39761) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/IVpePreferencesPage.java 2012-03-22 11:57:55 UTC (rev 39762) @@ -14,6 +14,7 @@ static final String SHOW_BORDER_FOR_UNKNOWN_TAGS = "Show Border for Unknown Tags"; //$NON-NLS-1$ static final String SHOW_NON_VISUAL_TAGS = "Show non-visual tags"; //$NON-NLS-1$ + static final String SHOW_SELECTION_TAG_BAR = "Show Selection Tag Bar"; //$NON-NLS-1$ static final String SHOW_TEXT_FORMATTING = "Show Text Formatting bar"; //$NON-NLS-1$ static final String SHOW_RESOURCE_BUNDLES_USAGE_AS_EL = "Show Resource Bundles Usage as EL Expressions"; //$NON-NLS-1$ static final String ASK_TAG_ATTRIBUTES_ON_TAG_INSERT = "Ask for tag attributes during tag insert"; //$NON-NLS-1$ 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 2012-03-22 11:26:51 UTC (rev 39761) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/VpePreferencesInitializer.java 2012-03-22 11:57:55 UTC (rev 39762) @@ -24,6 +24,7 @@ defaultPreferences.putBoolean(IVpePreferencesPage.SHOW_VISUAL_TOOLBAR, 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); defaultPreferences.putBoolean(IVpePreferencesPage.SHOW_RESOURCE_BUNDLES_USAGE_AS_EL, false); defaultPreferences.putBoolean(IVpePreferencesPage.ASK_TAG_ATTRIBUTES_ON_TAG_INSERT, true); Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar/SelectionBar.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar/SelectionBar.java 2012-03-22 11:26:51 UTC (rev 39761) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar/SelectionBar.java 2012-03-22 11:57:55 UTC (rev 39762) @@ -64,9 +64,10 @@ import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter; import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier; import org.eclipse.wst.sse.ui.StructuredTextEditor; +import org.jboss.tools.jst.jsp.JspEditorPlugin; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; -import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditorPart; import org.jboss.tools.jst.jsp.messages.JstUIMessages; +import org.jboss.tools.jst.jsp.preferences.IVpePreferencesPage; import org.jboss.tools.jst.jsp.selection.SelectionHelper; import org.jboss.tools.jst.jsp.selection.SourceSelection; import org.jboss.tools.jst.jsp.selection.SourceSelectionBuilder; @@ -135,9 +136,7 @@ ICommandService commandService = (ICommandService) PlatformUI .getWorkbench().getService(ICommandService.class); this.toggleSelBarCommand = commandService.getCommand(SelectionBarHandler.COMMAND_ID); - toggleSelBarState = toggleSelBarCommand - .getState("org.eclipse.ui.commands.toggleState"); //$NON-NLS-1$ - + toggleSelBarState = toggleSelBarCommand.getState("org.eclipse.ui.commands.toggleState"); //$NON-NLS-1$ toggleSelBarCommandListener = new ICommandListener() { @Override public void commandChanged(CommandEvent commandEvent) { @@ -189,6 +188,8 @@ */ setVisible(false); toggleSelBarState.setValue(false); + JspEditorPlugin.getDefault().getPreferenceStore(). + setValue(IVpePreferencesPage.SHOW_SELECTION_TAG_BAR, false); } }; @@ -243,7 +244,6 @@ public void refreshVisibility() { boolean visible = (Boolean) toggleSelBarState.getValue(); - IEditorPart editorPart = textEditor.getEditorPart(); if(editorPart instanceof JSPMultiPageEditor){ JSPMultiPageEditor jspEditor = (JSPMultiPageEditor) editorPart; Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar/SelectionBarHandler.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar/SelectionBarHandler.java 2012-03-22 11:26:51 UTC (rev 39761) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar/SelectionBarHandler.java 2012-03-22 11:57:55 UTC (rev 39762) @@ -22,7 +22,9 @@ import org.eclipse.ui.commands.IElementUpdater; import org.eclipse.ui.handlers.HandlerUtil; import org.eclipse.ui.menus.UIElement; +import org.jboss.tools.jst.jsp.JspEditorPlugin; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.jst.jsp.preferences.IVpePreferencesPage; /** * Selection bar handler @@ -35,6 +37,11 @@ * The constructor. */ public SelectionBarHandler() { + /* + * Init the item state + */ + setBaseEnabled(JspEditorPlugin.getDefault().getPreferenceStore(). + getBoolean(IVpePreferencesPage.SHOW_SELECTION_TAG_BAR)); } @Override @@ -62,7 +69,12 @@ * from the application context. */ public Object execute(ExecutionEvent event) throws ExecutionException { - HandlerUtil.toggleCommandState(event.getCommand()); + /* + * Change command state and save it to PreferenceStore + */ + JspEditorPlugin.getDefault().getPreferenceStore().setValue( + IVpePreferencesPage.SHOW_SELECTION_TAG_BAR, + !HandlerUtil.toggleCommandState(event.getCommand())); return null; } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml 2012-03-22 11:26:51 UTC (rev 39761) +++ trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml 2012-03-22 11:57:55 UTC (rev 39762) @@ -192,7 +192,7 @@ </dynamic> </menuContribution> <menuContribution - locationURI="toolbar:org.jboss.tools.jst.jsp.toolbars.sampleToolbar?after=org.jboss.tools.jst.jsp.toolbars.i18"> + locationURI="toolbar:org.jboss.tools.jst.jsp.toolbars.sampleToolbar?before=org.jboss.tools.jst.jsp.toolbars.i18"> <command commandId="org.jboss.tools.vpe.commands.preferencesCommand" icon="icons/preferences.gif" Added: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/selbar.gif =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/selbar.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream 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 2012-03-22 11:26:51 UTC (rev 39761) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java 2012-03-22 11:57:55 UTC (rev 39762) @@ -70,6 +70,7 @@ import org.jboss.tools.jst.jsp.jspeditor.StorageRevisionEditorInputAdapter; import org.jboss.tools.jst.jsp.preferences.IVpePreferencesPage; import org.jboss.tools.jst.jsp.preferences.VpePreference; +import org.jboss.tools.jst.jsp.selection.bar.SelectionBar; import org.jboss.tools.vpe.IVpeHelpContextIds; import org.jboss.tools.vpe.VpePlugin; import org.jboss.tools.vpe.editor.mozilla.MozillaEditor; @@ -98,7 +99,7 @@ private ControlListener controlListener; private XModelTreeListener listener; private XModelObject optionsObject; -// private SelectionBar selectionBar = new SelectionBar(); + private SelectionBar selectionBar; // should be get from o.j.t.jst.jsp plugin private ActivationListener activationListener = new ActivationListener(); private int visualMode; private EditorPart multiPageEditor; @@ -806,12 +807,16 @@ toolBar = visualEditor.createVisualToolbar(verticalToolbarSplitter); visualEditor.createPartControl(visualContent); - /* - * https://issues.jboss.org/browse/JBIDE-10711 - */ - if (!XulRunnerBrowser.isCurrentPlatformOfficiallySupported()) { - if (multiPageEditor instanceof JSPMultiPageEditor) { - JSPMultiPageEditor jspMultiPageEditor = (JSPMultiPageEditor) multiPageEditor; + if (multiPageEditor instanceof JSPMultiPageEditor) { + JSPMultiPageEditor jspMultiPageEditor = (JSPMultiPageEditor) multiPageEditor; + /* + * https://issues.jboss.org/browse/JBIDE-11302 + */ + selectionBar = jspMultiPageEditor.getSelectionBar(); + /* + * https://issues.jboss.org/browse/JBIDE-10711 + */ + if (!XulRunnerBrowser.isCurrentPlatformOfficiallySupported()) { /* * Set the flag in JSPMultiPageEditor */ @@ -1124,27 +1129,24 @@ // doVisualRefresh = true; // } - boolean prefsShowNonVisualTags = JspEditorPlugin.getDefault() - .getPreferenceStore().getBoolean( - IVpePreferencesPage.SHOW_NON_VISUAL_TAGS); - if (prefsShowNonVisualTags != getController().getVisualBuilder() - .isShowInvisibleTags()) { - getController().getVisualBuilder().setShowInvisibleTags( - prefsShowNonVisualTags); + 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); + 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; } + + boolean prefsShowVPEToolBar = JspEditorPlugin.getDefault().getPreferenceStore() + .getBoolean(IVpePreferencesPage.SHOW_VISUAL_TOOLBAR); + setVerticalToolbarVisible(prefsShowVPEToolBar); + /* * Visual refresh is only needed when some options have changed. */ @@ -1155,13 +1157,13 @@ } } -// public void updateSelectionBar(boolean isSelectionBarVisible) { -// if (selectionBar != null) { -// selectionBar.setVisible(isSelectionBarVisible); -// } else { -// VpePlugin.getDefault().logError("VPE Selection Bar is not initialized."); //$NON-NLS-1$ -// } -// } + public void updateSelectionBar(boolean isSelectionBarVisible) { + if (selectionBar != null) { + selectionBar.setVisible(isSelectionBarVisible); + } else { + VpePlugin.getDefault().logError("VPE Selection Bar is not initialized."); //$NON-NLS-1$ + } + } private void deactivateServices() { IWorkbench workbench = PlatformUI.getWorkbench(); 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 2012-03-22 11:26:51 UTC (rev 39761) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java 2012-03-22 11:57:55 UTC (rev 39762) @@ -33,6 +33,8 @@ import org.eclipse.jface.action.IAction; import org.eclipse.jface.action.ToolBarManager; import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.jface.util.IPropertyChangeListener; +import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.jface.viewers.ISelection; import org.eclipse.swt.SWT; import org.eclipse.swt.SWTError; @@ -125,6 +127,7 @@ public static final String ICON_ORIENTATION_SOURCE_LEFT_DISABLED = "icons/source_left_disabled.gif"; //$NON-NLS-1$ public static final String ICON_SHOW_BORDER_FOR_UNKNOWN_TAGS = "icons/border.gif"; //$NON-NLS-1$ public static final String ICON_NON_VISUAL_TAGS = "icons/non-visusal-tags.gif"; //$NON-NLS-1$ + public static final String ICON_SELECTION_BAR = "icons/selbar.gif"; //$NON-NLS-1$ public static final String ICON_TEXT_FORMATTING = "icons/text-formatting.gif"; //$NON-NLS-1$ public static final String ICON_BUNDLE_AS_EL= "icons/bundle-as-el.gif"; //$NON-NLS-1$ public static final String ICON_SCROLL_LOCK= "icons/scroll_lock.gif"; //$NON-NLS-1$ @@ -153,6 +156,7 @@ private Action rotateEditorsAction; private Action showBorderAction; private Action showNonVisualTagsAction; + private Action showSelectionBarAction; private Action showTextFormattingAction; private Action showBundleAsELAction; private Action scrollLockAction; @@ -389,7 +393,7 @@ ICON_NON_VISUAL_TAGS)); showNonVisualTagsAction.setToolTipText(VpeUIMessages.SHOW_NON_VISUAL_TAGS); toolBarManager.add(showNonVisualTagsAction); - + /* * Create SHOW TEXT FORMATTING tool bar item */ @@ -478,6 +482,40 @@ ICON_EXTERNALIZE_STRINGS)); externalizeStringsAction.setToolTipText(JstUIMessages.EXTERNALIZE_STRINGS); toolBarManager.add(externalizeStringsAction); + + /* + * Create SHOW SELECTION BAR tool bar item + */ + showSelectionBarAction = new Action(VpeUIMessages.SHOW_SELECTION_BAR, + IAction.AS_CHECK_BOX) { + @Override + public void run() { + /* + * Update Selection Bar + */ + controller.getPageContext().getEditPart().updateSelectionBar(this.isChecked()); + JspEditorPlugin.getDefault().getPreferenceStore(). + setValue(IVpePreferencesPage.SHOW_SELECTION_TAG_BAR, this.isChecked()); + } + }; + JspEditorPlugin.getDefault().getPreferenceStore().addPropertyChangeListener(new IPropertyChangeListener() { + @Override + public void propertyChange(PropertyChangeEvent event) { + /* + * Change icon state after sel bar was closed + */ + if (IVpePreferencesPage.SHOW_SELECTION_TAG_BAR.equalsIgnoreCase(event.getProperty())) { + boolean newValue = (Boolean) event.getNewValue(); + if (showSelectionBarAction.isChecked() != newValue) { + showSelectionBarAction.setChecked(newValue); + } + } + } + }); + showSelectionBarAction.setImageDescriptor(ImageDescriptor.createFromFile(MozillaEditor.class, + ICON_SELECTION_BAR)); + showSelectionBarAction.setToolTipText(VpeUIMessages.SHOW_SELECTION_BAR); + toolBarManager.add(showSelectionBarAction); updateToolbarItemsAccordingToPreferences(); toolBarManager.update(true); @@ -492,6 +530,7 @@ showResouceDialogAction = null; rotateEditorsAction = null;; showBorderAction = null; + showSelectionBarAction = null; showNonVisualTagsAction = null; showTextFormattingAction = null; showBundleAsELAction = null; @@ -1063,6 +1102,8 @@ .getBoolean(IVpePreferencesPage.SHOW_NON_VISUAL_TAGS); boolean prefsShowTextFormatting = JspEditorPlugin.getDefault().getPreferenceStore() .getBoolean(IVpePreferencesPage.SHOW_TEXT_FORMATTING); + boolean prefsShowSelectionBar = JspEditorPlugin.getDefault().getPreferenceStore() + .getBoolean(IVpePreferencesPage.SHOW_SELECTION_TAG_BAR); boolean prefsShowBundlesAsEL = JspEditorPlugin.getDefault().getPreferenceStore() .getBoolean(IVpePreferencesPage.SHOW_RESOURCE_BUNDLES_USAGE_AS_EL); boolean scrollLockEditors = JspEditorPlugin.getDefault().getPreferenceStore() @@ -1074,6 +1115,9 @@ if (showNonVisualTagsAction != null) { showNonVisualTagsAction.setChecked(prefsShowNonVisualTags); } + if (showSelectionBarAction != null) { + showSelectionBarAction.setChecked(prefsShowSelectionBar); + } if (showTextFormattingAction != null) { showTextFormattingAction.setChecked(prefsShowTextFormatting); } 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 2012-03-22 11:26:51 UTC (rev 39761) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/VpePreferencesPage.java 2012-03-22 11:57:55 UTC (rev 39762) @@ -30,6 +30,7 @@ import org.jboss.tools.jst.jsp.editor.IVisualEditor; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; import org.jboss.tools.jst.jsp.preferences.IVpePreferencesPage; +import org.jboss.tools.jst.jsp.selection.bar.SelectionBarHandler; import org.jboss.tools.vpe.VpePlugin; import org.jboss.tools.vpe.editor.VpeEditorPart; import org.jboss.tools.vpe.handlers.ScrollLockSourceVisualHandler; @@ -134,6 +135,8 @@ visualAppearanceGroup)); addField(new VpeBooleanFieldEditor(SHOW_NON_VISUAL_TAGS, VpeUIMessages.SHOW_NON_VISUAL_TAGS, visualAppearanceGroup)); + addField(new VpeBooleanFieldEditor(SHOW_SELECTION_TAG_BAR, + VpeUIMessages.SHOW_SELECTION_TAG_BAR, visualAppearanceGroup)); addField(new VpeBooleanFieldEditor(SHOW_TEXT_FORMATTING, VpeUIMessages.SHOW_TEXT_FORMATTING, visualAppearanceGroup)); addField(new VpeBooleanFieldEditor(SHOW_RESOURCE_BUNDLES_USAGE_AS_EL, @@ -190,6 +193,8 @@ .getPreferenceStore().getBoolean(IVpePreferencesPage.SHOW_BORDER_FOR_UNKNOWN_TAGS); boolean prefsShowNonVisualTags = JspEditorPlugin.getDefault() .getPreferenceStore().getBoolean(IVpePreferencesPage.SHOW_NON_VISUAL_TAGS); + boolean prefsShowSelectionBar = JspEditorPlugin.getDefault() + .getPreferenceStore().getBoolean(IVpePreferencesPage.SHOW_SELECTION_TAG_BAR); boolean prefsShowTextFormattingBar = JspEditorPlugin.getDefault() .getPreferenceStore().getBoolean(IVpePreferencesPage.SHOW_TEXT_FORMATTING); boolean prefsShowBundlesAsEL = JspEditorPlugin.getDefault() @@ -199,6 +204,7 @@ setCommandToggleState(ShowBorderHandler.COMMAND_ID, presfShowBorderForUnknownTags); setCommandToggleState(ShowNonVisualTagsHandler.COMMAND_ID, prefsShowNonVisualTags); + setCommandToggleState(SelectionBarHandler.COMMAND_ID, prefsShowSelectionBar); setCommandToggleState(ShowTextFormattingHandler.COMMAND_ID, prefsShowTextFormattingBar); setCommandToggleState(ShowBundleAsELHandler.COMMAND_ID, prefsShowBundlesAsEL); setCommandToggleState(ScrollLockSourceVisualHandler.COMMAND_ID, prefsSynchronizeScrolling); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java 2012-03-22 11:26:51 UTC (rev 39761) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java 2012-03-22 11:57:55 UTC (rev 39762) @@ -29,6 +29,7 @@ public static String PREFERENCES; public static String REFRESH; public static String PAGE_DESIGN_OPTIONS; + public static String SHOW_SELECTION_BAR; public static String MOZILLA_LOADING_ERROR; public static String MOZILLA_LOADING_ERROR_LINK_TEXT; public static String MOZILLA_LOADING_ERROR_LINK; 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 2012-03-22 11:26:51 UTC (rev 39761) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties 2012-03-22 11:57:55 UTC (rev 39762) @@ -6,6 +6,7 @@ PREFERENCES=Preferences REFRESH=Refresh PAGE_DESIGN_OPTIONS=Page Design Options +SHOW_SELECTION_BAR=Toggle selection tag bar MOZILLA_LOADING_ERROR=Could not open the Visual Page Editor:\n{0} CURRENT_PLATFORM_IS_NOT_SUPPORTED=Current platform ''{0}'' is not supported. MOZILLA_LOADING_ERROR_LINK_TEXT=See JBoss Tools Visual Editor FAQ