Author: adietish
Date: 2010-11-11 09:49:31 -0500 (Thu, 11 Nov 2010)
New Revision: 26452
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml
Log:
[JBIDE-7558] stop, destroy, reboot actions unified for instance- and cloud-view
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml 2010-11-11 14:42:30
UTC (rev 26451)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml 2010-11-11 14:49:31
UTC (rev 26452)
@@ -162,10 +162,6 @@
variable="selection">
<iterate operator="and">
<and>
-<!-- <or>
- <instanceof
value="org.jboss.tools.deltacloud.ui.views.CVInstanceElement" />
- <instanceof
value="org.jboss.tools.deltacloud.core.DeltaCloudInstance" />
- </or> -->
<adapt
type="org.jboss.tools.deltacloud.core.DeltaCloudInstance">
<test property="org.jboss.tools.deltacloud.ui.commands.isStopped"
@@ -181,15 +177,15 @@
commandId="org.jboss.tools.deltacloud.ui.stopinstance">
<activeWhen>
<with
- variable="selection">
+ variable="selection">
<iterate operator="and">
<and>
- <instanceof
-
value="org.jboss.tools.deltacloud.ui.views.CVInstanceElement" />
- <test
- property="org.jboss.tools.deltacloud.ui.instance.isStopped"
- value="false"/>
- </and>
+ <adapt
+
type="org.jboss.tools.deltacloud.core.DeltaCloudInstance">
+ <test property="org.jboss.tools.deltacloud.ui.commands.isStopped"
+ value="false"/>
+ </adapt>
+ </and>
</iterate>
</with>
</activeWhen>
@@ -199,16 +195,15 @@
commandId="org.jboss.tools.deltacloud.ui.rebootinstance">
<activeWhen>
<with
- variable="selection">
+ variable="selection">
<iterate operator="and">
<and>
- <instanceof
-
value="org.jboss.tools.deltacloud.ui.views.CVInstanceElement">
- </instanceof>
- <test
- property="org.jboss.tools.deltacloud.ui.instance.isStopped"
- value="false"/>
- </and>
+ <adapt
+
type="org.jboss.tools.deltacloud.core.DeltaCloudInstance">
+ <test property="org.jboss.tools.deltacloud.ui.commands.isStopped"
+ value="false"/>
+ </adapt>
+ </and>
</iterate>
</with>
</activeWhen>
@@ -218,16 +213,15 @@
commandId="org.jboss.tools.deltacloud.ui.destroyinstance">
<activeWhen>
<with
- variable="selection">
+ variable="selection">
<iterate operator="and">
<and>
- <instanceof
-
value="org.jboss.tools.deltacloud.ui.views.CVInstanceElement">
- </instanceof>
- <test
- property="org.jboss.tools.deltacloud.ui.instance.isStopped"
- value="true"/>
- </and>
+ <adapt
+
type="org.jboss.tools.deltacloud.core.DeltaCloudInstance">
+ <test property="org.jboss.tools.deltacloud.ui.commands.isStopped"
+ value="true"/>
+ </adapt>
+ </and>
</iterate>
</with>
</activeWhen>
@@ -321,6 +315,32 @@
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"
+ label="%command.destroyinstance.label"
+ style="push"
+ tooltip="%command.destroyinstance.tooltip">
+ </command>
+ <separator
+ name="additions"
+ visible="true">
+ </separator>
</menuContribution>
</extension>
<extension point="org.eclipse.ui.menus">
@@ -583,18 +603,6 @@
type="org.jboss.tools.deltacloud.core.DeltaCloudInstance">
</propertyTester>
</extension>
- <extension point="org.eclipse.core.expressions.definitions">
- <definition
id="org.jboss.tools.deltacloud.ui.commands.instanceStopped">
- <with
- variable="selection">
- <iterate operator="or">
- <adapt
- type="org.jboss.tools.deltacloud.core.DeltaCloudInstance">
- </adapt>
- </iterate>
- </with>
- </definition>
- </extension>
<extension
point="org.eclipse.core.runtime.adapters">
<factory