Author: mareshkau Date: 2010-09-17 10:51:48 -0400 (Fri, 17 Sep 2010) New Revision: 24992 Added: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar/ISelectionBarController.java Modified: 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/jspeditor/JSPMultiPageEditorPart.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/handlers/SelectionBarHandler.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 Log: JBIDE-7059 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.properties =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.properties 2010-09-17 14:35:05 UTC (rev 24991) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.properties 2010-09-17 14:51:48 UTC (rev 24992) @@ -16,4 +16,6 @@ proposalCategory.xmlEL= JBoss JSF/SEAM EL Proposals proposalCategory.xmlTag= JBoss JSF/SEAM Tag Proposals -Show.Selection.Bar=Show Selection Bar \ No newline at end of file +Show.Selection.Bar=Show Selection Bar +Toggle.Selection.Bar=Toggle Selection Bar + Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml 2010-09-17 14:35:05 UTC (rev 24991) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml 2010-09-17 14:51:48 UTC (rev 24992) @@ -311,18 +311,19 @@ locationURI="menu:navigate?endof=show.ext"> <command label="%Show.Selection.Bar" commandId="org.jboss.tools.jst.jsp.commands.showSelectionBar" - id="org.jboss.tools.jst.jsp.menus.sampleCommand" + id="org.jboss.tools.jst.jsp.menus.showSelectionBar" + style="toggle" mnemonic="S"> </command> </menuContribution> <menuContribution locationURI="toolbar:org.eclipse.ui.workbench.navigate?after=forwardHistory"> <command - commandId="org.jboss.tools.jst.jsp.commands.showSelectionBar" icon="icons/selbar.gif" - id="org.jboss.tools.jst.jsp.toolbars.sampleCommand" - tooltip="%Show.Selection.Bar"> + id="org.jboss.tools.jst.jsp.toolbars.showSelectionBar" + style="toggle" + tooltip="%Toggle.Selection.Bar"> </command> </menuContribution> </extension> @@ -684,12 +685,16 @@ </command> <category id="org.jboss.tools.jst.jsp.commands.category" - name="Sample Category"> + name="Visual Page Editor Category"> </category> <command categoryId="org.jboss.tools.jst.jsp.commands.category" id="org.jboss.tools.jst.jsp.commands.showSelectionBar" - name="Sample Command"> + name="Show Selection Bar"> + <state + class="org.eclipse.ui.handlers.RegistryToggleState:true" + id="org.eclipse.ui.commands.toggleState"> + </state> </command> </extension> <extension Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditorPart.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditorPart.java 2010-09-17 14:35:05 UTC (rev 24991) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditorPart.java 2010-09-17 14:51:48 UTC (rev 24992) @@ -46,16 +46,19 @@ import org.eclipse.ui.part.MultiPageSelectionProvider; import org.eclipse.wst.sse.ui.StructuredTextEditor; import org.jboss.tools.common.core.resources.XModelObjectEditorInput; +import org.jboss.tools.jst.jsp.selection.bar.ISelectionBarController; import org.jboss.tools.jst.jsp.selection.bar.SelectionBar; /** * */ -public abstract class JSPMultiPageEditorPart extends EditorPart { +public abstract class JSPMultiPageEditorPart extends EditorPart implements ISelectionBarController { private CTabFolder container; private ArrayList nestedEditors = new ArrayList(3); + + private SelectionBar selectionBar; protected JSPMultiPageEditorPart() { super(); @@ -90,12 +93,8 @@ editor.createPartControl(parent2); parent2.setLayout(new GridLayout(2, false)); - SelectionBar selBar = new SelectionBar(sourcePart); - selBar.createToolBarComposite(parent2, true); -// GridData gridData = new GridData(); -// gridData.horizontalAlignment = GridData.FILL; -// gridData.horizontalSpan = 2; -// but.setLayoutData(gridData); + selectionBar = new SelectionBar(sourcePart); + selectionBar.createToolBarComposite(parent2, true); editor.addPropertyListener(new IPropertyListener() { public void propertyChanged(Object source, int propertyId) { JSPMultiPageEditorPart.this @@ -157,6 +156,7 @@ IEditorPart editor = (IEditorPart) nestedEditors.get(i); disposePart(editor); } + selectionBar.dispose(); nestedEditors.clear(); } @@ -348,4 +348,18 @@ getItem(pageIndex).setText(text); } + @Override + public void showSelectionBar() { + selectionBar.setVisible(true); + } + + @Override + public void hideSelectionBar() { + selectionBar.setVisible(false); + } + + @Override + public boolean isSelectionBarAvailable() { + return selectionBar.isVisible(); + } } 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 2010-09-17 14:35:05 UTC (rev 24991) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/IVpePreferencesPage.java 2010-09-17 14:51:48 UTC (rev 24992) @@ -17,7 +17,6 @@ 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$ - static final String ASK_CONFIRMATION_ON_CLOSING_SELECTION_BAR = "Ask for confirmation when closing Selection Bar"; //$NON-NLS-1$ static final String INFORM_WHEN_PROJECT_MIGHT_NOT_BE_CONFIGURED_PROPERLY_FOR_VPE = "Inform when a project might not be configured properly for Visual Page Editor"; //$NON-NLS-1$ static final String DEFAULT_VPE_TAB = "Default VPE Tab"; //$NON-NLS-1$ static final String VISUAL_SOURCE_EDITORS_SPLITTING = "Visual/Source Editors Splitting"; //$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 2010-09-17 14:35:05 UTC (rev 24991) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/VpePreferencesInitializer.java 2010-09-17 14:51:48 UTC (rev 24992) @@ -27,7 +27,6 @@ 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); - defaultPreferences.putBoolean(IVpePreferencesPage.ASK_CONFIRMATION_ON_CLOSING_SELECTION_BAR, true); defaultPreferences.putBoolean(IVpePreferencesPage.INFORM_WHEN_PROJECT_MIGHT_NOT_BE_CONFIGURED_PROPERLY_FOR_VPE, true); defaultPreferences.put(IVpePreferencesPage.DEFAULT_VPE_TAB, IVpePreferencesPage.DEFAULT_VPE_TAB_VISUAL_SOURCE_VALUE); defaultPreferences.put(IVpePreferencesPage.VISUAL_SOURCE_EDITORS_SPLITTING, IVpePreferencesPage.SPLITTING_VERT_TOP_SOURCE_VALUE); Added: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar/ISelectionBarController.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar/ISelectionBarController.java (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar/ISelectionBarController.java 2010-09-17 14:51:48 UTC (rev 24992) @@ -0,0 +1,32 @@ +/******************************************************************************* + * Copyright (c) 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 + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.jst.jsp.selection.bar; + +/** + * Controller to control state of selection bar + * + * @author mareshkau + * + */ +public interface ISelectionBarController { + /** + * Shows selection bar + */ + public void showSelectionBar(); + /** + * Hides selection bar + */ + public void hideSelectionBar(); + /** + * retry the availability of selection bar + */ + public boolean isSelectionBarAvailable(); +} Property changes on: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar/ISelectionBarController.java ___________________________________________________________________ Name: svn:mime-type + text/plain 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 2010-09-17 14:35:05 UTC (rev 24991) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar/SelectionBar.java 2010-09-17 14:51:48 UTC (rev 24992) @@ -130,21 +130,6 @@ final Listener closeListener = new Listener() { public void handleEvent(Event event) { - if (askConfirmationOnClosingSelectionBar()) { - MessageDialogWithToggle dialog = MessageDialogWithToggle - .openOkCancelConfirm( - PlatformUI.getWorkbench() - .getActiveWorkbenchWindow() - .getShell(), - JstUIMessages.CONFIRM_SELECTION_BAR_DIALOG_TITLE, - JstUIMessages.CONFIRM_SELECTION_BAR_DIALOG_MESSAGE, - JstUIMessages.ASK_CONFIRMATION_ON_CLOSING_SELECTION_BAR, - askConfirmationOnClosingSelectionBar(), null, null); - if (dialog.getReturnCode() != IDialogConstants.OK_ID) { - return; - } - setAskConfirmationOnClosingSelectionBar(dialog.getToggleState()); - } /* * Hide the selection bar */ @@ -174,17 +159,6 @@ return splitter; } - public void setAskConfirmationOnClosingSelectionBar(boolean askConfirmation) { - JspEditorPlugin.getDefault().getPreferenceStore().setValue( - IVpePreferencesPage.ASK_CONFIRMATION_ON_CLOSING_SELECTION_BAR, - askConfirmation); - } - - public boolean askConfirmationOnClosingSelectionBar() { - return JspEditorPlugin.getDefault().getPreferenceStore().getBoolean( - IVpePreferencesPage.ASK_CONFIRMATION_ON_CLOSING_SELECTION_BAR); - } - /** * Sets {@code visible} state to this {@code SelectionBar} and fires * all registered {@code VisibilityListener}s. Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar/handlers/SelectionBarHandler.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar/handlers/SelectionBarHandler.java 2010-09-17 14:35:05 UTC (rev 24991) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar/handlers/SelectionBarHandler.java 2010-09-17 14:51:48 UTC (rev 24992) @@ -1,3 +1,14 @@ +/******************************************************************************* + * Copyright (c) 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 + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ + package org.jboss.tools.jst.jsp.selection.bar.handlers; import org.eclipse.core.commands.AbstractHandler; @@ -3,12 +14,12 @@ import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; +import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.handlers.HandlerUtil; import org.eclipse.jface.dialogs.MessageDialog; +import org.jboss.tools.jst.jsp.selection.bar.ISelectionBarController; /** - * Our sample handler extends AbstractHandler, an IHandler base class. - * @see org.eclipse.core.commands.IHandler - * @see org.eclipse.core.commands.AbstractHandler + * Selection bar handler */ public class SelectionBarHandler extends AbstractHandler { @@ -24,11 +35,14 @@ * from the application context. */ public Object execute(ExecutionEvent event) throws ExecutionException { - IWorkbenchWindow window = HandlerUtil.getActiveWorkbenchWindowChecked(event); - MessageDialog.openInformation( - window.getShell(), - "Jsp Editor Plug-in", - "Hello, Selection Bar Handler"); + IEditorPart activeEditor = HandlerUtil.getActiveEditorChecked(event); + boolean togleState = HandlerUtil.toggleCommandState(event.getCommand()); + if(!togleState){ + ((ISelectionBarController)activeEditor).showSelectionBar(); + }else{ + ((ISelectionBarController)activeEditor).hideSelectionBar(); + } return null; } + } 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 2010-09-17 14:35:05 UTC (rev 24991) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/VpePreferencesPage.java 2010-09-17 14:51:48 UTC (rev 24992) @@ -144,10 +144,6 @@ addField(new BooleanFieldEditor(ASK_TAG_ATTRIBUTES_ON_TAG_INSERT, VpeUIMessages.ASK_TAG_ATTRIBUTES_ON_TAG_INSERT, confirmationGroup)); - addField(new BooleanFieldEditor( - ASK_CONFIRMATION_ON_CLOSING_SELECTION_BAR, - VpeUIMessages.ASK_CONFIRMATION_ON_CLOSING_SELECTION_BAR, - confirmationGroup)); addField(new BooleanFieldEditor(INFORM_WHEN_PROJECT_MIGHT_NOT_BE_CONFIGURED_PROPERLY_FOR_VPE, VpeUIMessages.INFORM_WHEN_PROJECT_MIGHT_NOT_BE_CONFIGURED_PROPERLY_FOR_VPE, confirmationGroup)); 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 2010-09-17 14:35:05 UTC (rev 24991) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java 2010-09-17 14:51:48 UTC (rev 24992) @@ -132,7 +132,6 @@ public static String SHOW_BUNDLES_AS_MESSAGES; public static String EXTERNALIZE_STRINGS; public static String ASK_TAG_ATTRIBUTES_ON_TAG_INSERT; - public static String ASK_CONFIRMATION_ON_CLOSING_SELECTION_BAR; public static String INFORM_WHEN_PROJECT_MIGHT_NOT_BE_CONFIGURED_PROPERLY_FOR_VPE; public static String DEFAULT_VPE_TAB; public static String VISUAL_SOURCE_EDITORS_SPLITTING;