Thread: [Jtreemap-svn] SF.net SVN: jtreemap: [65] trunk/JTreeMap/src/main/java/net/sf/jtreemap/ swing

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 65
          http://svn.sourceforge.net/jtreemap/?rev=65&view=rev
Author:   benoitx
Date:     2006-10-24 04:38:30 -0700 (Tue, 24 Oct 2006)

Log Message:
-----------
Sorted most of issues raised by FindBugs, down to 1.

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/DefaultValue.java
    trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/IToolTipBuilder.java
    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/TreeMapNodeBuilder.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/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/HSBTreeMapColorProvider.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/example/RandomColorProvider.java
    trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/example/RedGreenColorProvider.java
    trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/example/ValuePercent.java
    trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/example/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	2006-10-24 10:28:55 UTC (rev 64)
+++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/ColorProvider.java	2006-10-24 11:38:30 UTC (rev 65)
@@ -1,30 +1,33 @@
 package net.sf.jtreemap.swing;
 
-import javax.swing.JPanel;
 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 {
+public abstract class ColorProvider implements Serializable {
 
-  /**
-   * 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 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();
+    /**
+     * get a legend JPanel.
+     * 
+     * @return a legend JPanel
+     */
+    public abstract JPanel getLegendPanel();
 
 }

Modified: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/DefaultToolTip.java
===================================================================
--- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/DefaultToolTip.java	2006-10-24 10:28:55 UTC (rev 64)
+++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/DefaultToolTip.java	2006-10-24 11:38:30 UTC (rev 65)
@@ -12,47 +12,48 @@
 
 /**
  * Default ToolTip for the jTreeMap.
- *
+ * 
  * @author Laurent DUTHEIL
  */
 public class DefaultToolTip extends JToolTip {
-  private static final long serialVersionUID = -2492627777999093973L;
-  private JTreeMap jTreeMap;
-  private Font labelFont;
-  private Font valueFont;
+    private static final long serialVersionUID = -2492627777999093973L;
 
-  /**
-   * Constructor.
-   *
-   * @param jTreeMap the jTreeMap who display the tooltip
-   */
-  public DefaultToolTip(JTreeMap jTreeMap) {
-    this.jTreeMap = jTreeMap;
-    this.labelFont = new Font("Default", Font.BOLD, 14);
-    this.valueFont = new Font("Default", Font.PLAIN, 10);
+    private JTreeMap jTreeMap;
 
-    int width = 160;
-    int height = getFontMetrics(this.labelFont).getHeight()
-        + getFontMetrics(this.valueFont).getHeight();
+    private Font labelFont;
 
-    Dimension size = new Dimension(width, height);
-    this.setSize(size);
-    this.setPreferredSize(size);
-  }
+    private Font valueFont;
 
-  @Override
-  public void paint(Graphics g) {
-    if (this.jTreeMap.getActiveLeaf() != null) {
-      g.setColor(Color.lightGray);
-      g.fill3DRect(0, 0, this.getWidth(), this.getHeight(), true);
-      g.setColor(Color.black);
-      g.setFont(this.labelFont);
-      g.drawString(this.jTreeMap.getActiveLeaf().getLabel(), 5, g
-          .getFontMetrics(this.labelFont).getAscent());
-      g.setFont(this.valueFont);
-      g.drawString(this.jTreeMap.getActiveLeaf().getLabelValue(), 5, this
-          .getHeight() - 5);
+    /**
+     * Constructor.
+     * 
+     * @param jTreeMap
+     *            the jTreeMap who display the tooltip
+     */
+    public DefaultToolTip(final JTreeMap jTreeMap) {
+        this.jTreeMap = jTreeMap;
+        this.labelFont = new Font("Default", Font.BOLD, 14);
+        this.valueFont = new Font("Default", Font.PLAIN, 10);
+
+        final int width = 160;
+        final int height = getFontMetrics(this.labelFont).getHeight() + getFontMetrics(this.valueFont).getHeight();
+
+        final Dimension size = new Dimension(width, height);
+        this.setSize(size);
+        this.setPreferredSize(size);
     }
-  }
 
+    @Override
+    public void paint(final Graphics g) {
+        if (this.jTreeMap.getActiveLeaf() != null) {
+            g.setColor(Color.lightGray);
+            g.fill3DRect(0, 0, this.getWidth(), this.getHeight(), true);
+            g.setColor(Color.black);
+            g.setFont(this.labelFont);
+            g.drawString(this.jTreeMap.getActiveLeaf().getLabel(), 5, g.getFontMetrics(this.labelFont).getAscent());
+            g.setFont(this.valueFont);
+            g.drawString(this.jTreeMap.getActiveLeaf().getLabelValue(), 5, this.getHeight() - 5);
+        }
+    }
+
 }

Modified: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/DefaultToolTipBuilder.java
===================================================================
--- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/DefaultToolTipBuilder.java	2006-10-24 10:28:55 UTC (rev 64)
+++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/DefaultToolTipBuilder.java	2006-10-24 11:38:30 UTC (rev 65)
@@ -3,35 +3,46 @@
  */
 package net.sf.jtreemap.swing;
 
+import java.io.Serializable;
+
 import javax.swing.JToolTip;
 
 /**
  * Default class to build the DefaultToolTip displayed by the JTreeMap.<BR>
- *
+ * 
  * @see net.sf.jtreemap.swing.DefaultToolTip
  * @author Laurent DUTHEIL
- *
+ * 
  */
-public class DefaultToolTipBuilder implements IToolTipBuilder {
-  private static JToolTip instance = null;
-  private JTreeMap jTreeMap;
+public class DefaultToolTipBuilder implements IToolTipBuilder, Serializable {
+    /**
+     * 
+     */
+    private static final long serialVersionUID = -1646772942428571187L;
 
-  /**
-   * Constructor.
-   *
-   * @param jTreeMap the linked JTreeMap
-   */
-  public DefaultToolTipBuilder(JTreeMap jTreeMap) {
-    this.jTreeMap = jTreeMap;
-  }
+    private static JToolTip instance = null;
 
-  /* (non-Javadoc)
-   * @see net.sf.jtreemap.swing.IToolTipBuilder#getToolTip()
-   */
-  public JToolTip getToolTip() {
-    if (instance == null) {
-      instance = new DefaultToolTip(this.jTreeMap);
+    private JTreeMap jTreeMap;
+
+    /**
+     * Constructor.
+     * 
+     * @param jTreeMap
+     *            the linked JTreeMap
+     */
+    public DefaultToolTipBuilder(final JTreeMap jTreeMap) {
+        this.jTreeMap = jTreeMap;
     }
-    return instance;
-  }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see net.sf.jtreemap.swing.IToolTipBuilder#getToolTip()
+     */
+    public JToolTip getToolTip() {
+        if (instance == null) {
+            instance = new DefaultToolTip(this.jTreeMap);
+        }
+        return instance;
+    }
 }

Modified: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/DefaultValue.java
===================================================================
--- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/DefaultValue.java	2006-10-24 10:28:55 UTC (rev 64)
+++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/DefaultValue.java	2006-10-24 11:38:30 UTC (rev 65)
@@ -6,67 +6,72 @@
 /**
  * Default Value <BR>
  * The getLabel() method returns the "" + getValue()
- *
+ * 
  * @author Laurent DUTHEIL
  */
 public class DefaultValue extends Value {
-  private double value;
+    /**
+     * 
+     */
+    private static final long serialVersionUID = 367321198951855282L;
+    private double value;
 
-  /**
-   * Constructor.
-   */
-  public DefaultValue() {
-  //nothing to do
-  }
+    /**
+     * Constructor.
+     */
+    public DefaultValue() {
+        // nothing to do
+    }
 
-  /**
-   * Constructor.
-   *
-   * @param value double value
-   */
-  public DefaultValue(double value) {
-    this.value = value;
-  }
+    /**
+     * Constructor.
+     * 
+     * @param value
+     *            double value
+     */
+    public DefaultValue(final double value) {
+        this.value = value;
+    }
 
-  /*
-   * (non-Javadoc)
-   *
-   * @see net.sf.jtreemap.swing.Value#getValue()
-   */
-  @Override
-  public double getValue() {
-    return this.value;
-  }
+    /*
+     * (non-Javadoc)
+     * 
+     * @see net.sf.jtreemap.swing.Value#getValue()
+     */
+    @Override
+    public double getValue() {
+        return this.value;
+    }
 
-  /*
-   * (non-Javadoc)
-   *
-   * @see net.sf.jtreemap.swing.Value#getLabel()
-   */
-  @Override
-  public String getLabel() {
-    return "" + this.value;
-  }
+    /*
+     * (non-Javadoc)
+     * 
+     * @see net.sf.jtreemap.swing.Value#getLabel()
+     */
+    @Override
+    public String getLabel() {
+        return "" + this.value;
+    }
 
-  /*
-   * (non-Javadoc)
-   *
-   * @see net.sf.jtreemap.swing.Value#setValue(double)
-   */
-  @Override
-  public void setValue(double value) {
-    this.value = value;
-  }
+    /*
+     * (non-Javadoc)
+     * 
+     * @see net.sf.jtreemap.swing.Value#setValue(double)
+     */
+    @Override
+    public void setValue(final double value) {
+        this.value = value;
+    }
 
-  /*
-   * (non-Javadoc)
-   *
-   * @see net.sf.jtreemap.swing.Value#setLabel(java.lang.String)
-   */
-  @Override
-  public void setLabel(String newLabel) {
-  // ignore
+    /*
+     * (non-Javadoc)
+     * 
+     * @see net.sf.jtreemap.swing.Value#setLabel(java.lang.String)
+     */
+    @Override
+    public void setLabel(final String newLabel) {
+        // ignore
 
-  }
+    }
 
 }

Modified: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/IToolTipBuilder.java
===================================================================
--- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/IToolTipBuilder.java	2006-10-24 10:28:55 UTC (rev 64)
+++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/IToolTipBuilder.java	2006-10-24 11:38:30 UTC (rev 65)
@@ -8,18 +8,17 @@
 
 /**
  * Interface used to build your own JToolTip for the jTreeMap.
- *
+ * 
  * @see net.sf.jtreemap.swing.JTreeMap#setToolTipBuilder(IToolTipBuilder)
  * @author Laurent DUTHEIL
  */
 public interface IToolTipBuilder {
 
-  /**
-   * Return the instance of the JToolTip.<BR>
-   * Override this method to build your own JToolTip
-   *
-   * @return the instance of the JToolTip
-   */
-  public abstract JToolTip getToolTip();
-
+    /**
+     * Return the instance of the JToolTip.<BR>
+     * Override this method to build your own JToolTip
+     * 
+     * @return the instance of the JToolTip
+     */
+    JToolTip getToolTip();
 }
\ No newline at end of file

Modified: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/JTreeMap.java
===================================================================
--- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/JTreeMap.java	2006-10-24 10:28:55 UTC (rev 64)
+++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/JTreeMap.java	2006-10-24 11:38:30 UTC (rev 65)
@@ -1,13 +1,14 @@
 package net.sf.jtreemap.swing;
 
-import java.util.Enumeration;
 import java.awt.Color;
 import java.awt.FontMetrics;
 import java.awt.Graphics;
 import java.awt.Insets;
 import java.awt.Point;
+import java.awt.event.MouseEvent;
 import java.awt.event.MouseMotionAdapter;
-import java.awt.event.MouseEvent;
+import java.io.Serializable;
+import java.util.Enumeration;
 
 import javax.swing.JComponent;
 import javax.swing.JToolTip;
@@ -27,555 +28,587 @@
  * <p>
  * So, in a JTreeMap, you can see the size and the value of an element in a
  * tree.
- *
+ * 
  * @see net.sf.jtreemap.swing.TreeMapNode
  * @author Laurent Dutheil
  */
 public class JTreeMap extends JComponent {
-  private static final long serialVersionUID = 7255952672238300249L;
-  private static final Color transparencyColor = new Color(204, 204, 204, 128);
-  // active leaf
-  private TreeMapNode activeLeaf = null;
-  // color provider
-  private ColorProvider colorProvider = null;
-  // displayed root
-  private TreeMapNode displayedRoot = null;
-  // root of the tree
-  private TreeMapNode root = null;
-  // divide strategy
-  private SplitStrategy strategy = null;
-  // tooltip builder
-  private IToolTipBuilder toolTipBuilder;
-  // zoom
-  private Zoom zoom;
+    private static final long serialVersionUID = 7255952672238300249L;
 
-  /**
-   * Constructor of JTreeMap. <BR>
-   * The chosen strategy is SplitSquarified. <BR>
-   * The chosen color provider is UniqueColorProvider.
-   *
-   * @see SplitSquarified
-   * @see UniqueColorProvider
-   * @param root the root of the tree to display
-   */
-  public JTreeMap(TreeMapNode root) {
-    this(root, new SplitSquarified());
-  }
+    private static final Color transparencyColor = new Color(204, 204, 204, 128);
 
-  /**
-   * Constructor of JTreeMap. <BR>
-   * The chosen color provider is UniqueColorProvider.
-   *
-   * @see UniqueColorProvider
-   * @param root the root of the tree to display
-   * @param strategy the split strategy
-   */
-  public JTreeMap(TreeMapNode root, SplitStrategy strategy) {
-    // ToolTips appears without delay and stay as long as possible
-    ToolTipManager ttm = ToolTipManager.sharedInstance();
-    ttm.setInitialDelay(0);
-    ttm.setReshowDelay(0);
-    ttm.setDismissDelay(100000);
-    ttm.setEnabled(true);
-    ttm.setLightWeightPopupEnabled(true);
-    this.setToolTipText("");
+    // active leaf
+    private TreeMapNode activeLeaf = null;
 
-    // the default DefaultToolTipBuilder
-    this.toolTipBuilder = new DefaultToolTipBuilder(this);
+    // color provider
+    private ColorProvider colorProvider = null;
 
-    this.zoom = new Zoom();
+    // displayed root
+    private TreeMapNode displayedRoot = null;
 
-    this.setRoot(root);
-    this.setStrategy(strategy);
-    this.setColorProvider(new UniqueColorProvider());
+    // root of the tree
+    private TreeMapNode root = null;
 
-    this.addMouseMotionListener(new HandleMouseMotion());
-  }
+    // divide strategy
+    private SplitStrategy strategy = null;
 
-  /**
-   * calculate the postitions for the displayed root. <BR>
-   * The positions of the root must be calculated first.
-   */
-  public void calculatePositions() {
-    if (this.getStrategy() != null && this.displayedRoot != null) {
-      this.getStrategy().calculatePositions(this.displayedRoot);
-    }
-  }
+    // tooltip builder
+    private IToolTipBuilder toolTipBuilder;
 
-  @Override
-  public JToolTip createToolTip() {
-    return this.toolTipBuilder.getToolTip();
-  }
+    // zoom
+    private Zoom zoom;
 
-  /**
-   * draw the item.
-   *
-   * @param g Graphics where you have to draw
-   * @param item item to draw
-   */
-  protected void draw(Graphics g, TreeMapNode item) {
-    if (item.isLeaf()) {
-      g.setColor(this.colorProvider.getColor(item.getValue()));
-      g.fillRect(item.getX(), item.getY(), item.getWidth(), item.getHeight());
-    } else {
-      for (Enumeration e = item.children(); e.hasMoreElements();) {
-        draw(g, (TreeMapNode) (e.nextElement()));
-      }
+    /**
+     * Constructor of JTreeMap. <BR>
+     * The chosen strategy is SplitSquarified. <BR>
+     * The chosen color provider is UniqueColorProvider.
+     * 
+     * @see SplitSquarified
+     * @see UniqueColorProvider
+     * @param root
+     *            the root of the tree to display
+     */
+    public JTreeMap(final TreeMapNode root) {
+        this(root, new SplitSquarified());
     }
-  }
 
-  /**
-   * write the label in the middle of the item. <BR>
-   * You have first to define the font of the Graphics. <BR>
-   * You may override this method to change the position or the color of the
-   * label.
-   *
-   * @param g Graphics where you have to draw
-   * @param item TreeMapNode to draw
-   */
-  protected void drawLabel(Graphics g, TreeMapNode item) {
-    FontMetrics fm = g.getFontMetrics(g.getFont());
-    // if the height of the item is high enough
-    if (fm.getHeight() < item.getHeight() - 2) {
-      String label = item.getLabel();
+    /**
+     * Constructor of JTreeMap. <BR>
+     * The chosen color provider is UniqueColorProvider.
+     * 
+     * @see UniqueColorProvider
+     * @param root
+     *            the root of the tree to display
+     * @param strategy
+     *            the split strategy
+     */
+    public JTreeMap(final TreeMapNode root, final SplitStrategy strategy) {
+        // ToolTips appears without delay and stay as long as possible
+        final ToolTipManager ttm = ToolTipManager.sharedInstance();
+        ttm.setInitialDelay(0);
+        ttm.setReshowDelay(0);
+        ttm.setDismissDelay(100000);
+        ttm.setEnabled(true);
+        ttm.setLightWeightPopupEnabled(true);
+        this.setToolTipText("");
 
-      int y = (item.getHeight() + fm.getAscent() - fm.getDescent()) / 2;
-      int stringWidth = fm.stringWidth(label);
-      // the width of the label depends on the font :
-      // if the width of the label is larger than the item
-      if (item.getWidth() - 5 <= stringWidth) {
-        // We have to truncate the label
-        // number of chars who can be writen in the item
-        int nbChar = (label.length() * item.getWidth()) / stringWidth;
-        if (nbChar > 3) {
-          // and add "..." at the end
-          label = label.substring(0, nbChar - 3) + "...";
-        } else {
-          // if it is not enough large, we display nothing
-          label = "";
-        }
-      }
-      int x = (item.getWidth() - fm.stringWidth(label)) / 2;
+        // the default DefaultToolTipBuilder
+        this.toolTipBuilder = new DefaultToolTipBuilder(this);
 
-      // background in black
-      g.setColor(Color.black);
-      g.drawString(label, item.getX() + x + 1, item.getY() + y + 1);
-      g.drawString(label, item.getX() + x - 1, item.getY() + y + 1);
-      g.drawString(label, item.getX() + x + 1, item.getY() + y - 1);
-      g.drawString(label, item.getX() + x - 1, item.getY() + y - 1);
-      g.drawString(label, item.getX() + x + 1, item.getY() + y);
-      g.drawString(label, item.getX() + x - 1, item.getY() + y);
-      g.drawString(label, item.getX() + x, item.getY() + y + 1);
-      g.drawString(label, item.getX() + x, item.getY() + y - 1);
-      // label in white
-      g.setColor(Color.white);
-      g.drawString(label, item.getX() + x, item.getY() + y);
+        this.zoom = new Zoom();
+
+        this.setRoot(root);
+        this.setStrategy(strategy);
+        this.setColorProvider(new UniqueColorProvider());
+
+        this.addMouseMotionListener(new HandleMouseMotion());
     }
-  }
 
-  /**
-   * Draw all the labels to draw. <BR>
-   * You may override this method to draw the labels you want. <BR>
-   * For exemples, all the leaves, or all the first level children, or all of
-   * them...
-   *
-   * @param g Graphics where you have to draw
-   * @param item TreeMapNode to draw
-   */
-  protected void drawLabels(Graphics g, TreeMapNode item) {
-    // add the labels (level -1)
-    g.setFont(this.getFont());
-    if (this.displayedRoot.isLeaf()) {
-      drawLabel(g, this.displayedRoot);
-    } else {
-      for (Enumeration e = this.displayedRoot.children(); e.hasMoreElements();) {
-        drawLabel(g, (TreeMapNode) (e.nextElement()));
-      }
+    /**
+     * calculate the postitions for the displayed root. <BR>
+     * The positions of the root must be calculated first.
+     */
+    public void calculatePositions() {
+        if (this.getStrategy() != null && this.displayedRoot != null) {
+            this.getStrategy().calculatePositions(this.displayedRoot);
+        }
     }
 
-    /* uncomment to add the labels of the lowered levels (up to depth > 2) */
-    // int depth = item.getLevel() - this.displayedRoot.getLevel();
-    // float newSize = Math.max(20, this.getFont().getSize2D());
-    // java.awt.Font labelFont = this.getFont().deriveFont(java.awt.Font.BOLD,
-    // newSize - 3 * depth);
-    // g.setFont(labelFont);
-    // if (depth > 2) {
-    // drawLabel(g, item);
-    // return;
-    // }
-    // if (item.isLeaf()) {
-    // drawLabel(g, item);
-    // } else {
-    // for (Enumeration e = item.children(); e.hasMoreElements();) {
-    // drawLabels(g, (TreeMapNode) (e.nextElement()));
-    // }
-    // }
-  }
+    @Override
+    public JToolTip createToolTip() {
+        return this.toolTipBuilder.getToolTip();
+    }
 
-  /**
-   * get the active leaf (the one under the mouse).
-   *
-   * @return Returns the activeLeaf.
-   */
-  public TreeMapNode getActiveLeaf() {
-    return this.activeLeaf;
-  }
+    /**
+     * draw the item.
+     * 
+     * @param g
+     *            Graphics where you have to draw
+     * @param item
+     *            item to draw
+     */
+    protected void draw(final Graphics g, final TreeMapNode item) {
+        if (item.isLeaf()) {
+            g.setColor(this.colorProvider.getColor(item.getValue()));
+            g.fillRect(item.getX(), item.getY(), item.getWidth(), item.getHeight());
+        } else {
+            for (final Enumeration e = item.children(); e.hasMoreElements();) {
+                draw(g, (TreeMapNode) (e.nextElement()));
+            }
+        }
+    }
 
-  /**
-   * get the ColorProvider.
-   *
-   * @return the ColorProvider
-   */
-  public ColorProvider getColorProvider() {
-    return this.colorProvider;
-  }
+    /**
+     * write the label in the middle of the item. <BR>
+     * You have first to define the font of the Graphics. <BR>
+     * You may override this method to change the position or the color of the
+     * label.
+     * 
+     * @param g
+     *            Graphics where you have to draw
+     * @param item
+     *            TreeMapNode to draw
+     */
+    protected void drawLabel(final Graphics g, final TreeMapNode item) {
+        final FontMetrics fm = g.getFontMetrics(g.getFont());
+        // if the height of the item is high enough
+        if (fm.getHeight() < item.getHeight() - 2) {
+            String label = item.getLabel();
 
-  /**
-   * get the displayed root.
-   * <p>
-   * This may be not the root of the jTreeMap. After a zoom, the displayed root
-   * can be the root of an under-tree.
-   * </p>
-   *
-   * @return the displayed root
-   */
-  public TreeMapNode getDisplayedRoot() {
-    return this.displayedRoot;
-  }
+            final int y = (item.getHeight() + fm.getAscent() - fm.getDescent()) / 2;
+            final int stringWidth = fm.stringWidth(label);
+            // the width of the label depends on the font :
+            // if the width of the label is larger than the item
+            if (item.getWidth() - 5 <= stringWidth) {
+                // We have to truncate the label
+                // number of chars who can be writen in the item
+                final int nbChar = (label.length() * item.getWidth()) / stringWidth;
+                if (nbChar > 3) {
+                    // and add "..." at the end
+                    label = label.substring(0, nbChar - 3) + "...";
+                } else {
+                    // if it is not enough large, we display nothing
+                    label = "";
+                }
+            }
+            final int x = (item.getWidth() - fm.stringWidth(label)) / 2;
 
-  /**
-   * get the root.
-   *
-   * @return the root
-   */
-  public TreeMapNode getRoot() {
-    return this.root;
-  }
+            // background in black
+            g.setColor(Color.black);
+            g.drawString(label, item.getX() + x + 1, item.getY() + y + 1);
+            g.drawString(label, item.getX() + x - 1, item.getY() + y + 1);
+            g.drawString(label, item.getX() + x + 1, item.getY() + y - 1);
+            g.drawString(label, item.getX() + x - 1, item.getY() + y - 1);
+            g.drawString(label, item.getX() + x + 1, item.getY() + y);
+            g.drawString(label, item.getX() + x - 1, item.getY() + y);
+            g.drawString(label, item.getX() + x, item.getY() + y + 1);
+            g.drawString(label, item.getX() + x, item.getY() + y - 1);
+            // label in white
+            g.setColor(Color.white);
+            g.drawString(label, item.getX() + x, item.getY() + y);
+        }
+    }
 
-  /**
-   * get the SplitStrategy.
-   *
-   * @return the SplitStrategy
-   */
-  public SplitStrategy getStrategy() {
-    return this.strategy;
-  }
+    /**
+     * Draw all the labels to draw. <BR>
+     * You may override this method to draw the labels you want. <BR>
+     * For exemples, all the leaves, or all the first level children, or all of
+     * them...
+     * 
+     * @param g
+     *            Graphics where you have to draw
+     * @param item
+     *            TreeMapNode to draw
+     */
+    protected void drawLabels(final Graphics g, final TreeMapNode item) {
+        // add the labels (level -1)
+        g.setFont(this.getFont());
+        if (this.displayedRoot.isLeaf()) {
+            drawLabel(g, this.displayedRoot);
+        } else {
+            for (final Enumeration e = this.displayedRoot.children(); e.hasMoreElements();) {
+                drawLabel(g, (TreeMapNode) (e.nextElement()));
+            }
+        }
 
-  @Override
-  public Point getToolTipLocation(MouseEvent event) {
-    int posX;
-    int posY;
-    JToolTip toolTip = this.createToolTip();
-    int XMax = this.displayedRoot.getX() + this.displayedRoot.getWidth();
-    int YMin = this.displayedRoot.getY();
-    if (this.activeLeaf != null) {
-      if (this.activeLeaf.getWidth() >= toolTip.getWidth() + 8
-          && this.activeLeaf.getHeight() >= toolTip.getHeight() + 8) {
-        posX = this.activeLeaf.getX() + 4;
-        posY = this.activeLeaf.getY() + 4;
-      } else {
-        posX = this.activeLeaf.getX() + this.activeLeaf.getWidth() + 4;
-        posY = this.activeLeaf.getY() - toolTip.getHeight() - 4;
-      }
+        /* uncomment to add the labels of the lowered levels (up to depth > 2) */
+        // int depth = item.getLevel() - this.displayedRoot.getLevel();
+        // float newSize = Math.max(20, this.getFont().getSize2D());
+        // java.awt.Font labelFont =
+        // this.getFont().deriveFont(java.awt.Font.BOLD,
+        // newSize - 3 * depth);
+        // g.setFont(labelFont);
+        // if (depth > 2) {
+        // drawLabel(g, item);
+        // return;
+        // }
+        // if (item.isLeaf()) {
+        // drawLabel(g, item);
+        // } else {
+        // for (Enumeration e = item.children(); e.hasMoreElements();) {
+        // drawLabels(g, (TreeMapNode) (e.nextElement()));
+        // }
+        // }
+    }
 
-      if (posY < YMin + 4) {
-        posY = YMin + 4;
-      }
-      if ((posX + toolTip.getWidth() > XMax - 4)
-          && (this.activeLeaf.getX() >= toolTip.getWidth() + 4)) {
-        posX = this.activeLeaf.getX() - 4 - toolTip.getWidth();
-      }
-
-      return new Point(posX, posY);
+    /**
+     * get the active leaf (the one under the mouse).
+     * 
+     * @return Returns the activeLeaf.
+     */
+    public TreeMapNode getActiveLeaf() {
+        return this.activeLeaf;
     }
-    return null;
-  }
 
-  /*
-   * (non-Javadoc)
-   *
-   * @see javax.swing.JComponent#paintComponent(java.awt.Graphics)
-   */
-  @Override
-  protected void paintComponent(Graphics g) {
-    super.paintComponent(g);
-    int width = getSize().width;
-    int height = getSize().height;
-    Insets insets = getInsets();
-
-    int border = TreeMapNode.getBorder();
-    this.root.setDimension(this.root.getX(), this.root.getY(), width - border
-        - insets.left - insets.right, height - border - insets.top
-        - insets.bottom);
-
-    if (!this.root.equals( this.displayedRoot )) {
-      this.displayedRoot.setDimension(this.displayedRoot.getX(), this.displayedRoot.getY(), width - border
-          - insets.left - insets.right, height - border - insets.top
-          - insets.bottom);
+    /**
+     * get the ColorProvider.
+     * 
+     * @return the ColorProvider
+     */
+    public ColorProvider getColorProvider() {
+        return this.colorProvider;
     }
 
-    this.calculatePositions();
-
-    if (this.displayedRoot.children().hasMoreElements()) {
-      // the background
-      g.setColor(this.getBackground());
-      g.fillRect(this.displayedRoot.getX(), this.displayedRoot.getY(),
-          this.displayedRoot.getWidth() + border, this.displayedRoot
-              .getHeight()
-              + border);
-      // the ...
 
[truncated message content]

Thread: [Jtreemap-svn] SF.net SVN: jtreemap: [65] trunk/JTreeMap/src/main/java/net/sf/jtreemap/ swing

jtreemap-svn