Author: adietish Date: 2011-01-05 09:50:15 -0500 (Wed, 05 Jan 2011) New Revision: 27911 Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/InstanceItem.java Log: [JBIDE-7294] changed label in tree to display ALIAS__OR__NAME[ID] for instances Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/InstanceItem.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/InstanceItem.java 2011-01-05 13:56:57 UTC (rev 27910) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/InstanceItem.java 2011-01-05 14:50:15 UTC (rev 27911) @@ -14,7 +14,6 @@ import org.eclipse.ui.views.properties.IPropertySource; import org.jboss.tools.deltacloud.core.DeltaCloudInstance; import org.jboss.tools.deltacloud.ui.views.cloud.property.InstancePropertySource; -import org.jboss.tools.internal.deltacloud.ui.utils.DeltaCloudObjectLabelUtils; /** * @author Jeff Johnston @@ -27,7 +26,23 @@ } public String getName() { - return DeltaCloudObjectLabelUtils.getLabel(getModel()); + DeltaCloudInstance instance = getModel(); + StringBuilder sb = new StringBuilder(); + if (instance != null) { + String alias = instance.getAlias(); + if (alias != null) { + sb.append(alias).append(' '); + } else { + String name = instance.getName(); + if (name != null) { + sb.append(name); + } + } + if (instance.getId() != null) { + sb.append('[').append(instance.getId()).append(']'); + } + } + return sb.toString(); } @Override