Author: adietish Date: 2011-02-03 08:34:40 -0500 (Thu, 03 Feb 2011) New Revision: 28971 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/Columns.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudImageColumns.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudInstanceColumns.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/AbstractCloudElementTableView.java Log: [JBIDE-8319] added columns imageId, ownerId, key, realm and profile to instance view Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2011-02-03 13:06:52 UTC (rev 28970) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2011-02-03 13:34:40 UTC (rev 28971) @@ -1,5 +1,7 @@ 2011-02-03 André Dietisheim <André Dietisheim@adietisheim-thinkpad> + * src/org/jboss/tools/deltacloud/ui/views/DeltaCloudInstanceColumns.java (DeltaCloudInstanceColumns): + [JBIDE-8319] added columns imageId, ownerId, key, realm and profile to instance view * src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties: * src/org/jboss/tools/internal/deltacloud/ui/wizards/InstanceFilterPage.java: [JBIDE-8187] added capability to filter for instance alias 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-02-03 13:06:52 UTC (rev 28970) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties 2011-02-03 13:34:40 UTC (rev 28971) @@ -75,10 +75,15 @@ ConfirmCloudDelete.msg=Please choose the clouds that shall be disconnected by checking them: CreateInstance.label=Launch Instance -NAME=Name -ALIAS=Alias -ID=ID -HOSTNAME=Public Hostname -STATUS=State -ARCH=Architecture -DESC=Description \ No newline at end of file +DeltaCloudElementColumn.name.label=Name +DeltaCloudElementColumn.alias.label=Alias +DeltaCloudElementColumn.id.label=Id +DeltaCloudElementColumn.imageId.label=Image Id +DeltaCloudElementColumn.ownerId.label=Owner Id +DeltaCloudElementColumn.keyId.label=Key Id +DeltaCloudElementColumn.realm.label=Realm +DeltaCloudElementColumn.profile.label=Profile +DeltaCloudElementColumn.state.label=State +DeltaCloudElementColumn.hostname.label=Public Hostname +DeltaCloudElementColumn.architecture.label=Architecture +DeltaCloudElementColumn.description.label=Description \ No newline at end of file Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/Columns.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/Columns.java 2011-02-03 13:06:52 UTC (rev 28970) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/Columns.java 2011-02-03 13:34:40 UTC (rev 28971) @@ -24,8 +24,8 @@ private String name; private int weight; - public Column(String name, int weight) { - this.name = name; + public Column(String nameKey, int weight) { + this.name = CVMessages.getString(nameKey); this.weight = weight; } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudImageColumns.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudImageColumns.java 2011-02-03 13:06:52 UTC (rev 28970) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudImageColumns.java 2011-02-03 13:34:40 UTC (rev 28971) @@ -20,28 +20,28 @@ @SuppressWarnings("unchecked") public DeltaCloudImageColumns() { super( - new Column<DeltaCloudImage>("NAME", 20) { + new Column<DeltaCloudImage>("DeltaCloudElementColumn.name.label", 20) { @Override public String getColumnText(DeltaCloudImage image) { return image.getName(); } }, - new Column<DeltaCloudImage>("ID", 20) { + new Column<DeltaCloudImage>("DeltaCloudElementColumn.id.label", 20) { @Override public String getColumnText(DeltaCloudImage image) { return image.getId(); } }, - new Column<DeltaCloudImage>("ARCH", 20) { + new Column<DeltaCloudImage>("DeltaCloudElementColumn.architecture.label", 20) { @Override public String getColumnText(DeltaCloudImage image) { return image.getArchitecture(); } }, - new Column<DeltaCloudImage>("DESC", 40) { + new Column<DeltaCloudImage>("DeltaCloudElementColumn.description.label", 40) { @Override public String getColumnText(DeltaCloudImage image) { return image.getDescription(); Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudInstanceColumns.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudInstanceColumns.java 2011-02-03 13:06:52 UTC (rev 28970) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudInstanceColumns.java 2011-02-03 13:34:40 UTC (rev 28971) @@ -25,30 +25,65 @@ @SuppressWarnings("unchecked") public DeltaCloudInstanceColumns() { super( - new Column<DeltaCloudInstance>("NAME", 20) { + new Column<DeltaCloudInstance>("DeltaCloudElementColumn.name.label", 20) { @Override public String getColumnText(DeltaCloudInstance image) { return image.getName(); } }, - new Column<DeltaCloudInstance>("ALIAS", 20) { + new Column<DeltaCloudInstance>("DeltaCloudElementColumn.alias.label", 20) { @Override public String getColumnText(DeltaCloudInstance image) { return image.getAlias(); } }, - new Column<DeltaCloudInstance>("ID", 20) { + new Column<DeltaCloudInstance>("DeltaCloudElementColumn.id.label", 20) { @Override public String getColumnText(DeltaCloudInstance image) { return image.getId(); } }, - new Column<DeltaCloudInstance>("STATUS", 20) { + new Column<DeltaCloudInstance>("DeltaCloudElementColumn.imageId.label", 20) { @Override + public String getColumnText(DeltaCloudInstance image) { + return image.getImageId(); + } + }, + new Column<DeltaCloudInstance>("DeltaCloudElementColumn.ownerId.label", 20) { + + @Override + public String getColumnText(DeltaCloudInstance image) { + return image.getOwnerId(); + } + }, + new Column<DeltaCloudInstance>("DeltaCloudElementColumn.keyId.label", 20) { + + @Override + public String getColumnText(DeltaCloudInstance image) { + return image.getKeyId(); + } + }, + new Column<DeltaCloudInstance>("DeltaCloudElementColumn.realm.label", 20) { + + @Override + public String getColumnText(DeltaCloudInstance image) { + return image.getRealmId(); + } + }, + new Column<DeltaCloudInstance>("DeltaCloudElementColumn.profile.label", 20) { + + @Override + public String getColumnText(DeltaCloudInstance image) { + return image.getProfileId(); + } + }, + new Column<DeltaCloudInstance>("DeltaCloudElementColumn.state.label", 20) { + + @Override public Image getColumnImage(DeltaCloudInstance instance) { State state = instance.getState(); if (DeltaCloudInstance.State.STOPPED.equals(state)) { @@ -68,7 +103,8 @@ return image.getState().toString(); } }, - new Column<DeltaCloudInstance>("HOSTNAME", 40) { + + new Column<DeltaCloudInstance>("DeltaCloudElementColumn.hostname.label", 40) { @Override public String getColumnText(DeltaCloudInstance image) { return image.getHostName(); Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/AbstractCloudElementTableView.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/AbstractCloudElementTableView.java 2011-02-03 13:06:52 UTC (rev 28970) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/AbstractCloudElementTableView.java 2011-02-03 13:34:40 UTC (rev 28971) @@ -316,7 +316,7 @@ if (i == 0) { table.setSortColumn(tc); } - tc.setText(CVMessages.getString(c.getName())); + tc.setText(c.getName()); tableLayout.setColumnData(tc, new ColumnWeightData(c.getWeight(), true)); tc.addSelectionListener(new ColumnListener(i)); }