Author: jjohnstn Date: 2010-09-08 16:50:06 -0400 (Wed, 08 Sep 2010) New Revision: 24822 Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/.classpath trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/META-INF/MANIFEST.MF 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/DeltaCloudManager.java Log: 2010-09-08 Jeff Johnston <jjohnstn(a)redhat.com&gt; * .classpath: Fix to remove error messages. * META-INF/MANIFEST.MF: Move deltaclient.jar to end of dependencies. * src/org/jboss/tools/deltacloud/core/DeltaCloud.java (getActionJob): New method. (registerActionJob): Ditto. (removeActionJob): Ditto. * src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java (removeCloud): Use cached username and url. Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/.classpath =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/.classpath 2010-09-08 19:11:58 UTC (rev 24821) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/.classpath 2010-09-08 20:50:06 UTC (rev 24822) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry exported="true" kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry exported="true" kind="lib" path="lib/deltacloudclient-1.0.jar" sourcepath="/home/cygnus/jjohnstn/deltacloud-tools/DeltaCloudClient/src"/> <classpathentry exported="true" kind="lib" path="lib/httpclient-4.0.1.jar"/> Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-09-08 19:11:58 UTC (rev 24821) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-09-08 20:50:06 UTC (rev 24822) @@ -1,3 +1,13 @@ +2010-09-08 Jeff Johnston <jjohnstn(a)redhat.com&gt; + + * .classpath: Fix to remove error messages. + * META-INF/MANIFEST.MF: Move deltaclient.jar to end of dependencies. + * src/org/jboss/tools/deltacloud/core/DeltaCloud.java (getActionJob): New method. + (registerActionJob): Ditto. + (removeActionJob): Ditto. + * src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java (removeCloud): Use cached + username and url. + 2010-09-03 Jeff Johnston <jjohnstn(a)redhat.com&gt; * src/org/jboss/tools/deltacloud/core/DeltaCloud.java (addReplaceInstance): New method. Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/META-INF/MANIFEST.MF =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/META-INF/MANIFEST.MF 2010-09-08 19:11:58 UTC (rev 24821) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/META-INF/MANIFEST.MF 2010-09-08 20:50:06 UTC (rev 24822) @@ -12,7 +12,6 @@ Bundle-ActivationPolicy: lazy Export-Package: org.jboss.tools.deltacloud.core;x-friends:="org.jboss.tools.deltacloud.ui" Bundle-ClassPath: ., - lib/deltacloudclient-1.0.jar, lib/apache-mime4j-0.6.jar, lib/commons-codec-1.3.jar, lib/commons-logging-1.1.1.jar, @@ -20,4 +19,5 @@ lib/httpcore-4.0.1.jar, lib/httpcore-nio-4.0.1.jar, lib/httpmime-4.0.1.jar, - lib/log4j-1.2.14.jar + lib/log4j-1.2.14.jar, + lib/deltacloudclient-1.0.jar 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-09-08 19:11:58 UTC (rev 24821) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2010-09-08 20:50:06 UTC (rev 24822) @@ -13,10 +13,13 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.ArrayList; +import java.util.HashMap; import java.util.Iterator; import java.util.List; +import java.util.Map; import org.eclipse.core.runtime.ListenerList; +import org.eclipse.core.runtime.jobs.Job; import org.eclipse.equinox.security.storage.EncodingUtils; import org.eclipse.equinox.security.storage.ISecurePreferences; import org.eclipse.equinox.security.storage.SecurePreferencesFactory; @@ -38,8 +41,10 @@ private DeltaCloudClient client; private ArrayList<DeltaCloudInstance> instances; private ArrayList<DeltaCloudImage> images; + private Map<String, Job> actionJobs; private Object imageLock = new Object(); private Object instanceLock = new Object(); + private Object actionLock = new Object(); ListenerList instanceListeners = new ListenerList(); ListenerList imageListeners = new ListenerList(); @@ -129,6 +134,31 @@ ((IImageListListener)listeners[i]).listChanged(this, array); } + public Job getActionJob(String id) { + synchronized (actionLock) { + Job j = null; + if (actionJobs != null) { + return actionJobs.get(id); + } + return j; + } + } + + public void registerActionJob(String id, Job j) { + synchronized (actionLock) { + if (actionJobs == null) + actionJobs = new HashMap<String, Job>(); + actionJobs.put(id, j); + } + } + + public void removeActionJob(String id, Job j) { + synchronized (actionLock) { + if (actionJobs != null && actionJobs.get(id) == j) + actionJobs.remove(id); + } + } + public DeltaCloudInstance[] getInstances() { synchronized (instanceLock) { instances = new ArrayList<DeltaCloudInstance>(); Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java 2010-09-08 19:11:58 UTC (rev 24821) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java 2010-09-08 20:50:06 UTC (rev 24822) @@ -156,7 +156,7 @@ // includes the password. if (!found) { ISecurePreferences root = SecurePreferencesFactory.getDefault(); - String key = DeltaCloud.getPreferencesKey(d.getURL(), d.getUsername()); + String key = DeltaCloud.getPreferencesKey(url, userName); ISecurePreferences node = root.node(key); node.clear(); }