Mercurial > hg > release > thermostat-1.6

changeset 1979:e5259653d335

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Expose better constructors for 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/016415.html
author James Aziz <jaziz@redhat.com>
date Wed, 29 Jun 2016 12:23:01 -0400
parents b0090df5cadb
children f1aa6970ef55
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, 14 insertions(+), 45 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:23:00 2016 -0400
+++ b/client/swing/src/main/java/com/redhat/thermostat/client/swing/components/experimental/TreeMapComponent.java	Wed Jun 29 12:23:01 2016 -0400
@@ -166,11 +166,7 @@
     private ToolTipRenderer tooltipRenderer = new SimpleRenderer();
 
     public TreeMapComponent() {
-        this(null, new Dimension());
-    }
-
-    public TreeMapComponent(Dimension d) {
-        this(null, d);
+        this(null);
     }
 
     /**
@@ -178,13 +174,9 @@
      * {@Dimension} object in input.
      * 
      * @param tree the tree to represent as TreeMap.
-     * @param d the dimension the TreeMap will fulfill.
-     * @param renderer
-     * @throws NullPointerException if the dimension is null
      */
-    public TreeMapComponent(TreeMapNode tree, Dimension d) {
+    public TreeMapComponent(TreeMapNode tree) {
         super();
-        Objects.requireNonNull(d);
         this.tree = tree;
         lastDim = getSize();
         this.zoomStack = new Stack<>();
--- a/client/swing/src/test/java/com/redhat/thermostat/client/swing/components/experimental/TreeMapComponentTest.java	Wed Jun 29 12:23:00 2016 -0400
+++ b/client/swing/src/test/java/com/redhat/thermostat/client/swing/components/experimental/TreeMapComponentTest.java	Wed Jun 29 12:23:01 2016 -0400
@@ -41,7 +41,6 @@
 import static org.junit.Assert.assertTrue;
 
 import java.awt.BorderLayout;
-import java.awt.Dimension;
 import java.awt.Font;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -63,7 +62,6 @@
     private static TreeMapNode tree;
     private static TreeMapNode node1;
     private static TreeMapNode node2;
-    private static Dimension dim;
 
     @BeforeClass
     public static void setUpOnce() {
@@ -72,7 +70,6 @@
         node2 = new TreeMapNode(1);
         tree.addChild(node1);
         node1.addChild(node2);
-        dim = new Dimension(500, 500);
     }
 
 
@@ -85,44 +82,24 @@
 
                 try {
                     treeMap = new TreeMapComponent();
+                    // pass
                 } catch (NullPointerException e) {
                     Assert.fail("Didn't expect exception.");
                 }
 
-                boolean caught = false;
                 try {
-                    treeMap = new TreeMapComponent(dim);
-                } catch (NullPointerException e) {
-                    Assert.fail("Didn't expect exception.");
-                }
-                try {
-                    treeMap = new TreeMapComponent(null);
-                } catch (NullPointerException e) {
-                    caught = true;
-                }
-                assertTrue(caught);
-                caught = false;
-
-                try {
-                    treeMap = new TreeMapComponent(tree, dim);
+                    treeMap = new TreeMapComponent(tree);
                     // pass
                 } catch (NullPointerException e) {
                     Assert.fail("Didn't expect exception.");
                 }
-                try {
-                    treeMap = new TreeMapComponent(null, null);
-                } catch (NullPointerException e) {
-                    caught = true;
-                }
-                assertTrue(caught);
-                caught = false;
 
                 try {
-                    treeMap = new TreeMapComponent(tree, null);
+                    treeMap = new TreeMapComponent(null);
+                    // pass
                 } catch (NullPointerException e) {
-                    caught = true;
+                    Assert.fail("Didn't expect exception.");
                 }
-                assertTrue(caught);
             }
         });
     }
@@ -143,7 +120,7 @@
     @Test
     public final void testSetModel() {
         try {
-            treeMap = new TreeMapComponent(dim);
+            treeMap = new TreeMapComponent();
             treeMap.setModel(tree);
         } catch (NullPointerException e) {
             Assert.fail("Didn't expect exception.");
@@ -151,7 +128,7 @@
 
         boolean caught = false;
         try {
-            treeMap = new TreeMapComponent(dim);
+            treeMap = new TreeMapComponent();
             treeMap.setModel(null);
         } catch (NullPointerException e) {
             caught = true;
@@ -166,7 +143,7 @@
             @Override
             public void run() {
                 try {
-                    treeMap = new TreeMapComponent(dim);
+                    treeMap = new TreeMapComponent();
                     treeMap.processAndDrawTreeMap(node1);
                 } catch (NullPointerException e) {
                     Assert.fail("Didn't expect exception.");
@@ -174,7 +151,7 @@
 
                 boolean caught = false;
                 try {
-                    treeMap = new TreeMapComponent(dim);
+                    treeMap = new TreeMapComponent();
                     treeMap.processAndDrawTreeMap(null);
                 } catch (NullPointerException e) {
                     caught = true;
@@ -187,7 +164,7 @@
     @Test
     public final void testIsZoomInEnabled() throws InvocationTargetException, InterruptedException {
         try {
-            treeMap = new TreeMapComponent(dim);
+            treeMap = new TreeMapComponent();
             treeMap.setModel(tree);
             treeMap.isZoomInEnabled(node1);
         } catch (NullPointerException e) {
@@ -196,7 +173,7 @@
 
         boolean caught = false;
         try {
-            treeMap = new TreeMapComponent(dim);
+            treeMap = new TreeMapComponent();
             treeMap.isZoomInEnabled(node1);
         } catch (NullPointerException e) {
             caught = true;
@@ -378,7 +355,7 @@
     @Test
     public final void testSetNode() {
         try {
-            treeMap = new TreeMapComponent(dim);
+            treeMap = new TreeMapComponent();
             TreeMapComponent.Comp comp = treeMap.new Comp();
             comp.setNode(node1);
         } catch (NullPointerException e) {