Author: adietish
Date: 2011-03-16 11:11:23 -0400 (Wed, 16 Mar 2011)
New Revision: 29818
Modified:
branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java
branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/rse/util/RSEUtils.java
Log:
[JBIDE-8294] corrected alias reporting
Modified:
branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java
===================================================================
---
branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java 2011-03-16
14:46:42 UTC (rev 29817)
+++
branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java 2011-03-16
15:11:23 UTC (rev 29818)
@@ -86,6 +86,9 @@
}
public String getAlias() {
+ if (alias == null || alias.length() == 0) {
+ return instance.getName();
+ }
return alias;
}
Modified:
branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/rse/util/RSEUtils.java
===================================================================
---
branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/rse/util/RSEUtils.java 2011-03-16
14:46:42 UTC (rev 29817)
+++
branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/rse/util/RSEUtils.java 2011-03-16
15:11:23 UTC (rev 29818)
@@ -70,11 +70,7 @@
public static String createConnectionName(DeltaCloudInstance instance) {
Assert.isLegal(instance != null, "Cannot create connection name: instance is not
defined");
- String connectionName = instance.getAlias();
- if (connectionName == null || connectionName.length() == 0) {
- connectionName = instance.getName();
- }
- return connectionName;
+ return instance.getAlias();
}
/**