Author: adietish
Date: 2011-01-07 12:04:22 -0500 (Fri, 07 Jan 2011)
New Revision: 27992
Modified:
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/DestroyInstanceHandler.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/StopInstanceHandler.java
Log:
[JBIDE-7557] implemented capability to destroy the destroyable instances out of a bunch of
instances (destroyables and non-destroyables)
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2011-01-07 17:00:22
UTC (rev 27991)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2011-01-07 17:04:22
UTC (rev 27992)
@@ -1,9 +1,14 @@
2011-01-07 André Dietisheim <André Dietisheim@adietisheim-thinkpad>
* plugin.xml:
+ * src/org/jboss/tools/deltacloud/ui/commands/DestroyInstanceHandler.java
+ (destroyWithDialog):
+ (getDestroyableInstances):
+ [JBIDE-7557] implemented capability to stop the running instances out of a bunch of
instances (running and stopped ones)
+ * plugin.xml:
* src/org/jboss/tools/deltacloud/ui/commands/RebootInstanceHandler.java
(rebootWithDialog):
- (getRunningInstances):
+ (getRebootableInstances):
[JBIDE-7557] implemented capability to stop the running instances out of a bunch of
instances (running and stopped ones)
* plugin.xml:
* src/org/jboss/tools/deltacloud/ui/commands/StopInstanceHandler.java
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml 2011-01-07 17:00:22
UTC (rev 27991)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml 2011-01-07 17:04:22
UTC (rev 27992)
@@ -233,26 +233,19 @@
<handler
class="org.jboss.tools.deltacloud.ui.commands.DestroyInstanceHandler"
commandId="org.jboss.tools.deltacloud.ui.destroyinstance">
- <activeWhen>
+ <enabledWhen>
<with
variable="selection">
- <iterate operator="and">
- <and>
- <adapt
-
type="org.jboss.tools.deltacloud.core.DeltaCloudInstance">
- <test property="org.jboss.tools.deltacloud.ui.commands.canDestroy"
+ <iterate operator="or">
+ <adapt
+ type="org.jboss.tools.deltacloud.core.DeltaCloudInstance">
+ <test property="org.jboss.tools.deltacloud.ui.commands.canDestroy"
value="true"/>
- </adapt>
- </and>
+ </adapt>
</iterate>
</with>
- </activeWhen>
- <enabledWhen>
- <with
- variable="selection">
- <count value="+" />
- </with>
</enabledWhen>
+
</handler>
<handler
class="org.jboss.tools.deltacloud.ui.commands.CreateInstanceFromAnyImageHandler"
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/DestroyInstanceHandler.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/DestroyInstanceHandler.java 2011-01-07
17:00:22 UTC (rev 27991)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/DestroyInstanceHandler.java 2011-01-07
17:04:22 UTC (rev 27992)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.deltacloud.ui.commands;
+import java.util.ArrayList;
import java.util.List;
import org.eclipse.core.commands.ExecutionEvent;
@@ -59,17 +60,29 @@
private void destroyWithDialog(IStructuredSelection selection) {
List<DeltaCloudInstance> deltaCloudInstances =
UIUtils.adapt((List<DeltaCloudInstance>)
selection.toList(),DeltaCloudInstance.class);
+ List<DeltaCloudInstance> destroyableInstances =
getDestroyableInstances(deltaCloudInstances);
DeltaCloudInstanceDialog dialog = new DeltaCloudInstanceDialog(
UIUtils.getActiveShell()
- , deltaCloudInstances
+ , destroyableInstances
, CVMessages.getString(DESTROY_INSTANCE_TITLE)
, CVMessages.getString(DESTROY_INSTANCE_MSG));
- dialog.setInitialElementSelections(deltaCloudInstances);
+ dialog.setInitialElementSelections(destroyableInstances);
if (Dialog.OK == dialog.open()) {
destroyInstances(dialog.getResult());
}
}
+
+ private List<DeltaCloudInstance>
getDestroyableInstances(List<DeltaCloudInstance> deltaCloudInstances) {
+ ArrayList<DeltaCloudInstance> stoppedInstances = new
ArrayList<DeltaCloudInstance>();
+ for (DeltaCloudInstance instance : deltaCloudInstances) {
+ if (instance.canDestroy()) {
+ stoppedInstances.add(instance);
+ }
+ }
+ return stoppedInstances;
+ }
+
private void destroyInstances(Object[] cvInstances) {
for (int i = 0; i < cvInstances.length; i++) {
destroyInstance((DeltaCloudInstance) cvInstances[i]);
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/StopInstanceHandler.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/StopInstanceHandler.java 2011-01-07
17:00:22 UTC (rev 27991)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/StopInstanceHandler.java 2011-01-07
17:04:22 UTC (rev 27992)
@@ -61,22 +61,22 @@
private void stopWithDialog(IStructuredSelection selection) {
List<DeltaCloudInstance> deltaCloudInstances =
UIUtils.adapt((List<DeltaCloudInstance>) selection.toList(),
DeltaCloudInstance.class);
- List<DeltaCloudInstance> runningInstances =
getRunningInstances(deltaCloudInstances);
+ List<DeltaCloudInstance> stoppableInstances =
getStoppableInstances(deltaCloudInstances);
DeltaCloudInstanceDialog dialog = new DeltaCloudInstanceDialog(
UIUtils.getActiveShell()
- , runningInstances
+ , stoppableInstances
, CVMessages.getString(STOP_INSTANCES_DIALOG_TITLE)
, CVMessages.getString(STOP_INSTANCES_DIALOG_MSG));
- dialog.setInitialElementSelections(runningInstances);
+ dialog.setInitialElementSelections(stoppableInstances);
if (Dialog.OK == dialog.open()) {
stopInstances(dialog.getResult());
}
}
- private List<DeltaCloudInstance>
getRunningInstances(List<DeltaCloudInstance> deltaCloudInstances) {
+ private List<DeltaCloudInstance>
getStoppableInstances(List<DeltaCloudInstance> deltaCloudInstances) {
ArrayList<DeltaCloudInstance> stoppedInstances = new
ArrayList<DeltaCloudInstance>();
for (DeltaCloudInstance instance : deltaCloudInstances) {
- if (instance.isRunning()) {
+ if (instance.canStop()) {
stoppedInstances.add(instance);
}
}