Author: adietish Date: 2011-01-05 06:17:43 -0500 (Wed, 05 Jan 2011) New Revision: 27906 Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/property/InstancePropertySource.java Log: [JBIDE-8051] added alias to property page for instances Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2011-01-05 10:57:22 UTC (rev 27905) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2011-01-05 11:17:43 UTC (rev 27906) @@ -1,3 +1,10 @@ +2011-01-05 André Dietisheim <André Dietisheim@adietisheim-thinkpad> + + * src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties: + * src/org/jboss/tools/deltacloud/ui/views/cloud/property/InstancePropertySource.java + (getPropertyDescriptors): + (getPropertyValue): + 2011-01-04 André Dietisheim <André Dietisheim@adietisheim-thinkpad> * src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePageModel.java Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties 2011-01-05 10:57:22 UTC (rev 27905) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties 2011-01-05 11:17:43 UTC (rev 27906) @@ -16,6 +16,7 @@ CloudViewName=Cloud View PropertyName.title=Name +PropertyAlias.title=Alias PropertyId.title=Id PropertyOwnerId.title=Owner Id PropertyHostname.title=Hostname Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/property/InstancePropertySource.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/property/InstancePropertySource.java 2011-01-05 10:57:22 UTC (rev 27905) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/property/InstancePropertySource.java 2011-01-05 11:17:43 UTC (rev 27906) @@ -19,18 +19,23 @@ import org.jboss.tools.deltacloud.ui.views.CVMessages; import org.jboss.tools.deltacloud.ui.views.cloud.InstanceItem; +/** + * @author Jeff Johnston + */ public class InstancePropertySource implements IPropertySource { private static final String PROPERTY_NAME = "deltacloud.views.instance.name"; //$NON-NLS-1$ + private static final String PROPERTY_ALIAS = "deltacloud.views.instance.alias"; //$NON-NLS-1$ private static final String PROPERTY_ID = "deltacloud.views.instance.id"; //$NON-NLS-1$ - public static final String PROPERTY_OWNER = "deltacloud.views.instance.owner"; //$NON-NLS-1$ - public static final String PROPERTY_STATE = "deltacloud.views.instance.state"; //$NON-NLS-1$ + private static final String PROPERTY_OWNER = "deltacloud.views.instance.owner"; //$NON-NLS-1$ + private static final String PROPERTY_STATE = "deltacloud.views.instance.state"; //$NON-NLS-1$ private static final String PROPERTY_HOSTNAME = "deltacloud.views.instance.hostname"; //$NON-NLS-1$ private static final String PROPERTY_KEYNAME = "deltacloud.views.instance.keyname"; //$NON-NLS-1$ private static final String PROPERTY_PROFILEID = "deltacloud.views.instance.profileid"; //$NON-NLS-1$ private static final String PROPERTY_REALMID = "deltacloud.views.instance.realmid"; //$NON-NLS-1$ private static final String PROPERTY_IMAGEID = "deltacloud.views.instance.imageid"; //$NON-NLS-1$ private static final String PROPERTY_NAME_TITLE = "PropertyName.title"; //$NON-NLS-1$ + private static final String PROPERTY_ALIAS_TITLE = "PropertyAlias.title"; //$NON-NLS-1$ private static final String PROPERTY_ID_TITLE = "PropertyId.title"; //$NON-NLS-1$ private static final String PROPERTY_OWNER_TITLE = "PropertyOwnerId.title"; //$NON-NLS-1$ private static final String PROPERTY_STATE_TITLE = "PropertyState.title"; //$NON-NLS-1$ @@ -55,27 +60,30 @@ @Override public IPropertyDescriptor[] getPropertyDescriptors() { if (propertyDescriptors == null) { - PropertyDescriptor nameDescriptor = new PropertyDescriptor(PROPERTY_NAME, - CVMessages.getString(PROPERTY_NAME_TITLE)); - PropertyDescriptor idDescriptor = new PropertyDescriptor(PROPERTY_ID, - CVMessages.getString(PROPERTY_ID_TITLE)); - PropertyDescriptor ownerDescriptor = new PropertyDescriptor(PROPERTY_OWNER, - CVMessages.getString(PROPERTY_OWNER_TITLE)); - PropertyDescriptor stateDescriptor = new PropertyDescriptor(PROPERTY_STATE, - CVMessages.getString(PROPERTY_STATE_TITLE)); - PropertyDescriptor hardwareDescriptor = new PropertyDescriptor(PROPERTY_PROFILEID, - CVMessages.getString(PROPERTY_PROFILEID_TITLE)); - PropertyDescriptor realmDescriptor = new PropertyDescriptor(PROPERTY_REALMID, - CVMessages.getString(PROPERTY_REALMID_TITLE)); - PropertyDescriptor imageDescriptor = new PropertyDescriptor(PROPERTY_IMAGEID, - CVMessages.getString(PROPERTY_IMAGEID_TITLE)); - PropertyDescriptor hostnameDescriptor = new PropertyDescriptor(PROPERTY_HOSTNAME, - CVMessages.getString(PROPERTY_HOSTNAME_TITLE)); - PropertyDescriptor keyDescriptor = new PropertyDescriptor(PROPERTY_KEYNAME, - CVMessages.getString(PROPERTY_KEYNAME_TITLE)); + PropertyDescriptor nameDescriptor = + new PropertyDescriptor(PROPERTY_NAME, CVMessages.getString(PROPERTY_NAME_TITLE)); + PropertyDescriptor aliasDescriptor = + new PropertyDescriptor(PROPERTY_ALIAS, CVMessages.getString(PROPERTY_ALIAS_TITLE)); + PropertyDescriptor idDescriptor = + new PropertyDescriptor(PROPERTY_ID, CVMessages.getString(PROPERTY_ID_TITLE)); + PropertyDescriptor ownerDescriptor = + new PropertyDescriptor(PROPERTY_OWNER, CVMessages.getString(PROPERTY_OWNER_TITLE)); + PropertyDescriptor stateDescriptor = + new PropertyDescriptor(PROPERTY_STATE, CVMessages.getString(PROPERTY_STATE_TITLE)); + PropertyDescriptor hardwareDescriptor = + new PropertyDescriptor(PROPERTY_PROFILEID, CVMessages.getString(PROPERTY_PROFILEID_TITLE)); + PropertyDescriptor realmDescriptor = + new PropertyDescriptor(PROPERTY_REALMID, CVMessages.getString(PROPERTY_REALMID_TITLE)); + PropertyDescriptor imageDescriptor = + new PropertyDescriptor(PROPERTY_IMAGEID, CVMessages.getString(PROPERTY_IMAGEID_TITLE)); + PropertyDescriptor hostnameDescriptor = + new PropertyDescriptor(PROPERTY_HOSTNAME, CVMessages.getString(PROPERTY_HOSTNAME_TITLE)); + PropertyDescriptor keyDescriptor = + new PropertyDescriptor(PROPERTY_KEYNAME, CVMessages.getString(PROPERTY_KEYNAME_TITLE)); propertyDescriptors = new IPropertyDescriptor[] { nameDescriptor, + aliasDescriptor, idDescriptor, ownerDescriptor, stateDescriptor, @@ -91,67 +99,42 @@ @Override public Object getPropertyValue(Object id) { - if (id.equals(PROPERTY_NAME)) + if (id.equals(PROPERTY_NAME)) { return instance.getName(); - if (id.equals(PROPERTY_ID)) + } + if (id.equals(PROPERTY_ALIAS)) { + return instance.getAlias(); + } + if (id.equals(PROPERTY_ID)) { return instance.getId(); - if (id.equals(PROPERTY_OWNER)) + } + if (id.equals(PROPERTY_OWNER)) { return instance.getOwnerId(); - if (id.equals(PROPERTY_PROFILEID)) + } + if (id.equals(PROPERTY_PROFILEID)) { return instance.getProfileId(); - if (id.equals(PROPERTY_REALMID)) + } + if (id.equals(PROPERTY_REALMID)) { return instance.getRealmId(); - if (id.equals(PROPERTY_IMAGEID)) + } + if (id.equals(PROPERTY_IMAGEID)) { return instance.getImageId(); + } if (id.equals(PROPERTY_KEYNAME)) { - return getKey(); + return instance.getKeyId(); } if (id.equals(PROPERTY_STATE)) { return instance.getState(); } if (id.equals(PROPERTY_HOSTNAME)) { List<String> hostnames = instance.getHostNames(); - if (hostnames.size() >= 1) + if (hostnames.size() >= 1) { return hostnames.get(0); + } } return null; } - private Object getKey() { - // At present (Deltacloud 0.0.7), the keyname is omitted - // in the data passed back from a listInstances request. - // If an instance is running and the keyname is missing, - // we can refresh the instance by its id and this will give us - // the full data. We can then replace the instance so that - // it will be complete for future requests until a refresh gets the - // entire list again. - String key = null; - // TODO: very weird stuff here. Why should we check for the server to be - // a mock and then refresh the instance? investigate what are the - // consequences of uncommenting this stuff here - // try { - key = instance.getKeyId(); - // if (!cloud.getType().equals(DeltaCloud.MOCK_TYPE)) { - // if (instance.getState().equals(DeltaCloudInstance.State.RUNNING) && - // (key == null || key.length() == 0)) { - // instance = cloud.refreshInstance(instance.getId()); - // consequences - // - // if (instance != null) { - // key = instance.getKey(); - // if (key != null && key.length() > 0) - // cloud.replaceInstance(instance); - // } - // } - // } - // } catch (DeltaCloudException e) { - // ErrorUtils.handleError( - // "Error", "Could not get key for instance " + instance.getName(), - // e, Display.getDefault().getActiveShell()); - // } - return key; - } - @Override public boolean isPropertySet(Object id) { return false;