Author: adietish Date: 2011-03-22 12:25:08 -0400 (Tue, 22 Mar 2011) New Revision: 29934 Modified: branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/Columns.java branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudImageColumns.java branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudInstanceColumns.java Log: [JBIDE-8319] added missing columns, externalized column titles Modified: branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog =================================================================== --- branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2011-03-22 04:30:13 UTC (rev 29933) +++ branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2011-03-22 16:25:08 UTC (rev 29934) @@ -1,3 +1,26 @@ +2011-03-22 André Dietisheim <André Dietisheim@adietisheim-thinkpad> + + * src/org/jboss/tools/deltacloud/ui/views/Columns.java: + * src/org/jboss/tools/deltacloud/ui/views/DeltaCloudImageColumns.java: + * src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties: + * src/org/jboss/tools/deltacloud/ui/views/DeltaCloudInstanceColumns.java (DeltaCloudInstanceColumns): + [JBIDE-8319] added missing columns, externalized column titles + +2011-03-21 André Dietisheim <André Dietisheim@adietisheim-thinkpad> + + * src/org/jboss/tools/deltacloud/ui/commands/CopyCVPropertySheetPageEntryHandler.java: + * src/org/jboss/tools/deltacloud/ui/views/cloud/property/CVPropertySheetPage.java + * plugin.xml: + [JBIDE-8416] implemented custom property sheet page so that elements copied (to the clipboard) + from it do not contain the label + +2011-03-17 André Dietisheim <André Dietisheim@adietisheim-thinkpad> + + * src/org/jboss/tools/internal/deltacloud/ui/wizards/EditCloudConnectionWizard.java (performFinish): + (editCloud): + * src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java (performFinish): + (createCloud): + 2011-03-16 André Dietisheim <André Dietisheim@adietisheim-thinkpad> * src/org/jboss/tools/ * plugin.xml: Modified: branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties =================================================================== --- branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties 2011-03-22 04:30:13 UTC (rev 29933) +++ branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties 2011-03-22 16:25:08 UTC (rev 29934) @@ -58,6 +58,9 @@ StopInstancesDialog.msg=Please choose the instances that shall be stopped by checking them: StopInstancesDialogError.title=Error while stopping instance(s) StopInstancesDialogError.msg=Could not stop instance(s) {0} +StopInstancesConfirm.title=Confirm instance stop +StopInstancesConfirm.msg=You are about to stop a running system(s), that might be in production. Are you sure that you want to stop the given instance(s)? +StopInstancesConfirmDontWarn.msg=Don't warn me again RebootingInstance.title=Rebooting Instance RebootingInstance.msg=Rebooting Instance: {0} RebootInstancesDialog.title=Reboot Instances @@ -75,10 +78,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: branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/Columns.java =================================================================== --- branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/Columns.java 2011-03-22 04:30:13 UTC (rev 29933) +++ branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/Columns.java 2011-03-22 16:25:08 UTC (rev 29934) @@ -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: branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudImageColumns.java =================================================================== --- branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudImageColumns.java 2011-03-22 04:30:13 UTC (rev 29933) +++ branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudImageColumns.java 2011-03-22 16:25:08 UTC (rev 29934) @@ -12,33 +12,36 @@ import org.jboss.tools.deltacloud.core.DeltaCloudImage; +/** + * @author André Dietisheim + */ public class DeltaCloudImageColumns extends Columns<DeltaCloudImage> { @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: branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudInstanceColumns.java =================================================================== --- branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudInstanceColumns.java 2011-03-22 04:30:13 UTC (rev 29933) +++ branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudInstanceColumns.java 2011-03-22 16:25:08 UTC (rev 29934) @@ -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();