Author: vrubezhny Date: 2011-12-23 11:13:22 -0500 (Fri, 23 Dec 2011) New Revision: 37561 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.properties trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.xml Log: JBIDE-10564 Open CDI Named Bean Toolbar button and navigaton Menu item is always visible (even if no CDI-related perspective is activated) Issue is fixed Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.properties =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.properties 2011-12-23 15:59:53 UTC (rev 37560) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.properties 2011-12-23 16:13:22 UTC (rev 37561) @@ -16,4 +16,7 @@ preferenceKeywords.newBeansXML=CDI XML NewWizards.file=File beans.xml -NewWizards.file.description=Create a new beans.xml File \ No newline at end of file +NewWizards.file.description=Create a new beans.xml File + +ActionSetCDIUIDescription=Makes CDI UI Actions available in main menu and toolbar +ActionSetCDIUILabel=CDI UI Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.xml =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.xml 2011-12-23 15:59:53 UTC (rev 37560) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.xml 2011-12-23 16:13:22 UTC (rev 37561) @@ -129,6 +129,19 @@ icon="$nl$/icons/open_cdi_named_bean.png" label="Open CDI Named Bean" tooltip="Open CDI Named Bean" > + <visibleWhen + checkEnabled="false"> + <with + variable="activeContexts"> + <iterate + operator="or"> + <equals + value="org.jboss.tools.cdi.ui.actionSet"> + </equals> + </iterate> + </with> + </visibleWhen> + </command> </menuContribution> <menuContribution @@ -142,12 +155,34 @@ icon="$nl$/icons/open_cdi_named_bean.png" label="Open CDI Named Bean" tooltip="Open CDI Named Bean" > + <visibleWhen + checkEnabled="false"> + <with + variable="activeContexts"> + <iterate + operator="or"> + <equals + value="org.jboss.tools.cdi.ui.actionSet"> + </equals> + </iterate> + </with> + </visibleWhen> </command> </toolbar> </menuContribution> </extension> + <extension + point="org.eclipse.ui.actionSets"> + <actionSet + description="%ActionSetCDIUIDescription" + id="org.jboss.tools.cdi.ui.actionSet" + label="%ActionSetCDIUILabel" + visible="false"> + </actionSet> + </extension> + <extension point="org.eclipse.ui.handlers"> <handler @@ -388,6 +423,7 @@ <newWizardShortcut id="org.jboss.tools.cdi.ui.wizard.NewBeansXMLCreationWizard"> </newWizardShortcut--> + <actionSet id="org.jboss.tools.cdi.ui.actionSet" /> </perspectiveExtension> <perspectiveExtension @@ -422,7 +458,13 @@ <newWizardShortcut id="org.jboss.tools.cdi.ui.wizard.NewBeansXMLCreationWizard"> </newWizardShortcut> + <actionSet id="org.jboss.tools.cdi.ui.actionSet" /> </perspectiveExtension> + + <perspectiveExtension + targetID="org.eclipse.debug.ui.DebugPerspective"> + <actionSet id="org.jboss.tools.cdi.ui.actionSet" /> + </perspectiveExtension> </extension> <extension point="org.eclipse.ui.navigator.navigatorContent">