Author: adietish Date: 2010-11-16 07:15:53 -0500 (Tue, 16 Nov 2010) New Revision: 26613 Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Instance.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/InstancePropertyTester.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java Log: [JBIDE-7365] changed property tester to test available actions (tested state and guessed the available actions from it), added methods to deltacloud instance classes Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-11-16 11:47:43 UTC (rev 26612) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-11-16 12:15:53 UTC (rev 26613) @@ -1,6 +1,17 @@ 2010-11-16 André Dietisheim <adietish(a)redhat.com&gt; - * src/org/jboss/tools/deltacloud/core/DeltaCloud.java (registerInstanceJob): + * src/org/jboss/tools/deltacloud/core/client/Instance.java + (canStart): + (canStop): + (canReboot): + (canDestroy): + * src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java + (canStart): + (canStop): + (canReboot): + (canDestroy): + * src/org/jboss/tools/deltacloud/core/DeltaCloud.java + (registerInstanceJob): (getInstanceJob): (registerInstanceJob): (removeInstanceJob): Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java 2010-11-16 11:47:43 UTC (rev 26612) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java 2010-11-16 12:15:53 UTC (rev 26613) @@ -92,6 +92,23 @@ return instance.getState() == State.STOPPED; } + public boolean canStart() { + return instance.canStart(); + } + + public boolean canStop() { + return instance.canStop(); + } + + public boolean canReboot() { + return instance.canReboot(); + } + + public boolean canDestroy() { + return instance.canDestroy(); + } + + public String getHostName() { List<String> hostNames = getHostNames(); if (hostNames != null && hostNames.size() > 0) Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Instance.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Instance.java 2010-11-16 11:47:43 UTC (rev 26612) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Instance.java 2010-11-16 12:15:53 UTC (rev 26613) @@ -182,6 +182,22 @@ return null; } + public boolean canStart() { + return actions.contains(InstanceAction.START); + } + + public boolean canStop() { + return actions.contains(InstanceAction.STOP); + } + + public boolean canReboot() { + return actions.contains(InstanceAction.REBOOT); + } + + public boolean canDestroy() { + return actions.contains(InstanceAction.DESTROY); + } + public List<String> getPublicAddresses() { return publicAddresses.getAddress(); } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-11-16 11:47:43 UTC (rev 26612) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-11-16 12:15:53 UTC (rev 26613) @@ -1,5 +1,9 @@ 2010-11-16 André Dietisheim <adietish(a)redhat.com&gt; + * src/org/jboss/tools/deltacloud/ui/views/InstanceView.java (refreshToolbarCommandStates): + * src/org/jboss/tools/deltacloud/ui/commands/InstancePropertyTester.java (test): + [JBIDE-7365] changed property tester to test available actions (tested state and guessed the available actions from it), + added methods to deltacloud instance classes * plugin.xml: [JBIDE-7599] switched refresh for image- and instance-view to be available as soon as the view is active (and not only when an item is selected) Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml 2010-11-16 11:47:43 UTC (rev 26612) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml 2010-11-16 12:15:53 UTC (rev 26613) @@ -211,7 +211,7 @@ <and> <adapt type="org.jboss.tools.deltacloud.core.DeltaCloudInstance"> - <test property="org.jboss.tools.deltacloud.ui.commands.isStopped" + <test property="org.jboss.tools.deltacloud.ui.commands.canStart" value="true"/> </adapt> </and> @@ -235,8 +235,8 @@ <and> <adapt type="org.jboss.tools.deltacloud.core.DeltaCloudInstance"> - <test property="org.jboss.tools.deltacloud.ui.commands.isStopped" - value="false"/> + <test property="org.jboss.tools.deltacloud.ui.commands.canStop" + value="true"/> </adapt> </and> </iterate> @@ -259,8 +259,8 @@ <and> <adapt type="org.jboss.tools.deltacloud.core.DeltaCloudInstance"> - <test property="org.jboss.tools.deltacloud.ui.commands.isStopped" - value="false"/> + <test property="org.jboss.tools.deltacloud.ui.commands.canReboot" + value="true"/> </adapt> </and> </iterate> @@ -283,7 +283,7 @@ <and> <adapt type="org.jboss.tools.deltacloud.core.DeltaCloudInstance"> - <test property="org.jboss.tools.deltacloud.ui.commands.isStopped" + <test property="org.jboss.tools.deltacloud.ui.commands.canDestroy" value="true"/> </adapt> </and> @@ -833,7 +833,7 @@ class="org.jboss.tools.deltacloud.ui.commands.InstancePropertyTester" id="org.jboss.tools.deltacloud.ui.commands.instancepropertytester" namespace="org.jboss.tools.deltacloud.ui.commands" - properties="isStopped,isStarted" + properties="canStart,canStop,canReboot,canDestroy" type="org.jboss.tools.deltacloud.core.DeltaCloudInstance"> </propertyTester> </extension> Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/InstancePropertyTester.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/InstancePropertyTester.java 2010-11-16 11:47:43 UTC (rev 26612) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/InstancePropertyTester.java 2010-11-16 12:15:53 UTC (rev 26613) @@ -23,24 +23,37 @@ */ public class InstancePropertyTester extends PropertyTester { - private static final String PROPERTY_STATE_STOPPED = "isStopped"; - + private static final String PROPERTY_ACTION_CANSTART = "canStart"; + private static final String PROPERTY_ACTION_CANSTOP = "canStop"; + private static final String PROPERTY_ACTION_CANREBOOT = "canReboot"; + private static final String PROPERTY_ACTION_CANDESTROY = "canDestroy"; + @Override public boolean test(Object receiver, String property, Object[] args, Object expectedValue) { DeltaCloudInstance instance = UIUtils.adapt(receiver, DeltaCloudInstance.class); if (instance == null) { return false; } - if (PROPERTY_STATE_STOPPED.equals(property)) { - return isStopped(instance, expectedValue); + + if (PROPERTY_ACTION_CANSTART.equals(property)) { + return equalsExpectedValue(instance.canStart(), expectedValue); } + if (PROPERTY_ACTION_CANSTOP.equals(property)) { + return equalsExpectedValue(instance.canStop(), expectedValue); + } + if (PROPERTY_ACTION_CANREBOOT.equals(property)) { + return equalsExpectedValue(instance.canReboot(), expectedValue); + } + if (PROPERTY_ACTION_CANDESTROY.equals(property)) { + return equalsExpectedValue(instance.canDestroy(), expectedValue); + } return false; } - private boolean isStopped(DeltaCloudInstance instance, Object expectedValue) { + private boolean equalsExpectedValue(boolean propertyValue, Object expectedValue) { Assert.isTrue(expectedValue instanceof Boolean); Boolean expectedBoolean = (Boolean) expectedValue; - Object propertyValue = instance.isStopped(); return expectedBoolean.equals(propertyValue); } + } 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-16 11:47:43 UTC (rev 26612) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java 2010-11-16 12:15:53 UTC (rev 26613) @@ -332,7 +332,10 @@ private void refreshToolbarCommandStates() { IEvaluationService evaluationService = (IEvaluationService) PlatformUI.getWorkbench().getService( IEvaluationService.class); - evaluationService.requestEvaluation("org.jboss.tools.deltacloud.ui.commands.isStopped"); + evaluationService.requestEvaluation("org.jboss.tools.deltacloud.ui.commands.canStart"); + evaluationService.requestEvaluation("org.jboss.tools.deltacloud.ui.commands.canStop"); + evaluationService.requestEvaluation("org.jboss.tools.deltacloud.ui.commands.canReboot"); + evaluationService.requestEvaluation("org.jboss.tools.deltacloud.ui.commands.canDestroy"); } @Override