Mercurial > hg > release > thermostat-1.6
changeset 1977:733df97a6cd1
Remove ToolTipRenderer from TreeMap constructor
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/016406.html
author | James Aziz <jaziz@redhat.com> |
---|---|
date | Wed, 29 Jun 2016 12:23:00 -0400 |
parents | 994cafd25dc5 |
children | b0090df5cadb |
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, 7 insertions(+), 8 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:00 2016 -0400 @@ -165,14 +165,14 @@ */ private List<TreeMapObserver> observers; - private ToolTipRenderer tooltipRenderer; + private ToolTipRenderer tooltipRenderer = new SimpleRenderer(); public TreeMapComponent() { - this(null, new Dimension(), new SimpleRenderer()); + this(null, new Dimension()); } public TreeMapComponent(Dimension d) { - this(null, d, new SimpleRenderer()); + this(null, d); } /** @@ -184,7 +184,7 @@ * @param renderer * @throws NullPointerException if the dimension is null */ - public TreeMapComponent(TreeMapNode tree, Dimension d, ToolTipRenderer renderer) { + public TreeMapComponent(TreeMapNode tree, Dimension d) { super(); Objects.requireNonNull(d); this.dimension = d; @@ -192,7 +192,6 @@ lastDim = getSize(); this.zoomStack = new Stack<>(); this.observers = new ArrayList<>(); - this.tooltipRenderer = renderer; if (tree != null) { this.zoomStack.push(this.tree);
--- 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:00 2016 -0400 @@ -104,13 +104,13 @@ caught = false; try { - treeMap = new TreeMapComponent(tree, dim, new TreeMapComponent.WeightAsSizeRenderer()); + treeMap = new TreeMapComponent(tree, dim); // pass } catch (NullPointerException e) { Assert.fail("Didn't expect exception."); } try { - treeMap = new TreeMapComponent(null, null, new TreeMapComponent.WeightAsSizeRenderer()); + treeMap = new TreeMapComponent(null, null); } catch (NullPointerException e) { caught = true; } @@ -118,7 +118,7 @@ caught = false; try { - treeMap = new TreeMapComponent(tree, null, new TreeMapComponent.WeightAsSizeRenderer()); + treeMap = new TreeMapComponent(tree, null); } catch (NullPointerException e) { caught = true; }