Author: adietish Date: 2010-11-05 09:52:10 -0400 (Fri, 05 Nov 2010) New Revision: 26291 Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java Log: [JBIDE-7503] added instance notification Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-11-05 13:51:42 UTC (rev 26290) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-11-05 13:52:10 UTC (rev 26291) @@ -1,3 +1,8 @@ +2010-11-05 André Dietisheim <adietish(a)redhat.com&gt; + + * src/org/jboss/tools/deltacloud/core/DeltaCloud.java (performInstanceAction): + [JBIDE-7503] added instance notification + 2010-11-04 André Dietisheim <adietish(a)redhat.com&gt; * src/org/jboss/tools/deltacloud/core/DeltaCloud.java: Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2010-11-05 13:51:42 UTC (rev 26290) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2010-11-05 13:52:10 UTC (rev 26291) @@ -25,8 +25,8 @@ import org.eclipse.equinox.security.storage.SecurePreferencesFactory; import org.eclipse.equinox.security.storage.StorageException; import org.jboss.tools.deltacloud.core.client.DeltaCloudAuthException; +import org.jboss.tools.deltacloud.core.client.DeltaCloudClientException; import org.jboss.tools.deltacloud.core.client.DeltaCloudClientImpl; -import org.jboss.tools.deltacloud.core.client.DeltaCloudClientException; import org.jboss.tools.deltacloud.core.client.DeltaCloudNotFoundClientException; import org.jboss.tools.deltacloud.core.client.HardwareProfile; import org.jboss.tools.deltacloud.core.client.Image; @@ -164,7 +164,7 @@ } if (!rules.equals(ruleString)) { save(); - notifyInstanceListListeners(getCurrInstances()); + notifyInstanceListListeners(instances.toArray(instances.toArray(new DeltaCloudInstance[instances.size()]))); } } @@ -214,8 +214,9 @@ public void notifyInstanceListListeners(DeltaCloudInstance[] array) { Object[] listeners = instanceListeners.getListeners(); - for (int i = 0; i < listeners.length; ++i) + for (int i = 0; i < listeners.length; ++i) { ((IInstanceListListener) listeners[i]).listChanged(this, array); + } } public void addImageListListener(IImageListListener listener) { @@ -269,17 +270,17 @@ } catch (DeltaCloudClientException e) { Activator.log(e); } - DeltaCloudInstance[] instanceArray = new DeltaCloudInstance[instances.size()]; - instanceArray = instances.toArray(instanceArray); - notifyInstanceListListeners(instanceArray); - return instanceArray; + DeltaCloudInstance[] instancesArray = instances.toArray(new DeltaCloudInstance[instances.size()]); + notifyInstanceListListeners(instancesArray); + return instancesArray; } } public DeltaCloudInstance[] getCurrInstances() { synchronized (instanceLock) { - if (instances == null) + if (instances == null) { return getInstances(); + } DeltaCloudInstance[] instanceArray = new DeltaCloudInstance[instances.size()]; instanceArray = instances.toArray(instanceArray); return instanceArray; @@ -294,10 +295,9 @@ } catch (DeltaCloudException e) { return null; } - DeltaCloudInstance[] instanceArray = new DeltaCloudInstance[instances.size()]; - instanceArray = instances.toArray(instanceArray); - notifyInstanceListListeners(instanceArray); - return instanceArray; + DeltaCloudInstance[] instancesArray = instances.toArray(instances.toArray(new DeltaCloudInstance[instances.size()])); + notifyInstanceListListeners(instancesArray); + return instancesArray; } public void createKey(String keyname, String keystoreLocation) throws DeltaCloudException { @@ -330,9 +330,9 @@ if (!found) { instances.add(instance); } - DeltaCloudInstance[] instanceArray = new DeltaCloudInstance[instances.size()]; - instanceArray = instances.toArray(instanceArray); - notifyInstanceListListeners(instanceArray); + + notifyInstanceListListeners( + instances.toArray(instances.toArray(new DeltaCloudInstance[instances.size()]))); } } @@ -349,9 +349,7 @@ if (!(retVal.getState().equals(DeltaCloudInstance.BOGUS)) && !(inst.getState().equals(retVal.getState()))) { instances.set(i, retVal); - DeltaCloudInstance[] instanceArray = new DeltaCloudInstance[instances.size()]; - instanceArray = instances.toArray(instanceArray); - notifyInstanceListListeners(instanceArray); + notifyInstanceListListeners(getCurrInstances()); return retVal; } } @@ -371,8 +369,12 @@ if (instance == null) { return false; } - return instance.performInstanceAction(actionId, client); + boolean result = instance.performInstanceAction(actionId, client); + if (result) { + notifyInstanceListListeners(instances.toArray(instances.toArray(new DeltaCloudInstance[instances.size()]))); + } + return result; } catch (DeltaCloudClientException e) { throw new DeltaCloudException(e); }