Author: jjohnstn Date: 2010-08-26 14:22:14 -0400 (Thu, 26 Aug 2010) New Revision: 24476 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 trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/IImageListListener.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/IInstanceListListener.java Log: 2010-08-26 Jeff Johnston <jjohnstn(a)redhat.com&gt; * src/org/jboss/tools/deltacloud/core/DeltaCloud.java (notifyImageListListeners): Pass new cloud argument to listeners. (notifyInstanceListListeners): Ditto. (refreshInstance): Fix the check for states to be in the String realm rather than the State realm. * src/org/jboss/tools/deltacloud/core/IImageListListener.java: Add new cloud argument to listChanged notifier method. * src/org/jboss/tools/deltacloud/core/IInstanceListListener.java: Ditto. Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-08-26 17:11:33 UTC (rev 24475) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-08-26 18:22:14 UTC (rev 24476) @@ -1,3 +1,14 @@ +2010-08-26 Jeff Johnston <jjohnstn(a)redhat.com&gt; + + * src/org/jboss/tools/deltacloud/core/DeltaCloud.java (notifyImageListListeners): Pass new + cloud argument to listeners. + (notifyInstanceListListeners): Ditto. + (refreshInstance): Fix the check for states to be in the String realm rather than + the State realm. + * src/org/jboss/tools/deltacloud/core/IImageListListener.java: Add new cloud argument + to listChanged notifier method. + * src/org/jboss/tools/deltacloud/core/IInstanceListListener.java: Ditto. + 2010-08-23 Jeff Johnston <jjohnstn(a)redhat.com&gt; * src/org/jboss/tools/deltacloud/core/client/Instance.java (getKey): New method. 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-08-26 17:11:33 UTC (rev 24475) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2010-08-26 18:22:14 UTC (rev 24476) @@ -104,7 +104,7 @@ public void notifyInstanceListListeners(DeltaCloudInstance[] array) { Object[] listeners = instanceListeners.getListeners(); for (int i = 0; i < listeners.length; ++i) - ((IInstanceListListener)listeners[i]).listChanged(array); + ((IInstanceListListener)listeners[i]).listChanged(this, array); } public void addImageListListener(IImageListListener listener) { @@ -118,7 +118,7 @@ public void notifyImageListListeners(DeltaCloudImage[] array) { Object[] listeners = imageListeners.getListeners(); for (int i = 0; i < listeners.length; ++i) - ((IImageListListener)listeners[i]).listChanged(array); + ((IImageListListener)listeners[i]).listChanged(this, array); } public DeltaCloudInstance[] getInstances() { @@ -175,7 +175,7 @@ if (inst.getId().equals(instanceId)) { instance.setKey(inst.getKey()); // FIXME: remove BOGUS state when server fixes state problems - if (!(instance.getState().equals(DeltaCloudInstance.BOGUS)) && !(inst.getState().equals(instance.getState()))) { + 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); Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/IImageListListener.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/IImageListListener.java 2010-08-26 17:11:33 UTC (rev 24475) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/IImageListListener.java 2010-08-26 18:22:14 UTC (rev 24476) @@ -2,6 +2,6 @@ public interface IImageListListener { - public void listChanged(DeltaCloudImage[] list); + public void listChanged(DeltaCloud cloud, DeltaCloudImage[] list); } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/IInstanceListListener.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/IInstanceListListener.java 2010-08-26 17:11:33 UTC (rev 24475) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/IInstanceListListener.java 2010-08-26 18:22:14 UTC (rev 24476) @@ -2,6 +2,6 @@ public interface IInstanceListListener { - public void listChanged(DeltaCloudInstance[] list); + public void listChanged(DeltaCloud cloud, DeltaCloudInstance[] list); }