Menu
▾
▴
[Jtreemap-svn] SF.net SVN: jtreemap:[134] trunk/JTreeMap/src/main/java/net/sf/jtreemap/ swing
|
From: <be...@us...> - 2009-06-12 20:19:52
|
Revision: 134
http://jtreemap.svn.sourceforge.net/jtreemap/?rev=134&view=rev
Author: benoitx
Date: 2009-06-12 20:19:50 +0000 (Fri, 12 Jun 2009)
Log Message:
-----------
Running the Eclipse cleanUp.
Modified Paths:
--------------
trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/ColorProvider.java
trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/DefaultToolTip.java
trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/DefaultToolTipBuilder.java
trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/JTreeMap.java
trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitBySlice.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/UniqueColorProvider.java
trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/Value.java
trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/ValuePercent.java
trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/example/BuilderTM3.java
trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/example/BuilderXML.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
trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/provider/ZoomAction.java
trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/provider/ZoomPopupMenu.java
Modified: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/ColorProvider.java
===================================================================
--- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/ColorProvider.java 2009-06-12 20:01:58 UTC (rev 133)
+++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/ColorProvider.java 2009-06-12 20:19:50 UTC (rev 134)
@@ -47,6 +47,11 @@
public abstract class ColorProvider implements Serializable {
/**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ /**
* get the associated color to the value.
*
* @param value
Modified: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/DefaultToolTip.java
===================================================================
--- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/DefaultToolTip.java 2009-06-12 20:01:58 UTC (rev 133)
+++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/DefaultToolTip.java 2009-06-12 20:19:50 UTC (rev 134)
@@ -53,18 +53,18 @@
private static final long serialVersionUID = -2492627777999093973L;
- private JTreeMap jTreeMap;
+ private final JTreeMap jTreeMap;
- private Font labelFont;
+ private final Font labelFont;
- private Font valueFont;
-
- private String weightPrefix;
-
- private String valuePrefix;
-
- private boolean showWeight;
-
+ private final Font valueFont;
+
+ private final String weightPrefix;
+
+ private final String valuePrefix;
+
+ private final boolean showWeight;
+
/**
* Constructor.
*
@@ -90,7 +90,7 @@
@Override
public void paint(final Graphics g) {
if (this.jTreeMap.getActiveLeaf() != null) {
- Graphics g2D = (Graphics) g;
+ final Graphics g2D = g;
g2D.setColor(Color.YELLOW);
g2D.fill3DRect(0, 0, this.getWidth(), this.getHeight(), true);
g2D.setColor(Color.black);
@@ -99,13 +99,13 @@
g2D.setFont(this.valueFont);
String toDraw = this.jTreeMap.getActiveLeaf().getLabelValue();
if (valuePrefix != null) {
- toDraw = valuePrefix + " " + toDraw;
+ toDraw = valuePrefix + " " + toDraw;
}
if (showWeight) {
- toDraw = this.jTreeMap.getActiveLeaf().getWeight() + ", " + toDraw;
+ toDraw = this.jTreeMap.getActiveLeaf().getWeight() + ", " + toDraw;
}
if (weightPrefix != null && showWeight) {
- toDraw = weightPrefix + " " + toDraw;
+ toDraw = weightPrefix + " " + toDraw;
}
g2D.drawString(toDraw, TOOLTIP_OFFSET, this.getHeight() - TOOLTIP_OFFSET);
}
Modified: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/DefaultToolTipBuilder.java
===================================================================
--- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/DefaultToolTipBuilder.java 2009-06-12 20:01:58 UTC (rev 133)
+++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/DefaultToolTipBuilder.java 2009-06-12 20:19:50 UTC (rev 134)
@@ -47,10 +47,10 @@
private static final long serialVersionUID = -1646772942428571187L;
private JToolTip instance = null;
- private JTreeMap jTreeMap;
- private String weightPrefix;
- private String valuePrefix;
- private boolean showWeight;
+ private final JTreeMap jTreeMap;
+ private final String weightPrefix;
+ private final String valuePrefix;
+ private final boolean showWeight;
/**
* Constructor.
@@ -72,8 +72,7 @@
*/
public JToolTip getToolTip() {
if (instance == null) {
- instance = new DefaultToolTip(this.jTreeMap, this.weightPrefix,
- this.valuePrefix, this.showWeight);
+ instance = new DefaultToolTip(this.jTreeMap, this.weightPrefix, this.valuePrefix, this.showWeight);
}
return instance;
}
Modified: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/JTreeMap.java
===================================================================
--- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/JTreeMap.java 2009-06-12 20:01:58 UTC (rev 133)
+++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/JTreeMap.java 2009-06-12 20:19:50 UTC (rev 134)
@@ -68,16 +68,11 @@
* @author Laurent Dutheil
*/
public class JTreeMap extends JComponent {
+ private static final long serialVersionUID = 7255952672238300249L;
private static final int BORDER_FOR_FONT = 5;
-
private static final int MAX_NUM_CHAR = 3;
-
private static final int INSET = 4;
-
private static final int DISMISS_DELAY_MS = 100000;
-
- private static final long serialVersionUID = 7255952672238300249L;
-
private static final Color TRANSPARENCY_COLOR = new Color(204, 204, 204, 128);
/**
@@ -104,7 +99,7 @@
private IToolTipBuilder toolTipBuilder;
// zoom
- private Zoom zoom;
+ private final Zoom zoom = new Zoom();
/**
* Constructor of JTreeMap. <BR>
@@ -175,8 +170,6 @@
// the default DefaultToolTipBuilder
toolTipBuilder = new DefaultToolTipBuilder(this, weightPrefix, valuePrefix, showWeight);
- zoom = new Zoom();
-
setRoot(root);
setStrategy(strategy);
setColorProvider(new UniqueColorProvider());
@@ -572,7 +565,6 @@
* @author Laurent Dutheil
*/
protected class HandleMouseMotion extends MouseMotionAdapter {
-
@Override
public void mouseMoved(final MouseEvent e) {
if (getDisplayedRoot().children().hasMoreElements()) {
@@ -591,9 +583,8 @@
* @author Ekin Gulen
*/
protected class HandleMouseClick extends MouseAdapter {
-
@Override
- public void mouseClicked(MouseEvent e) {
+ public void mouseClicked(final MouseEvent e) {
if (e.getButton() == MouseEvent.BUTTON1 && e.getClickCount() == 1) {
final TreeMapNode t = getDisplayedRoot().getChild(e.getX(), e.getY());
if (t != null && !t.isLeaf()) {
@@ -602,7 +593,7 @@
} else {
//zoom(t);
// dont know why below does not work so for now leave it commented out
- TreePath path = new TreePath(t.getPath());
+ final TreePath path = new TreePath(t.getPath());
treeView.setSelectionPath(path);
treeView.scrollPathToVisible(path);
}
@@ -613,7 +604,7 @@
} else {
//zoom((TreeMapNode) getDisplayedRoot().getParent());
// dont know why below does not work so for now leave it commented out
- TreePath path = new TreePath(((TreeMapNode) getDisplayedRoot().getParent()).getPath());
+ final TreePath path = new TreePath(((TreeMapNode) getDisplayedRoot().getParent()).getPath());
treeView.setSelectionPath(path);
treeView.scrollPathToVisible(path);
}
@@ -629,18 +620,10 @@
* @author Laurent Dutheil
*/
private class Zoom implements Serializable {
- /**
- *
- */
private static final long serialVersionUID = 6708828099608367996L;
-
private boolean enable;
-
private boolean keepProportion = false;
- /**
- * Constructor
- */
public Zoom() {
enable = true;
}
@@ -729,7 +712,7 @@
return treeView;
}
- public void setTreeView(JTree treeView) {
+ public void setTreeView(final JTree treeView) {
this.treeView = treeView;
}
}
Modified: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitBySlice.java
===================================================================
--- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitBySlice.java 2009-06-12 20:01:58 UTC (rev 133)
+++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitBySlice.java 2009-06-12 20:19:50 UTC (rev 134)
@@ -62,10 +62,9 @@
* @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 Vector<TreeMapNode> v, final double sumWeight) {
int offset = 0;
- boolean vertical = h0 > w0;
+ final boolean vertical = h0 > w0;
for (final TreeMapNode node : v) {
if (vertical) {
@@ -114,8 +113,7 @@
* int, int, double, java.util.Vector)
*/
@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 Vector<TreeMapNode> v) {
SplitBySlice.splitInSlice(x0, y0, w0, h0, v, weight0);
@@ -129,17 +127,14 @@
// if this is not a leaf, calculation for the children
if (TreeMapNode.getBorder() > 1) {
TreeMapNode.setBorder(TreeMapNode.getBorder() - 2);
- calculatePositionsRec(node.getX() + 2, node.getY() + 2, node.getWidth() - 2, node.getHeight() - 2, node
- .getWeight(), node.getChildren());
+ calculatePositionsRec(node.getX() + 2, node.getY() + 2, node.getWidth() - 2, node.getHeight() - 2, node.getWeight(), node.getChildren());
TreeMapNode.setBorder(TreeMapNode.getBorder() + 2);
} else if (TreeMapNode.getBorder() == 1) {
TreeMapNode.setBorder(0);
- calculatePositionsRec(node.getX() + 1, node.getY() + 1, node.getWidth() - 1, node.getHeight() - 1, node
- .getWeight(), node.getChildren());
+ calculatePositionsRec(node.getX() + 1, node.getY() + 1, node.getWidth() - 1, node.getHeight() - 1, node.getWeight(), node.getChildren());
TreeMapNode.setBorder(1);
} else {
- calculatePositionsRec(node.getX(), node.getY(), node.getWidth(), node.getHeight(), node.getWeight(), node
- .getChildren());
+ calculatePositionsRec(node.getX(), node.getY(), node.getWidth(), node.getHeight(), node.getWeight(), node.getChildren());
}
}
}
Modified: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitSquarified.java
===================================================================
--- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitSquarified.java 2009-06-12 20:01:58 UTC (rev 133)
+++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitSquarified.java 2009-06-12 20:19:50 UTC (rev 134)
@@ -130,8 +130,7 @@
* int, int, double, java.util.Vector)
*/
@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 Vector<TreeMapNode> v) {
final Vector<TreeMapNode> vClone = new Vector<TreeMapNode>(v);
sortVector(vClone);
Modified: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitStrategy.java
===================================================================
--- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitStrategy.java 2009-06-12 20:01:58 UTC (rev 133)
+++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitStrategy.java 2009-06-12 20:19:50 UTC (rev 134)
@@ -48,6 +48,11 @@
public abstract class SplitStrategy implements Serializable {
/**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ /**
* calculate the positions for all the elements of the root.
*
* @param root
@@ -97,8 +102,7 @@
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 Vector<TreeMapNode> v) {
if (v.isEmpty()) {
return;
@@ -204,8 +208,7 @@
}
- protected void workOutWeight(final Vector<TreeMapNode> v1, final Vector<TreeMapNode> v2, final Vector<TreeMapNode> vClone,
- final double sumWeight) {
+ protected void workOutWeight(final Vector<TreeMapNode> v1, final Vector<TreeMapNode> v2, final Vector<TreeMapNode> vClone, final double sumWeight) {
double memWeight = 0.0;
double elemWeight = 0.0;
for (final Iterator<TreeMapNode> i = vClone.iterator(); i.hasNext();) {
Modified: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/TreeMapNode.java
===================================================================
--- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/TreeMapNode.java 2009-06-12 20:01:58 UTC (rev 133)
+++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/TreeMapNode.java 2009-06-12 20:19:50 UTC (rev 134)
@@ -140,8 +140,7 @@
public TreeMapNode getActiveLeaf(final int xParam, final int yParam) {
if (this.isLeaf()) {
- if ((xParam >= this.getX()) && (xParam <= this.getX() + this.getWidth()) && (yParam >= this.getY())
- && (yParam <= this.getY() + this.getHeight())) {
+ if ((xParam >= this.getX()) && (xParam <= this.getX() + this.getWidth()) && (yParam >= this.getY()) && (yParam <= this.getY() + this.getHeight())) {
return this;
}
} else {
Modified: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/UniqueColorProvider.java
===================================================================
--- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/UniqueColorProvider.java 2009-06-12 20:01:58 UTC (rev 133)
+++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/UniqueColorProvider.java 2009-06-12 20:19:50 UTC (rev 134)
@@ -52,7 +52,7 @@
private static final Color DEFAULT_COLOR = new Color(153, 153, 51);
- private Color color;
+ private final Color color;
private JPanel legend;
Modified: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/Value.java
===================================================================
--- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/Value.java 2009-06-12 20:01:58 UTC (rev 133)
+++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/Value.java 2009-06-12 20:19:50 UTC (rev 134)
@@ -41,6 +41,10 @@
*/
public abstract class Value implements Comparable, Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
private static final int SHIFT = 32;
private static final int PRIME = 31;
@@ -116,10 +120,9 @@
}
throw new IllegalArgumentException();
}
-
-
+
public String toString() {
- StringBuilder b = new StringBuilder();
+ final StringBuilder b = new StringBuilder();
b.append(getLabel()).append(" - ").append(getValue());
return b.toString();
}
Modified: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/ValuePercent.java
===================================================================
--- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/ValuePercent.java 2009-06-12 20:01:58 UTC (rev 133)
+++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/ValuePercent.java 2009-06-12 20:19:50 UTC (rev 134)
@@ -34,7 +34,6 @@
import java.text.NumberFormat;
-
/**
* class who can display the values of elements of a JTreeMap with pourcent
*
@@ -44,7 +43,7 @@
public class ValuePercent extends Value {
private static final long serialVersionUID = 1087258219010392928L;
private double value;
- private NumberFormat nf;
+ private final NumberFormat nf;
/**
* Constructor of ValuePercent
Modified: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/example/BuilderTM3.java
===================================================================
--- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/example/BuilderTM3.java 2009-06-12 20:01:58 UTC (rev 133)
+++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/example/BuilderTM3.java 2009-06-12 20:19:50 UTC (rev 134)
@@ -50,8 +50,6 @@
import net.sf.jtreemap.swing.TreeMapNode;
import net.sf.jtreemap.swing.TreeMapNodeBuilder;
-
-
/**
* Parse a TM3 file to build the tree. <BR>
* See <a href=http://www.cs.umd.edu/hcil/treemap/doc4.1/create_TM3_file.html>
@@ -93,7 +91,7 @@
private final HashMap<TreeMapNode, HashMap<String, Object>> values = new HashMap<TreeMapNode, HashMap<String, Object>>();
- private TreeMapNodeBuilder builder;
+ private final TreeMapNodeBuilder builder;
/**
* Constructor
Modified: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/example/BuilderXML.java
===================================================================
--- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/example/BuilderXML.java 2009-06-12 20:01:58 UTC (rev 133)
+++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/example/BuilderXML.java 2009-06-12 20:19:50 UTC (rev 134)
@@ -71,7 +71,7 @@
private Document document;
- private TreeMapNodeBuilder builder;
+ private final TreeMapNodeBuilder builder;
/**
* Constructor
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 2009-06-12 20:01:58 UTC (rev 133)
+++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/example/JTreeMapAppletExample.java 2009-06-12 20:19:50 UTC (rev 134)
@@ -83,7 +83,7 @@
public class JTreeMapAppletExample extends JApplet {
private static final double CONSTRAINT_WEIGHTX = 0.5;
-
+
private static final int SCROLLPANE_WIDTH = 140;
private static final String XML = "xml";
@@ -107,18 +107,18 @@
private BuilderTM3 builderTM3;
private boolean showTM3CTonf;
-
+
private boolean showTree;
-
+
private boolean showWeight;
-
+
private String weightPrefix;
-
+
private String valuePrefix;
-
+
private JTree treeView;
private DefaultTreeModel treeModel;
-
+
/**
* This is the default constructor
*/
@@ -146,7 +146,7 @@
final String dataFile = getParameter("dataFile");
final String dataFileType = getParameter("dataFileType");
TreeMapNode root = null;
- if(TM3.equalsIgnoreCase(dataFileType)) {
+ if (TM3.equalsIgnoreCase(dataFileType)) {
try {
builderTM3 = new BuilderTM3(createReader(dataFile));
root = builderTM3.getRoot();
@@ -157,7 +157,7 @@
} catch (final IOException e) {
root = handleException(e);
}
- } else if(XML.equalsIgnoreCase(dataFileType)) {
+ } else if (XML.equalsIgnoreCase(dataFileType)) {
try {
final URL url = new URL(getCodeBase() + dataFile);
final URLConnection connection = url.openConnection();
@@ -176,32 +176,28 @@
this.jTreeMap = new JTreeMap(root, new SplitBySortedWeight(), treeView, weightPrefix, valuePrefix, showWeight);
this.jTreeMap.setFont(new Font(null, Font.BOLD, DEFAULT_FONT_SIZE));
-
+
final String colourProvider = getParameter("colorProvider");
-
+
ColorProvider colourProviderInstance = null;
if ("Random".equalsIgnoreCase(colourProvider)) {
colourProviderInstance = new RandomColorProvider(this.jTreeMap);
} else if ("HSBLinear".equalsIgnoreCase(colourProvider)) {
- colourProviderInstance = new HSBTreeMapColorProvider(jTreeMap,
- HSBTreeMapColorProvider.ColorDistributionTypes.Linear, Color.GREEN, Color.RED);
+ colourProviderInstance = new HSBTreeMapColorProvider(jTreeMap, HSBTreeMapColorProvider.ColorDistributionTypes.Linear, Color.GREEN, Color.RED);
} else if ("HSBLog".equalsIgnoreCase(colourProvider)) {
- colourProviderInstance = new HSBTreeMapColorProvider(jTreeMap, HSBTreeMapColorProvider.ColorDistributionTypes.Log,
- Color.GREEN, Color.RED);
+ colourProviderInstance = new HSBTreeMapColorProvider(jTreeMap, HSBTreeMapColorProvider.ColorDistributionTypes.Log, Color.GREEN, Color.RED);
} else if ("HSBSquareRoot".equalsIgnoreCase(colourProvider)) {
colourProviderInstance = new RandomColorProvider(this.jTreeMap);
} else if ("HSBCubicRoot".equalsIgnoreCase(colourProvider)) {
- colourProviderInstance = new HSBTreeMapColorProvider(jTreeMap,
- HSBTreeMapColorProvider.ColorDistributionTypes.CubicRoot, Color.GREEN, Color.RED);
+ colourProviderInstance = new HSBTreeMapColorProvider(jTreeMap, HSBTreeMapColorProvider.ColorDistributionTypes.CubicRoot, Color.GREEN, Color.RED);
} else if ("HSBExp".equalsIgnoreCase(colourProvider)) {
- colourProviderInstance = new HSBTreeMapColorProvider(jTreeMap,
- HSBTreeMapColorProvider.ColorDistributionTypes.Exp, Color.GREEN, Color.RED);
+ colourProviderInstance = new HSBTreeMapColorProvider(jTreeMap, HSBTreeMapColorProvider.ColorDistributionTypes.Exp, Color.GREEN, Color.RED);
}
-
+
if (colourProviderInstance == null) {
colourProviderInstance = new RedGreenColorProvider(this.jTreeMap);
}
-
+
this.jTreeMap.setColorProvider(colourProviderInstance);
// Add a popupMenu to zoom
@@ -252,8 +248,7 @@
private BufferedReader createReader(final String dataFile) throws IOException {
final URL url = new URL(getCodeBase() + dataFile);
final URLConnection connection = url.openConnection();
- final BufferedReader reader = new BufferedReader(
- new InputStreamReader(connection.getInputStream()));
+ final BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()));
return reader;
}
@@ -320,8 +315,8 @@
final JComboBox cmb = (JComboBox) e.getSource();
final String field = (String) cmb.getSelectedItem();
JTreeMapAppletExample.this.builderTM3.setValues(field);
-// createColorProviders();
-// updateLegendPanel();
+ // createColorProviders();
+ // updateLegendPanel();
JTreeMapAppletExample.this.repaint();
}
});
@@ -372,7 +367,6 @@
this.jContentPane.removeAll();
}
-
}
/*
* ObjectLab is supporing JTreeMap
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 2009-06-12 20:01:58 UTC (rev 133)
+++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/example/JTreeMapExample.java 2009-06-12 20:19:50 UTC (rev 134)
@@ -107,7 +107,7 @@
private static final String OPEN_XML_FILE = "Open Xml File";
- private JTreeMap jTreeMap;
+ private final JTreeMap jTreeMap;
private JTree treeView = new JTree();
@@ -457,16 +457,13 @@
protected void createColorProviders() {
colorProviders.put("Red Green", new RedGreenColorProvider(this.jTreeMap));
colorProviders.put("Random", new RandomColorProvider(jTreeMap));
- colorProviders.put("HSB linear", new HSBTreeMapColorProvider(jTreeMap,
- HSBTreeMapColorProvider.ColorDistributionTypes.Linear, Color.GREEN, Color.RED));
- colorProviders.put("HSB log", new HSBTreeMapColorProvider(jTreeMap, HSBTreeMapColorProvider.ColorDistributionTypes.Log,
- Color.GREEN, Color.RED));
- colorProviders.put("HSB SquareRoot", new HSBTreeMapColorProvider(jTreeMap,
- HSBTreeMapColorProvider.ColorDistributionTypes.SquareRoot, Color.GREEN, Color.RED));
- colorProviders.put("HSB CubicRoot", new HSBTreeMapColorProvider(jTreeMap,
- HSBTreeMapColorProvider.ColorDistributionTypes.CubicRoot, Color.GREEN, Color.RED));
- colorProviders.put("HSB exp", new HSBTreeMapColorProvider(jTreeMap, HSBTreeMapColorProvider.ColorDistributionTypes.Exp,
- Color.GREEN, Color.RED));
+ colorProviders.put("HSB linear", new HSBTreeMapColorProvider(jTreeMap, HSBTreeMapColorProvider.ColorDistributionTypes.Linear, Color.GREEN, Color.RED));
+ colorProviders.put("HSB log", new HSBTreeMapColorProvider(jTreeMap, HSBTreeMapColorProvider.ColorDistributionTypes.Log, Color.GREEN, Color.RED));
+ colorProviders.put("HSB SquareRoot", new HSBTreeMapColorProvider(jTreeMap, HSBTreeMapColorProvider.ColorDistributionTypes.SquareRoot, Color.GREEN,
+ Color.RED));
+ colorProviders.put("HSB CubicRoot", new HSBTreeMapColorProvider(jTreeMap, HSBTreeMapColorProvider.ColorDistributionTypes.CubicRoot, Color.GREEN,
+ Color.RED));
+ colorProviders.put("HSB exp", new HSBTreeMapColorProvider(jTreeMap, HSBTreeMapColorProvider.ColorDistributionTypes.Exp, Color.GREEN, Color.RED));
for (final String key : colorProviders.keySet()) {
final ColorProvider cp = colorProviders.get(key);
panelLegend.add(cp.getLegendPanel(), key);
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 2009-06-12 20:01:58 UTC (rev 133)
+++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/provider/HSBTreeMapColorProvider.java 2009-06-12 20:19:50 UTC (rev 134)
@@ -99,8 +99,7 @@
* @param positiveColor
* @param negativeColor
*/
- public HSBTreeMapColorProvider(final JTreeMap treeMap, final ColorDistributionTypes colorDistribution,
- final Color positiveColor, final Color negativeColor) {
+ public HSBTreeMapColorProvider(final JTreeMap treeMap, final ColorDistributionTypes colorDistribution, final Color positiveColor, final Color negativeColor) {
super();
jTreeMap = treeMap;
this.colorDistribution = colorDistribution;
@@ -122,8 +121,7 @@
* @param hue
* @param saturation
*/
- public HSBTreeMapColorProvider(final JTreeMap treeMap, final ColorDistributionTypes colorDistribution, final float hue,
- final float saturation) {
+ public HSBTreeMapColorProvider(final JTreeMap treeMap, final ColorDistributionTypes colorDistribution, final float hue, final float saturation) {
this(treeMap, colorDistribution, hue, saturation, hue, saturation);
}
@@ -134,8 +132,8 @@
* @param negativeHue
* @param negativeSaturation
*/
- public HSBTreeMapColorProvider(final JTreeMap treeMap, final float positiveHue, final float positiveSaturation,
- final float negativeHue, final float negativeSaturation) {
+ public HSBTreeMapColorProvider(final JTreeMap treeMap, final float positiveHue, final float positiveSaturation, final float negativeHue,
+ final float negativeSaturation) {
this(treeMap, ColorDistributionTypes.Linear, positiveHue, positiveSaturation, negativeHue, negativeSaturation);
}
@@ -147,8 +145,8 @@
* @param negativeHue
* @param negativeSaturation
*/
- public HSBTreeMapColorProvider(final JTreeMap treeMap, final ColorDistributionTypes colorDistribution,
- final float positiveHue, final float positiveSaturation, final float negativeHue, final float negativeSaturation) {
+ public HSBTreeMapColorProvider(final JTreeMap treeMap, final ColorDistributionTypes colorDistribution, final float positiveHue,
+ final float positiveSaturation, final float negativeHue, final float negativeSaturation) {
super();
jTreeMap = treeMap;
this.colorDistribution = colorDistribution;
@@ -334,7 +332,7 @@
}
}
- private JTreeMap jTreeMap;
+ private final JTreeMap jTreeMap;
private JPanel legend;
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 2009-06-12 20:01:58 UTC (rev 133)
+++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/provider/RandomColorProvider.java 2009-06-12 20:19:50 UTC (rev 134)
@@ -63,10 +63,9 @@
*/
private static final long serialVersionUID = -8184356270950978553L;
- private static final Color[] COLOURS = new Color[] { new Color(255, 0, 0), new Color(0, 255, 0), new Color(0, 0, 255),
- new Color(255, 255, 0), new Color(255, 0, 255), new Color(0, 255, 255), new Color(102, 102, 51),
- new Color(255, 51, 153), new Color(255, 153, 51), new Color(204, 204, 51), new Color(205, 102, 204),
- new Color(51, 153, 255), new Color(153, 102, 0) };
+ private static final Color[] COLOURS = new Color[] { new Color(255, 0, 0), new Color(0, 255, 0), new Color(0, 0, 255), new Color(255, 255, 0),
+ new Color(255, 0, 255), new Color(0, 255, 255), new Color(102, 102, 51), new Color(255, 51, 153), new Color(255, 153, 51), new Color(204, 204, 51),
+ new Color(205, 102, 204), new Color(51, 153, 255), new Color(153, 102, 0) };
private int cursor = 0;
@@ -74,7 +73,7 @@
private JPanel legend;
- private JTreeMap jTreeMap;
+ private final JTreeMap jTreeMap;
/**
* Constructor
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 2009-06-12 20:01:58 UTC (rev 133)
+++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/provider/RedGreenColorProvider.java 2009-06-12 20:19:50 UTC (rev 134)
@@ -174,8 +174,9 @@
* Constructor of Legend
*/
public Legend() {
- this.setPreferredSize(new java.awt.Dimension(
- 2 * Legend.X + RedGreenColorProvider.this.tabColor.length * Legend.WIDTH, 2 * Legend.Y + Legend.HEIGHT));
+ this
+ .setPreferredSize(new java.awt.Dimension(2 * Legend.X + RedGreenColorProvider.this.tabColor.length * Legend.WIDTH, 2 * Legend.Y
+ + Legend.HEIGHT));
}
@Override
@@ -204,8 +205,7 @@
}
g.setColor(Color.black);
- g.drawString(RedGreenColorProvider.this.maxAbsValue.getLabel(), Legend.X + (xCursor - 1) * Legend.WIDTH, Legend.Y
- - Y_INSET);
+ g.drawString(RedGreenColorProvider.this.maxAbsValue.getLabel(), Legend.X + (xCursor - 1) * Legend.WIDTH, Legend.Y - Y_INSET);
}
}
}
Modified: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/provider/ZoomAction.java
===================================================================
--- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/provider/ZoomAction.java 2009-06-12 20:01:58 UTC (rev 133)
+++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/provider/ZoomAction.java 2009-06-12 20:19:50 UTC (rev 134)
@@ -42,11 +42,10 @@
jTreeMap.zoom(this.node);
jTreeMap.repaint();
} else {
- TreePath path = new TreePath(this.node.getPath());
+ final TreePath path = new TreePath(this.node.getPath());
jTreeMap.getTreeView().setSelectionPath(path);
jTreeMap.getTreeView().scrollPathToVisible(path);
}
-
}
Modified: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/provider/ZoomPopupMenu.java
===================================================================
--- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/provider/ZoomPopupMenu.java 2009-06-12 20:01:58 UTC (rev 133)
+++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/provider/ZoomPopupMenu.java 2009-06-12 20:19:50 UTC (rev 134)
@@ -63,12 +63,12 @@
*/
public static final Icon ZOOM_ICON = new ImageIcon(ZoomPopupMenu.class.getResource("icons/zoom.png"));
- private JTreeMap jTreeMap;
+ private final JTreeMap jTreeMap;
- private transient MouseListener mouseListener;
-
- private boolean showAbout;
+ private transient final MouseListener mouseListener;
+ private final boolean showAbout;
+
/**
* Constructor
*
@@ -76,9 +76,9 @@
* jTreeMap which you want to add a zoom popup menu
*/
public ZoomPopupMenu(final JTreeMap jTreeMap) {
- this(jTreeMap,false);
+ this(jTreeMap, false);
}
-
+
public ZoomPopupMenu(final JTreeMap jTreeMap, final boolean showAbout) {
super();
this.jTreeMap = jTreeMap;
@@ -86,14 +86,12 @@
this.jTreeMap.addMouseListener(this.mouseListener);
this.showAbout = showAbout;
}
-
protected class HandleClickMouse extends MouseAdapter {
@Override
public void mouseClicked(final MouseEvent e) {
if (e.getButton() == MouseEvent.BUTTON3
- || (e.getButton() == MouseEvent.BUTTON1 && (e.isAltDown() || e.isControlDown()
- || e.isMetaDown() || e.isAltGraphDown()))) {
+ || (e.getButton() == MouseEvent.BUTTON1 && (e.isAltDown() || e.isControlDown() || e.isMetaDown() || e.isAltGraphDown()))) {
for (int i = ZoomPopupMenu.this.getComponentCount(); i > 0; i--) {
ZoomPopupMenu.this.remove(i - 1);
@@ -122,12 +120,12 @@
}
cursor = child;
}
-
+
if (showAbout) {
// Separator
ZoomPopupMenu.this.addSeparator();
final AboutAction action = new AboutAction();
- ZoomPopupMenu.this.add(action);
+ ZoomPopupMenu.this.add(action);
}
ZoomPopupMenu.this.show(e.getComponent(), e.getX(), e.getY());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|