From: <jen...@us...> - 2011-09-30 09:25:18
|
Revision: 145 http://jtreemap.svn.sourceforge.net/jtreemap/?rev=145&view=rev Author: jense128 Date: 2011-09-30 09:25:10 +0000 (Fri, 30 Sep 2011) Log Message: ----------- Bug 2721666 : Applet dataFile URL is handled incorrectly Bug 1876433 : jtreemap-1.1.0.jar in m2 repo lacks (un)zoom.png Bug 1643720 : Mousing out quickly leaves last highlighted leaf highlighted Refactoring to suppress Vector Modified Paths: -------------- trunk/JTreeMap/pom.xml trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/JTreeMap.java trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitByNumber.java trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitBySlice.java trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitBySortedWeight.java trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitByWeight.java trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitSquarified.java trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitStrategy.java trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/TreeMapNode.java trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/example/JTreeMapAppletExample.java trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/example/JTreeMapExample.java trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/provider/HSBTreeMapColorProvider.java trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/provider/RandomColorProvider.java trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/provider/RedGreenColorProvider.java Added Paths: ----------- trunk/JTreeMap/src/main/conf/ trunk/JTreeMap/src/main/conf/net/ trunk/JTreeMap/src/main/conf/net/sf/ trunk/JTreeMap/src/main/conf/net/sf/jtreemap/ trunk/JTreeMap/src/main/conf/net/sf/jtreemap/swing/ trunk/JTreeMap/src/main/conf/net/sf/jtreemap/swing/provider/ trunk/JTreeMap/src/main/conf/net/sf/jtreemap/swing/provider/icons/ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/provider/ColorProvider.java trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/provider/UniqueColorProvider.java Removed Paths: ------------- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/ColorProvider.java trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/UniqueColorProvider.java trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/provider/icons/ Modified: trunk/JTreeMap/pom.xml =================================================================== --- trunk/JTreeMap/pom.xml 2010-04-29 06:36:48 UTC (rev 144) +++ trunk/JTreeMap/pom.xml 2011-09-30 09:25:10 UTC (rev 145) @@ -8,7 +8,7 @@ <packaging>jar</packaging> <!-- this is always the current version of the QALab plugin --> - <version>1.1.0</version> + <version>1.1.1</version> <name>JTreemap Built By Maven 2</name> <url>http://jtreemap.sourceforge.net</url> @@ -39,10 +39,11 @@ <build> <resources> <resource> - <directory>src/conf</directory> + <directory>src/main/conf</directory> <includes> <include>*.properties</include> <include>**/*.gif</include> + <include>**/*.png</include> </includes> <filtering>false</filtering> </resource> Deleted: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/ColorProvider.java =================================================================== --- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/ColorProvider.java 2010-04-29 06:36:48 UTC (rev 144) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/ColorProvider.java 2011-09-30 09:25:10 UTC (rev 145) @@ -1,85 +0,0 @@ -/* - * ObjectLab, http://www.objectlab.co.uk/open is supporting JTreeMap. - * - * Based in London, we are world leaders in the design and development - * of bespoke applications for the securities financing markets. - * - * <a href="http://www.objectlab.co.uk/open">Click here to learn more</a> - * ___ _ _ _ _ _ - * / _ \| |__ (_) ___ ___| |_| | __ _| |__ - * | | | | '_ \| |/ _ \/ __| __| | / _` | '_ \ - * | |_| | |_) | | __/ (__| |_| |__| (_| | |_) | - * \___/|_.__// |\___|\___|\__|_____\__,_|_.__/ - * |__/ - * - * www.ObjectLab.co.uk - * - * $Id$ - * - * Copyright 2006 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package net.sf.jtreemap.swing; - -import java.awt.Color; -import java.io.Serializable; - -import javax.swing.JPanel; - -/** - * Abstract class with the methods who attribute color to the elements of - * JTreeMap. - * - * @author Laurent DUTHEIL - */ - -public abstract class ColorProvider implements Serializable { - - /** - * - */ - private static final long serialVersionUID = 1L; - - /** - * get the associated color to the value. - * - * @param value - * double value - * @return the associated color to the value - */ - public abstract Color getColor(Value value); - - /** - * get a legend JPanel. - * - * @return a legend JPanel - */ - public abstract JPanel getLegendPanel(); -} -/* - * ObjectLab is supporing JTreeMap - * - * Based in London, we are world leaders in the design and development - * of bespoke applications for the securities financing markets. - * - * <a href="http://www.objectlab.co.uk/open">Click here to learn more about us</a> - * ___ _ _ _ _ _ - * / _ \| |__ (_) ___ ___| |_| | __ _| |__ - * | | | | '_ \| |/ _ \/ __| __| | / _` | '_ \ - * | |_| | |_) | | __/ (__| |_| |__| (_| | |_) | - * \___/|_.__// |\___|\___|\__|_____\__,_|_.__/ - * |__/ - * - * www.ObjectLab.co.uk - */ Modified: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/JTreeMap.java =================================================================== --- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/JTreeMap.java 2010-04-29 06:36:48 UTC (rev 144) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/JTreeMap.java 2011-09-30 09:25:10 UTC (rev 145) @@ -50,6 +50,9 @@ import javax.swing.border.Border; import javax.swing.tree.TreePath; +import net.sf.jtreemap.swing.provider.ColorProvider; +import net.sf.jtreemap.swing.provider.UniqueColorProvider; + /** * JComponent who represents each element of a tree in a rectangle of more or * less big size according to its importance in the tree. @@ -569,12 +572,13 @@ public void mouseMoved(final MouseEvent e) { if (getDisplayedRoot().children().hasMoreElements()) { final TreeMapNode t = getDisplayedRoot().getActiveLeaf(e.getX(), e.getY()); - if (t != null && !t.equals(getActiveLeaf())) { + if (t == null || (t != null && !t.equals(getActiveLeaf()))) { setActiveLeaf(t); repaint(); } } } + } /** @@ -612,6 +616,13 @@ repaint(); } } + + @Override + public void mouseExited(MouseEvent arg0) { + setActiveLeaf(null); + repaint(); + } + } /** Modified: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitByNumber.java =================================================================== --- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitByNumber.java 2010-04-29 06:36:48 UTC (rev 144) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitByNumber.java 2011-09-30 09:25:10 UTC (rev 145) @@ -32,8 +32,9 @@ */ package net.sf.jtreemap.swing; -import java.util.Vector; +import java.util.List; + /** * Strategy who split the elements in 2 groups of same cardinal. * @@ -47,22 +48,22 @@ private static final long serialVersionUID = -6484279333222332702L; @Override - public void splitElements(final Vector<TreeMapNode> v, final Vector<TreeMapNode> v1, final Vector<TreeMapNode> v2) { + public void splitElements(final List<TreeMapNode> v, final List<TreeMapNode> v1, final List<TreeMapNode> v2) { final int size = v.size(); final int middle = size / 2; int index = 0; // we add first elements to v1 for (; index < middle; index++) { - v1.addElement(v.elementAt(index)); + v1.add(v.get(index)); } // we add last elements to v2 for (; index < size; index++) { - v2.addElement(v.elementAt(index)); + v2.add(v.get(index)); } } @Override - public double sumWeight(final Vector<TreeMapNode> v) { + public double sumWeight(final List<TreeMapNode> v) { // all the elements must have the same weight double weight = 0.0; for (final TreeMapNode node : v) { Modified: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitBySlice.java =================================================================== --- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitBySlice.java 2010-04-29 06:36:48 UTC (rev 144) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitBySlice.java 2011-09-30 09:25:10 UTC (rev 145) @@ -32,7 +32,7 @@ */ package net.sf.jtreemap.swing; -import java.util.Vector; +import java.util.List; /** * Split the treemap by slice @@ -47,7 +47,7 @@ private static final long serialVersionUID = 8484486418097321160L; /** - * Calculate the dimension of the elements of the Vector. + * Calculate the dimension of the elements of the List. * * @param x0 * x-coordinate @@ -62,7 +62,7 @@ * @param sumWeight * sum of the weights */ - public static void splitInSlice(final int x0, final int y0, final int w0, final int h0, final Vector<TreeMapNode> v, final double sumWeight) { + public static void splitInSlice(final int x0, final int y0, final int w0, final int h0, final List<TreeMapNode> v, final double sumWeight) { int offset = 0; final boolean vertical = h0 > w0; @@ -85,11 +85,11 @@ // Because of the Math.round(), we adjust the last element to fit the // correctly the JTreeMap if (!v.isEmpty()) { - final TreeMapNode node = v.lastElement(); + final TreeMapNode lastElement = v.get(v.size() - 1); if (vertical && h0 != offset) { - node.setHeight(node.getHeight() - offset + h0); + lastElement.setHeight(lastElement.getHeight() - offset + h0); } else if (!vertical && w0 != offset) { - node.setWidth(node.getWidth() - offset + w0); + lastElement.setWidth(lastElement.getWidth() - offset + w0); } } } @@ -97,11 +97,11 @@ /* * (non-Javadoc) * - * @see net.sf.jtreemap.swing.SplitStrategy#splitElements(java.util.Vector, - * java.util.Vector, java.util.Vector) + * @see net.sf.jtreemap.swing.SplitStrategy#splitElements(java.util.List, + * java.util.List, java.util.List) */ @Override - public void splitElements(final Vector<TreeMapNode> v, final Vector<TreeMapNode> v1, final Vector<TreeMapNode> v2) { + public void splitElements(final List<TreeMapNode> v, final List<TreeMapNode> v1, final List<TreeMapNode> v2) { // ignore } @@ -110,10 +110,10 @@ * (non-Javadoc) * * @see net.sf.jtreemap.swing.SplitStrategy#calculatePositionsRec(int, int, - * int, int, double, java.util.Vector) + * int, int, double, java.util.List) */ @Override - protected void calculatePositionsRec(final int x0, final int y0, final int w0, final int h0, final double weight0, final Vector<TreeMapNode> v) { + protected void calculatePositionsRec(final int x0, final int y0, final int w0, final int h0, final double weight0, final List<TreeMapNode> v) { // 1. don't calculate if the area is too small, if (w0 * h0 < 20) { Modified: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitBySortedWeight.java =================================================================== --- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitBySortedWeight.java 2010-04-29 06:36:48 UTC (rev 144) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitBySortedWeight.java 2011-09-30 09:25:10 UTC (rev 145) @@ -32,8 +32,10 @@ */ package net.sf.jtreemap.swing; -import java.util.Vector; +import java.util.ArrayList; +import java.util.List; + /** * Strategy who split the elements in 2 groups of equivalent weight. * <p> @@ -54,11 +56,11 @@ private static final long serialVersionUID = 1600419780258843122L; @Override - public void splitElements(final Vector<TreeMapNode> v, final Vector<TreeMapNode> v1, final Vector<TreeMapNode> v2) { - final Vector<TreeMapNode> vClone = new Vector<TreeMapNode>(v); + public void splitElements(final List<TreeMapNode> v, final List<TreeMapNode> v1, final List<TreeMapNode> v2) { + final List<TreeMapNode> vClone = new ArrayList<TreeMapNode>(v); final double sumWeight = sumWeight(v); - sortVector(vClone); + sortList(vClone); workOutWeight(v1, v2, vClone, sumWeight); } Modified: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitByWeight.java =================================================================== --- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitByWeight.java 2010-04-29 06:36:48 UTC (rev 144) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitByWeight.java 2011-09-30 09:25:10 UTC (rev 145) @@ -32,8 +32,9 @@ */ package net.sf.jtreemap.swing; -import java.util.Vector; +import java.util.List; + /** * Strategy who split the elements in 2 groups of equivalent weight. * @@ -48,7 +49,7 @@ private static final long serialVersionUID = 1136669403687512925L; @Override - public void splitElements(final Vector<TreeMapNode> v, final Vector<TreeMapNode> v1, final Vector<TreeMapNode> v2) { + public void splitElements(final List<TreeMapNode> v, final List<TreeMapNode> v1, final List<TreeMapNode> v2) { final double sumWeight = sumWeight(v); workOutWeight(v, v1, v2, sumWeight); Modified: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitSquarified.java =================================================================== --- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitSquarified.java 2010-04-29 06:36:48 UTC (rev 144) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitSquarified.java 2011-09-30 09:25:10 UTC (rev 145) @@ -32,7 +32,8 @@ */ package net.sf.jtreemap.swing; -import java.util.Vector; +import java.util.ArrayList; +import java.util.List; /** * The Squarified split strategy @@ -66,7 +67,7 @@ private int h2; @Override - public void splitElements(final Vector<TreeMapNode> v, final Vector<TreeMapNode> v1, final Vector<TreeMapNode> v2) { + public void splitElements(final List<TreeMapNode> v, final List<TreeMapNode> v1, final List<TreeMapNode> v2) { int mid = 0; final double weight0 = sumWeight(v); final double a = v.get(mid).getWeight() / weight0; @@ -127,10 +128,10 @@ * (non-Javadoc) * * @see net.sf.jtreemap.swing.SplitStrategy#calculatePositionsRec(int, int, - * int, int, double, java.util.Vector) + * int, int, double, java.util.List) */ @Override - protected void calculatePositionsRec(final int x0, final int y0, final int w0, final int h0, final double weight0, final Vector<TreeMapNode> v) { + protected void calculatePositionsRec(final int x0, final int y0, final int w0, final int h0, final double weight0, final List<TreeMapNode> v) { // 1. don't calculate if the area is too small, if (w0 * h0 < 20) { return; @@ -141,23 +142,23 @@ return; } - final Vector<TreeMapNode> vClone = new Vector<TreeMapNode>(v); + final List<TreeMapNode> vClone = new ArrayList<TreeMapNode>(v); - sortVector(vClone); + sortList(vClone); if (vClone.size() <= 2) { SplitBySlice.splitInSlice(x0, y0, w0, h0, vClone, sumWeight(vClone)); calculateChildren(vClone); } else { - final Vector<TreeMapNode> v1 = new Vector<TreeMapNode>(); - final Vector<TreeMapNode> v2 = new Vector<TreeMapNode>(); + final List<TreeMapNode> v1 = new ArrayList<TreeMapNode>(); + final List<TreeMapNode> v2 = new ArrayList<TreeMapNode>(); this.x = x0; this.y = y0; this.w = w0; this.h = h0; splitElements(vClone, v1, v2); // before the recurence, we have to "save" the values for the 2nd - // Vector + // list final int prevX2 = this.x2; final int prevY2 = this.y2; final int prevW2 = this.w2; @@ -174,13 +175,13 @@ } /** - * Execute the recurence for the children of the elements of the vector.<BR> + * Execute the recurence for the children of the elements of the list.<BR> * Add also the borders if necessary * * @param v - * Vector with the elements to calculate + * List with the elements to calculate */ - private void calculateChildren(final Vector<TreeMapNode> v) { + private void calculateChildren(final List<TreeMapNode> v) { for (final TreeMapNode node : v) { if (node.isLeaf()) { node.setX(node.getX() + TreeMapNode.getBorder()); Modified: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitStrategy.java =================================================================== --- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitStrategy.java 2010-04-29 06:36:48 UTC (rev 144) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitStrategy.java 2011-09-30 09:25:10 UTC (rev 145) @@ -33,8 +33,9 @@ package net.sf.jtreemap.swing; import java.io.Serializable; +import java.util.ArrayList; import java.util.Iterator; -import java.util.Vector; +import java.util.List; /** * Abtract class with the method which split the elements of a JTreeMap. @@ -63,7 +64,7 @@ return; } - final Vector<TreeMapNode> v = root.getChildren(); + final List<TreeMapNode> v = root.getChildren(); if (v != null && !v.isEmpty()) { calculatePositionsRec(root.getX(), root.getY(), root.getWidth(), root.getHeight(), this.sumWeight(v), v); } @@ -73,13 +74,13 @@ * split the elements of a JTreeMap. * * @param v - * Vector with the elements to split (arg IN) + * List with the elements to split (arg IN) * @param v1 - * first Vector of the split (arg OUT) + * first List of the split (arg OUT) * @param v2 - * second Vector of the split (arg OUT) + * second List of the split (arg OUT) */ - public abstract void splitElements(Vector<TreeMapNode> v, Vector<TreeMapNode> v1, Vector<TreeMapNode> v2); + public abstract void splitElements(List<TreeMapNode> v, List<TreeMapNode> v1, List<TreeMapNode> v2); /** * Sum the weight of elements. <BR> @@ -87,22 +88,22 @@ * or to cancel the effect of weight on the strategy. * * @param v - * Vector with the elements to sum + * List with the elements to sum * @return the sum of the weight of elements */ - public double sumWeight(final Vector<TreeMapNode> v) { + public double sumWeight(final List<TreeMapNode> v) { double d = 0.0; if (v != null) { final int size = v.size(); for (int i = 0; i < size; i++) { - d += (v.elementAt(i)).getWeight(); + d += (v.get(i)).getWeight(); } } return d; } - protected void calculatePositionsRec(final int x0, final int y0, final int w0, final int h0, final double weight0, final Vector<TreeMapNode> v) { + protected void calculatePositionsRec(final int x0, final int y0, final int w0, final int h0, final double weight0, final List<TreeMapNode> v) { if (v.isEmpty()) { return; @@ -117,9 +118,9 @@ return; } - // if the Vector contains only one element + // if the List contains only one element if (v.size() == 1) { - final TreeMapNode f = v.elementAt(0); + final TreeMapNode f = v.get(0); if (f.isLeaf()) { // if this is a leaf, we display with the border int w = w0 - TreeMapNode.getBorder(); @@ -159,9 +160,9 @@ } } else { // if there is more than one element - // we split the Vector according to the selected strategy - final Vector<TreeMapNode> v1 = new Vector<TreeMapNode>(); - final Vector<TreeMapNode> v2 = new Vector<TreeMapNode>(); + // we split the List according to the selected strategy + final List<TreeMapNode> v1 = new ArrayList<TreeMapNode>(); + final List<TreeMapNode> v2 = new ArrayList<TreeMapNode>(); double weight1; double weight2; // poids des 2 vecteurs this.splitElements(v, v1, v2); @@ -191,7 +192,7 @@ x2 = x0; y2 = y0 + h1; } - // calculation for the new two Vectors + // calculation for the new two Lists calculatePositionsRec(x0, y0, w1, h1, weight1, v1); calculatePositionsRec(x2, y2, w2, h2, weight2, v2); } @@ -201,24 +202,24 @@ * Sort the elements by descending weight. * * @param v - * Vector with the elements to be sorted + * List with the elements to be sorted */ - protected void sortVector(final Vector<TreeMapNode> v) { + protected void sortList(final List<TreeMapNode> v) { TreeMapNode tmn; // we use the bubble sort for (int i = 0; i < v.size(); i++) { for (int j = v.size() - 1; j > i; j--) { - if ((v.elementAt(j)).getWeight() > (v.elementAt(j - 1)).getWeight()) { - tmn = (v.elementAt(j)); - v.setElementAt(v.elementAt(j - 1), j); - v.setElementAt(tmn, j - 1); + if ((v.get(j)).getWeight() > (v.get(j - 1)).getWeight()) { + tmn = (v.get(j)); + v.set(j, v.get(j - 1)); + v.set(j-1, tmn); } } } } - protected void workOutWeight(final Vector<TreeMapNode> v1, final Vector<TreeMapNode> v2, final Vector<TreeMapNode> vClone, final double sumWeight) { + protected void workOutWeight(final List<TreeMapNode> v1, final List<TreeMapNode> v2, final List<TreeMapNode> vClone, final double sumWeight) { double memWeight = 0.0; double elemWeight = 0.0; for (final Iterator<TreeMapNode> i = vClone.iterator(); i.hasNext();) { @@ -230,29 +231,29 @@ // weight) if (((sumWeight / 2) - memWeight) > ((memWeight + elemWeight) - (sumWeight / 2))) { // if it is after the add, we add the element to the first - // Vector + // List memWeight += elemWeight; - v1.addElement(tmn); + v1.add(tmn); } else { - // we must have at least 1 element in the first vector + // we must have at least 1 element in the first List if (v1.isEmpty()) { - v1.addElement(tmn); + v1.add(tmn); } else { // if it is before the add, we add the element to the - // second Vector - v2.addElement(tmn); + // second List + v2.add(tmn); } } - // then we fill the second Vector qith the rest of elements + // then we fill the second List qith the rest of elements while (i.hasNext()) { tmn = i.next(); - v2.addElement(tmn); + v2.add(tmn); } } else { - // we add in the first vector while we don't reach the middle of + // we add in the first List while we don't reach the middle of // weight memWeight += elemWeight; - v1.addElement(tmn); + v1.add(tmn); } } } Modified: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/TreeMapNode.java =================================================================== --- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/TreeMapNode.java 2010-04-29 06:36:48 UTC (rev 144) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/TreeMapNode.java 2011-09-30 09:25:10 UTC (rev 145) @@ -33,7 +33,7 @@ package net.sf.jtreemap.swing; import java.util.Enumeration; -import java.util.Vector; +import java.util.List; import javax.swing.tree.DefaultMutableTreeNode; @@ -175,12 +175,12 @@ } /** - * get a Vector with the children. + * get a List with the children. * - * @return Vector with the children + * @return List with the children */ @SuppressWarnings("unchecked") - public Vector<TreeMapNode> getChildren() { + public List<TreeMapNode> getChildren() { return this.children; } Deleted: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/UniqueColorProvider.java =================================================================== --- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/UniqueColorProvider.java 2010-04-29 06:36:48 UTC (rev 144) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/UniqueColorProvider.java 2011-09-30 09:25:10 UTC (rev 145) @@ -1,147 +0,0 @@ -/* - * ObjectLab, http://www.objectlab.co.uk/open is supporting JTreeMap. - * - * Based in London, we are world leaders in the design and development - * of bespoke applications for the securities financing markets. - * - * <a href="http://www.objectlab.co.uk/open">Click here to learn more</a> - * ___ _ _ _ _ _ - * / _ \| |__ (_) ___ ___| |_| | __ _| |__ - * | | | | '_ \| |/ _ \/ __| __| | / _` | '_ \ - * | |_| | |_) | | __/ (__| |_| |__| (_| | |_) | - * \___/|_.__// |\___|\___|\__|_____\__,_|_.__/ - * |__/ - * - * www.ObjectLab.co.uk - * - * $Id$ - * - * Copyright 2006 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package net.sf.jtreemap.swing; - -import java.awt.Color; -import java.awt.Graphics; - -import javax.swing.JPanel; - -/** - * Color Provider by default.<BR> - * All values are associated to a unique color. - * - * @author Laurent DUTHEIL - * - */ -public class UniqueColorProvider extends ColorProvider { - /** - * - */ - private static final long serialVersionUID = -7571926934516139432L; - - private static final Color DEFAULT_COLOR = new Color(153, 153, 51); - - private final Color color; - - private JPanel legend; - - /** - * Constructor. - */ - public UniqueColorProvider() { - this.color = DEFAULT_COLOR; - } - - /** - * Constructor. - * - * @param color - * unique color - */ - public UniqueColorProvider(final Color color) { - this.color = color; - } - - /* - * (non-Javadoc) - * - * @see net.sf.jtreemap.swing.ColorProvider#getColor(double) - */ - @Override - public Color getColor(final Value value) { - return this.color; - } - - /* - * (non-Javadoc) - * - * @see net.sf.jtreemap.swing.ColorProvider#getLegendPanel() - */ - @Override - public JPanel getLegendPanel() { - if (this.legend == null) { - this.legend = new Legend(); - } - return this.legend; - } - - /** - * Panel with the legend. - * - * @author Laurent Dutheil - */ - private static class Legend extends JPanel { - private static final int LEGEND_Y_POS = 20; - - private static final int LEGEND_X_POS = 20; - - private static final int LEGEND_HEIGHT = 40; - - private static final int LEGEND_WIDTH = 100; - - private static final long serialVersionUID = -8046211081305644785L; - - private static final String TEXT = "Unique Color Provider"; - - /** - * Constructor. - */ - public Legend() { - this.setPreferredSize(new java.awt.Dimension(LEGEND_WIDTH, LEGEND_HEIGHT)); - - } - - @Override - public void paint(final Graphics g) { - g.setColor(Color.black); - g.drawString(Legend.TEXT, LEGEND_X_POS, LEGEND_Y_POS); - } - } -} -/* - * ObjectLab is supporing JTreeMap - * - * Based in London, we are world leaders in the design and development - * of bespoke applications for the securities financing markets. - * - * <a href="http://www.objectlab.co.uk/open">Click here to learn more about us</a> - * ___ _ _ _ _ _ - * / _ \| |__ (_) ___ ___| |_| | __ _| |__ - * | | | | '_ \| |/ _ \/ __| __| | / _` | '_ \ - * | |_| | |_) | | __/ (__| |_| |__| (_| | |_) | - * \___/|_.__// |\___|\___|\__|_____\__,_|_.__/ - * |__/ - * - * www.ObjectLab.co.uk - */ Modified: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/example/JTreeMapAppletExample.java =================================================================== --- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/example/JTreeMapAppletExample.java 2010-04-29 06:36:48 UTC (rev 144) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/example/JTreeMapAppletExample.java 2011-09-30 09:25:10 UTC (rev 145) @@ -62,10 +62,10 @@ import javax.swing.event.TreeSelectionListener; import javax.swing.tree.DefaultTreeModel; -import net.sf.jtreemap.swing.ColorProvider; import net.sf.jtreemap.swing.JTreeMap; import net.sf.jtreemap.swing.SplitBySortedWeight; import net.sf.jtreemap.swing.TreeMapNode; +import net.sf.jtreemap.swing.provider.ColorProvider; import net.sf.jtreemap.swing.provider.HSBTreeMapColorProvider; import net.sf.jtreemap.swing.provider.RandomColorProvider; import net.sf.jtreemap.swing.provider.RedGreenColorProvider; @@ -159,7 +159,7 @@ } } else if (XML.equalsIgnoreCase(dataFileType)) { try { - final URL url = new URL(getCodeBase() + dataFile); + final URL url = new URL(getCodeBase(), dataFile); final URLConnection connection = url.openConnection(); final BuilderXML bXml = new BuilderXML(connection.getInputStream()); root = bXml.getRoot(); @@ -246,7 +246,7 @@ * @throws IOException */ private BufferedReader createReader(final String dataFile) throws IOException { - final URL url = new URL(getCodeBase() + dataFile); + final URL url = new URL(getCodeBase(), dataFile); final URLConnection connection = url.openConnection(); final BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream())); return reader; Modified: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/example/JTreeMapExample.java =================================================================== --- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/example/JTreeMapExample.java 2010-04-29 06:36:48 UTC (rev 144) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/example/JTreeMapExample.java 2011-09-30 09:25:10 UTC (rev 145) @@ -69,7 +69,6 @@ import javax.swing.filechooser.FileFilter; import javax.swing.tree.DefaultTreeModel; -import net.sf.jtreemap.swing.ColorProvider; import net.sf.jtreemap.swing.JTreeMap; import net.sf.jtreemap.swing.SplitByNumber; import net.sf.jtreemap.swing.SplitBySlice; @@ -78,6 +77,7 @@ import net.sf.jtreemap.swing.SplitSquarified; import net.sf.jtreemap.swing.SplitStrategy; import net.sf.jtreemap.swing.TreeMapNode; +import net.sf.jtreemap.swing.provider.ColorProvider; import net.sf.jtreemap.swing.provider.HSBTreeMapColorProvider; import net.sf.jtreemap.swing.provider.RandomColorProvider; import net.sf.jtreemap.swing.provider.RedGreenColorProvider; Copied: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/provider/ColorProvider.java (from rev 144, trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/ColorProvider.java) =================================================================== --- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/provider/ColorProvider.java (rev 0) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/provider/ColorProvider.java 2011-09-30 09:25:10 UTC (rev 145) @@ -0,0 +1,87 @@ +/* + * ObjectLab, http://www.objectlab.co.uk/open is supporting JTreeMap. + * + * Based in London, we are world leaders in the design and development + * of bespoke applications for the securities financing markets. + * + * <a href="http://www.objectlab.co.uk/open">Click here to learn more</a> + * ___ _ _ _ _ _ + * / _ \| |__ (_) ___ ___| |_| | __ _| |__ + * | | | | '_ \| |/ _ \/ __| __| | / _` | '_ \ + * | |_| | |_) | | __/ (__| |_| |__| (_| | |_) | + * \___/|_.__// |\___|\___|\__|_____\__,_|_.__/ + * |__/ + * + * www.ObjectLab.co.uk + * + * $Id$ + * + * Copyright 2006 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package net.sf.jtreemap.swing.provider; + +import java.awt.Color; +import java.io.Serializable; + +import javax.swing.JPanel; + +import net.sf.jtreemap.swing.Value; + +/** + * Abstract class with the methods who attribute color to the elements of + * JTreeMap. + * + * @author Laurent DUTHEIL + */ + +public abstract class ColorProvider implements Serializable { + + /** + * + */ + private static final long serialVersionUID = 1L; + + /** + * get the associated color to the value. + * + * @param value + * double value + * @return the associated color to the value + */ + public abstract Color getColor(Value value); + + /** + * get a legend JPanel. + * + * @return a legend JPanel + */ + public abstract JPanel getLegendPanel(); +} +/* + * ObjectLab is supporing JTreeMap + * + * Based in London, we are world leaders in the design and development + * of bespoke applications for the securities financing markets. + * + * <a href="http://www.objectlab.co.uk/open">Click here to learn more about us</a> + * ___ _ _ _ _ _ + * / _ \| |__ (_) ___ ___| |_| | __ _| |__ + * | | | | '_ \| |/ _ \/ __| __| | / _` | '_ \ + * | |_| | |_) | | __/ (__| |_| |__| (_| | |_) | + * \___/|_.__// |\___|\___|\__|_____\__,_|_.__/ + * |__/ + * + * www.ObjectLab.co.uk + */ Property changes on: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/provider/ColorProvider.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/provider/HSBTreeMapColorProvider.java =================================================================== --- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/provider/HSBTreeMapColorProvider.java 2010-04-29 06:36:48 UTC (rev 144) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/provider/HSBTreeMapColorProvider.java 2011-09-30 09:25:10 UTC (rev 145) @@ -38,7 +38,6 @@ import javax.swing.JPanel; -import net.sf.jtreemap.swing.ColorProvider; import net.sf.jtreemap.swing.DefaultValue; import net.sf.jtreemap.swing.JTreeMap; import net.sf.jtreemap.swing.TreeMapNode; Modified: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/provider/RandomColorProvider.java =================================================================== --- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/provider/RandomColorProvider.java 2010-04-29 06:36:48 UTC (rev 144) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/provider/RandomColorProvider.java 2011-09-30 09:25:10 UTC (rev 145) @@ -41,7 +41,6 @@ import javax.swing.JPanel; -import net.sf.jtreemap.swing.ColorProvider; import net.sf.jtreemap.swing.JTreeMap; import net.sf.jtreemap.swing.TreeMapNode; import net.sf.jtreemap.swing.Value; Modified: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/provider/RedGreenColorProvider.java =================================================================== --- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/provider/RedGreenColorProvider.java 2010-04-29 06:36:48 UTC (rev 144) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/provider/RedGreenColorProvider.java 2011-09-30 09:25:10 UTC (rev 145) @@ -37,7 +37,6 @@ import javax.swing.JPanel; -import net.sf.jtreemap.swing.ColorProvider; import net.sf.jtreemap.swing.JTreeMap; import net.sf.jtreemap.swing.TreeMapNode; import net.sf.jtreemap.swing.Value; Copied: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/provider/UniqueColorProvider.java (from rev 144, trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/UniqueColorProvider.java) =================================================================== --- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/provider/UniqueColorProvider.java (rev 0) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/provider/UniqueColorProvider.java 2011-09-30 09:25:10 UTC (rev 145) @@ -0,0 +1,149 @@ +/* + * ObjectLab, http://www.objectlab.co.uk/open is supporting JTreeMap. + * + * Based in London, we are world leaders in the design and development + * of bespoke applications for the securities financing markets. + * + * <a href="http://www.objectlab.co.uk/open">Click here to learn more</a> + * ___ _ _ _ _ _ + * / _ \| |__ (_) ___ ___| |_| | __ _| |__ + * | | | | '_ \| |/ _ \/ __| __| | / _` | '_ \ + * | |_| | |_) | | __/ (__| |_| |__| (_| | |_) | + * \___/|_.__// |\___|\___|\__|_____\__,_|_.__/ + * |__/ + * + * www.ObjectLab.co.uk + * + * $Id$ + * + * Copyright 2006 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package net.sf.jtreemap.swing.provider; + +import java.awt.Color; +import java.awt.Graphics; + +import javax.swing.JPanel; + +import net.sf.jtreemap.swing.Value; + +/** + * Color Provider by default.<BR> + * All values are associated to a unique color. + * + * @author Laurent DUTHEIL + * + */ +public class UniqueColorProvider extends ColorProvider { + /** + * + */ + private static final long serialVersionUID = -7571926934516139432L; + + private static final Color DEFAULT_COLOR = new Color(153, 153, 51); + + private final Color color; + + private JPanel legend; + + /** + * Constructor. + */ + public UniqueColorProvider() { + this.color = DEFAULT_COLOR; + } + + /** + * Constructor. + * + * @param color + * unique color + */ + public UniqueColorProvider(final Color color) { + this.color = color; + } + + /* + * (non-Javadoc) + * + * @see net.sf.jtreemap.swing.ColorProvider#getColor(double) + */ + @Override + public Color getColor(final Value value) { + return this.color; + } + + /* + * (non-Javadoc) + * + * @see net.sf.jtreemap.swing.ColorProvider#getLegendPanel() + */ + @Override + public JPanel getLegendPanel() { + if (this.legend == null) { + this.legend = new Legend(); + } + return this.legend; + } + + /** + * Panel with the legend. + * + * @author Laurent Dutheil + */ + private static class Legend extends JPanel { + private static final int LEGEND_Y_POS = 20; + + private static final int LEGEND_X_POS = 20; + + private static final int LEGEND_HEIGHT = 40; + + private static final int LEGEND_WIDTH = 100; + + private static final long serialVersionUID = -8046211081305644785L; + + private static final String TEXT = "Unique Color Provider"; + + /** + * Constructor. + */ + public Legend() { + this.setPreferredSize(new java.awt.Dimension(LEGEND_WIDTH, LEGEND_HEIGHT)); + + } + + @Override + public void paint(final Graphics g) { + g.setColor(Color.black); + g.drawString(Legend.TEXT, LEGEND_X_POS, LEGEND_Y_POS); + } + } +} +/* + * ObjectLab is supporing JTreeMap + * + * Based in London, we are world leaders in the design and development + * of bespoke applications for the securities financing markets. + * + * <a href="http://www.objectlab.co.uk/open">Click here to learn more about us</a> + * ___ _ _ _ _ _ + * / _ \| |__ (_) ___ ___| |_| | __ _| |__ + * | | | | '_ \| |/ _ \/ __| __| | / _` | '_ \ + * | |_| | |_) | | __/ (__| |_| |__| (_| | |_) | + * \___/|_.__// |\___|\___|\__|_____\__,_|_.__/ + * |__/ + * + * www.ObjectLab.co.uk + */ Property changes on: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/provider/UniqueColorProvider.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |