# HG changeset patch # User Omair Majid # Date 1360872479 18000 # Node ID 2bab65a9bc4c0a7f5c51b19b5ef8e641021dd0c9 # Parent af7bd0b8070f0de37dfff73a47b5dc5fa5d7eaf8 Don't display placeholder values in UI Reviewed-by: neugens Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2013-February/005676.html PR 1310 diff -r af7bd0b8070f -r 2bab65a9bc4c client/swing/src/main/java/com/redhat/thermostat/client/swing/internal/views/MemorySpacePanel.java --- a/client/swing/src/main/java/com/redhat/thermostat/client/swing/internal/views/MemorySpacePanel.java Thu Feb 14 14:16:10 2013 +0100 +++ b/client/swing/src/main/java/com/redhat/thermostat/client/swing/internal/views/MemorySpacePanel.java Thu Feb 14 15:07:59 2013 -0500 @@ -60,8 +60,8 @@ additionalDetailsIcon = new JLabel(IconResource.ARROW_RIGHT.getIcon()); - lblUsed = new JLabel("${USED}"); - lblAvailable = new JLabel("${AVAILABLE}"); + lblUsed = new JLabel(""); + lblAvailable = new JLabel(""); GroupLayout groupLayout = new GroupLayout(this); groupLayout.setHorizontalGroup( diff -r af7bd0b8070f -r 2bab65a9bc4c client/swing/src/main/java/com/redhat/thermostat/client/swing/internal/views/SummaryPanel.java --- a/client/swing/src/main/java/com/redhat/thermostat/client/swing/internal/views/SummaryPanel.java Thu Feb 14 14:16:10 2013 +0100 +++ b/client/swing/src/main/java/com/redhat/thermostat/client/swing/internal/views/SummaryPanel.java Thu Feb 14 15:07:59 2013 -0500 @@ -79,11 +79,11 @@ JLabel lblTotalHosts = new JLabel(translator.localize(LocaleResources.HOME_PANEL_TOTAL_MACHINES)); - totalMonitoredHosts = new ValueField("${TOTAL_MONITORED_HOSTS}"); + totalMonitoredHosts = new ValueField(""); JLabel lblTotal = new JLabel(translator.localize(LocaleResources.HOME_PANEL_TOTAL_JVMS)); - totalMonitoredVms = new ValueField("${TOTAL_MONITORED_VMS}"); + totalMonitoredVms = new ValueField(""); JLabel lblIssues = new SectionHeader(translator.localize(LocaleResources.HOME_PANEL_SECTION_ISSUES)); diff -r af7bd0b8070f -r 2bab65a9bc4c host-cpu/client-swing/src/main/java/com/redhat/thermostat/host/cpu/client/swing/internal/HostCpuPanel.java --- a/host-cpu/client-swing/src/main/java/com/redhat/thermostat/host/cpu/client/swing/internal/HostCpuPanel.java Thu Feb 14 14:16:10 2013 +0100 +++ b/host-cpu/client-swing/src/main/java/com/redhat/thermostat/host/cpu/client/swing/internal/HostCpuPanel.java Thu Feb 14 15:07:59 2013 -0500 @@ -82,8 +82,8 @@ private JPanel visiblePanel; - private final JTextComponent cpuModel = new ValueField("${CPU_MODEL}"); - private final JTextComponent cpuCount = new ValueField("${CPU_COUNT}"); + private final JTextComponent cpuModel = new ValueField(""); + private final JTextComponent cpuCount = new ValueField(""); private final TimeSeriesCollection datasetCollection = new TimeSeriesCollection(); private final Map datasets = new HashMap<>(); diff -r af7bd0b8070f -r 2bab65a9bc4c host-memory/client-swing/src/main/java/com/redhat/thermostat/host/memory/client/swing/internal/HostMemoryPanel.java --- a/host-memory/client-swing/src/main/java/com/redhat/thermostat/host/memory/client/swing/internal/HostMemoryPanel.java Thu Feb 14 14:16:10 2013 +0100 +++ b/host-memory/client-swing/src/main/java/com/redhat/thermostat/host/memory/client/swing/internal/HostMemoryPanel.java Thu Feb 14 15:07:59 2013 -0500 @@ -87,7 +87,7 @@ private final MemoryCheckboxListener memoryCheckboxListener = new MemoryCheckboxListener(); - private final JTextComponent totalMemory = new ValueField("${TOTAL_MEMORY}"); + private final JTextComponent totalMemory = new ValueField(""); private final JPanel memoryCheckBoxPanel = new JPanel(new WrapLayout(FlowLayout.LEADING)); private final CopyOnWriteArrayList listeners = new CopyOnWriteArrayList<>(); diff -r af7bd0b8070f -r 2bab65a9bc4c host-overview/client-swing/src/main/java/com/redhat/thermostat/host/overview/client/swing/internal/HostOverviewPanel.java --- a/host-overview/client-swing/src/main/java/com/redhat/thermostat/host/overview/client/swing/internal/HostOverviewPanel.java Thu Feb 14 14:16:10 2013 +0100 +++ b/host-overview/client-swing/src/main/java/com/redhat/thermostat/host/overview/client/swing/internal/HostOverviewPanel.java Thu Feb 14 15:07:59 2013 -0500 @@ -66,12 +66,12 @@ private JPanel visiblePanel; private JScrollPane scrollPane; - private final ValueField hostname = new ValueField("${hostname}"); - private final ValueField cpuModel = new ValueField("${cpu-model}"); - private final ValueField cpuCount = new ValueField("${cpu-count}"); - private final ValueField totalMemory = new ValueField("${total-memory}"); - private final ValueField osName = new ValueField("${os-name}"); - private final ValueField osKernel = new ValueField("${os-kernel}"); + private final ValueField hostname = new ValueField(""); + private final ValueField cpuModel = new ValueField(""); + private final ValueField cpuCount = new ValueField(""); + private final ValueField totalMemory = new ValueField(""); + private final ValueField osName = new ValueField(""); + private final ValueField osKernel = new ValueField(""); private final DefaultTableModel networkTableModel = new DefaultTableModel() { @Override