[jbosstools-commits] JBoss Tools SVN: r26686 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui: src/org/jboss/tools/deltacloud/ui/commands and 1 other directories.

Author: adietish Date: 2010-11-17 13:55:33 -0500 (Wed, 17 Nov 2010) New Revision: 26686 Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 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/RebootInstanceHandler.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/StartInstanceHandler.java 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/internal/deltacloud/ui/utils/UIUtils.java Log: [JBIDE-7618] checked all instances initially Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-11-17 18:46:01 UTC (rev 26685) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-11-17 18:55:33 UTC (rev 26686) @@ -1,5 +1,10 @@ 2010-11-17 André Dietisheim <adietish(a)redhat.com&gt; + * src/org/jboss/tools/deltacloud/ui/commands/DestroyInstanceHandler.java: + * src/org/jboss/tools/deltacloud/ui/commands/StartInstanceHandler.java (startWithDialog): + * src/org/jboss/tools/deltacloud/ui/commands/RebootInstanceHandler.java (rebootWithDialog): + * src/org/jboss/tools/deltacloud/ui/commands/StopInstanceHandler.java (stopWithDialog): + [JBIDE-7618] checked all instances initially * src/org/jboss/tools/deltacloud/ui/commands/AbstractCloudJob.java (AbstractCloudJob): [JBIDE-7554] removed 'blocking' dialog since I now clear instances and images before reloading * src/org/jboss/tools/deltacloud/ui/views/PerformDestroyInstanceActionThread.java (.run): 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 2010-11-17 18:46:01 UTC (rev 26685) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/DestroyInstanceHandler.java 2010-11-17 18:55:33 UTC (rev 26686) @@ -61,11 +61,13 @@ @SuppressWarnings("unchecked") private void destroyWithDialog(IStructuredSelection selection) { + List<DeltaCloudInstance> deltaCloudInstances = UIUtils.adapt((List<DeltaCloudInstance>) selection.toList(), DeltaCloudInstance.class); DeltaCloudInstanceDialog dialog = new DeltaCloudInstanceDialog( UIUtils.getActiveShell() - , UIUtils.adapt((List<DeltaCloudInstance>) selection.toList(), DeltaCloudInstance.class) + , deltaCloudInstances , CVMessages.getString(DESTROY_INSTANCE_TITLE) , CVMessages.getString(DESTROY_INSTANCE_MSG)); + dialog.setInitialElementSelections(deltaCloudInstances); if (Dialog.OK == dialog.open()) { destroyInstances(dialog.getResult()); } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/RebootInstanceHandler.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/RebootInstanceHandler.java 2010-11-17 18:46:01 UTC (rev 26685) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/RebootInstanceHandler.java 2010-11-17 18:55:33 UTC (rev 26686) @@ -59,11 +59,13 @@ @SuppressWarnings("unchecked") private void rebootWithDialog(IStructuredSelection selection) { + List<DeltaCloudInstance> deltaCloudInstances = UIUtils.adapt((List<DeltaCloudInstance>) selection.toList(), DeltaCloudInstance.class); DeltaCloudInstanceDialog dialog = new DeltaCloudInstanceDialog( UIUtils.getActiveShell() - , UIUtils.adapt((List<DeltaCloudInstance>) selection.toList(), DeltaCloudInstance.class) + , deltaCloudInstances , CVMessages.getString(REBOOT_INSTANCE_TITLE) , CVMessages.getString(REBOOT_INSTANCE_MSG)); + dialog.setInitialElementSelections(deltaCloudInstances); if (Dialog.OK == dialog.open()) { rebootInstances(dialog.getResult()); } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/StartInstanceHandler.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/StartInstanceHandler.java 2010-11-17 18:46:01 UTC (rev 26685) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/StartInstanceHandler.java 2010-11-17 18:55:33 UTC (rev 26686) @@ -60,11 +60,13 @@ @SuppressWarnings("unchecked") private void startWithDialog(IStructuredSelection selection) { + List<DeltaCloudInstance> deltaCloudInstances = UIUtils.adapt((List<DeltaCloudInstance>) selection.toList(), DeltaCloudInstance.class); DeltaCloudInstanceDialog dialog = new DeltaCloudInstanceDialog( UIUtils.getActiveShell() - , UIUtils.adapt((List<DeltaCloudInstance>) selection.toList(), DeltaCloudInstance.class) + , deltaCloudInstances , CVMessages.getString(START_INSTANCES_DIALOG_TITLE) , CVMessages.getString(START_INSTANCES_DIALOG_MSG)); + dialog.setInitialElementSelections(deltaCloudInstances); if (Dialog.OK == dialog.open()) { startInstances(dialog.getResult()); } 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 2010-11-17 18:46:01 UTC (rev 26685) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/StopInstanceHandler.java 2010-11-17 18:55:33 UTC (rev 26686) @@ -58,11 +58,14 @@ @SuppressWarnings("unchecked") private void stopWithDialog(IStructuredSelection selection) { + List<DeltaCloudInstance> deltaCloudInstances = UIUtils.adapt((List<DeltaCloudInstance>) selection.toList(), + DeltaCloudInstance.class); DeltaCloudInstanceDialog dialog = new DeltaCloudInstanceDialog( UIUtils.getActiveShell() - , UIUtils.adapt((List<DeltaCloudInstance>) selection.toList(), DeltaCloudInstance.class) + , deltaCloudInstances , CVMessages.getString(STOP_INSTANCES_DIALOG_TITLE) , CVMessages.getString(STOP_INSTANCES_DIALOG_MSG)); + dialog.setInitialElementSelections(deltaCloudInstances); if (Dialog.OK == dialog.open()) { stopInstances(dialog.getResult()); } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/utils/UIUtils.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/utils/UIUtils.java 2010-11-17 18:46:01 UTC (rev 26685) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/utils/UIUtils.java 2010-11-17 18:55:33 UTC (rev 26686) @@ -12,6 +12,7 @@ import java.util.ArrayList; import java.util.Collection; +import java.util.List; import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.IAdaptable; @@ -123,8 +124,8 @@ && getFirstAdaptedElement(selection, expectedClass) != null; } - public static <T> Collection<T> adapt(Collection<?> objects, Class<T> expectedClass) { - ArrayList<T> adaptedObjects = new ArrayList<T>(); + public static <T> List<T> adapt(Collection<?> objects, Class<T> expectedClass) { + List<T> adaptedObjects = new ArrayList<T>(); for (Object object : objects) { T adaptedObject = adapt(object, expectedClass); if (adaptedObject != null) {