Author: koen.aers(a)jboss.com Date: 2011-12-19 07:16:48 -0500 (Mon, 19 Dec 2011) New Revision: 37421 Added: trunk/forge/plugins/org.jboss.tools.forge.ui/icons/link.gif trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/commands/LinkHandler.java trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/commands/SourceProvider.java trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/commands/StartHandler.java trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/commands/StopHandler.java trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/util/ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/util/ForgeHelper.java Removed: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/action/ShowInForgeDelegate.java trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/action/StartDelegate.java trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/action/StopDelegate.java Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/META-INF/MANIFEST.MF trunk/forge/plugins/org.jboss.tools.forge.ui/plugin.xml trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeCommandProcessor.java trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/part/ForgeView.java Log: JBIDE-10523: Reimplement the Start/Stop functionality of the Forge View using the Command Framework Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/META-INF/MANIFEST.MF 2011-12-19 12:14:49 UTC (rev 37420) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/META-INF/MANIFEST.MF 2011-12-19 12:16:48 UTC (rev 37421) @@ -21,7 +21,8 @@ org.eclipse.rse.ui;bundle-version="3.2.1", org.eclipse.rse.core;bundle-version="3.2.1", org.eclipse.rse.subsystems.files.core;bundle-version="3.2.101", - org.eclipse.rse.subsystems.files.local;bundle-version="2.1.200" + org.eclipse.rse.subsystems.files.local;bundle-version="2.1.200", + org.eclipse.core.expressions;bundle-version="3.4.300" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Bundle-Activator: org.jboss.tools.forge.ui.ForgeUIPlugin Added: trunk/forge/plugins/org.jboss.tools.forge.ui/icons/link.gif =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/icons/link.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/plugin.xml =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/plugin.xml 2011-12-19 12:14:49 UTC (rev 37420) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/plugin.xml 2011-12-19 12:16:48 UTC (rev 37421) @@ -4,63 +4,18 @@ <extension point="org.eclipse.ui.views"> <category - id="org.jboss.tools.forge" + id="org.jboss.tools.forge.ui" name="Forge"> </category> <view - category="org.jboss.tools.forge" + category="org.jboss.tools.forge.ui" class="org.jboss.tools.forge.ui.part.ForgeView" icon="icons/jbossforge_icon_16px.png" - id="org.jboss.tools.forge.console" + id="org.jboss.tools.forge.ui.view" name="Forge Console" restorable="true"> </view> -<!-- <view - category="org.jboss.tools.forge" - class="org.jboss.tools.forge.ui.part.ConsoleView" - id="org.jboss.tools.forge.console" - name="Forge Console" - restorable="true"> - </view> --> </extension> - <extension - point="org.eclipse.ui.viewActions"> - <viewContribution - id="org.jboss.tools.forge.view" - targetID="org.jboss.tools.forge.console"> - <menu - id="org.jboss.tools.forge.menubar" - label="Forge"> - </menu> - <action - class="org.jboss.tools.forge.ui.action.StopDelegate" - icon="icons/stop.gif" - id="org.jboss.tools.forge.stop" - label="Stop Forge" - menubarPath="org.jboss.tools.forge.menubar" - style="push" - toolbarPath="org.jboss.tools.forge.toolbar"> - </action> - <action - class="org.jboss.tools.forge.ui.action.StartDelegate" - icon="icons/start.gif" - id="org.jboss.tools.forge.start" - label="Start Forge" - menubarPath="org.jboss.tools.forge.menu" - style="push" - toolbarPath="org.jboss.tools.forge.toolbar"> - </action> - <action - class="org.jboss.tools.forge.ui.action.ShowInForgeDelegate" - icon="icons/jbossforge_icon_16px.png" - id="org.jboss.tools.forge.show" - label="Show In Forge" - menubarPath="org.jboss.tools.forge.menu" - style="push" - toolbarPath="org.jboss.tools.forge.toolbar"> - </action> - </viewContribution> - </extension> <extension point="org.eclipse.ui.preferencePages"> <page name="Forge" @@ -76,6 +31,24 @@ </extension> <extension point="org.eclipse.ui.commands"> + <category + id="org.jboss.tools.forge.ui" + name="Forge Commands"/> + <command + categoryId="org.jboss.tools.forge.ui" + description="Start the default Forge runtime" + id="org.jboss.tools.forge.ui.start" + name="Start Forge"/> + <command + categoryId="org.jboss.tools.forge.ui" + description="Stop the default Forge runtime" + id="org.jboss.tools.forge.ui.stop" + name="Stop Forge"/> +<!-- <command + categoryId="org.jboss.tools.forge.ui" + description="Link the currently selected item to the running Forge runtime" + id="org.jboss.tools.forge.ui.link" + name="Link To Selection"/> --> <command categoryId="org.eclipse.ui.category.window" defaultHandler="org.jboss.tools.forge.ui.commands.ForgeCommandListHandler" @@ -84,6 +57,63 @@ name="Forge Command List"/> </extension> <extension + point="org.eclipse.ui.menus"> + <menuContribution + locationURI="menu:org.jboss.tools.forge.ui.view"> + <command + commandId="org.jboss.tools.forge.ui.start" + icon="icons/start.gif" + label="Start Forge" + mnemonic="A" + style="push" + tooltip="Start the default Forge runtime"> + </command> + <command + commandId="org.jboss.tools.forge.ui.stop" + icon="icons/stop.gif" + label="Stop Forge" + mnemonic="O" + style="push" + tooltip="Stop the running Forge runtime"> + </command> +<!-- <command + commandId="org.jboss.tools.forge.ui.link" + icon="icons/link.gif" + label="Link To Forge" + mnemonic="L" + style="toggle" + tooltip="Link the current selection to Forge"> + </command> --> + </menuContribution> + <menuContribution + locationURI="toolbar:org.jboss.tools.forge.ui.view"> + <command + commandId="org.jboss.tools.forge.ui.start" + icon="icons/start.gif" + label="Start Forge" + mnemonic="A" + style="push" + tooltip="Start the default Forge runtime"> + </command> + <command + commandId="org.jboss.tools.forge.ui.stop" + icon="icons/stop.gif" + label="Stop Forge" + mnemonic="O" + style="push" + tooltip="Stop the running Forge runtime"> + </command> +<!-- <command + commandId="org.jboss.tools.forge.ui.link" + icon="icons/link.gif" + label="Link To Forge" + mnemonic="L" + style="toggle" + tooltip="Link the current selection to Forge"> + </command> --> + </menuContribution> + </extension> + <extension point="org.eclipse.ui.bindings"> <key commandId="org.jboss.tools.forge.ui.commandList" @@ -108,4 +138,53 @@ id = "org.jboss.tools.forge.console"/> </perspectiveExtension> </extension> + <extension + point="org.eclipse.ui.handlers"> + <handler + class="org.jboss.tools.forge.ui.commands.StartHandler" + commandId="org.jboss.tools.forge.ui.start"> + <enabledWhen> + <with + variable="org.jboss.tools.forge.runtime.state"> + <equals + value="org.jboss.tools.forge.runtime.notRunning"> + </equals> + </with> + </enabledWhen> + </handler> + <handler + class="org.jboss.tools.forge.ui.commands.StopHandler" + commandId="org.jboss.tools.forge.ui.stop"> + <enabledWhen> + <with + variable="org.jboss.tools.forge.runtime.state"> + <equals + value="org.jboss.tools.forge.runtime.running"> + </equals> + </with> + </enabledWhen> + </handler> +<!-- <handler + class="org.jboss.tools.forge.ui.commands.LinkHandler" + commandId="org.jboss.tools.forge.ui.link"> + <enabledWhen> + <with + variable="org.jboss.tools.forge.runtime.state"> + <equals + value="org.jboss.tools.forge.runtime.running"> + </equals> + </with> + </enabledWhen> + </handler> --> + </extension> + <extension + point="org.eclipse.ui.services"> + <sourceProvider + provider="org.jboss.tools.forge.ui.commands.SourceProvider"> + <variable + name="org.jboss.tools.forge.runtime.state" + priorityLevel="workbench"> + </variable> + </sourceProvider> + </extension> </plugin> Deleted: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/action/ShowInForgeDelegate.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/action/ShowInForgeDelegate.java 2011-12-19 12:14:49 UTC (rev 37420) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/action/ShowInForgeDelegate.java 2011-12-19 12:16:48 UTC (rev 37421) @@ -1,32 +0,0 @@ -package org.jboss.tools.forge.ui.action; - -import org.eclipse.jface.action.IAction; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.ui.IViewActionDelegate; -import org.eclipse.ui.IViewPart; -import org.eclipse.ui.part.ShowInContext; -import org.jboss.tools.forge.ui.part.ForgeView; - -public class ShowInForgeDelegate implements IViewActionDelegate { - - private ForgeView forgeView = null; - - @Override - public void run(IAction action) { - if (forgeView != null) { - forgeView.show(new ShowInContext(null, forgeView.getSelection())); - } - } - - @Override - public void selectionChanged(IAction action, ISelection selection) { - } - - @Override - public void init(IViewPart view) { - if (view != null && view instanceof ForgeView) { - forgeView = (ForgeView)view; - } - } - -} Deleted: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/action/StartDelegate.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/action/StartDelegate.java 2011-12-19 12:14:49 UTC (rev 37420) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/action/StartDelegate.java 2011-12-19 12:16:48 UTC (rev 37421) @@ -1,29 +0,0 @@ -package org.jboss.tools.forge.ui.action; - -import org.eclipse.jface.action.IAction; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.ui.IViewActionDelegate; -import org.eclipse.ui.IViewPart; -import org.jboss.tools.forge.ui.part.ForgeView; - -public class StartDelegate implements IViewActionDelegate { - - private IViewPart part = null; - - @Override - public void run(IAction action) { - if (part != null && part instanceof ForgeView) { - ((ForgeView)part).startForge(); - } - } - - @Override - public void selectionChanged(IAction action, ISelection selection) { - } - - @Override - public void init(IViewPart view) { - part = view; - } - -} Deleted: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/action/StopDelegate.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/action/StopDelegate.java 2011-12-19 12:14:49 UTC (rev 37420) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/action/StopDelegate.java 2011-12-19 12:16:48 UTC (rev 37421) @@ -1,31 +0,0 @@ -package org.jboss.tools.forge.ui.action; - -import org.eclipse.jface.action.IAction; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.ui.IViewActionDelegate; -import org.eclipse.ui.IViewPart; -import org.jboss.tools.forge.ui.part.ForgeView; - -public class StopDelegate implements IViewActionDelegate { - - private IViewPart part = null; - - @Override - public void run(IAction action) { - if (part != null && part instanceof ForgeView) { - ((ForgeView)part).stopForge(); - } - } - - @Override - public void selectionChanged(IAction action, ISelection selection) { - // TODO Auto-generated method stub - - } - - @Override - public void init(IViewPart view) { - part = view; - } - -} Added: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/commands/LinkHandler.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/commands/LinkHandler.java (rev 0) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/commands/LinkHandler.java 2011-12-19 12:16:48 UTC (rev 37421) @@ -0,0 +1,13 @@ +package org.jboss.tools.forge.ui.commands; + +import org.eclipse.core.commands.AbstractHandler; +import org.eclipse.core.commands.ExecutionEvent; + +public class LinkHandler extends AbstractHandler { + + public Object execute(ExecutionEvent executionEvent) { + System.out.println("Execute Link Handler"); + return null; + } + +} \ No newline at end of file Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/commands/LinkHandler.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/commands/SourceProvider.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/commands/SourceProvider.java (rev 0) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/commands/SourceProvider.java 2011-12-19 12:16:48 UTC (rev 37421) @@ -0,0 +1,35 @@ +package org.jboss.tools.forge.ui.commands; + +import java.util.HashMap; +import java.util.Map; + +import org.eclipse.ui.AbstractSourceProvider; +import org.eclipse.ui.ISources; +import org.jboss.tools.forge.core.process.ForgeRuntime; + +public class SourceProvider extends AbstractSourceProvider { + + private String runtimeState = ForgeRuntime.STATE_NOT_RUNNING; + + @Override + public void dispose() { + } + + @Override + public Map<Object, Object> getCurrentState() { + Map<Object, Object> result = new HashMap<Object, Object>(); + result.put(ForgeRuntime.PROPERTY_STATE, runtimeState); + return result; + } + + @Override + public String[] getProvidedSourceNames() { + return new String[] { ForgeRuntime.PROPERTY_STATE }; + } + + public void setRuntimeState(String state) { + runtimeState = state; + fireSourceChanged(ISources.WORKBENCH, ForgeRuntime.PROPERTY_STATE, state); + } + +} Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/commands/SourceProvider.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/commands/StartHandler.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/commands/StartHandler.java (rev 0) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/commands/StartHandler.java 2011-12-19 12:16:48 UTC (rev 37421) @@ -0,0 +1,18 @@ +package org.jboss.tools.forge.ui.commands; + +import org.eclipse.core.commands.AbstractHandler; +import org.eclipse.core.commands.ExecutionEvent; +import org.jboss.tools.forge.ui.part.ForgeView; +import org.jboss.tools.forge.ui.util.ForgeHelper; + +public class StartHandler extends AbstractHandler { + + public Object execute(ExecutionEvent executionEvent) { + ForgeView forgeView = ForgeHelper.getForgeView(); + if (forgeView != null) { + forgeView.startForge(); + } + return null; + } + +} \ No newline at end of file Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/commands/StartHandler.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/commands/StopHandler.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/commands/StopHandler.java (rev 0) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/commands/StopHandler.java 2011-12-19 12:16:48 UTC (rev 37421) @@ -0,0 +1,18 @@ +package org.jboss.tools.forge.ui.commands; + +import org.eclipse.core.commands.AbstractHandler; +import org.eclipse.core.commands.ExecutionEvent; +import org.jboss.tools.forge.ui.part.ForgeView; +import org.jboss.tools.forge.ui.util.ForgeHelper; + +public class StopHandler extends AbstractHandler { + + public Object execute(ExecutionEvent executionEvent) { + ForgeView forgeView = ForgeHelper.getForgeView(); + if (forgeView != null) { + forgeView.stopForge(); + } + return null; + } + +} \ No newline at end of file Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/commands/StopHandler.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeCommandProcessor.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeCommandProcessor.java 2011-12-19 12:14:49 UTC (rev 37420) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeCommandProcessor.java 2011-12-19 12:16:48 UTC (rev 37421) @@ -12,6 +12,7 @@ import org.eclipse.ui.PartInitException; import org.eclipse.ui.PlatformUI; import org.jboss.tools.forge.ui.ForgeUIPlugin; +import org.jboss.tools.forge.ui.part.ForgeView; public class ForgeCommandProcessor { @@ -83,7 +84,7 @@ try { IWorkbenchWindow workbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); IWorkbenchPage workbenchPage = workbenchWindow.getActivePage(); - workbenchPage.showView("org.jboss.tools.forge.console").setFocus(); + workbenchPage.showView(ForgeView.ID).setFocus(); } catch (PartInitException e) { ForgeUIPlugin.log(e); } Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/part/ForgeView.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/part/ForgeView.java 2011-12-19 12:14:49 UTC (rev 37420) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/part/ForgeView.java 2011-12-19 12:16:48 UTC (rev 37421) @@ -26,14 +26,16 @@ import org.eclipse.ui.part.PageSite; import org.eclipse.ui.part.ShowInContext; import org.eclipse.ui.part.ViewPart; +import org.eclipse.ui.services.ISourceProviderService; import org.jboss.tools.forge.core.preferences.ForgeRuntimesPreferences; import org.jboss.tools.forge.core.process.ForgeRuntime; import org.jboss.tools.forge.ui.ForgeUIPlugin; +import org.jboss.tools.forge.ui.commands.SourceProvider; import org.jboss.tools.forge.ui.console.ForgeTextViewer; public class ForgeView extends ViewPart implements PropertyChangeListener, IShowInTarget { - public static final String ID = "org.jboss.tools.forge.console"; + public static final String ID = "org.jboss.tools.forge.ui.view"; private static final String NOT_RUNNING_MESSAGE = "Forge is not running."; private static final String STARTING_MESSAGE = "Please wait while Forge is starting"; @@ -137,6 +139,7 @@ getDisplay().asyncExec(new Runnable() { public void run() { running.forceFocus(); + updateCommands(ForgeRuntime.STATE_RUNNING); } }); } @@ -154,10 +157,19 @@ notRunningPage.setMessage(notRunningMessage); } showPage(notRunning); + updateCommands(ForgeRuntime.STATE_NOT_RUNNING); } }); } + private void updateCommands(String state) { + ISourceProviderService service = + (ISourceProviderService)getViewSite().getService(ISourceProviderService.class); + SourceProvider sourceProvider = + (SourceProvider) service.getSourceProvider(ForgeRuntime.PROPERTY_STATE); + sourceProvider.setRuntimeState(state); + } + private void showPage(final Control control) { if (getSite().getShell() != null) { getDisplay().asyncExec(new Runnable() { Added: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/util/ForgeHelper.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/util/ForgeHelper.java (rev 0) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/util/ForgeHelper.java 2011-12-19 12:16:48 UTC (rev 37421) @@ -0,0 +1,27 @@ +package org.jboss.tools.forge.ui.util; + +import org.eclipse.ui.IViewPart; +import org.eclipse.ui.IWorkbench; +import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.IWorkbenchWindow; +import org.eclipse.ui.PlatformUI; +import org.jboss.tools.forge.ui.part.ForgeView; + +public class ForgeHelper { + + public static ForgeView getForgeView() { + IWorkbench workbench = PlatformUI.getWorkbench(); + if (workbench == null) return null; + IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow(); + if (workbenchWindow == null) return null; + IWorkbenchPage workbenchPage = workbenchWindow.getActivePage(); + if (workbenchPage == null) return null; + IViewPart viewPart = workbenchPage.findView(ForgeView.ID); + if (viewPart != null && viewPart instanceof ForgeView) { + return (ForgeView)viewPart; + } else { + return null; + } + } + +} Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/util/ForgeHelper.java ___________________________________________________________________ Added: svn:mime-type + text/plain