Mercurial > hg > release > thermostat-0.9
changeset 798:e4010e59a149
Fix VM version in VM Overview and remove setVmInfo
This commit corrects the setVmNameAndVersion call in VmOverviewController
to include the VM version. Since this call also includes the VM info,
we are removing the setVmInfo method from VmOverviewView as this is
unused.
Reviewed-by: jerboaa
Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2012-November/004272.html
author | Elliott Baron <ebaron@redhat.com> |
---|---|
date | Mon, 26 Nov 2012 10:31:29 -0500 |
parents | d6145521e208 |
children | 15afbd5a66c4 |
files | client/core/src/main/java/com/redhat/thermostat/client/core/views/VmOverviewView.java client/core/src/main/java/com/redhat/thermostat/client/ui/VmOverviewController.java client/core/src/main/resources/com/redhat/thermostat/client/locale/strings.properties client/swing/src/main/java/com/redhat/thermostat/client/swing/views/VmOverviewPanel.java |
diffstat | 4 files changed, 4 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/client/core/src/main/java/com/redhat/thermostat/client/core/views/VmOverviewView.java Wed Nov 21 21:29:49 2012 +0100 +++ b/client/core/src/main/java/com/redhat/thermostat/client/core/views/VmOverviewView.java Mon Nov 26 10:31:29 2012 -0500 @@ -57,6 +57,4 @@ public abstract void setVmArguments(String vmArguments); - public abstract void setVmInfo(String string); - }
--- a/client/core/src/main/java/com/redhat/thermostat/client/ui/VmOverviewController.java Wed Nov 21 21:29:49 2012 +0100 +++ b/client/core/src/main/java/com/redhat/thermostat/client/ui/VmOverviewController.java Mon Nov 26 10:31:29 2012 -0500 @@ -114,10 +114,10 @@ view.setMainClass(info.getMainClass()); view.setJavaCommandLine(info.getJavaCommandLine()); String actualVmName = info.getVmName(); - view.setVmInfo(info.getVmInfo()); - String actualVmVersion = info.getVmInfo(); + String actualVmVersion = info.getVmVersion(); + String actualVmInfo = info.getVmInfo(); view.setVmNameAndVersion(translator.localize(LocaleResources.VM_INFO_VM_NAME_AND_VERSION, - actualVmName, actualVmVersion)); + actualVmName, actualVmVersion, actualVmInfo)); view.setVmArguments(info.getVmArguments()); } });
--- a/client/core/src/main/resources/com/redhat/thermostat/client/locale/strings.properties Wed Nov 21 21:29:49 2012 +0100 +++ b/client/core/src/main/resources/com/redhat/thermostat/client/locale/strings.properties Mon Nov 26 10:31:29 2012 -0500 @@ -121,7 +121,7 @@ VM_INFO_JAVA_VERSION = Java Version VM_INFO_VM = Virtual Machine VM_INFO_VM_ARGUMENTS = VM arguments -VM_INFO_VM_NAME_AND_VERSION = {0} version {1} +VM_INFO_VM_NAME_AND_VERSION = {0} version {1} {2} VM_INFO_PROPERTIES = Properties VM_INFO_ENVIRONMENT = Environment VM_INFO_LIBRARIES = Native Libraries
--- a/client/swing/src/main/java/com/redhat/thermostat/client/swing/views/VmOverviewPanel.java Wed Nov 21 21:29:49 2012 +0100 +++ b/client/swing/src/main/java/com/redhat/thermostat/client/swing/views/VmOverviewPanel.java Mon Nov 26 10:31:29 2012 -0500 @@ -144,11 +144,6 @@ } @Override - public void setVmInfo(String string) { - // no-op - } - - @Override public Component getUiComponent() { return visiblePanel; }