Author: vrubezhny Date: 2012-02-03 11:20:53 -0500 (Fri, 03 Feb 2012) New Revision: 38418 Added: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/actions/ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/actions/OpenCDINamedBeanAction.java Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.xml trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.properties Log: JBIDE-10564 Open CDI Named Bean Toolbar button and navigaton Menu item is always visible (even if no CDI-related perspective is activated) The visibility of CDI-toolbar action is set to be default only for JBoss/JEE/Debug perspective. The CDI-toolbar action is visible now in "Configure Perspective..." dialog for any perspective (as 'disabled' unless it's not JBoss/JEE/Debug perspective) Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.xml =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.xml 2012-02-03 16:05:26 UTC (rev 38417) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.xml 2012-02-03 16:20:53 UTC (rev 38418) @@ -122,52 +122,11 @@ <menuContribution locationURI="menu:navigate?after=open.ext2"> - <command - commandId="org.jboss.tools.cdi.ui.open.namedBean" - id="openNamedBean" - mnemonic="Z" - 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 locationURI="toolbar:org.eclipse.ui.main.toolbar?after=additions"> <toolbar id="org.eclipse.search.searchActionSet"> - <command - commandId="org.jboss.tools.cdi.ui.open.namedBean" - id="openNamedBean" - mnemonic="Z" - 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> @@ -180,15 +139,28 @@ id="org.jboss.tools.cdi.ui.actionSet" label="%ActionSetCDIUILabel" visible="false"> + + <action id="openNamedBean" + style="push" + label="Open CDI Named Bean" + tooltip="Open CDI Named Bean" + definitionId="org.jboss.tools.cdi.ui.open.namedBean" + toolbarPath="org.eclipse.search.searchActionSet/Search" + menubarPath="navigate/open.ext2" + icon="$nl$/icons/open_cdi_named_bean.png" + disabledIcon="$nl$/icons/open_cdi_named_bean.png" + class="org.jboss.tools.cdi.ui.actions.OpenCDINamedBeanAction"> + </action> + </actionSet> </extension> <extension point="org.eclipse.ui.handlers"> - <handler + <!-- handler class="org.jboss.tools.cdi.ui.handlers.OpenCDINamedBeanHandler" commandId="org.jboss.tools.cdi.ui.open.namedBean"> - </handler> + </handler --> </extension> <extension Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.java 2012-02-03 16:05:26 UTC (rev 38417) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.java 2012-02-03 16:20:53 UTC (rev 38418) @@ -153,6 +153,8 @@ public static String OPEN_CDI_NAMED_BEAN_DIALOG_WAIT; public static String OPEN_CDI_NAMED_BEAN_ACTION_NAME; + public static String OPEN_CDI_NAMED_BEAN_ACTION_DESCRIPTION; + public static String OPEN_CDI_NAMED_BEAN_ACTION_TOOL_TIP; public static String OPEN_CDI_NAMED_BEAN_ACTION_MESSAGE; public static String CDI_PROJECT_WIZARD_NEW_PROJECT; Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.properties =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.properties 2012-02-03 16:05:26 UTC (rev 38417) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.properties 2012-02-03 16:20:53 UTC (rev 38418) @@ -141,6 +141,8 @@ OPEN_CDI_NAMED_BEAN_DIALOG_WAIT=Wait for Build... OPEN_CDI_NAMED_BEAN_ACTION_NAME=Open CDI Named Bean +OPEN_CDI_NAMED_BEAN_ACTION_DESCRIPTION=Open CDI Named Bean +OPEN_CDI_NAMED_BEAN_ACTION_TOOL_TIP=Open CDI Named Bean OPEN_CDI_NAMED_BEAN_ACTION_MESSAGE=Enter bean EL name prefix or pattern (? = any character, * = any string): CDI_PROJECT_WIZARD_NEW_PROJECT=New CDI Web Project Added: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/actions/OpenCDINamedBeanAction.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/actions/OpenCDINamedBeanAction.java (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/actions/OpenCDINamedBeanAction.java 2012-02-03 16:20:53 UTC (rev 38418) @@ -0,0 +1,95 @@ +/******************************************************************************* + * Copyright (c) 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, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.cdi.ui.actions; + +import org.eclipse.jface.action.Action; +import org.eclipse.jface.action.IAction; +import org.eclipse.jface.dialogs.IDialogConstants; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.swt.widgets.Event; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.ui.IActionDelegate2; +import org.eclipse.ui.IWorkbenchWindow; +import org.eclipse.ui.IWorkbenchWindowActionDelegate; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.dialogs.SelectionDialog; +import org.jboss.tools.cdi.ui.CDIUIMessages; +import org.jboss.tools.cdi.ui.wizard.OpenCDINamedBeanDialog; +import org.jboss.tools.cdi.ui.wizard.OpenCDINamedBeanDialog.CDINamedBeanWrapper; + +/** + * + * @author Victor V. Rubezhny + * + */ +public class OpenCDINamedBeanAction extends Action implements IWorkbenchWindowActionDelegate, IActionDelegate2 { + + public OpenCDINamedBeanAction() { + super(); + setText(CDIUIMessages.OPEN_CDI_NAMED_BEAN_ACTION_NAME); + setDescription(CDIUIMessages.OPEN_CDI_NAMED_BEAN_ACTION_DESCRIPTION); + setToolTipText(CDIUIMessages.OPEN_CDI_NAMED_BEAN_ACTION_TOOL_TIP); + } + + public void run() { + runWithEvent(null); + } + + public void runWithEvent(Event e) { + Shell parent= PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(); + SelectionDialog dialog; + + dialog= new OpenCDINamedBeanDialog(parent); + + dialog.setTitle(CDIUIMessages.OPEN_CDI_NAMED_BEAN_ACTION_NAME); + dialog.setMessage(CDIUIMessages.OPEN_CDI_NAMED_BEAN_ACTION_MESSAGE); + + int result= dialog.open(); + if (result != IDialogConstants.OK_ID) + return; + + Object[] resultObjects = dialog.getResult(); + for (Object resultObject : resultObjects) { + ((CDINamedBeanWrapper) resultObject).getBean().open(); + } + } + + + // ---- IWorkbenchWindowActionDelegate + // ------------------------------------------------ + + public void run(IAction action) { + run(); + } + + public void dispose() { + // do nothing. + } + + public void init(IWorkbenchWindow window) { + // do nothing. + } + + public void selectionChanged(IAction action, ISelection selection) { + // do nothing. Action doesn't depend on selection. + } + + // ---- IActionDelegate2 + // ------------------------------------------------ + + public void runWithEvent(IAction action, Event event) { + runWithEvent(event); + } + + public void init(IAction action) { + // do nothing. + } +} Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/actions/OpenCDINamedBeanAction.java ___________________________________________________________________ Added: svn:mime-type + text/plain