Author: vrubezhny Date: 2012-02-03 10:29:01 -0500 (Fri, 03 Feb 2012) New Revision: 38415 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions/FindSeamAction.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions/FindSeamDeclarationsAction.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions/FindSeamReferencesAction.java Log: JBIDE-7361 Seam toolbar items are showing up in the Teiid toolbar The visibility of Seam-toolbar/menu actions is set to be default only for Seam perspective. The Seam-toolbar action is visible now in "Configure Perspective..." dialog for any perspective (as 'disabled' unless it's not Seam perspective) Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml 2012-02-03 14:53:22 UTC (rev 38414) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml 2012-02-03 15:29:01 UTC (rev 38415) @@ -661,6 +661,7 @@ name="Find Seam References"> </command> </extension> + <extension point="org.eclipse.ui.bindings"> <key @@ -761,51 +762,11 @@ point="org.eclipse.ui.menus"> <menuContribution locationURI="menu:navigate?after=open.ext2"> - <command - commandId="org.jboss.tools.seam.ui.open.component" - id="openComponent" - mnemonic="Z" - icon="$nl$/icons/open_seam_component.gif" - label="Open Seam Component" - tooltip="Open Seam Component" > - <visibleWhen - checkEnabled="false"> - <with - variable="activeContexts"> - <iterate - operator="or"> - <equals - value="org.jboss.tools.seam.ui.actionSet"> - </equals> - </iterate> - </with> - </visibleWhen> - </command> </menuContribution> <menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar?after=additions"> <toolbar id="org.eclipse.search.searchActionSet"> - <command - commandId="org.jboss.tools.seam.ui.open.component" - id="openComponent" - mnemonic="Z" - icon="$nl$/icons/open_seam_component.gif" - label="Open Seam Component" - tooltip="Open Seam Component" > - <visibleWhen - checkEnabled="false"> - <with - variable="activeContexts"> - <iterate - operator="or"> - <equals - value="org.jboss.tools.seam.ui.actionSet"> - </equals> - </iterate> - </with> - </visibleWhen> - </command> </toolbar> </menuContribution> <menuContribution @@ -821,47 +782,6 @@ <separator name="internalDialogGroup" visible="false"/> <!-- not to be used by clients --> <separator name="dialogGroup" visible="false"/> <!-- to be used by clients --> <separator name="seamSearchMenuActionsGroup"/> <!-- to be used by clients --> - <command - commandId="org.jboss.tools.seam.ui.find.references" - id="findReferences" - mnemonic="G" - icon="$nl$/icons/find_seam_references.gif" - label="Find Seam References" - tooltip="Find Seam References" > - <visibleWhen - checkEnabled="false"> - <with - variable="activeContexts"> - <iterate - operator="or"> - <equals - value="org.jboss.tools.seam.ui.actionSet"> - </equals> - </iterate> - </with> - </visibleWhen> - </command> - <command - commandId="org.jboss.tools.seam.ui.find.declarations" - id="findDeclarations" - mnemonic="G" - icon="$nl$/icons/open_seam_component.gif" - label="Find Seam Declarations" - tooltip="Find Seam Declarations" > - <visibleWhen - checkEnabled="false"> - <with - variable="activeContexts"> - <iterate - operator="or"> - <equals - value="org.jboss.tools.seam.ui.actionSet"> - </equals> - </iterate> - </with> - </visibleWhen> - </command> - <separator name="fileSearchContextMenuActionsGroup"/> <!-- to be used by clients --> <separator name="contextMenuActionsGroup"/> <!-- to be used by clients --> <separator name="occurencesActionsGroup"/> <!-- to be used by clients --> @@ -877,12 +797,43 @@ id="org.jboss.tools.seam.ui.actionSet" label="%ActionSetSeamUILabel" visible="false"> + <action id="openComponent" + style="push" + label="Open Seam Component" + tooltip="Open Seam Component" + definitionId="org.jboss.tools.seam.ui.open.component" + toolbarPath="org.eclipse.search.searchActionSet/Search" + menubarPath="navigate/open.ext2" + icon="$nl$/icons/open_seam_component.gif" + disabledIcon="$nl$/icons/open_seam_component.gif" + class="org.jboss.tools.seam.ui.actions.OpenSeamComponentAction"> + </action> + <action id="findReferences" + style="push" + label="Find Seam References" + tooltip="Find Seam References" + definitionId="org.jboss.tools.seam.ui.find.references" + menubarPath="org.eclipse.search.menu/seamSearchMenuActionsGroup" + icon="$nl$/icons/find_seam_references.gif" + disabledIcon="$nl$/icons/find_seam_references.gif" + class="org.jboss.tools.seam.ui.actions.FindSeamReferencesAction"> + </action> + <action id="findDeclarations" + style="push" + label="Find Seam Declarations" + tooltip="Find Seam Declarations" + definitionId="org.jboss.tools.seam.ui.find.references" + menubarPath="org.eclipse.search.menu/seamSearchMenuActionsGroup" + icon="$nl$/icons/find_seam_declarations.gif" + disabledIcon="$nl$/icons/find_seam_declarations.gif" + class="org.jboss.tools.seam.ui.actions.FindSeamDeclarationsAction"> + </action> </actionSet> </extension> <extension point="org.eclipse.ui.handlers"> - <handler + <!-- handler class="org.jboss.tools.seam.ui.handlers.OpenSeamComponentHandler" commandId="org.jboss.tools.seam.ui.open.component"> </handler> @@ -893,7 +844,7 @@ <handler class="org.jboss.tools.seam.ui.handlers.FindSeamDeclarationsHandler" commandId="org.jboss.tools.seam.ui.find.declarations"> - </handler> + </handler --> </extension> <extension point="org.jboss.tools.common.model.classes"> Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions/FindSeamAction.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions/FindSeamAction.java 2012-02-03 14:53:22 UTC (rev 38414) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions/FindSeamAction.java 2012-02-03 15:29:01 UTC (rev 38415) @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Red Hat, Inc. + * Copyright (c) 2007-2012 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, @@ -57,15 +57,12 @@ import org.jboss.tools.seam.core.SeamCorePlugin; import org.jboss.tools.seam.internal.core.el.SeamELCompletionEngine; import org.jboss.tools.seam.ui.SeamGuiPlugin; -import org.jboss.tools.seam.ui.handlers.FindSeamHandler; import org.jboss.tools.seam.ui.search.SeamSearchQuery; import org.jboss.tools.seam.ui.search.SeamSearchScope; /** * Base class for Seam Find actions * - * @deprecated This class is subject to remove. Use {@link FindSeamHandler} instead. - * * @author Jeremy */ abstract public class FindSeamAction extends Action implements IWorkbenchWindowActionDelegate, IActionDelegate2, ISelectionListener Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions/FindSeamDeclarationsAction.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions/FindSeamDeclarationsAction.java 2012-02-03 14:53:22 UTC (rev 38414) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions/FindSeamDeclarationsAction.java 2012-02-03 15:29:01 UTC (rev 38415) @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Red Hat, Inc. + * Copyright (c) 2007-2012 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, @@ -12,14 +12,11 @@ package org.jboss.tools.seam.ui.actions; import org.jboss.tools.seam.ui.SeamUIMessages; -import org.jboss.tools.seam.ui.handlers.FindSeamHandler; import org.jboss.tools.seam.ui.search.SeamSearchScope; /** * Find Seam Declarations action * - * @deprecated This class is subject to remove. Use {@link FindSeamDeclarationHandler} instead. - * * @author Jeremy */ public class FindSeamDeclarationsAction extends FindSeamAction { Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions/FindSeamReferencesAction.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions/FindSeamReferencesAction.java 2012-02-03 14:53:22 UTC (rev 38414) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions/FindSeamReferencesAction.java 2012-02-03 15:29:01 UTC (rev 38415) @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Red Hat, Inc. + * Copyright (c) 2007-2012 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, @@ -17,8 +17,6 @@ /** * Find Seam References action * - * @deprecated This class is subject to remove. Use {@link FindSeamReferencesHandler} instead. - * * @author Jeremy */ public class FindSeamReferencesAction extends FindSeamAction {