Mercurial > hg > release > thermostat-1.6

changeset 1976:994cafd25dc5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Set a default TooltipRenderer in TreeMapComponent PR3059 Reviewed-by: jkang Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2016-June/019844.html Original-thread: http://icedtea.classpath.org/pipermail/thermostat/2015-September/016404.html
author James Aziz <jaziz@redhat.com>
date Wed, 29 Jun 2016 12:23:00 -0400
parents 609350a0bb0e
children 733df97a6cd1
files client/swing/src/main/java/com/redhat/thermostat/client/swing/components/experimental/TreeMapComponent.java client/swing/src/test/java/com/redhat/thermostat/client/swing/components/experimental/TreeMapComponentTest.java
diffstat 2 files changed, 2 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/client/swing/src/main/java/com/redhat/thermostat/client/swing/components/experimental/TreeMapComponent.java	Wed Jun 29 12:22:59 2016 -0400
+++ b/client/swing/src/main/java/com/redhat/thermostat/client/swing/components/experimental/TreeMapComponent.java	Wed Jun 29 12:23:00 2016 -0400
@@ -168,11 +168,11 @@
     private ToolTipRenderer tooltipRenderer;
 
     public TreeMapComponent() {
-        this(null, new Dimension(), null);
+        this(null, new Dimension(), new SimpleRenderer());
     }
 
     public TreeMapComponent(Dimension d) {
-        this(null, d, null);
+        this(null, d, new SimpleRenderer());
     }
 
     /**
--- a/client/swing/src/test/java/com/redhat/thermostat/client/swing/components/experimental/TreeMapComponentTest.java	Wed Jun 29 12:22:59 2016 -0400
+++ b/client/swing/src/test/java/com/redhat/thermostat/client/swing/components/experimental/TreeMapComponentTest.java	Wed Jun 29 12:23:00 2016 -0400
@@ -167,7 +167,6 @@
             public void run() {
                 try {
                     treeMap = new TreeMapComponent(dim);
-                    treeMap.setToolTipRenderer(new TreeMapComponent.WeightAsSizeRenderer());
                     treeMap.processAndDrawTreeMap(node1);
                 } catch (NullPointerException e) {
                     Assert.fail("Didn't expect exception.");
@@ -176,7 +175,6 @@
                 boolean caught = false;
                 try {
                     treeMap = new TreeMapComponent(dim);
-                    treeMap.setToolTipRenderer(new TreeMapComponent.WeightAsSizeRenderer());
                     treeMap.processAndDrawTreeMap(null);
                 } catch (NullPointerException e) {
                     caught = true;
@@ -227,7 +225,6 @@
             public void run() {
                 TreeMapComponent treeMap = new TreeMapComponent();
                 treeMap.setModel(tree);
-                treeMap.setToolTipRenderer(new TreeMapComponent.WeightAsSizeRenderer());
 
                 treeMap.zoomIn(node1);
                 assertEquals(node1, treeMap.getTreeMapRoot());
@@ -246,7 +243,6 @@
             public void run() {
                 treeMap = new TreeMapComponent();
                 treeMap.setModel(tree);
-                treeMap.setToolTipRenderer(new TreeMapComponent.WeightAsSizeRenderer());
 
                 treeMap.zoomOut();
                 assertEquals(tree, treeMap.getTreeMapRoot());
@@ -287,7 +283,6 @@
             public void run() {
                 treeMap = new TreeMapComponent();
                 treeMap.setModel(tree);
-                treeMap.setToolTipRenderer(new TreeMapComponent.WeightAsSizeRenderer());
 
                 // the root is always in the stack
                 assertEquals(1, treeMap.getZoomCallsStack().size());
@@ -312,7 +307,6 @@
             public void run() {
                 treeMap = new TreeMapComponent();
                 treeMap.setModel(tree);
-                treeMap.setToolTipRenderer(new TreeMapComponent.WeightAsSizeRenderer());
 
                 treeMap.clearZoomCallsStack();
                 assertEquals(1, treeMap.getZoomCallsStack().size());
@@ -362,7 +356,6 @@
 
                 treeMap = new TreeMapComponent();
                 treeMap.setModel(tree);
-                treeMap.setToolTipRenderer(new TreeMapComponent.WeightAsSizeRenderer());
                 treeMap.register(observer);
 
                 treeMap.zoomIn(child);
@@ -386,22 +379,11 @@
     public final void testSetNode() {
         try {
             treeMap = new TreeMapComponent(dim);
-            treeMap.setToolTipRenderer(new TreeMapComponent.WeightAsSizeRenderer());
             TreeMapComponent.Comp comp = treeMap.new Comp();
             comp.setNode(node1);
         } catch (NullPointerException e) {
             Assert.fail("Didn't expect exception.");
         }
-
-        boolean caught = false;
-        try {
-            treeMap = new TreeMapComponent(dim);
-            TreeMapComponent.Comp comp = treeMap.new Comp();
-            comp.setNode(node1);
-        } catch (NullPointerException e) {
-            caught = true;
-        }
-        assertTrue(caught);
     }
 
     public static void main(String[] args) {
@@ -424,8 +406,6 @@
                 UIManager.put("thermostat-default-font", Font.decode(Font.MONOSPACED));
 
                 final TreeMapComponent treeMap = new TreeMapComponent();
-                // FIXME the default renderer should not be null
-                treeMap.setToolTipRenderer(new TreeMapComponent.WeightAsSizeRenderer());
                 treeMap.setModel(modelA);
 
                 // FIXME no other swing component needs the following: