Author: adietish Date: 2010-11-10 19:04:45 -0500 (Wed, 10 Nov 2010) New Revision: 26444 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/DeltaCloudInstance.java Log: [JBIDE-7516] added reference to DeltaCloud in DeltaCloudInstance Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-11-10 23:33:37 UTC (rev 26443) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-11-11 00:04:45 UTC (rev 26444) @@ -1,3 +1,11 @@ +2010-11-11 André Dietisheim <adietish(a)redhat.com&gt; + + * src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java (DeltaCloudInstance): + * src/org/jboss/tools/deltacloud/core/DeltaCloud.java (refreshInstance): + (loadInstances): + (createInstance): + [JBIDE-7516] added reference to DeltaCloud in DeltaCloudInstance + 2010-11-10 André Dietisheim <adietish(a)redhat.com&gt; * src/org/jboss/tools/deltacloud/core/client/utils/UrlBuilder.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-10 23:33:37 UTC (rev 26443) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2010-11-11 00:04:45 UTC (rev 26444) @@ -287,7 +287,7 @@ try { List<Instance> list = client.listInstances(); for (Iterator<Instance> i = list.iterator(); i.hasNext();) { - DeltaCloudInstance instance = new DeltaCloudInstance(i.next()); + DeltaCloudInstance instance = new DeltaCloudInstance(this, i.next()); instances.add(instance); } } catch (DeltaCloudClientException e) { @@ -368,7 +368,7 @@ DeltaCloudInstance retVal = null; try { Instance instance = client.listInstances(instanceId); - retVal = new DeltaCloudInstance(instance); + retVal = new DeltaCloudInstance(this, instance); for (int i = 0; i < instances.size(); ++i) { DeltaCloudInstance inst = instances.get(i); if (inst.getId().equals(instanceId)) { @@ -522,7 +522,7 @@ instance = client.createInstance(imageId, profileId, realmId, name, memory, storage); } if (instance != null) { - DeltaCloudInstance newInstance = new DeltaCloudInstance(instance); + DeltaCloudInstance newInstance = new DeltaCloudInstance(this, instance); newInstance.setGivenName(name); instances.add(newInstance); DeltaCloudInstance[] instanceArray = new DeltaCloudInstance[instances.size()]; 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-10 23:33:37 UTC (rev 26443) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java 2010-11-11 00:04:45 UTC (rev 26444) @@ -30,10 +30,12 @@ public final static String REBOOT = InstanceAction.REBOOT; public final static String DESTROY = InstanceAction.DESTROY; + private DeltaCloud cloud; private Instance instance; private String givenName; - public DeltaCloudInstance(Instance instance) { + public DeltaCloudInstance(DeltaCloud cloud, Instance instance) { + this.cloud = cloud; this.instance = instance; } @@ -92,6 +94,10 @@ return null; } + public DeltaCloud getDeltaCloud() { + return cloud; + } + protected boolean performInstanceAction(String actionId, DeltaCloudClientImpl client) throws DeltaCloudClientException { InstanceAction action = instance.getAction(actionId);