Mercurial > hg > release > thermostat-0.7

changeset 1039:0b512dd942f7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove HtmlTextBuilder Reviewed-by: neugens Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2013-March/006107.html
author Omair Majid <omajid@redhat.com>
date Wed, 20 Mar 2013 13:11:02 -0400
parents 597cef77dc73
children fd4f84176be8
files client/core/src/main/java/com/redhat/thermostat/client/locale/LocaleResources.java client/core/src/main/resources/com/redhat/thermostat/client/locale/strings.properties client/swing/src/main/java/com/redhat/thermostat/client/swing/HtmlTextBuilder.java client/swing/src/main/java/com/redhat/thermostat/client/swing/components/SectionHeader.java client/swing/src/main/java/com/redhat/thermostat/client/swing/internal/MainWindow.java
diffstat 5 files changed, 11 insertions(+), 145 deletions(-) [+]
line wrap: on
line diff
--- a/client/core/src/main/java/com/redhat/thermostat/client/locale/LocaleResources.java	Fri Mar 08 10:40:42 2013 +0100
+++ b/client/core/src/main/java/com/redhat/thermostat/client/locale/LocaleResources.java	Wed Mar 20 13:11:02 2013 -0400
@@ -83,10 +83,8 @@
     STARTUP_MODE_SELECTION_TYPE_CLUSTER,
     STARTUP_MODE_SELECTION_URL_LABEL,
 
-    TREE_HOST_TOOLTIP_HOST_NAME,
-    TREE_HOST_TOOLTIP_AGENT_ID,
-    TREE_HOST_TOOLTIP_VM_NAME,
-    TREE_HOST_TOOLTIP_VM_ID,
+    HOST_TOOLTIP,
+    VM_TOOLTIP,
 
     ABOUT_DIALOG_LICENSE,
     ABOUT_DIALOG_EMAIL,
--- a/client/core/src/main/resources/com/redhat/thermostat/client/locale/strings.properties	Fri Mar 08 10:40:42 2013 +0100
+++ b/client/core/src/main/resources/com/redhat/thermostat/client/locale/strings.properties	Wed Mar 20 13:11:02 2013 -0400
@@ -41,10 +41,8 @@
 STARTUP_MODE_SELECTION_TYPE_CLUSTER = Cluster
 STARTUP_MODE_SELECTION_URL_LABEL = Host Location
 
-TREE_HOST_TOOLTIP_HOST_NAME = Host Name: {0}
-TREE_HOST_TOOLTIP_AGENT_ID = Agent Id: {0}
-TREE_HOST_TOOLTIP_VM_NAME = Vm Name: {0}
-TREE_HOST_TOOLTIP_VM_ID = Vm Id: {0}
+HOST_TOOLTIP = <html>Host Name: <b>{0}</b><br>Agent Id: <b>{1}</b></html>
+VM_TOOLTIP = <html>Vm Name: <b>{0}</b><br> Vm Id: <b>{1}</b></html>
 
 ABOUT_DIALOG_LICENSE = Licensed under the {0} license.
 ABOUT_DIALOG_EMAIL = Email: {0}
--- a/client/swing/src/main/java/com/redhat/thermostat/client/swing/HtmlTextBuilder.java	Fri Mar 08 10:40:42 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,119 +0,0 @@
-/*
- * Copyright 2012, 2013 Red Hat, Inc.
- *
- * This file is part of Thermostat.
- *
- * Thermostat is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2, or (at your
- * option) any later version.
- *
- * Thermostat is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Thermostat; see the file COPYING.  If not see
- * <http://www.gnu.org/licenses/>.
- *
- * Linking this code with other modules is making a combined work
- * based on this code.  Thus, the terms and conditions of the GNU
- * General Public License cover the whole combination.
- *
- * As a special exception, the copyright holders of this code give
- * you permission to link this code with independent modules to
- * produce an executable, regardless of the license terms of these
- * independent modules, and to copy and distribute the resulting
- * executable under terms of your choice, provided that you also
- * meet, for each linked independent module, the terms and conditions
- * of the license of that module.  An independent module is a module
- * which is not derived from or based on this code.  If you modify
- * this code, you may extend this exception to your version of the
- * library, but you are not obligated to do so.  If you do not wish
- * to do so, delete this exception statement from your version.
- */
-
-package com.redhat.thermostat.client.swing;
-
-public class HtmlTextBuilder {
-
-    /*
-     * The api provided by this class needs to be cleaned up.
-     */
-
-    private final StringBuilder text = new StringBuilder();
-
-    public HtmlTextBuilder() {
-        // do nothing
-    }
-
-    public HtmlTextBuilder(String text) {
-        text = escape(text);
-        this.text.append(text);
-    }
-
-    public HtmlTextBuilder bold(boolean on) {
-        if (on) {
-            this.text.append("<b>");
-        } else {
-            this.text.append("</b>");
-        }
-        return this;
-    }
-
-    public HtmlTextBuilder bold(String toBold) {
-        text.append("<b>").append(toBold).append("</b>");
-        return this;
-    }
-
-    public HtmlTextBuilder larger(String toAppend) {
-        text.append("<font size='+2'>").append(escape(toAppend)).append("</font>");
-        return this;
-    }
-
-    public HtmlTextBuilder huge(String toAppend) {
-        text.append("<font size='+6'>").append(escape(toAppend)).append("</font>");
-        return this;
-    }
-
-    @Override
-    public String toString() {
-        // FIXME
-        return null;
-    }
-
-    public String toHtml() {
-        return "<html>" + text.toString() + "</html>";
-    }
-
-    public String toPartialHtml() {
-        return text.toString();
-    }
-
-    private static String escape(String toEscape) {
-        // FIXME implement this
-        return toEscape;
-    }
-
-    public HtmlTextBuilder append(String toAppend) {
-        text.append(escape(toAppend));
-        return this;
-    }
-
-    public HtmlTextBuilder appendRaw(String toAppend) {
-        text.append(toAppend);
-        return this;
-    }
-
-    public static String boldHtml(String toBold) {
-        return new HtmlTextBuilder().bold(toBold).toHtml();
-    }
-
-    public HtmlTextBuilder newLine() {
-        text.append("<br>");
-        return this;
-    }
-
-}
-
--- a/client/swing/src/main/java/com/redhat/thermostat/client/swing/components/SectionHeader.java	Fri Mar 08 10:40:42 2013 +0100
+++ b/client/swing/src/main/java/com/redhat/thermostat/client/swing/components/SectionHeader.java	Wed Mar 20 13:11:02 2013 -0400
@@ -39,8 +39,6 @@
 import javax.swing.JLabel;
 import javax.swing.SwingConstants;
 
-import com.redhat.thermostat.client.swing.HtmlTextBuilder;
-
 /**
  * A {@link JLabel} that is appropriate to use as a label for grouping
  * the following information together.
@@ -49,7 +47,7 @@
 public class SectionHeader extends JLabel {
 
     public SectionHeader(String text) {
-        super(HtmlTextBuilder.boldHtml(text));
+        super("<html><b>" + text + " </b><html>");
         setHorizontalAlignment(SwingConstants.LEADING);
     }
 }
--- a/client/swing/src/main/java/com/redhat/thermostat/client/swing/internal/MainWindow.java	Fri Mar 08 10:40:42 2013 +0100
+++ b/client/swing/src/main/java/com/redhat/thermostat/client/swing/internal/MainWindow.java	Wed Mar 20 13:11:02 2013 -0400
@@ -99,7 +99,6 @@
 import com.redhat.thermostat.client.osgi.service.MenuAction;
 import com.redhat.thermostat.client.osgi.service.VMContextAction;
 import com.redhat.thermostat.client.swing.EdtHelper;
-import com.redhat.thermostat.client.swing.HtmlTextBuilder;
 import com.redhat.thermostat.client.swing.MenuHelper;
 import com.redhat.thermostat.client.swing.SwingComponent;
 import com.redhat.thermostat.client.swing.components.SearchField;
@@ -658,22 +657,14 @@
         private String createToolTipText(Object value) {
             if (value instanceof HostRef) {
                 HostRef hostRef = (HostRef) value;
-                String hostNameHtml = new HtmlTextBuilder().bold(hostRef.getHostName()).toPartialHtml();
-                String agentIdHtml = new HtmlTextBuilder().bold(hostRef.getAgentId()).toPartialHtml();
-                HtmlTextBuilder builder = new HtmlTextBuilder()
-                    .appendRaw(translator.localize(LocaleResources.TREE_HOST_TOOLTIP_HOST_NAME, hostNameHtml))
-                    .newLine()
-                    .appendRaw(translator.localize(LocaleResources.TREE_HOST_TOOLTIP_AGENT_ID, agentIdHtml));
-                return builder.toHtml();
+                String hostName = hostRef.getHostName();
+                String agentId = hostRef.getAgentId();
+                return translator.localize(LocaleResources.HOST_TOOLTIP, hostName, agentId);
             } else if (value instanceof VmRef) {
                 VmRef vmRef = (VmRef) value;
-                String vmNameHtml= new HtmlTextBuilder().bold(vmRef.getName()).toPartialHtml();
-                String vmIdHtml = new HtmlTextBuilder().bold(vmRef.getIdString()).toPartialHtml();
-                HtmlTextBuilder builder = new HtmlTextBuilder()
-                    .appendRaw(translator.localize(LocaleResources.TREE_HOST_TOOLTIP_VM_NAME, vmNameHtml))
-                    .newLine()
-                    .appendRaw(translator.localize(LocaleResources.TREE_HOST_TOOLTIP_VM_ID, vmIdHtml));
-                return builder.toHtml();
+                String vmName = vmRef.getName();
+                String vmId = vmRef.getIdString();
+                return translator.localize(LocaleResources.VM_TOOLTIP, vmName, vmId);
             } else {
                 return null;
             }