Author: adietish Date: 2011-01-17 04:40:19 -0500 (Mon, 17 Jan 2011) New Revision: 28282 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/DeltaCloudInstanceFactory.java Log: [JBIDE-8051] 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 2011-01-17 09:39:40 UTC (rev 28281) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2011-01-17 09:40:19 UTC (rev 28282) @@ -63,7 +63,7 @@ public static interface IInstanceStateMatcher { public boolean matchesState(DeltaCloudInstance instance, DeltaCloudInstance.State instanceState); } - + public DeltaCloud(String name, String url, String username, String passwd) throws DeltaCloudException { this(name, url, username, passwd, null); } @@ -74,12 +74,14 @@ } public DeltaCloud(String name, String url, String username, Driver driver, String imageFilterRules, - String instanceFilterRules, Collection<IInstanceAliasMapping> instanceAliasMappings) throws DeltaCloudException { + String instanceFilterRules, Collection<IInstanceAliasMapping> instanceAliasMappings) + throws DeltaCloudException { this(name, url, username, null, driver, imageFilterRules, instanceFilterRules, instanceAliasMappings); } public DeltaCloud(String name, String url, String username, String password, Driver driver, - String imageFilterRules, String instanceFilterRules, Collection<IInstanceAliasMapping> instanceAliasMappings) throws DeltaCloudException { + String imageFilterRules, String instanceFilterRules, Collection<IInstanceAliasMapping> instanceAliasMappings) + throws DeltaCloudException { this.url = url; this.name = name; this.username = username; @@ -88,9 +90,6 @@ this.client = createClient(url, username, passwordStore.getPassword()); this.imageFilter = createImageFilter(imageFilterRules); this.instanceFilter = createInstanceFilter(instanceFilterRules); - if (instanceAliasMappings == null) { - instanceAliasMappings = new ArrayList<IInstanceAliasMapping>(); - } this.instanceAliasMappings = instanceAliasMappings; } @@ -343,7 +342,8 @@ DeltaCloudInstancesRepository repo = getInstancesRepository(); DeltaCloudInstance[] oldInstances = repo.get(); List<Instance> instances = client.listInstances(); - Collection<DeltaCloudInstance> deltaCloudInstances = DeltaCloudInstanceFactory.create(instances, this, instanceAliasMappings); + Collection<DeltaCloudInstance> deltaCloudInstances = + DeltaCloudInstanceFactory.create(instances, this, instanceAliasMappings); repo.add(deltaCloudInstances); // TODO: remove notification with all instanceRepo, replace by // notifying the changed instance Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstanceFactory.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstanceFactory.java 2011-01-17 09:39:40 UTC (rev 28281) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstanceFactory.java 2011-01-17 09:40:19 UTC (rev 28282) @@ -53,8 +53,11 @@ return deltaCloudInstances; } - private static void setAlias(DeltaCloudInstance instance, Collection<IInstanceAliasMapping> instanceMappings) { - for (IInstanceAliasMapping aliasMapping : instanceMappings) { + private static void setAlias(DeltaCloudInstance instance, Collection<IInstanceAliasMapping> aliasMappings) { + if (aliasMappings == null || aliasMappings.size() == 0) { + return; + } + for (IInstanceAliasMapping aliasMapping : aliasMappings) { if (aliasMapping.matches(instance)) { instance.setAlias(aliasMapping.getAlias()); }