Author: adietish Date: 2010-11-11 14:11:15 -0500 (Thu, 11 Nov 2010) New Revision: 26464 Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/icons/destroy.gif trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/icons/destroyd.gif trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/RefreshInstancesHandler.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/ShowInRemoteSystemExplorerHandler.java Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/Deltacloud Tools.launch trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/icons/running.gif trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/icons/runningd.gif trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/icons/stopped.gif trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/icons/stoppedd.gif trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.properties trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVInstanceElement.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java Log: [JBIDE-7558] removal of action code done, moved all of them to handlers/commands. Now bugfixing Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/Deltacloud Tools.launch =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/Deltacloud Tools.launch 2010-11-11 17:38:06 UTC (rev 26463) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/Deltacloud Tools.launch 2010-11-11 19:11:15 UTC (rev 26464) @@ -11,7 +11,7 @@ <booleanAttribute key="clearwslog" value="false"/> <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/Deltacloud Tools"/> <booleanAttribute key="default" value="false"/> -<stringAttribute key="deselected_workspace_plugins" value="org.eclipse.epp.usagedata.recording,org.eclipse.epp.usagedata.gathering,org.mozilla.xulrunner.cocoa.macosx,org.jboss.tools.deltacloud.docs,org.mozilla.xulrunner.gtk.linux.x86_64,org.mozilla.xulrunner.win32.win32.x86,com.jboss.jbds.usage.branding,org.jboss.tools.deltacloud.test,org.jboss.tools.usage.test,org.mozilla.xulrunner.gtk.linux.x86,org.eclipse.epp.usagedata.ui,org.mozilla.xulrunner.carbon.macosx,org.mozilla.xpcom,org.jboss.tools.tests,org.jruby.jruby"/> +<stringAttribute key="deselected_workspace_plugins" value="org.eclipse.epp.usagedata.recording,org.eclipse.epp.usagedata.gathering,org.mozilla.xulrunner.cocoa.macosx,org.jboss.tools.deltacloud.docs,org.mozilla.xulrunner.gtk.linux.x86_64,org.mozilla.xulrunner.win32.win32.x86,com.jboss.jbds.usage.branding,org.jboss.tools.deltacloud.test,org.jboss.tools.usage.test,org.mozilla.xulrunner.gtk.linux.x86,org.mozilla.xulrunner.carbon.macosx,org.eclipse.epp.usagedata.ui,org.mozilla.xpcom,org.jboss.tools.tests,org.jruby.jruby"/> <booleanAttribute key="includeOptional" value="true"/> <stringAttribute key="location" value="${workspace_loc}/../runtime-New_configuration"/> <listAttribute key="org.eclipse.debug.ui.favoriteGroups"> @@ -24,8 +24,8 @@ <stringAttribute key="pde.version" value="3.3"/> <stringAttribute key="product" value="org.eclipse.sdk.ide"/> <stringAttribute key="selectedPlugin" value="org.eclipse.core.expressions"/> -<stringAttribute key="selected_target_plugins" value="org.eclipse.jdt.core@default:default,javax.servlet.jsp@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.team.ui@default:default,org.eclipse.help.ui@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.core.resources@default:default,org.eclipse.equinox.security.ui@default:default,org.hamcrest.core@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.core.net@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.equinox.concurrent@default:default,org.apache.jasper@default:default,org.eclipse.jface@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.jem.util@! default:default,org.mortbay.jetty.util@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.apache.ant@default:default,org.eclipse.wst.validation@default:default,org.mortbay.jetty.server@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.debug.ui@default:default,org.apache.commons.el@default:default,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.debug.core@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.core.commands@default:default,org.eclipse.update.configurator@3:true,org.eclipse.ui.console@default:default,org.eclipse.ant.core@default:default,org.eclipse.equinox.p2.repository@default:default,! org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.ecli! pse.ecf@ default:default,org.eclipse.ui.workbench@default:default,org.eclipse.help@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.core.expressions@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.app@default:default,org.junit4@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.osgi.util@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.emf.edit@default:default,org.eclipse.osgi@-1:true,org.eclipse.equinox.registry@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.wst.common.core@default:default,org.eclipse.wst.common.emf@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.e! quinox.common@2:true,org.eclipse.ecf.identity@default:default,org.eclipse.compare.core@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.core.jobs@default:default,org.eclipse.wst.common.project.facet.core@default:default,javax.xml@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.help.base@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.swt@default:default,org.eclipse.core.variables@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.apache.xerces@default:default,org.eclipse.emf.common@default:default,org.apache.commons.httpclient*3.1.0.v201005080502@default:default,org.eclipse.ui.forms@default:default,org.eclipse.swtbot.ant.optional.junit4@default:false,org.eclipse.core.net.lin! ux.x86_64@default:false,org.eclipse.osgi.services@default:defa! ult,org. apache.lucene@default:default,org.eclipse.ui.views@default:default,org.eclipse.rse.services@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.rse.core@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.wst.common.environment@default:default,org.apache.xml.resolver@default:default,org.eclipse.compare@default:default,org.eclipse.ui.ide@default:default,javax.servlet@default:default,org.eclipse.search@default:default,org.eclipse.ui@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.text@default:default,org.eclipse.core.runtime@default:true,org.eclipse.jdt.launching@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.team.core@default:default,com.instantiations.designer.jdt.fragment@default:false,org.apache.xml.! serializer@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.sdk@default:default,org.eclipse.swtbot.ant.optional.junit3@default:false,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,com.ibm.icu@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.apache.lucene.analysis@default:default"/> -<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.common@default:default,org.jboss.tools.usage@default:default,org.jboss.tools.deltacloud.core@default:default,org.jboss.tools.deltacloud.ui@default:default"/> +<stringAttribute key="selected_target_plugins" value="org.eclipse.jdt.launching@default:default,org.eclipse.update.configurator@3:true,org.eclipse.ui.cheatsheets@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.search@default:default,org.eclipse.help.base@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.rse.services@default:default,org.eclipse.core.databinding@default:default,org.eclipse.rse.files.ui@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.equinox.http.servlet@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.ui.workbench@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.databinding.beans@default:default,org.eclipse.team.ui@default:default,org.apache.xml.serializer@default:default,org.ecl! ipse.equinox.concurrent@default:default,org.apache.commons.net@default:default,org.eclipse.osgi.services@default:default,org.eclipse.debug.core@default:default,org.eclipse.wst.validation@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.jobs@default:default,org.eclipse.swtbot.ant.optional.junit3@default:false,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.emf.ecore@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.editors@default:default,org.eclipse.help@default:default,org.eclipse.ecf.provider.filetransfer@default:default,javax.xml@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.hamcrest.core@default:default,org.eclipse.compare.core@default:default,org.eclipse.cdt.core.linux@default:false,org.eclipse.rse.subsystems.shells.core@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.jface@default:default,org.eclipse.rse.core@defau! lt:default,org.apache.commons.httpclient*3.1.0.v201005080502@d! efault:d efault,org.eclipse.cdt.ui@default:default,org.eclipse.cdt.core@default:default,org.eclipse.equinox.preferences@default:default,org.apache.lucene.analysis@default:default,org.eclipse.ant.core@default:default,org.eclipse.ui.views@default:default,org.eclipse.core.resources@default:default,org.eclipse.rse.ui@default:default,com.jcraft.jsch@default:default,org.apache.commons.el@default:default,org.eclipse.emf.edit@default:default,org.mortbay.jetty.server@default:default,org.eclipse.help.ui@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.emf.common@default:default,org.apache.lucene@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.ui@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.eclipse.equinox.p2.meta! data@default:default,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.team.core@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.text@default:default,org.eclipse.sdk@default:default,org.eclipse.ecf@default:default,org.eclipse.equinox.security.ui@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.ecf.filetransfer@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.debug.ui@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.swt@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.jem.util@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.jdt.core@default:default,javax.servlet.jsp@default:default,org.mortbay.jetty.uti! l@default:default,org.eclipse.equinox.app@default:default,org.! eclipse. core.net.linux.x86_64@default:false,org.eclipse.ui.ide.application@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.ui.forms@default:default,com.ibm.icu@default:default,org.eclipse.swtbot.ant.optional.junit4@default:false,org.eclipse.osgi.util@default:default,org.eclipse.core.expressions@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.core.databinding.property@default:default,org.eclipse.cdt.core.linux.x86_64@default:false,org.eclipse.wst.common.frameworks@default:default,org.eclipse.equinox.http.jetty@default:default,org.junit4@default:default,org.eclipse.ecf.identity@default:default,org.apache.ant@default:default,org.apache.jasper@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.osgi@-1:true,com.instantiations.designer.jdt.fragment@default:false,org.eclipse.rse.services.ssh@defaul! t:default,org.eclipse.rse.services.local@default:default,org.eclipse.core.net@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.common@2:true,org.apache.xerces@default:default,org.eclipse.core.variables@default:default,org.apache.xml.resolver@default:default,javax.servlet@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.jface.text@default:default,org.eclipse.ui.console@default:default,org.eclipse.rse.services.files.ftp@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.eclipse.compare@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.core.commands@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.rse.subsystems.files.core@default:default,org.eclipse.ltk.core.refactoring@default:default"/> +<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.common@default:default,org.jboss.tools.deltacloud.core@default:default,org.jboss.tools.deltacloud.ui@default:default,org.jboss.tools.usage@default:default"/> <booleanAttribute key="show_selected_only" value="false"/> <stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/> <booleanAttribute key="tracing" value="true"/> Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/icons/destroy.gif =================================================================== (Binary files differ) Property changes on: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/icons/destroy.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/icons/destroyd.gif =================================================================== (Binary files differ) Property changes on: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/icons/destroyd.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/icons/running.gif =================================================================== (Binary files differ) Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/icons/runningd.gif =================================================================== (Binary files differ) Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/icons/stopped.gif =================================================================== (Binary files differ) Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/icons/stoppedd.gif =================================================================== (Binary files differ) Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.properties =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.properties 2010-11-11 17:38:06 UTC (rev 26463) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.properties 2010-11-11 19:11:15 UTC (rev 26464) @@ -25,6 +25,8 @@ command.editconnection.tooltip = Edit Conncetion command.refresh.label = Refresh Cloud command.refresh.tooltip = Refresh Cloud +command.refreshinstances.label = Refresh Instances +command.refreshisntances.tooltip = Refresh Instances command.createinstance.label = Launch Instance command.createinstance.tooltip = Launch Instance command.filterimages.label = Filter images... @@ -52,4 +54,7 @@ command.filterimages.description = Filters images command.filterimages.name = Filter Images... command.filterinstances.description = Filters instances -command.filterinstancesname = Filter Instances... \ No newline at end of file +command.filterinstancesname = Filter Instances... +command.showInRemoteSysExplorer=Show in Remote System Explorer... +command.showInRemoteSysExplorer.tooltip=Show in Remote System Explorer... +command.showInRemoteSysExplorer.description=Show in Remote System Explorer \ No newline at end of file Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml 2010-11-11 17:38:06 UTC (rev 26463) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml 2010-11-11 19:11:15 UTC (rev 26464) @@ -136,7 +136,7 @@ </with> </activeWhen> </handler> - <handler + <handler class="org.jboss.tools.deltacloud.ui.commands.RefreshCloudHandler" commandId="org.eclipse.ui.file.refresh"> <activeWhen> @@ -149,7 +149,21 @@ </iterate> </with> </activeWhen> - </handler> + </handler> + <handler + class="org.jboss.tools.deltacloud.ui.commands.RefreshInstancesHandler" + commandId="org.eclipse.ui.file.refresh"> + <activeWhen> + <with + variable="selection"> + <iterate> + <instanceof + value="org.jboss.tools.deltacloud.ui.views.CloudViewElement"> + </instanceof> + </iterate> + </with> + </activeWhen> + </handler> </extension> <!-- instance command handlers --> <extension @@ -259,9 +273,9 @@ </activeWhen> </handler> </extension> + <!-- Filter handlers --> <extension point="org.eclipse.ui.handlers"> - <!-- Filter handlers --> <handler class="org.jboss.tools.deltacloud.ui.commands.FilterImagesHandler" commandId="org.jboss.tools.deltacloud.ui.filterimages"> @@ -291,8 +305,26 @@ </activeWhen> </handler> </extension> + <!-- Show in remote system explorer handler --> + <extension + point="org.eclipse.ui.handlers"> + <handler + class="org.jboss.tools.deltacloud.ui.commands.ShowInRemoteSystemExplorerHandler" + commandId="org.jboss.tools.deltacloud.ui.showremotesysexplorer"> + <activeWhen> + <with + variable="selection"> + <iterate> + <instanceof + value="org.jboss.tools.deltacloud.core.DeltaCloudInstance"> + </instanceof> + </iterate> + </with> + </activeWhen> + </handler> + </extension> + <!-- InstanceView context menu ================================== --> <extension point="org.eclipse.ui.menus"> - <!-- InstanceView context menu ================================== --> <menuContribution allPopups="true" locationURI="popup:org.jboss.tools.deltacloud.ui.views.InstanceView"> @@ -302,6 +334,9 @@ <separator name="filters" visible="true" /> + <separator + name="additions" + visible="true" /> </menuContribution> <!-- instance commands --> <menuContribution @@ -337,16 +372,77 @@ style="push" tooltip="%command.destroyinstance.tooltip"> </command> - <separator - name="additions" - visible="true"> - </separator> </menuContribution> + <menuContribution + allPopups="true" + locationURI="popup:org.jboss.tools.deltacloud.ui.views.InstanceView?after=additions"> + <command + commandId="org.eclipse.ui.file.refresh" + label="%command.refreshinstances.label" + style="push" + tooltip="%command.refreshinstances.tooltip"> + </command> + </menuContribution> </extension> <extension point="org.eclipse.ui.menus"> - <!-- DeltaCloudView context menu ================================== --> + <!-- InstanceView toolbar ================================== --> <menuContribution allPopups="true" + locationURI="toolbar:org.jboss.tools.deltacloud.ui.views.InstanceView"> + <separator + name="instances" + visible="true" /> + </menuContribution> + <!-- instance commands --> + <menuContribution + allPopups="true" + locationURI="toolbar:org.jboss.tools.deltacloud.ui.views.InstanceView?after=instances"> + <command + commandId="org.jboss.tools.deltacloud.ui.startinstance" + disabledIcon="icons/runningd.gif" + icon="icons/running.gif" + label="%command.label" + style="push" + tooltip="%command.tooltip"> + </command> + <command + commandId="org.jboss.tools.deltacloud.ui.stopinstance" + disabledIcon="icons/stoppedd.gif" + icon="icons/stopped.gif" + label="%command.stopinstance.label" + style="push" + tooltip="%command.stopinstance.tooltip"> + </command> + <command + commandId="org.jboss.tools.deltacloud.ui.rebootinstance" + disabledIcon="icons/rebootd.gif" + icon="icons/reboot.gif" + label="%command.rebootinstance.label" + style="push" + tooltip="%command.rebootinstance.tooltip"> + </command> + <command + commandId="org.jboss.tools.deltacloud.ui.destroyinstance" + disabledIcon="icons/destroyd.gif" + icon="icons/destroy.gif" + label="%command.destroyinstance.label" + style="push" + tooltip="%command.destroyinstance.tooltip"> + </command> + <command + commandId="org.jboss.tools.deltacloud.ui.showremotesysexplorer" + disabledIcon="icons/cloud.gif" + icon="icons/cloud.gif" + label="%command.showInRemoteSysExplorer" + style="push" + tooltip="%command.showInRemoteSysExplorer.tooltip.tooltip"> + </command> + </menuContribution> + </extension> + <!-- DeltaCloudView context menu ================================== --> + <extension point="org.eclipse.ui.menus"> + <menuContribution + allPopups="true" locationURI="popup:org.jboss.tools.deltacloud.ui.views.DeltaCloudView"> <separator name="instances" @@ -593,6 +689,12 @@ id="org.jboss.tools.deltacloud.ui.filterinstances" name="%command.filterinstances.name"> </command> + <!-- launch remote system explorer command --> + <command + description="%command.showInRemoteSysExplorer.description" + id="org.jboss.tools.deltacloud.ui.showremotesysexplorer" + name="%command.showInRemoteSysExplorer"> + </command> </extension> <extension point="org.eclipse.core.expressions.propertyTesters"> <propertyTester Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/RefreshInstancesHandler.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/RefreshInstancesHandler.java (rev 0) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/RefreshInstancesHandler.java 2010-11-11 19:11:15 UTC (rev 26464) @@ -0,0 +1,49 @@ +/******************************************************************************* + * 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.deltacloud.ui.commands; + +import org.eclipse.core.commands.AbstractHandler; +import org.eclipse.core.commands.ExecutionEvent; +import org.eclipse.core.commands.ExecutionException; +import org.eclipse.core.commands.IHandler; +import org.eclipse.core.runtime.Status; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.ui.handlers.HandlerUtil; +import org.jboss.tools.deltacloud.core.DeltaCloud; +import org.jboss.tools.deltacloud.core.DeltaCloudInstance; +import org.jboss.tools.internal.deltacloud.ui.utils.UIUtils; + +/** + * @author Andre Dietisheim + */ +public class RefreshInstancesHandler extends AbstractHandler implements IHandler { + + @Override + public Object execute(ExecutionEvent event) throws ExecutionException { + ISelection selection = HandlerUtil.getCurrentSelection(event); + if (selection instanceof IStructuredSelection) { + DeltaCloudInstance deltaCloudInstance = UIUtils.getFirstElement(selection, DeltaCloudInstance.class); + refresh(deltaCloudInstance); + } + + return Status.OK_STATUS; + } + + private void refresh(DeltaCloudInstance deltaCloudInstance) { + if (deltaCloudInstance != null) { + DeltaCloud cloud = deltaCloudInstance.getDeltaCloud(); + if (cloud != null) { + cloud.loadChildren(); + } + } + } +} Property changes on: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/RefreshInstancesHandler.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/ShowInRemoteSystemExplorerHandler.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/ShowInRemoteSystemExplorerHandler.java (rev 0) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/ShowInRemoteSystemExplorerHandler.java 2010-11-11 19:11:15 UTC (rev 26464) @@ -0,0 +1,130 @@ +/******************************************************************************* + * 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.deltacloud.ui.commands; + +import org.eclipse.core.commands.AbstractHandler; +import org.eclipse.core.commands.ExecutionEvent; +import org.eclipse.core.commands.ExecutionException; +import org.eclipse.core.commands.IHandler; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.core.runtime.jobs.Job; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.rse.core.IRSECoreRegistry; +import org.eclipse.rse.core.IRSESystemType; +import org.eclipse.rse.core.RSECorePlugin; +import org.eclipse.rse.core.model.IHost; +import org.eclipse.rse.core.model.ISystemRegistry; +import org.eclipse.rse.core.model.SystemStartHere; +import org.eclipse.rse.core.subsystems.IConnectorService; +import org.eclipse.swt.widgets.Display; +import org.eclipse.ui.PartInitException; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.handlers.HandlerUtil; +import org.jboss.tools.deltacloud.core.DeltaCloudInstance; +import org.jboss.tools.deltacloud.ui.Activator; +import org.jboss.tools.deltacloud.ui.views.CVMessages; +import org.jboss.tools.internal.deltacloud.ui.utils.UIUtils; + +/** + * @author Andre Dietisheim + */ +public class ShowInRemoteSystemExplorerHandler extends AbstractHandler implements IHandler { + + private static final String VIEW_REMOTESYSEXPLORER_ID = "org.eclipse.rse.ui.view.systemView"; + private final static String RSE_CONNECTING_MSG = "ConnectingRSE.msg"; //$NON-NLS-1$ + + @Override + public Object execute(ExecutionEvent event) throws ExecutionException { + ISelection selection = HandlerUtil.getCurrentSelection(event); + if (selection instanceof IStructuredSelection) { + DeltaCloudInstance instance = UIUtils.getFirstElement(selection, DeltaCloudInstance.class); + launchRemoteSystemExplorer(instance); + } + + return Status.OK_STATUS; + } + + private void launchRemoteSystemExplorer(DeltaCloudInstance instance) { + String hostname = instance.getHostName(); + IRSESystemType sshType = getRSESystemType(); + String connectionName = instance.getName() + " [" + instance.getId() + "]"; //$NON-NLS-1$ //$NON-NLS-2$ + try { + ISystemRegistry registry = SystemStartHere.getSystemRegistry(); + IHost host = registry.createHost(sshType, connectionName, hostname, null); + if (host != null) { + host.setDefaultUserId("root"); //$NON-NLS-1$ + IConnectorService[] services = host.getConnectorServices(); + if (services.length > 0) { + final IConnectorService service = services[0]; + Job connect = new Job(CVMessages.getFormattedString(RSE_CONNECTING_MSG, connectionName)) { + @Override + protected IStatus run(IProgressMonitor monitor) { + try { + service.connect(monitor); + Display.getDefault().asyncExec(new Runnable() { + @Override + public void run() { + try { + PlatformUI.getWorkbench().getActiveWorkbenchWindow() + .getActivePage() + .showView(VIEW_REMOTESYSEXPLORER_ID); + } catch (PartInitException e) { + // TODO Auto-generated catch + // block + Activator.log(e); + } + } + }); + return Status.OK_STATUS; + } catch (Exception e) { + return Status.CANCEL_STATUS; + } + } + }; + connect.setUser(true); + connect.schedule(); + } + } else { + // Assume failure is due to name already in use + Display.getDefault().asyncExec(new Runnable() { + + @Override + public void run() { + try { + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage() + .showView(VIEW_REMOTESYSEXPLORER_ID); + } catch (PartInitException e) { + Activator.log(e); + } + } + + }); + } + } catch (Exception e) { + Activator.log(e); + } + } + + private IRSESystemType getRSESystemType() { + IRSESystemType sshType = null; + RSECorePlugin rsep = RSECorePlugin.getDefault(); + IRSECoreRegistry coreRegistry = rsep.getCoreRegistry(); + IRSESystemType[] sysTypes = coreRegistry.getSystemTypes(); + for (IRSESystemType sysType : sysTypes) { + if (sysType.getId().equals(IRSESystemType.SYSTEMTYPE_SSH_ONLY_ID)) + sshType = sysType; + } + return sshType; + } +} Property changes on: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/ShowInRemoteSystemExplorerHandler.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVInstanceElement.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVInstanceElement.java 2010-11-11 17:38:06 UTC (rev 26463) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVInstanceElement.java 2010-11-11 19:11:15 UTC (rev 26464) @@ -27,7 +27,6 @@ @SuppressWarnings("rawtypes") @Override public Object getAdapter(Class adapter) { - System.err.println("CVInstanceElement#getAdapter: adapter = " + adapter); if (adapter == DeltaCloudInstance.class) { return getElement(); } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java 2010-11-11 17:38:06 UTC (rev 26463) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java 2010-11-11 19:11:15 UTC (rev 26464) @@ -10,35 +10,12 @@ *******************************************************************************/ package org.jboss.tools.deltacloud.ui.views; -import java.util.HashMap; -import java.util.List; - -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.core.runtime.jobs.Job; import org.eclipse.core.runtime.preferences.InstanceScope; -import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IAction; import org.eclipse.jface.action.IMenuManager; -import org.eclipse.jface.action.IToolBarManager; import org.eclipse.jface.layout.TableColumnLayout; -import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.ColumnWeightData; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.ISelectionChangedListener; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.TableViewer; -import org.eclipse.jface.wizard.IWizard; -import org.eclipse.jface.wizard.WizardDialog; -import org.eclipse.rse.core.IRSECoreRegistry; -import org.eclipse.rse.core.IRSESystemType; -import org.eclipse.rse.core.RSECorePlugin; -import org.eclipse.rse.core.model.IHost; -import org.eclipse.rse.core.model.ISystemRegistry; -import org.eclipse.rse.core.model.SystemStartHere; -import org.eclipse.rse.core.subsystems.IConnectorService; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; @@ -55,12 +32,9 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; import org.eclipse.ui.IActionBars; -import org.eclipse.ui.ISharedImages; -import org.eclipse.ui.PartInitException; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.part.ViewPart; import org.jboss.tools.deltacloud.core.DeltaCloud; @@ -71,9 +45,7 @@ import org.jboss.tools.deltacloud.core.IInstanceListListener; import org.jboss.tools.deltacloud.ui.Activator; import org.jboss.tools.deltacloud.ui.IDeltaCloudPreferenceConstants; -import org.jboss.tools.deltacloud.ui.SWTImagesFactory; import org.jboss.tools.internal.deltacloud.ui.utils.UIUtils; -import org.jboss.tools.internal.deltacloud.ui.wizards.InstanceFilter; import org.osgi.service.prefs.Preferences; public class InstanceView extends ViewPart implements ICloudManagerListener, IInstanceListListener { @@ -85,24 +57,10 @@ private static final String CONTEXT_MENU_ID = "popup:" + ID; private static final String VIEW_MENU_ID = "menu:" + ID; - + private final static String CLOUD_SELECTOR_LABEL = "CloudSelector.label"; //$NON-NLS-1$ - private final static String START_LABEL = "Start.label"; //$NON-NLS-1$ - private final static String STOP_LABEL = "Stop.label"; //$NON-NLS-1$ - private final static String REBOOT_LABEL = "Reboot.label"; //$NON-NLS-1$ - private final static String DESTROY_LABEL = "Destroy.label"; //$NON-NLS-1$ - private final static String RSE_LABEL = "ShowInRSE.label"; //$NON-NLS-1$ - private final static String STARTING_INSTANCE_TITLE = "StartingInstance.title"; //$NON-NLS-1$ - private final static String STARTING_INSTANCE_MSG = "StartingInstance.msg"; //$NON-NLS-1$ - private final static String STOPPING_INSTANCE_TITLE = "StoppingInstance.title"; //$NON-NLS-1$ - private final static String STOPPING_INSTANCE_MSG = "StoppingInstance.msg"; //$NON-NLS-1$ - private final static String REBOOTING_INSTANCE_TITLE = "RebootingInstance.title"; //$NON-NLS-1$ - private final static String REBOOTING_INSTANCE_MSG = "RebootingInstance.msg"; //$NON-NLS-1$ - private final static String DESTROYING_INSTANCE_TITLE = "DestroyingInstance.title"; //$NON-NLS-1$ - private final static String DESTROYING_INSTANCE_MSG = "DestroyingInstance.msg"; //$NON-NLS-1$ - private final static String RSE_CONNECTING_MSG = "ConnectingRSE.msg"; //$NON-NLS-1$ + private static final String REFRESH = "Refresh.label"; //$NON-NLS-1$ - private static final String FILTER = "Filter.label"; //$NON-NLS-1$ private static final String FILTERED_LABEL = "Filtered.label"; //$NON-NLS-1$ private static final String FILTERED_TOOLTIP = "FilteredImages.tooltip"; //$NON-NLS-1$ @@ -110,23 +68,14 @@ private Composite container; private Combo cloudSelector; private Label filterLabel; - private DeltaCloudInstance selectedElement; private DeltaCloud[] clouds; private DeltaCloud currCloud; private InstanceViewLabelAndContentProvider contentProvider; - private IAction refreshAction; - private IAction filterAction; -// private IAction startAction; - private IAction stopAction; - private IAction destroyAction; - private IAction rebootAction; private IAction rseAction; - private HashMap<String, IAction> instanceActions; - private InstanceView parentView; public InstanceView() { @@ -253,8 +202,6 @@ PlatformUI.getWorkbench().getHelpSystem().setHelp(viewer.getControl(), "org.jboss.tools.deltacloud.ui.viewer"); makeActions(); hookContextMenu(viewer.getTable()); - hookSelection(); - contributeToActionBars(); getSite().setSelectionProvider(viewer); DeltaCloudManager.getDefault().addCloudManagerListener(this); @@ -264,7 +211,8 @@ TableColumnLayout tableLayout = new TableColumnLayout(); tableArea.setLayout(tableLayout); - TableViewer viewer = new TableViewer(tableArea, SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER | SWT.MULTI); + TableViewer viewer = new TableViewer(tableArea, SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER + | SWT.MULTI); Table table = viewer.getTable(); table.setHeaderVisible(true); table.setLinesVisible(true); @@ -276,7 +224,7 @@ createColumns(tableLayout, table); table.setSortDirection(SWT.NONE); return viewer; - + } private void createColumns(TableColumnLayout tableLayout, Table table) { @@ -311,333 +259,17 @@ return cloudSelectorLabel; } - private void hookSelection() { - viewer.addSelectionChangedListener(new ISelectionChangedListener() { - @Override - public void selectionChanged(SelectionChangedEvent event) { - handleSelection(); - System.err.println(event.getSelection()); - } - }); - } - private void hookContextMenu(Control control) { IMenuManager contextMenu = UIUtils.createContextMenu(control); UIUtils.registerContributionManager(CONTEXT_MENU_ID, contextMenu, control); - -// MenuManager menuMgr = new MenuManager("#PopupMenu"); -// menuMgr.setRemoveAllWhenShown(true); -// menuMgr.addMenuListener(new IMenuListener() { -// public void menuAboutToShow(IMenuManager manager) { -// InstanceView.this.fillContextMenu(manager); -// } -// }); -// Menu menu = menuMgr.createContextMenu(viewer.getControl()); -// viewer.getControl().setMenu(menu); -// getSite().registerContextMenu(menuMgr, viewer); } - private void contributeToActionBars() { - IActionBars bars = getViewSite().getActionBars(); - fillLocalPullDown(bars.getMenuManager()); - fillLocalToolBar(bars.getToolBarManager()); - } - - private void handleSelection() { - IStructuredSelection selection = (IStructuredSelection) viewer.getSelection(); - selectedElement = (DeltaCloudInstance) selection.getFirstElement(); -// instanceActions.get(DeltaCloudInstance.START).setEnabled(false); - instanceActions.get(DeltaCloudInstance.STOP).setEnabled(false); - instanceActions.get(DeltaCloudInstance.REBOOT).setEnabled(false); - instanceActions.get(DeltaCloudInstance.DESTROY).setEnabled(false); - if (selectedElement != null) { - enableActions(selectedElement.getActions()); - } - } - - private void fillLocalPullDown(IMenuManager manager) { - manager.add(refreshAction); - manager.add(filterAction); - } - - private void fillContextMenu(IMenuManager manager) { -// List<String> actions = selectedElement.getActions(); -// manager.add(instanceActions.get(DeltaCloudInstance.START)); -// instanceActions.get(DeltaCloudInstance.START).setEnabled(false); -// manager.add(instanceActions.get(DeltaCloudInstance.STOP)); -// instanceActions.get(DeltaCloudInstance.STOP).setEnabled(false); -// manager.add(instanceActions.get(DeltaCloudInstance.REBOOT)); -// instanceActions.get(DeltaCloudInstance.REBOOT).setEnabled(false); -// manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS)); -// manager.add(instanceActions.get(DeltaCloudInstance.DESTROY)); -// instanceActions.get(DeltaCloudInstance.DESTROY).setEnabled(false); -// enableActions(actions); -// manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS)); -// manager.add(rseAction); -// if (selectedElement.getState().equals(DeltaCloudInstance.RUNNING) || -// selectedElement.getState().equals(DeltaCloudInstance.STOPPED)) -// rseAction.setEnabled(true); -// else -// rseAction.setEnabled(false); -// // Other plug-ins can contribute there actions here -// manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS)); - } - - private void enableActions(List<String> actions) { - for (String actionId : actions) { - IAction action = instanceActions.get(actionId); - if (action != null) { - action.setEnabled(true); - } - } - } - - private void fillLocalToolBar(IToolBarManager manager) { -// manager.add(instanceActions.get(DeltaCloudInstance.START)); - manager.add(instanceActions.get(DeltaCloudInstance.STOP)); - manager.add(instanceActions.get(DeltaCloudInstance.REBOOT)); - manager.add(instanceActions.get(DeltaCloudInstance.DESTROY)); - } - private void makeActions() { - this.refreshAction = createRefreshAction(); - this.filterAction = createFilterAction(); - IActionBars actionBars = getViewSite().getActionBars(); IMenuManager menuManager = actionBars.getMenuManager(); UIUtils.registerContributionManager(VIEW_MENU_ID, menuManager, viewer.getControl()); - -// this.startAction = createStartAction(); - this.stopAction = createStopAction(); - this.rebootAction = createRebootAction(); - this.destroyAction = createDestroyAction(); - this.rseAction = createRseAction(); - - instanceActions = new HashMap<String, IAction>(); -// instanceActions.put(DeltaCloudInstance.START, startAction); - instanceActions.put(DeltaCloudInstance.STOP, stopAction); - instanceActions.put(DeltaCloudInstance.REBOOT, rebootAction); - instanceActions.put(DeltaCloudInstance.DESTROY, destroyAction); } - private IAction createRseAction() { - IAction rseAction = new Action() { - public void run() { - ISelection selection = viewer.getSelection(); - DeltaCloudInstance instance = (DeltaCloudInstance) ((IStructuredSelection) selection).getFirstElement(); - String hostname = instance.getHostName(); - ISystemRegistry registry = SystemStartHere.getSystemRegistry(); - RSECorePlugin rsep = RSECorePlugin.getDefault(); - IRSECoreRegistry coreRegistry = rsep.getCoreRegistry(); - IRSESystemType[] sysTypes = coreRegistry.getSystemTypes(); - IRSESystemType sshType = null; - for (IRSESystemType sysType : sysTypes) { - if (sysType.getId().equals(IRSESystemType.SYSTEMTYPE_SSH_ONLY_ID)) - sshType = sysType; - } - String connectionName = instance.getName() + " [" + instance.getId() + "]"; //$NON-NLS-1$ //$NON-NLS-2$ - try { - IHost host = registry.createHost(sshType, connectionName, hostname, null); - if (host != null) { - host.setDefaultUserId("root"); //$NON-NLS-1$ - IConnectorService[] services = host.getConnectorServices(); - if (services.length > 0) { - final IConnectorService service = services[0]; - Job connect = new Job(CVMessages.getFormattedString(RSE_CONNECTING_MSG, connectionName)) { - @Override - protected IStatus run(IProgressMonitor monitor) { - try { - service.connect(monitor); - Display.getDefault().asyncExec(new Runnable() { - @Override - public void run() { - try { - PlatformUI.getWorkbench().getActiveWorkbenchWindow() - .getActivePage() - .showView("org.eclipse.rse.ui.view.systemView"); - } catch (PartInitException e) { - // TODO Auto-generated catch - // block - Activator.log(e); - } - } - }); - return Status.OK_STATUS; - } catch (Exception e) { - return Status.CANCEL_STATUS; - } - } - }; - connect.setUser(true); - connect.schedule(); - } - } else { - // Assume failure is due to name already in use - Display.getDefault().asyncExec(new Runnable() { - - @Override - public void run() { - try { - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage() - .showView("org.eclipse.rse.ui.view.systemView"); - } catch (PartInitException e) { - Activator.log(e); - } - } - - }); - } - } catch (Exception e) { - // TODO Auto-generated catch block - Activator.log(e); - } - } - }; - rseAction.setText(CVMessages.getString(RSE_LABEL)); - rseAction.setToolTipText(CVMessages.getString(RSE_LABEL)); - return rseAction; - } - - private IAction createDestroyAction() { - IAction destroyAction = new Action() { - public void run() { - ISelection selection = viewer.getSelection(); - DeltaCloudInstance instance = (DeltaCloudInstance) ((IStructuredSelection) selection).getFirstElement(); - PerformDestroyInstanceActionThread t = new PerformDestroyInstanceActionThread(currCloud, instance, - CVMessages.getString(DESTROYING_INSTANCE_TITLE), - CVMessages.getFormattedString(DESTROYING_INSTANCE_MSG, new String[] { instance.getName() })); - t.setUser(true); - t.schedule(); - } - }; - destroyAction.setText(CVMessages.getString(DESTROY_LABEL)); - destroyAction.setToolTipText(CVMessages.getString(DESTROY_LABEL)); - ISharedImages sharedImages = PlatformUI.getWorkbench().getSharedImages(); - ImageDescriptor delete = ImageDescriptor.createFromImage(sharedImages.getImage(ISharedImages.IMG_ETOOL_DELETE)); - ImageDescriptor delete_disabled = ImageDescriptor.createFromImage(sharedImages - .getImage(ISharedImages.IMG_ETOOL_DELETE_DISABLED)); - destroyAction.setImageDescriptor(delete); - destroyAction.setDisabledImageDescriptor(delete_disabled); - destroyAction.setEnabled(false); - return destroyAction; - } - - private IAction createStopAction() { - IAction stopAction = new Action() { - public void run() { - ISelection selection = viewer.getSelection(); - DeltaCloudInstance instance = (DeltaCloudInstance) ((IStructuredSelection) selection).getFirstElement(); - PerformInstanceActionThread t = new PerformInstanceActionThread(currCloud, instance, - DeltaCloudInstance.STOP, - CVMessages.getString(STOPPING_INSTANCE_TITLE), - CVMessages.getFormattedString(STOPPING_INSTANCE_MSG, new String[] { instance.getName() }), - DeltaCloudInstance.STOPPED); - t.setUser(true); - t.schedule(); - } - }; - stopAction.setText(CVMessages.getString(STOP_LABEL)); - stopAction.setToolTipText(CVMessages.getString(STOP_LABEL)); - stopAction.setImageDescriptor(SWTImagesFactory.DESC_STOP); - stopAction.setDisabledImageDescriptor(SWTImagesFactory.DESC_STOPD); - stopAction.setEnabled(false); - return stopAction; - } - - private IAction createRebootAction() { - IAction rebootAction = new Action() { - public void run() { - ISelection selection = viewer.getSelection(); - DeltaCloudInstance instance = (DeltaCloudInstance) ((IStructuredSelection) selection).getFirstElement(); - PerformInstanceActionThread t = new PerformInstanceActionThread(currCloud, instance, - DeltaCloudInstance.REBOOT, - CVMessages.getString(REBOOTING_INSTANCE_TITLE), - CVMessages.getFormattedString(REBOOTING_INSTANCE_MSG, new String[] { instance.getName() }), - DeltaCloudInstance.RUNNING); - t.setUser(true); - t.schedule(); - } - }; - rebootAction.setText(CVMessages.getString(REBOOT_LABEL)); - rebootAction.setToolTipText(CVMessages.getString(REBOOT_LABEL)); - rebootAction.setImageDescriptor(SWTImagesFactory.DESC_REBOOT); - rebootAction.setDisabledImageDescriptor(SWTImagesFactory.DESC_REBOOTD); - rebootAction.setEnabled(false); - return rebootAction; - } - - private IAction createStartAction() { - IAction startAction = new Action() { - public void run() { - ISelection selection = viewer.getSelection(); - DeltaCloudInstance instance = (DeltaCloudInstance) ((IStructuredSelection) selection).getFirstElement(); - PerformInstanceActionThread t = new PerformInstanceActionThread(currCloud, instance, - DeltaCloudInstance.START, - CVMessages.getString(STARTING_INSTANCE_TITLE), - CVMessages.getFormattedString(STARTING_INSTANCE_MSG, new String[] { instance.getName() }), - DeltaCloudInstance.RUNNING); - t.setUser(true); - t.schedule(); - } - }; - startAction.setText(CVMessages.getString(START_LABEL)); - startAction.setToolTipText(CVMessages.getString(START_LABEL)); - startAction.setImageDescriptor(SWTImagesFactory.DESC_START); - startAction.setDisabledImageDescriptor(SWTImagesFactory.DESC_STARTD); - startAction.setEnabled(false); - return startAction; - } - - private IAction createFilterAction() { - IAction filterAction = new Action() { - public void run() { - Display.getDefault().asyncExec(new Runnable() { - - @Override - public void run() { - Shell shell = viewer.getControl().getShell(); - IWizard wizard = new InstanceFilter(currCloud); - WizardDialog dialog = new WizardDialog(shell, wizard); - dialog.create(); - dialog.open(); - if (!currCloud.getInstanceFilter().toString().equals(IInstanceFilter.ALL_STRING)) - filterLabel.setVisible(true); - else - filterLabel.setVisible(false); - } - - }); - } - }; - filterAction.setText(CVMessages.getString(FILTER)); - filterAction.setToolTipText(CVMessages.getString(FILTER)); - return filterAction; - } - - private IAction createRefreshAction() { - IAction refreshAction = new Action() { - public void run() { - Thread t = new Thread(new Runnable() { - - @Override - public void run() { - if (currCloud != null) { - currCloud.loadInstances(); - } - } - - }); - t.start(); - } - }; - refreshAction.setText(CVMessages.getString(REFRESH)); - refreshAction.setToolTipText(CVMessages.getString(REFRESH)); - refreshAction.setImageDescriptor(PlatformUI.getWorkbench().getSharedImages(). - getImageDescriptor(ISharedImages.IMG_TOOL_REDO)); - return refreshAction; - } - - private void initializeCloudSelector() { int defaultIndex = 0; clouds = DeltaCloudManager.getDefault().getClouds(); @@ -705,8 +337,25 @@ } }); } + refreshToolbarCommandStates(); } + /** + * Refresh the states of the commands in the toolsbar. This is a workaround + * since activation and enablement is declarative and I found no way to + * trigger their update. CommandService#refreshElements(COMMANDID) did not + * help. + */ + private void refreshToolbarCommandStates() { + viewer.getControl().getDisplay().syncExec(new Runnable() { + + @Override + public void run() { + viewer.setSelection(viewer.getSelection()); + } + }); + } + @Override public void setFocus() { viewer.getControl().setFocus();