Mercurial > hg > release > thermostat-0.4
changeset 604:5cd4aaf85d02
Merge
| author | Roman Kennke <rkennke@redhat.com> |
|---|---|
| date | Tue, 11 Sep 2012 22:59:49 +0200 |
| parents | 55792b78bcc4 (current diff) 2eeca26d586f (diff) |
| children | eea20cd2356b 430be1123985 |
| files | |
| diffstat | 8 files changed, 50 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/client/core/src/main/java/com/redhat/thermostat/client/locale/LocaleResources.java Tue Sep 11 22:55:50 2012 +0200 +++ b/client/core/src/main/java/com/redhat/thermostat/client/locale/LocaleResources.java Tue Sep 11 22:59:49 2012 +0200 @@ -78,6 +78,8 @@ HOURS, DAYS, + NUMBER_AND_UNIT, + SEARCH_HINT, CHART_DURATION_SELECTOR_LABEL,
--- a/client/core/src/main/java/com/redhat/thermostat/client/ui/HostMemoryController.java Tue Sep 11 22:55:50 2012 +0200 +++ b/client/core/src/main/java/com/redhat/thermostat/client/ui/HostMemoryController.java Tue Sep 11 22:59:49 2012 +0200 @@ -59,6 +59,7 @@ import com.redhat.thermostat.common.model.DiscreteTimeData; import com.redhat.thermostat.common.model.MemoryStat; import com.redhat.thermostat.common.model.MemoryType; +import com.redhat.thermostat.common.utils.DisplayableValues; public class HostMemoryController { @@ -107,7 +108,9 @@ backgroundUpdateTimer.setAction(new Runnable() { @Override public void run() { - view.setTotalMemory(String.valueOf(hostInfoDAO.getHostInfo(ref).getTotalMemory())); + long memorySize = hostInfoDAO.getHostInfo(ref).getTotalMemory(); + String[] memorySizeParts = DisplayableValues.bytes(memorySize); + view.setTotalMemory(localize(LocaleResources.NUMBER_AND_UNIT, memorySizeParts[0], memorySizeParts[1])); doMemoryChartUpdate(); } });
--- a/client/core/src/main/java/com/redhat/thermostat/client/ui/HostOverviewController.java Tue Sep 11 22:55:50 2012 +0200 +++ b/client/core/src/main/java/com/redhat/thermostat/client/ui/HostOverviewController.java Tue Sep 11 22:59:49 2012 +0200 @@ -59,6 +59,7 @@ import com.redhat.thermostat.common.dao.NetworkInterfaceInfoDAO; import com.redhat.thermostat.common.model.HostInfo; import com.redhat.thermostat.common.model.NetworkInterfaceInfo; +import com.redhat.thermostat.common.utils.DisplayableValues; import com.redhat.thermostat.common.utils.LoggingUtils; public class HostOverviewController { @@ -96,7 +97,10 @@ view.setOsKernel(hostInfo.getOsKernel()); view.setCpuModel(hostInfo.getCpuModel()); view.setCpuCount(String.valueOf(hostInfo.getCpuCount())); - view.setTotalMemory(String.valueOf(hostInfo.getTotalMemory())); + + String[] parts = DisplayableValues.bytes(hostInfo.getTotalMemory()); + String readableTotalMemory = localize(LocaleResources.NUMBER_AND_UNIT, parts[0], parts[1]); + view.setTotalMemory(readableTotalMemory); List<NetworkInterfaceInfo> networkInfo = networkInfoDAO.getNetworkInterfaces(ref);
--- a/client/core/src/main/resources/com/redhat/thermostat/client/locale/strings.properties Tue Sep 11 22:55:50 2012 +0200 +++ b/client/core/src/main/resources/com/redhat/thermostat/client/locale/strings.properties Tue Sep 11 22:59:49 2012 +0200 @@ -38,6 +38,8 @@ HOURS = Hours DAYS = Days +NUMBER_AND_UNIT = {0} {1} + SEARCH_HINT = Type here to search CHART_DURATION_SELECTOR_LABEL = Display the most recent
--- a/client/core/src/test/java/com/redhat/thermostat/client/ui/HostMemoryControllerTest.java Tue Sep 11 22:55:50 2012 +0200 +++ b/client/core/src/test/java/com/redhat/thermostat/client/ui/HostMemoryControllerTest.java Tue Sep 11 22:59:49 2012 +0200 @@ -76,7 +76,8 @@ @SuppressWarnings("unchecked") // any(List.class) @Test public void testUpdate() { - HostInfo hostInfo = new HostInfo("someHost", "someOS", "linux_0.0.1", "lreally_fast_cpu", 2, 1024); + final long TOTAL_MEMORY = 512; + HostInfo hostInfo = new HostInfo("someHost", "someOS", "linux_0.0.1", "lreally_fast_cpu", 2, TOTAL_MEMORY); HostInfoDAO hostInfoDAO = mock(HostInfoDAO.class); when(hostInfoDAO.getHostInfo(any(HostRef.class))).thenReturn(hostInfo); @@ -118,7 +119,7 @@ verify(timer).start(); timerActionCaptor.getValue().run(); - verify(view, times(1)).setTotalMemory(any(String.class)); + verify(view, times(1)).setTotalMemory(eq(TOTAL_MEMORY + " B")); verify(view, times(6)).addMemoryData(any(String.class), any(List.class)); l.actionPerformed(new ActionEvent<>(view, HostMemoryView.Action.HIDDEN));
--- a/client/core/src/test/java/com/redhat/thermostat/client/ui/HostOverviewControllerTest.java Tue Sep 11 22:55:50 2012 +0200 +++ b/client/core/src/test/java/com/redhat/thermostat/client/ui/HostOverviewControllerTest.java Tue Sep 11 22:59:49 2012 +0200 @@ -157,7 +157,9 @@ verify(view).setOsKernel(eq(KERNEL_NAME)); verify(view).setOsName(eq(OS_NAME)); - verify(view).setTotalMemory(eq(String.valueOf(TOTAL_MEMORY))); + + final String UNITS = " B"; + verify(view).setTotalMemory(eq(String.valueOf(TOTAL_MEMORY + UNITS))); } @Test
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/eclipse/com.redhat.thermostat.eclipse.target_platform/.project Tue Sep 11 22:59:49 2012 +0200 @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>com.redhat.thermostat.eclipse.target_platform</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + </buildSpec> + <natures> + </natures> +</projectDescription>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/eclipse/com.redhat.thermostat.eclipse.target_platform/thermostat_fedora.target Tue Sep 11 22:59:49 2012 +0200 @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<?pde version="3.8"?><target name="Thermostat Eclipse (Fedora)" sequenceNumber="3"> +<locations> +<location path="/usr/share/java" type="Directory"/> +<location path="/usr/share/java/hamcrest" type="Directory"/> +<location id="org.eclipse.cvs" path="${eclipse_home}" type="Feature"/> +<location id="org.eclipse.e4.rcp" path="${eclipse_home}" type="Feature"/> +<location id="org.eclipse.emf.common" path="${eclipse_home}" type="Feature"/> +<location id="org.eclipse.emf.ecore" path="${eclipse_home}" type="Feature"/> +<location id="org.eclipse.equinox.p2.core.feature" path="${eclipse_home}" type="Feature"/> +<location id="org.eclipse.equinox.p2.extras.feature" path="${eclipse_home}" type="Feature"/> +<location id="org.eclipse.equinox.p2.rcp.feature" path="${eclipse_home}" type="Feature"/> +<location id="org.eclipse.equinox.p2.user.ui" path="${eclipse_home}" type="Feature"/> +<location id="org.eclipse.help" path="${eclipse_home}" type="Feature"/> +<location id="org.eclipse.platform" path="${eclipse_home}" type="Feature"/> +<location id="org.eclipse.rcp" path="${eclipse_home}" type="Feature"/> +<location path="/usr/share/java/objectweb-asm" type="Directory"/> +</locations> +<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/> +</target>