You can subscribe to this list here.
2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(69) |
Nov
(19) |
Dec
(14) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2007 |
Jan
(2) |
Feb
|
Mar
|
Apr
(8) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2009 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
(1) |
Jun
(6) |
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
2010 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
From: <eki...@us...> - 2006-11-04 17:55:19
|
Revision: 91 http://svn.sourceforge.net/jtreemap/?rev=91&view=rev Author: ekingulen Date: 2006-11-04 09:55:14 -0800 (Sat, 04 Nov 2006) Log Message: ----------- Modified Paths: -------------- trunk/JTreeMap/dataDump.xml Modified: trunk/JTreeMap/dataDump.xml =================================================================== --- trunk/JTreeMap/dataDump.xml 2006-11-04 17:29:27 UTC (rev 90) +++ trunk/JTreeMap/dataDump.xml 2006-11-04 17:55:14 UTC (rev 91) @@ -314,11 +314,6 @@ <weight>8.0</weight> <value>10.0</value> </leaf> - <leaf> - <label>leaf 6414</label> - <weight>2.0</weight> - <value>2.0</value> - </leaf> </branch> <leaf> <label>leaf 65</label> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <be...@us...> - 2006-11-04 17:22:37
|
Revision: 89 http://svn.sourceforge.net/jtreemap/?rev=89&view=rev Author: benoitx Date: 2006-11-04 09:22:28 -0800 (Sat, 04 Nov 2006) Log Message: ----------- Do not fire the applet twice... Modified Paths: -------------- trunk/src/site/generic-appletsample.xml Modified: trunk/src/site/generic-appletsample.xml =================================================================== --- trunk/src/site/generic-appletsample.xml 2006-11-04 17:09:14 UTC (rev 88) +++ trunk/src/site/generic-appletsample.xml 2006-11-04 17:22:28 UTC (rev 89) @@ -24,12 +24,12 @@ <li>width and height are configured in the usual applet way</li> </ul> <div class="source"><pre> - <applet archive="./jtreemap-@JARVERSION@.jar" + < applet archive="./jtreemap-@JARVERSION@.jar" code="net.sf.jtreemap.swing.example.JTreeMapAppletExample.class" width="600" height="400"> <param name="dataFile" value="samples/dataDump.xml"/> <param name="dataFileType" value="xml"/> - </applet> + < /applet> </pre></div> </subsection> </section> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <be...@us...> - 2006-11-04 16:27:18
|
Revision: 87 http://svn.sourceforge.net/jtreemap/?rev=87&view=rev Author: benoitx Date: 2006-11-04 08:27:07 -0800 (Sat, 04 Nov 2006) Log Message: ----------- Base the Applet on a File following Ekin's changes. Modified Paths: -------------- trunk/JTreeMap/qalab.xml trunk/KTreeMap/qalab.xml trunk/maven.xml trunk/src/site/generic-appletsample.xml Modified: trunk/JTreeMap/qalab.xml =================================================================== --- trunk/JTreeMap/qalab.xml 2006-11-04 16:25:53 UTC (rev 86) +++ trunk/JTreeMap/qalab.xml 2006-11-04 16:27:07 UTC (rev 87) @@ -27,6 +27,11 @@ <summaryresult date="2006-10-23" filecount="14" statvalue="35" type="findbugs"/> <summaryresult date="2006-10-23" filecount="4" statvalue="280" type="simian"/> <summaryresult date="2006-10-24" filecount="29" statvalue="62" type="checkstyle"/> + <summaryresult date="2006-10-25" filecount="29" statvalue="62" type="checkstyle"/> + <summaryresult date="2006-10-26" filecount="29" statvalue="63" type="checkstyle"/> + <summaryresult date="2006-11-04" filecount="29" statvalue="111" type="checkstyle"/> + <summaryresult date="2006-11-04" filecount="1" statvalue="1" type="pmd"/> + <summaryresult date="2006-11-04" filecount="2" statvalue="112" type="simian"/> </summary> <file id="org_jense_swing_jtreemap_package.html" path="org/jense/swing/jtreemap/package.html"> <result date="2006-10-17" statvalue="1" type="checkstyle"/> @@ -187,6 +192,8 @@ <file id="net_sf_jtreemap_swing_JTreeMap.java" path="net/sf/jtreemap/swing/JTreeMap.java"> <result date="2006-10-23" statvalue="23" type="checkstyle"/> <result date="2006-10-23" statvalue="5" type="findbugs"/> + <result date="2006-11-04" statvalue="19" type="checkstyle"/> + <result date="2006-11-04" statvalue="1" type="pmd"/> </file> <file id="net_sf_jtreemap_swing_SplitSquarified.java" path="net/sf/jtreemap/swing/SplitSquarified.java"> <result date="2006-10-23" statvalue="12" type="checkstyle"/> @@ -209,9 +216,12 @@ <file id="net_sf_jtreemap_swing_example_BuilderTM3.java" path="net/sf/jtreemap/swing/example/BuilderTM3.java"> <result date="2006-10-23" statvalue="1" type="checkstyle"/> <result date="2006-10-23" statvalue="1" type="findbugs"/> + <result date="2006-10-26" statvalue="1" type="checkstyle"/> + <result date="2006-11-04" statvalue="1" type="checkstyle"/> </file> <file id="net_sf_jtreemap_swing_example_BuilderXML.java" path="net/sf/jtreemap/swing/example/BuilderXML.java"> <result date="2006-10-23" statvalue="2" type="checkstyle"/> + <result date="2006-11-04" statvalue="2" type="checkstyle"/> </file> <file id="net_sf_jtreemap_swing_example_HSBTreeMapColorProvider.java" path="net/sf/jtreemap/swing/example/HSBTreeMapColorProvider.java"> @@ -220,6 +230,7 @@ </file> <file id="net_sf_jtreemap_swing_example_JTreeMapAppletExample.java" path="net/sf/jtreemap/swing/example/JTreeMapAppletExample.java"> <result date="2006-10-23" statvalue="60" type="checkstyle"/> + <result date="2006-11-04" statvalue="27" type="checkstyle"/> </file> <file id="net_sf_jtreemap_swing_example_JTreeMapExample.java" path="net/sf/jtreemap/swing/example/JTreeMapExample.java"> <result date="2006-10-23" statvalue="2" type="findbugs"/> @@ -235,6 +246,9 @@ <result date="2006-10-23" statvalue="2" type="findbugs"/> <result date="2006-10-23" statvalue="2" type="findbugs"/> <result date="2006-10-24" statvalue="1" type="checkstyle"/> + <result date="2006-10-25" statvalue="1" type="checkstyle"/> + <result date="2006-10-26" statvalue="1" type="checkstyle"/> + <result date="2006-11-04" statvalue="1" type="checkstyle"/> </file> <file id="net_sf_jtreemap_swing_example_RandomColorProvider.java" path="net/sf/jtreemap/swing/example/RandomColorProvider.java"> <result date="2006-10-23" statvalue="10" type="checkstyle"/> @@ -258,12 +272,21 @@ <file id="net_sf_jtreemap_swing_SplitByWeight.java" path="net/sf/jtreemap/swing/SplitByWeight.java"/> <file id="net_sf_jtreemap_swing_example_DemoUtil.java" path="net/sf/jtreemap/swing/example/DemoUtil.java"> <result date="2006-10-24" statvalue="57" type="checkstyle"/> + <result date="2006-10-25" statvalue="57" type="checkstyle"/> + <result date="2006-10-26" statvalue="57" type="checkstyle"/> + <result date="2006-11-04" statvalue="57" type="checkstyle"/> </file> <file id="net_sf_jtreemap_swing_provider_HSBTreeMapColorProvider.java" path="net/sf/jtreemap/swing/provider/HSBTreeMapColorProvider.java"> <result date="2006-10-24" statvalue="2" type="checkstyle"/> + <result date="2006-10-25" statvalue="2" type="checkstyle"/> + <result date="2006-10-26" statvalue="2" type="checkstyle"/> + <result date="2006-11-04" statvalue="2" type="checkstyle"/> </file> <file id="net_sf_jtreemap_swing_provider_RedGreenColorProvider.java" path="net/sf/jtreemap/swing/provider/RedGreenColorProvider.java"> <result date="2006-10-24" statvalue="2" type="checkstyle"/> + <result date="2006-10-25" statvalue="2" type="checkstyle"/> + <result date="2006-10-26" statvalue="2" type="checkstyle"/> + <result date="2006-11-04" statvalue="2" type="checkstyle"/> </file> </qalab> Modified: trunk/KTreeMap/qalab.xml =================================================================== --- trunk/KTreeMap/qalab.xml 2006-11-04 16:25:53 UTC (rev 86) +++ trunk/KTreeMap/qalab.xml 2006-11-04 16:27:07 UTC (rev 87) @@ -29,6 +29,18 @@ <summaryresult date="2006-10-24" filecount="1" statvalue="4" type="pmd"/> <summaryresult date="2006-10-24" filecount="6" statvalue="7" type="findbugs"/> <summaryresult date="2006-10-24" filecount="2" statvalue="34" type="simian"/> + <summaryresult date="2006-10-25" filecount="22" statvalue="132" type="checkstyle"/> + <summaryresult date="2006-10-25" filecount="1" statvalue="4" type="pmd"/> + <summaryresult date="2006-10-25" filecount="6" statvalue="7" type="findbugs"/> + <summaryresult date="2006-10-25" filecount="2" statvalue="34" type="simian"/> + <summaryresult date="2006-10-26" filecount="22" statvalue="132" type="checkstyle"/> + <summaryresult date="2006-10-26" filecount="1" statvalue="4" type="pmd"/> + <summaryresult date="2006-10-26" filecount="6" statvalue="7" type="findbugs"/> + <summaryresult date="2006-10-26" filecount="2" statvalue="34" type="simian"/> + <summaryresult date="2006-11-04" filecount="22" statvalue="132" type="checkstyle"/> + <summaryresult date="2006-11-04" filecount="1" statvalue="4" type="pmd"/> + <summaryresult date="2006-11-04" filecount="6" statvalue="7" type="findbugs"/> + <summaryresult date="2006-11-04" filecount="2" statvalue="34" type="simian"/> </summary> <file id="org_jense_ktreemap_example_package.html" path="org/jense/ktreemap/example/package.html"> <result date="2006-10-18" statvalue="1" type="checkstyle"/> @@ -93,10 +105,16 @@ <file id="net_sf_jtreemap_ktreemap_package.html" path="net/sf/jtreemap/ktreemap/package.html"> <result date="2006-10-23" statvalue="1" type="checkstyle"/> <result date="2006-10-24" statvalue="1" type="checkstyle"/> + <result date="2006-10-25" statvalue="1" type="checkstyle"/> + <result date="2006-10-26" statvalue="1" type="checkstyle"/> + <result date="2006-11-04" statvalue="1" type="checkstyle"/> </file> <file id="net_sf_jtreemap_ktreemap_example_package.html" path="net/sf/jtreemap/ktreemap/example/package.html"> <result date="2006-10-23" statvalue="1" type="checkstyle"/> <result date="2006-10-24" statvalue="1" type="checkstyle"/> + <result date="2006-10-25" statvalue="1" type="checkstyle"/> + <result date="2006-10-26" statvalue="1" type="checkstyle"/> + <result date="2006-11-04" statvalue="1" type="checkstyle"/> </file> <file id="net_sf_jtreemap_ktreemap_ITreeMapColorProvider.java" path="net/sf/jtreemap/ktreemap/ITreeMapColorProvider.java"> <result date="2006-10-23" statvalue="1" type="checkstyle"/> @@ -109,28 +127,49 @@ <file id="net_sf_jtreemap_ktreemap_KTreeMap.java" path="net/sf/jtreemap/ktreemap/KTreeMap.java"> <result date="2006-10-23" statvalue="12" type="checkstyle"/> <result date="2006-10-24" statvalue="12" type="checkstyle"/> + <result date="2006-10-25" statvalue="12" type="checkstyle"/> + <result date="2006-10-26" statvalue="12" type="checkstyle"/> + <result date="2006-11-04" statvalue="12" type="checkstyle"/> </file> <file id="net_sf_jtreemap_ktreemap_SplitSquarified.java" path="net/sf/jtreemap/ktreemap/SplitSquarified.java"> <result date="2006-10-23" statvalue="12" type="checkstyle"/> <result date="2006-10-24" statvalue="12" type="checkstyle"/> + <result date="2006-10-25" statvalue="12" type="checkstyle"/> + <result date="2006-10-26" statvalue="12" type="checkstyle"/> + <result date="2006-11-04" statvalue="12" type="checkstyle"/> </file> <file id="net_sf_jtreemap_ktreemap_SplitStrategy.java" path="net/sf/jtreemap/ktreemap/SplitStrategy.java"> <result date="2006-10-23" statvalue="3" type="checkstyle"/> <result date="2006-10-24" statvalue="3" type="checkstyle"/> + <result date="2006-10-25" statvalue="3" type="checkstyle"/> + <result date="2006-10-26" statvalue="3" type="checkstyle"/> + <result date="2006-11-04" statvalue="3" type="checkstyle"/> </file> <file id="net_sf_jtreemap_ktreemap_TreeMapNode.java" path="net/sf/jtreemap/ktreemap/TreeMapNode.java"> <result date="2006-10-23" statvalue="4" type="checkstyle"/> <result date="2006-10-24" statvalue="4" type="checkstyle"/> + <result date="2006-10-25" statvalue="4" type="checkstyle"/> + <result date="2006-10-26" statvalue="4" type="checkstyle"/> + <result date="2006-11-04" statvalue="4" type="checkstyle"/> </file> <file id="net_sf_jtreemap_ktreemap_example_BuilderTM3.java" path="net/sf/jtreemap/ktreemap/example/BuilderTM3.java"> <result date="2006-10-23" statvalue="1" type="checkstyle"/> <result date="2006-10-23" statvalue="1" type="findbugs"/> <result date="2006-10-24" statvalue="1" type="checkstyle"/> <result date="2006-10-24" statvalue="1" type="findbugs"/> + <result date="2006-10-25" statvalue="1" type="checkstyle"/> + <result date="2006-10-25" statvalue="1" type="findbugs"/> + <result date="2006-10-26" statvalue="1" type="checkstyle"/> + <result date="2006-10-26" statvalue="1" type="findbugs"/> + <result date="2006-11-04" statvalue="1" type="checkstyle"/> + <result date="2006-11-04" statvalue="1" type="findbugs"/> </file> <file id="net_sf_jtreemap_ktreemap_example_BuilderXML.java" path="net/sf/jtreemap/ktreemap/example/BuilderXML.java"> <result date="2006-10-23" statvalue="2" type="checkstyle"/> <result date="2006-10-24" statvalue="2" type="checkstyle"/> + <result date="2006-10-25" statvalue="2" type="checkstyle"/> + <result date="2006-10-26" statvalue="2" type="checkstyle"/> + <result date="2006-11-04" statvalue="2" type="checkstyle"/> </file> <file id="net_sf_jtreemap_ktreemap_example_HSBTreeMapColorProvider.java" path="net/sf/jtreemap/ktreemap/example/HSBTreeMapColorProvider.java"> @@ -148,12 +187,28 @@ <result date="2006-10-24" statvalue="47" type="checkstyle"/> <result date="2006-10-24" statvalue="1" type="findbugs"/> <result date="2006-10-24" statvalue="1" type="findbugs"/> + <result date="2006-10-25" statvalue="47" type="checkstyle"/> + <result date="2006-10-25" statvalue="1" type="findbugs"/> + <result date="2006-10-25" statvalue="1" type="findbugs"/> + <result date="2006-10-26" statvalue="47" type="checkstyle"/> + <result date="2006-10-26" statvalue="1" type="findbugs"/> + <result date="2006-10-26" statvalue="1" type="findbugs"/> + <result date="2006-11-04" statvalue="1" type="findbugs"/> + <result date="2006-11-04" statvalue="47" type="checkstyle"/> + <result date="2006-11-04" statvalue="1" type="findbugs"/> + <result date="2006-11-04" statvalue="1" type="findbugs"/> </file> <file id="net_sf_jtreemap_ktreemap_example_KTreeMapView.java" path="net/sf/jtreemap/ktreemap/example/KTreeMapView.java"> <result date="2006-10-23" statvalue="15" type="checkstyle"/> <result date="2006-10-23" statvalue="1" type="findbugs"/> <result date="2006-10-24" statvalue="15" type="checkstyle"/> <result date="2006-10-24" statvalue="1" type="findbugs"/> + <result date="2006-10-25" statvalue="15" type="checkstyle"/> + <result date="2006-10-25" statvalue="1" type="findbugs"/> + <result date="2006-10-26" statvalue="15" type="checkstyle"/> + <result date="2006-10-26" statvalue="1" type="findbugs"/> + <result date="2006-11-04" statvalue="15" type="checkstyle"/> + <result date="2006-11-04" statvalue="1" type="findbugs"/> </file> <file id="net_sf_jtreemap_ktreemap_example_ResourceManager.java" path="net/sf/jtreemap/ktreemap/example/ResourceManager.java"> <result date="2006-10-23" statvalue="32" type="checkstyle"/> @@ -162,11 +217,26 @@ <result date="2006-10-24" statvalue="32" type="checkstyle"/> <result date="2006-10-24" statvalue="4" type="pmd"/> <result date="2006-10-24" statvalue="1" type="findbugs"/> + <result date="2006-10-25" statvalue="32" type="checkstyle"/> + <result date="2006-10-25" statvalue="4" type="pmd"/> + <result date="2006-10-25" statvalue="1" type="findbugs"/> + <result date="2006-10-26" statvalue="32" type="checkstyle"/> + <result date="2006-10-26" statvalue="4" type="pmd"/> + <result date="2006-10-26" statvalue="1" type="findbugs"/> + <result date="2006-11-04" statvalue="32" type="checkstyle"/> + <result date="2006-11-04" statvalue="4" type="pmd"/> + <result date="2006-11-04" statvalue="1" type="findbugs"/> </file> <file id="net_sf_jtreemap_ktreemap_example_TM3Bean.java" path="net/sf/jtreemap/ktreemap/example/TM3Bean.java"> <result date="2006-10-23" statvalue="2" type="checkstyle"/> <result date="2006-10-23" statvalue="2" type="findbugs"/> <result date="2006-10-24" statvalue="2" type="checkstyle"/> <result date="2006-10-24" statvalue="2" type="findbugs"/> + <result date="2006-10-25" statvalue="2" type="checkstyle"/> + <result date="2006-10-25" statvalue="2" type="findbugs"/> + <result date="2006-10-26" statvalue="2" type="checkstyle"/> + <result date="2006-10-26" statvalue="2" type="findbugs"/> + <result date="2006-11-04" statvalue="2" type="checkstyle"/> + <result date="2006-11-04" statvalue="2" type="findbugs"/> </file> </qalab> Modified: trunk/maven.xml =================================================================== --- trunk/maven.xml 2006-11-04 16:25:53 UTC (rev 86) +++ trunk/maven.xml 2006-11-04 16:27:07 UTC (rev 87) @@ -61,6 +61,17 @@ <ant:copy file="${basedir}/jtreemap/target/jtreemap-${pom.currentVersion}.jar" tofile="${maven.build.dir}/docs/jtreemap-${pom.currentVersion}.jar" overwrite="true"/> <ant:delete file="${maven.build.dir}/docs/generic-appletsample.html"/> <ant:delete file="${maven.build.dir}/docs/generic-jtreemap.jnlp"/> - <attainGoal name="dist:multiproject" /> + + <ant:copy todir="${maven.build.dir}/docs/samples" overwrite="true"> + <fileset dir="./src/samples"> + <include name="*.xml"/> + <include name="*.tm3"/> + <include name="*.dtd"/> + </fileset> + </ant:copy> + + <attainGoal name="dist:multiproject" /> + + </goal> </project> Modified: trunk/src/site/generic-appletsample.xml =================================================================== --- trunk/src/site/generic-appletsample.xml 2006-11-04 16:25:53 UTC (rev 86) +++ trunk/src/site/generic-appletsample.xml 2006-11-04 16:27:07 UTC (rev 87) @@ -8,10 +8,30 @@ </properties> <body> <section name="The Applet Example"> + <p>JTreeMap comes with an applet that you can use directly on your site. Here is an example:</p> <applet archive="./jtreemap-@JARVERSION@.jar" code="net.sf.jtreemap.swing.example.JTreeMapAppletExample.class" + width="750" height="500"> + <param name="dataFile" value="samples/dataDump.xml"/> + <param name="dataFileType" value="xml"/> + </applet> + + <subsection name="How to configure it?"> + <p>Here are the parameters:</p> + <ul> + <li>Parameter 'dataFile', the location of the data file, relative to the codebase of the applet</li> + <li>Parameter 'dataFileType', either xml or tm3</li> + <li>width and height are configured in the usual applet way</li> + </ul> + <div class="source"><pre> + <applet archive="./jtreemap-@JARVERSION@.jar" + code="net.sf.jtreemap.swing.example.JTreeMapAppletExample.class" width="600" height="400"> + <param name="dataFile" value="samples/dataDump.xml"/> + <param name="dataFileType" value="xml"/> </applet> + </pre></div> + </subsection> </section> </body> </document> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <be...@us...> - 2006-11-04 16:26:02
|
Revision: 86 http://svn.sourceforge.net/jtreemap/?rev=86&view=rev Author: benoitx Date: 2006-11-04 08:25:53 -0800 (Sat, 04 Nov 2006) Log Message: ----------- New sample files for the website. Added Paths: ----------- trunk/src/samples/ trunk/src/samples/TreeMap.dtd trunk/src/samples/TreeMap.xml trunk/src/samples/dataDump.xml trunk/src/samples/roads.tm3 Added: trunk/src/samples/TreeMap.dtd =================================================================== --- trunk/src/samples/TreeMap.dtd (rev 0) +++ trunk/src/samples/TreeMap.dtd 2006-11-04 16:25:53 UTC (rev 86) @@ -0,0 +1,7 @@ +<?xml version='1.0' encoding='ISO-8859-1'?> +<!ELEMENT root (label,(branch |leaf)*)> +<!ELEMENT branch (label,(branch|leaf)*)> +<!ELEMENT leaf (label,weight,value) > +<!ELEMENT label (#PCDATA) > +<!ELEMENT weight (#PCDATA) > +<!ELEMENT value (#PCDATA) > \ No newline at end of file Added: trunk/src/samples/TreeMap.xml =================================================================== --- trunk/src/samples/TreeMap.xml (rev 0) +++ trunk/src/samples/TreeMap.xml 2006-11-04 16:25:53 UTC (rev 86) @@ -0,0 +1,333 @@ +<?xml version='1.0' encoding='ISO-8859-1'?> +<!DOCTYPE root SYSTEM "TreeMap.dtd" > +<root> + <label>Root</label> + <branch> + <label>branch1</label> + <branch> + <label>branch11</label> + <leaf> + <label>leaf111</label> + <weight>1.0</weight> + <value>0.5</value> + </leaf> + <leaf> + <label>leaf112</label> + <weight>2.0</weight> + <value>-5.0</value> + </leaf> + <leaf> + <label>leaf113</label> + <weight>0.5</weight> + <value>2.0</value> + </leaf> + <leaf> + <label>leaf114</label> + <weight>3.0</weight> + <value>2.0</value> + </leaf> + <leaf> + <label>leaf115</label> + <weight>0.25</weight> + <value>-5.0</value> + </leaf> + </branch> + <branch> + <label>branch12</label> + <leaf> + <label>leaf121</label> + <weight>1.0</weight> + <value>1.0</value> + </leaf> + <leaf> + <label>leaf122</label> + <weight>2.0</weight> + <value>5.0</value> + </leaf> + <leaf> + <label>leaf123</label> + <weight>0.5</weight> + <value>2.0</value> + </leaf> + <leaf> + <label>leaf124</label> + <weight>3.0</weight> + <value>-2.0</value> + </leaf> + <leaf> + <label>leaf125</label> + <weight>0.25</weight> + <value>5.0</value> + </leaf> + </branch> + <branch> + <label>branch13</label> + <leaf> + <label>leaf131</label> + <weight>1.0</weight> + <value>1.0</value> + </leaf> + <leaf> + <label>leaf132</label> + <weight>2.0</weight> + <value>5.0</value> + </leaf> + <leaf> + <label>leaf133</label> + <weight>0.5</weight> + <value>2.0</value> + </leaf> + <leaf> + <label>leaf134</label> + <weight>3.0</weight> + <value>2.0</value> + </leaf> + </branch> + <leaf> + <label>leaf14</label> + <weight>3.0</weight> + <value>2.0</value> + </leaf> + <leaf> + <label>leaf15</label> + <weight>2.0</weight> + <value>-5.0</value> + </leaf> + </branch> + <branch> + <label>branch2</label> + <branch> + <label>branch21</label> + <leaf> + <label>leaf211</label> + <weight>1.0</weight> + <value>-1.0</value> + </leaf> + <leaf> + <label>leaf212</label> + <weight>2.0</weight> + <value>-5.0</value> + </leaf> + <leaf> + <label>leaf213</label> + <weight>0.5</weight> + <value>2.0</value> + </leaf> + <leaf> + <label>leaf214</label> + <weight>3.0</weight> + <value>2.0</value> + </leaf> + <leaf> + <label>leaf215</label> + <weight>0.25</weight> + <value>5.0</value> + </leaf> + </branch> + <branch> + <label>branch22</label> + <leaf> + <label>leaf221</label> + <weight>1.0</weight> + <value>1.0</value> + </leaf> + <leaf> + <label>leaf222</label> + <weight>2.0</weight> + <value>5.0</value> + </leaf> + <leaf> + <label>leaf223</label> + <weight>0.5</weight> + <value>2.0</value> + </leaf> + <leaf> + <label>leaf224</label> + <weight>3.0</weight> + <value>2.0</value> + </leaf> + </branch> + </branch> + <branch> + <label>branch3</label> + <branch> + <label>branch31</label> + <leaf> + <label>leaf311</label> + <weight>1.0</weight> + <value>-1.0</value> + </leaf> + <leaf> + <label>leaf312</label> + <weight>2.0</weight> + <value>-5.0</value> + </leaf> + <leaf> + <label>leaf313</label> + <weight>0.5</weight> + <value>-2.0</value> + </leaf> + <leaf> + <label>leaf314</label> + <weight>3.0</weight> + <value>-2.0</value> + </leaf> + <leaf> + <label>leaf315</label> + <weight>0.25</weight> + <value>-5.0</value> + </leaf> + </branch> + <branch> + <label>branch32</label> + <leaf> + <label>leaf321</label> + <weight>1.0</weight> + <value>-1.0</value> + </leaf> + <leaf> + <label>leaf322</label> + <weight>2.0</weight> + <value>-5.0</value> + </leaf> + <leaf> + <label>leaf323</label> + <weight>0.5</weight> + <value>2.0</value> + </leaf> + <leaf> + <label>leaf324</label> + <weight>3.0</weight> + <value>2.0</value> + </leaf> + <leaf> + <label>leaf325</label> + <weight>0.25</weight> + <value>-5.0</value> + </leaf> + </branch> + <branch> + <label>branch33</label> + <leaf> + <label>leaf331</label> + <weight>1.0</weight> + <value>-1.0</value> + </leaf> + <leaf> + <label>leaf332</label> + <weight>2.0</weight> + <value>5.0</value> + </leaf> + <leaf> + <label>leaf333</label> + <weight>0.5</weight> + <value>2.0</value> + </leaf> + <leaf> + <label>leaf334</label> + <weight>3.0</weight> + <value>-2.0</value> + </leaf> + </branch> + <branch> + <label>branch34</label> + <leaf> + <label>leaf341</label> + <weight>1.0</weight> + <value>-1.0</value> + </leaf> + <leaf> + <label>leaf342</label> + <weight>2.0</weight> + <value>5.0</value> + </leaf> + <leaf> + <label>leaf343</label> + <weight>0.5</weight> + <value>-2.0</value> + </leaf> + </branch> + </branch> + <branch> + <label>branch4</label> + <branch> + <label>branch41</label> + <leaf> + <label>leaf411</label> + <weight>1.0</weight> + <value>1.0</value> + </leaf> + <leaf> + <label>leaf412</label> + <weight>2.0</weight> + <value>5.0</value> + </leaf> + <leaf> + <label>leaf413</label> + <weight>0.5</weight> + <value>2.5</value> + </leaf> + <leaf> + <label>leaf414</label> + <weight>3.0</weight> + <value>2.0</value> + </leaf> + <leaf> + <label>leaf415</label> + <weight>0.25</weight> + <value>-5.0</value> + </leaf> + </branch> + <branch> + <label>branch42</label> + <leaf> + <label>leaf421</label> + <weight>1.0</weight> + <value>1.0</value> + </leaf> + <leaf> + <label>leaf422</label> + <weight>2.0</weight> + <value>5.0</value> + </leaf> + <leaf> + <label>leaf423</label> + <weight>0.5</weight> + <value>2.0</value> + </leaf> + <leaf> + <label>leaf424</label> + <weight>3.0</weight> + <value>2.1</value> + </leaf> + <leaf> + <label>leaf425</label> + <weight>0.25</weight> + <value>-5.0</value> + </leaf> + </branch> + <branch> + <label>branch43</label> + <leaf> + <label>leaf431</label> + <weight>1.0</weight> + <value>1.0</value> + </leaf> + <leaf> + <label>leaf432</label> + <weight>2.0</weight> + <value>-5.0</value> + </leaf> + <leaf> + <label>leaf433</label> + <weight>0.5</weight> + <value>2.0</value> + </leaf> + <leaf> + <label>leaf434</label> + <weight>3.0</weight> + <value>2.0</value> + </leaf> + </branch> + </branch> +</root> \ No newline at end of file Added: trunk/src/samples/dataDump.xml =================================================================== --- trunk/src/samples/dataDump.xml (rev 0) +++ trunk/src/samples/dataDump.xml 2006-11-04 16:25:53 UTC (rev 86) @@ -0,0 +1,415 @@ +<?xml version='1.0' encoding='ISO-8859-1'?> +<!DOCTYPE root SYSTEM "TreeMap.dtd" > + <root> + <label>Node 0</label> + <branch> + <label>Node 1</label> + <leaf> + <label>leaf 2</label> + <weight>40.0</weight> + <value>40.0</value> + </leaf> + <leaf> + <label>leaf 3</label> + <weight>19.0</weight> + <value>19.0</value> + </leaf> + </branch> + <branch> + <label>Node 4</label> + <leaf> + <label>leaf 5</label> + <weight>2.0</weight> + <value>2.0</value> + </leaf> + </branch> + <branch> + <label>Node 6</label> + <leaf> + <label>leaf 7</label> + <weight>1.0</weight> + <value>1.0</value> + </leaf> + </branch> + <branch> + <label>Node 8</label> + <leaf> + <label>leaf 9</label> + <weight>7.0</weight> + <value>7.0</value> + </leaf> + <leaf> + <label>leaf 10</label> + <weight>6.0</weight> + <value>6.0</value> + </leaf> + <leaf> + <label>leaf 11</label> + <weight>3.0</weight> + <value>3.0</value> + </leaf> + <leaf> + <label>leaf 12</label> + <weight>5.0</weight> + <value>6.0</value> + </leaf> + <leaf> + <label>leaf 13</label> + <weight>3.0</weight> + <value>3.0</value> + </leaf> + <leaf> + <label>leaf 14</label> + <weight>3.0</weight> + <value>3.0</value> + </leaf> + <leaf> + <label>leaf 15</label> + <weight>3.0</weight> + <value>3.0</value> + </leaf> + <leaf> + <label>leaf 16</label> + <weight>3.0</weight> + <value>3.0</value> + </leaf> + <leaf> + <label>leaf 17</label> + <weight>5.0</weight> + <value>5.0</value> + </leaf> + <leaf> + <label>leaf 18</label> + <weight>3.0</weight> + <value>3.0</value> + </leaf> + <leaf> + <label>leaf 19</label> + <weight>3.0</weight> + <value>3.0</value> + </leaf> + <leaf> + <label>leaf 20</label> + <weight>1.0</weight> + <value>1.0</value> + </leaf> + <leaf> + <label>leaf 21</label> + <weight>3.0</weight> + <value>3.0</value> + </leaf> + <leaf> + <label>leaf 22</label> + <weight>4.0</weight> + <value>5.0</value> + </leaf> + </branch> + <branch> + <label>Node 23</label> + <leaf> + <label>leaf 24</label> + <weight>3.0</weight> + <value>3.0</value> + </leaf> + </branch> + <leaf> + <label>leaf 25</label> + <weight>0.0</weight> + <value>0.0</value> + </leaf> + <branch> + <label>Node 26</label> + <leaf> + <label>leaf 27</label> + <weight>2.0</weight> + <value>2.0</value> + </leaf> + </branch> + <branch> + <label>Node 28</label> + <leaf> + <label>leaf 29</label> + <weight>1.0</weight> + <value>1.0</value> + </leaf> + <leaf> + <label>leaf 30</label> + <weight>5.0</weight> + <value>5.0</value> + </leaf> + <leaf> + <label>leaf 31</label> + <weight>1.0</weight> + <value>1.0</value> + </leaf> + <leaf> + <label>leaf 32</label> + <weight>4.0</weight> + <value>4.0</value> + </leaf> + <leaf> + <label>leaf 33</label> + <weight>1.0</weight> + <value>1.0</value> + </leaf> + </branch> + <leaf> + <label>leaf 34</label> + <weight>0.0</weight> + <value>0.0</value> + </leaf> + <branch> + <label>Node 35</label> + <leaf> + <label>leaf 36</label> + <weight>2.0</weight> + <value>2.0</value> + </leaf> + </branch> + <branch> + <label>Node 37</label> + <leaf> + <label>leaf 38</label> + <weight>1.0</weight> + <value>1.0</value> + </leaf> + <leaf> + <label>leaf 39</label> + <weight>1.0</weight> + <value>1.0</value> + </leaf> + <leaf> + <label>leaf 40</label> + <weight>3.0</weight> + <value>3.0</value> + </leaf> + <leaf> + <label>leaf 41</label> + <weight>1.0</weight> + <value>1.0</value> + </leaf> + <leaf> + <label>leaf 42</label> + <weight>1.0</weight> + <value>1.0</value> + </leaf> + <leaf> + <label>leaf 43</label> + <weight>1.0</weight> + <value>1.0</value> + </leaf> + <leaf> + <label>leaf 44</label> + <weight>1.0</weight> + <value>1.0</value> + </leaf> + <leaf> + <label>leaf 45</label> + <weight>1.0</weight> + <value>0.0</value> + </leaf> + <leaf> + <label>leaf 46</label> + <weight>1.0</weight> + <value>1.0</value> + </leaf> + <leaf> + <label>leaf 47</label> + <weight>1.0</weight> + <value>1.0</value> + </leaf> + <leaf> + <label>leaf 48</label> + <weight>1.0</weight> + <value>1.0</value> + </leaf> + <leaf> + <label>leaf 49</label> + <weight>1.0</weight> + <value>1.0</value> + </leaf> + <leaf> + <label>leaf 50</label> + <weight>1.0</weight> + <value>1.0</value> + </leaf> + <leaf> + <label>leaf 51</label> + <weight>1.0</weight> + <value>1.0</value> + </leaf> + <leaf> + <label>leaf 52</label> + <weight>1.0</weight> + <value>1.0</value> + </leaf> + <leaf> + <label>leaf 53</label> + <weight>1.0</weight> + <value>0.0</value> + </leaf> + <leaf> + <label>leaf 54</label> + <weight>1.0</weight> + <value>1.0</value> + </leaf> + <leaf> + <label>leaf 55</label> + <weight>1.0</weight> + <value>1.0</value> + </leaf> + <leaf> + <label>leaf 56</label> + <weight>1.0</weight> + <value>1.0</value> + </leaf> + <leaf> + <label>leaf 57</label> + <weight>1.0</weight> + <value>1.0</value> + </leaf> + <leaf> + <label>leaf 58</label> + <weight>1.0</weight> + <value>1.0</value> + </leaf> + </branch> + <leaf> + <label>leaf 59</label> + <weight>0.0</weight> + <value>0.0</value> + </leaf> + <branch> + <label>Node 60</label> + <leaf> + <label>leaf 61</label> + <weight>1.0</weight> + <value>1.0</value> + </leaf> + </branch> + <branch> + <label>Node 62</label> + <leaf> + <label>leaf 63</label> + <weight>7.0</weight> + <value>0.0</value> + </leaf> + </branch> + <branch> + <label>Node 64</label> + <branch> + <label>Node 641</label> + <leaf> + <label>leaf 6411</label> + <weight>10.0</weight> + <value>10.0</value> + </leaf> + <leaf> + <label>leaf 6412</label> + <weight>8.0</weight> + <value>10.0</value> + </leaf> + </branch> + <leaf> + <label>leaf 65</label> + <weight>5.0</weight> + <value>5.0</value> + </leaf> + <leaf> + <label>leaf 66</label> + <weight>34.0</weight> + <value>34.0</value> + </leaf> + <leaf> + <label>leaf 67</label> + <weight>1.0</weight> + <value>1.0</value> + </leaf> + <leaf> + <label>leaf 68</label> + <weight>1.0</weight> + <value>1.0</value> + </leaf> + <leaf> + <label>leaf 69</label> + <weight>1.0</weight> + <value>1.0</value> + </leaf> + <leaf> + <label>leaf 70</label> + <weight>1.0</weight> + <value>1.0</value> + </leaf> + <leaf> + <label>leaf 71</label> + <weight>1.0</weight> + <value>1.0</value> + </leaf> + <leaf> + <label>leaf 72</label> + <weight>33.0</weight> + <value>33.0</value> + </leaf> + <leaf> + <label>leaf 73</label> + <weight>1.0</weight> + <value>1.0</value> + </leaf> + <leaf> + <label>leaf 74</label> + <weight>1.0</weight> + <value>1.0</value> + </leaf> + </branch> + <branch> + <label>Node 75</label> + <leaf> + <label>leaf 76</label> + <weight>1.0</weight> + <value>1.0</value> + </leaf> + <leaf> + <label>leaf 77</label> + <weight>1.0</weight> + <value>1.0</value> + </leaf> + <leaf> + <label>leaf 78</label> + <weight>1.0</weight> + <value>1.0</value> + </leaf> + <leaf> + <label>leaf 79</label> + <weight>1.0</weight> + <value>1.0</value> + </leaf> + <leaf> + <label>leaf 80</label> + <weight>1.0</weight> + <value>1.0</value> + </leaf> + <leaf> + <label>leaf 81</label> + <weight>1.0</weight> + <value>1.0</value> + </leaf> + </branch> + <branch> + <label>Node 82</label> + <leaf> + <label>leaf 83</label> + <weight>25.0</weight> + <value>25.0</value> + </leaf> + <leaf> + <label>leaf 84</label> + <weight>2.0</weight> + <value>2.0</value> + </leaf> + <leaf> + <label>leaf 85</label> + <weight>5.0</weight> + <value>5.0</value> + </leaf> + </branch> + </root> Added: trunk/src/samples/roads.tm3 =================================================================== --- trunk/src/samples/roads.tm3 (rev 0) +++ trunk/src/samples/roads.tm3 2006-11-04 16:25:53 UTC (rev 86) @@ -0,0 +1,8 @@ +Length (Miles) Traffic Lights Speed Limit Repairs per week +FLOAT INTEGER INTEGER FLOAT +12.5 4 40 2.3 Roads Highway Route 1 +11.2 3 45 1.4 Roads Highway Route 5 +35.7 0 65 5.3 Roads Interstate I-300 +201.4 0 65 11.4 Roads Interstate I-234 +1.3 5 25 0.1 Roads Street Main St. +3.4 7 35 0.4 Roads Street Broad St. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <be...@us...> - 2006-10-31 14:00:57
|
Revision: 80 http://svn.sourceforge.net/jtreemap/?rev=80&view=rev Author: benoitx Date: 2006-10-31 06:00:46 -0800 (Tue, 31 Oct 2006) Log Message: ----------- better navigation. Modified Paths: -------------- trunk/JTreeMap/src/site/navigation.xml trunk/KTreeMap/src/site/navigation.xml trunk/src/site/navigation.xml Modified: trunk/JTreeMap/src/site/navigation.xml =================================================================== --- trunk/JTreeMap/src/site/navigation.xml 2006-10-31 13:54:48 UTC (rev 79) +++ trunk/JTreeMap/src/site/navigation.xml 2006-10-31 14:00:46 UTC (rev 80) @@ -7,8 +7,8 @@ <item name="Section map" href="sitemap.html" /> </menu> <links> - <item name="Page on Sourceforge" href="http://jtreemap.sourceforge.net" /> - <item name="Main Page" href="../../index.html" /> + <item name="Project Page on SF" href="http://jtreemap.sourceforge.net" /> + <item name="Home Page" href="../../index.html" /> <item name="KTreeMap" href="../net.sf.jtreemap.ktreemap/index.html" /> </links> <sitemap/> Modified: trunk/KTreeMap/src/site/navigation.xml =================================================================== --- trunk/KTreeMap/src/site/navigation.xml 2006-10-31 13:54:48 UTC (rev 79) +++ trunk/KTreeMap/src/site/navigation.xml 2006-10-31 14:00:46 UTC (rev 80) @@ -7,8 +7,8 @@ <item name="Section map" href="sitemap.html" /> </menu> <links> - <item name="Page on Sourceforge" href="http://jtreemap.sourceforge.net" /> - <item name="Main Page" href="../../index.html" /> + <item name="Project Page on SF" href="http://jtreemap.sourceforge.net" /> + <item name="Home Page" href="../../index.html" /> <item name="JTreeMap" href="../jtreemap/index.html" /> </links> <sitemap/> Modified: trunk/src/site/navigation.xml =================================================================== --- trunk/src/site/navigation.xml 2006-10-31 13:54:48 UTC (rev 79) +++ trunk/src/site/navigation.xml 2006-10-31 14:00:46 UTC (rev 80) @@ -15,7 +15,7 @@ <item name="KTreeMap library" href="./multiproject/net.sf.jtreemap.ktreemap/index.html" /> </menu> <links> - <item name="Main Page on Sourceforge" href="http://jtreemap.sourceforge.net" /> + <item name="Project Page on SF" href="http://jtreemap.sourceforge.net" /> <item name="JTreeMap" href="./multiproject/jtreemap/index.html" /> <item name="KTreeMap" href="./multiproject/net.sf.jtreemap.ktreemap/index.html" /> </links> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <be...@us...> - 2006-10-31 13:55:02
|
Revision: 79 http://svn.sourceforge.net/jtreemap/?rev=79&view=rev Author: benoitx Date: 2006-10-31 05:54:48 -0800 (Tue, 31 Oct 2006) Log Message: ----------- Added Digg link. Modified Paths: -------------- trunk/src/site/index.xml trunk/src/site/navigation.xml trunk/src/site/press/press-release-1.1.0.txt Added Paths: ----------- trunk/src/notes/ trunk/src/notes/how-to-digg.txt Added: trunk/src/notes/how-to-digg.txt =================================================================== --- trunk/src/notes/how-to-digg.txt (rev 0) +++ trunk/src/notes/how-to-digg.txt 2006-10-31 13:54:48 UTC (rev 79) @@ -0,0 +1,23 @@ +http://digg.com/submit?phase=2&url=www.UniqueURL.com&title=StoryTitle&bodytext=StoryDescription&topic=YourSelectedTopic + +http://digg.com/submit?phase=2&url=objectlabkit.sourceforge.net&title=ObjectLab%20Kit%3A%20Open%20Source%20Date%20Calculators%20for%20Business%20and%20Finance&bodytext=ObjectLab%20released%20version%201%2E0%2E1%20of%20ObjectLab%20Kit%20for%20Java%201%2E5,%20available%20for%20download%20via%20SourceForge%20or%20the%20Maven%20Central%20Repository%2E%20The%20Kit%20provides%20a%20Date%20Calculator%20that%20handle%20holidays,%20a%20IMM%20Date%20and%20Period%20Count%20Calculator%20and%20comes%20in%20two%20versions%3A%20one%20based%20on%20pure%20JDK%20(1%2E5)%20and%20one%20based%20on%20the%20Joda-time%20library%20(1%2E3%2B,%20JDK%201%2E5)%2E&topic=programming + +title +ObjectLab Kit: Open Source Date Calculators for Business and Finance +L.Dutheil and ObjectLab released v.1.1.0 of JTreeMap for Swing and SWT +L%2EDutheil%20and%20ObjectLab%20released%20v%2E1%2E1%2E0%20of%20JTreeMap%20for%20Swing%20and%20SWT + +bodytext +ObjectLab and Laurent Dutheil have release version 1.1.0 of JTreemap, a treemap/heatmap component for Swing or SWT and java 1.5+, available immediately on Sourceforge or Maven repository. A Treemap or Heatmap is a GUI component that graphically represents a hierarchical structure with different sizes and different colours.Released under Apachev2.0 +ObjectLab%20and%20Laurent%20Dutheil%20have%20release%20version%201%2E1%2E0%20of%20JTreemap,%20a%20treemap%2Fheatmap%20component%20for%20Swing%20or%20SWT%20and%20java%201%2E5%2B,%20available%20immediately%20on%20Sourceforge%20or%20Maven%20repository%2E%20A%20Treemap%20or%20Heatmap%20is%20a%20GUI%20component%20that%20graphically%20represents%20a%20hierarchical%20structure%20with%20different%20sizes%20and%20different%20colours%2EReleased%20under%20Apachev2%2E0 + +http://digg.com/submit?phase=2&url= +jtreemap.sourceforge.net +&title=L%2EDutheil%20and%20ObjectLab%20released%20v%2E1%2E1%2E0%20of%20JTreeMap%20for%20Swing%20and%20SWT +&bodytext=ObjectLab%20and%20Laurent%20Dutheil%20have%20release%20version%201%2E1%2E0%20of%20JTreemap,%20a%20treemap%2Fheatmap%20component%20for%20Swing%20or%20SWT%20and%20java%201%2E5%2B,%20available%20immediately%20on%20Sourceforge%20or%20Maven%20repository%2E%20A%20Treemap%20or%20Heatmap%20is%20a%20GUI%20component%20that%20graphically%20represents%20a%20hierarchical%20structure%20with%20different%20sizes%20and%20different%20colours%2EReleased%20under%20Apachev2%2E0 +&topic=programming + + +ObjectLab has announced the release of version 1.0.1 of ObjectLab Kit for Java 1.5, available for download via SourceForge or the Maven Central Repository. The Kit provides Date Calculators and comes in two versions: one based on pure JDK (1.5) and one based on the Joda-time library (1.3+, JDK 1.5). +ObjectLab released version 1.0.1 of ObjectLab Kit for Java 1.5, available for download via SourceForge or the Maven Central Repository. The Kit provides a Date Calculator that handle holidays, a IMM Date and Period Count Calculator and comes in two versions: one based on pure JDK (1.5) and one based on the Joda-time library (1.3+, JDK 1.5). +ObjectLab released version 1.0.1 of ObjectLab Kit for Java 1.5, available for download via SourceForge or the Maven Central Repository. The Kit provides a Date Calculator that handle holidays, a IMM Date and Period Count Calculator and comes in two versions: one based on pure JDK (1.5) and one based on the Joda-time library (1.3+, JDK 1.5). \ No newline at end of file Modified: trunk/src/site/index.xml =================================================================== --- trunk/src/site/index.xml 2006-10-26 15:35:13 UTC (rev 78) +++ trunk/src/site/index.xml 2006-10-31 13:54:48 UTC (rev 79) @@ -26,7 +26,10 @@ A <strong>Treemap</strong>, also known as <strong>Heatmap</strong>, is an important tool for this. A TreeMap graphically represents a hierarchical structure. Typically, the hierarchy will involve a tree of nodes of different sizes and different colours.</p> - <p>A Heatmap/Treemap is great to see a lot of information in one glance. It can be interactive and allow you to drill down into some section of the hierarchy. More on treemapping <a href="http://en.wikipedia.org/wiki/Treemapping">on Wikipedia</a>.</p> + <p> +<a href="http://digg.com/submit?phase=2&url=http%3A%2F%2Fjtreemap%2Esourceforge%2Enet&title=L%2EDutheil%20and%20ObjectLab%20released%20v%2E1%2E1%2E0%20of%20JTreeMap%20for%20Swing%20and%20SWT&bodytext=ObjectLab%20and%20Laurent%20Dutheil%20have%20release%20version%201%2E1%2E0%20of%20JTreemap,%20a%20treemap%2Fheatmap%20component%20for%20Swing%20or%20SWT%20and%20java%201%2E5%2B,%20available%20immediately%20on%20Sourceforge%20or%20Maven%20repository%2E%20A%20Treemap%20or%20Heatmap%20is%20a%20GUI%20component%20that%20graphically%20represents%20a%20hierarchical%20structure%20with%20different%20sizes%20and%20different%20colours%2EReleased%20under%20Apachev2%2E0&topic=programming"> + <img src="http://digg.com/img/badges/91x17-digg-button.png" width="91" height="17" alt="Digg!" style="vertical-align:middle" /></a> + A Heatmap/Treemap is great to see a lot of information in one glance. It can be interactive and allow you to drill down into some section of the hierarchy. More on treemapping <a href="http://en.wikipedia.org/wiki/Treemapping">on Wikipedia</a>.</p> <p> <ul><li>Each box on the chart may be contained in another box (e.g. Microsoft and Sun in the Technology box, CitiGroup in Banking, etc hence the hierachical view.</li> Modified: trunk/src/site/navigation.xml =================================================================== --- trunk/src/site/navigation.xml 2006-10-26 15:35:13 UTC (rev 78) +++ trunk/src/site/navigation.xml 2006-10-31 13:54:48 UTC (rev 79) @@ -31,6 +31,8 @@ <a href="http://sourceforge.net"> <img src="http://sourceforge.net/sflogo.php?group_id=265227&type=2" width="125" height="37" border="0" alt="SourceForge.net Logo" /> </a> +<a href="http://digg.com/submit?phase=2&url=http%3A%2F%2Fjtreemap%2Esourceforge%2Enet&title=L%2EDutheil%20and%20ObjectLab%20released%20v%2E1%2E1%2E0%20of%20JTreeMap%20for%20Swing%20and%20SWT&bodytext=ObjectLab%20and%20Laurent%20Dutheil%20have%20release%20version%201%2E1%2E0%20of%20JTreemap,%20a%20treemap%2Fheatmap%20component%20for%20Swing%20or%20SWT%20and%20java%201%2E5%2B,%20available%20immediately%20on%20Sourceforge%20or%20Maven%20repository%2E%20A%20Treemap%20or%20Heatmap%20is%20a%20GUI%20component%20that%20graphically%20represents%20a%20hierarchical%20structure%20with%20different%20sizes%20and%20different%20colours%2EReleased%20under%20Apachev2%2E0&topic=programming"> + <img src="http://digg.com/img/badges/91x17-digg-button.png" width="91" height="17" alt="Digg!" style="vertical-align:middle" /></a> <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"> </script> Modified: trunk/src/site/press/press-release-1.1.0.txt =================================================================== --- trunk/src/site/press/press-release-1.1.0.txt 2006-10-26 15:35:13 UTC (rev 78) +++ trunk/src/site/press/press-release-1.1.0.txt 2006-10-31 13:54:48 UTC (rev 79) @@ -1,5 +1,5 @@ Laurent Dutheil and ObjectLab are pleased to announce release 1.1.0 of -JTreeMap for Java 1.4+. +JTreeMap for Java 1.5+. Open Source TreeMap/Heatmap components for Swing and SWT. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <be...@us...> - 2006-10-26 15:35:27
|
Revision: 78 http://svn.sourceforge.net/jtreemap/?rev=78&view=rev Author: benoitx Date: 2006-10-26 08:35:13 -0700 (Thu, 26 Oct 2006) Log Message: ----------- Changed links to UML following Laurent's suggestion. Modified Paths: -------------- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/example/BuilderTM3.java trunk/JTreeMap/src/site/index.xml trunk/src/site/index.xml 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 2006-10-26 15:02:50 UTC (rev 77) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/example/BuilderTM3.java 2006-10-26 15:35:13 UTC (rev 78) @@ -89,7 +89,7 @@ private static final LinkedList<String> FIELD_TYPES = new LinkedList<String>(); - private static final HashMap<TreeMapNode, HashMap<String, Object>> VALUES = new HashMap<TreeMapNode, HashMap<String, Object>>(); + private final HashMap<TreeMapNode, HashMap<String, Object>> VALUES = new HashMap<TreeMapNode, HashMap<String, Object>>(); private TreeMapNodeBuilder builder; Modified: trunk/JTreeMap/src/site/index.xml =================================================================== --- trunk/JTreeMap/src/site/index.xml 2006-10-26 15:02:50 UTC (rev 77) +++ trunk/JTreeMap/src/site/index.xml 2006-10-26 15:35:13 UTC (rev 78) @@ -23,7 +23,7 @@ <section name="JTreemap Introduction"> <p>JTreeMap is a Java Swing component which reprensents hierarchical structure in a Treemap/heatmap.</p> - <p>Check out the <a href="apidocs/index.html">UML diagrams here</a></p> + <p>Check out the <a href="apidocs/index.html">Javadoc with UML diagrams here</a></p> <p>Also look at the <a href="maven-reports.html">Project Reports</a> menu on the left for project specific items, unit tests, QA etc.</p> </section> Modified: trunk/src/site/index.xml =================================================================== --- trunk/src/site/index.xml 2006-10-26 15:02:50 UTC (rev 77) +++ trunk/src/site/index.xml 2006-10-26 15:35:13 UTC (rev 78) @@ -66,8 +66,8 @@ <subsection name="UML?"> <p>We are using yDoc to generate a 'javadoc-like' documentation per module with the added twist of UML diagrams:</p> <ul> - <li><a href="multiproject/jtreemap/apidocs/index.html">UML for JTreeMap</a></li> - <li><a href="multiproject/net.sf.jtreemap.ktreemap/apidocs/index.html">UML for KTreeMap</a></li> + <li><a href="multiproject/jtreemap/apidocs/index.html">JavaDoc with UML for JTreeMap</a></li> + <li><a href="multiproject/net.sf.jtreemap.ktreemap/apidocs/index.html">JavaDoc with UML for KTreeMap</a></li> </ul> </subsection> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <be...@us...> - 2006-10-26 15:03:12
|
Revision: 77 http://svn.sourceforge.net/jtreemap/?rev=77&view=rev Author: benoitx Date: 2006-10-26 08:02:50 -0700 (Thu, 26 Oct 2006) Log Message: ----------- Fix the meta-inf issue Modified Paths: -------------- trunk/KTreeMap/project.xml trunk/KTreeMap/src/site/index.xml Added Paths: ----------- trunk/KTreeMap/project.properties trunk/KTreeMap/src/main/meta-inf/ trunk/KTreeMap/src/main/meta-inf/manifest.mf Removed Paths: ------------- trunk/KTreeMap/META-INF/ trunk/KTreeMap/src/main/conf/meta-inf/ Added: trunk/KTreeMap/project.properties =================================================================== --- trunk/KTreeMap/project.properties (rev 0) +++ trunk/KTreeMap/project.properties 2006-10-26 15:02:50 UTC (rev 77) @@ -0,0 +1 @@ +maven.jar.manifest=src/main/meta-inf/manifest.mf \ No newline at end of file Modified: trunk/KTreeMap/project.xml =================================================================== --- trunk/KTreeMap/project.xml 2006-10-25 13:02:16 UTC (rev 76) +++ trunk/KTreeMap/project.xml 2006-10-26 15:02:50 UTC (rev 77) @@ -134,6 +134,7 @@ <include>**/*.xml</include> <include>**/*.tm3</include> <include>**/*.mf</include> + <include>**/*.dtd</include> </includes> <filtering>false</filtering> </resource> Added: trunk/KTreeMap/src/main/meta-inf/manifest.mf =================================================================== --- trunk/KTreeMap/src/main/meta-inf/manifest.mf (rev 0) +++ trunk/KTreeMap/src/main/meta-inf/manifest.mf 2006-10-26 15:02:50 UTC (rev 77) @@ -0,0 +1,9 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: KTreeMap Plug-in +Bundle-SymbolicName: net.sf.jtreemap.ktreemap;singleton:=true +Bundle-Version: 1.1.0 +Bundle-Vendor: Jense +Bundle-Localization: plugin +Require-Bundle: org.eclipse.ui, + org.eclipse.core.runtime Modified: trunk/KTreeMap/src/site/index.xml =================================================================== --- trunk/KTreeMap/src/site/index.xml 2006-10-25 13:02:16 UTC (rev 76) +++ trunk/KTreeMap/src/site/index.xml 2006-10-26 15:02:50 UTC (rev 77) @@ -23,13 +23,14 @@ <section name="KTreemap Introduction"> <p>KTreeMap is a Java SWT component which reprensents hierarchical structure in a Treemap/heatmap. It is an Eclipse plugin</p> - <p>Check out the <a href="apidocs/index.html">UML diagrams here</a></p> + <p>Check out the <a href="apidocs/index.html">Javdoc with UML diagrams here</a></p> <p>Also look at the <a href="maven-reports.html">Project Reports</a> menu on the left for project specific items, unit tests, QA etc.</p> <subsection name="Building with maven"> <p>Now... building a SWT Eclipse plugin with Maven turned up to be a bit of a nightmare, primarily because of the - totally outdated jars on iBiblio.org. So we decided to tackle this problem and happily hack it. In order to compile the ktreemap, - you need to copy the jar files in the directory eclipse-jars. We have provided a quick (and dirty) copyToRepo.bat to help you. + totally outdated jars on iBiblio.org. So we decided to tackle this problem and happily hack it.</p> + + <p>In order to compile the ktreemap, you need to copy the jar files in the directory eclipse-jars. We have provided a quick (and dirty) copyToRepo.bat to help you. It is probably not putting the jars in the right directory structure, but then there is no standard at the moment...</p> </subsection> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <be...@us...> - 2006-10-25 13:02:31
|
Revision: 76 http://svn.sourceforge.net/jtreemap/?rev=76&view=rev Author: benoitx Date: 2006-10-25 06:02:16 -0700 (Wed, 25 Oct 2006) Log Message: ----------- Added an extra shot. Modified Paths: -------------- trunk/src/site/screenshots.xml Added Paths: ----------- trunk/src/site/images/tm3example.png Added: trunk/src/site/images/tm3example.png =================================================================== (Binary files differ) Property changes on: trunk/src/site/images/tm3example.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/src/site/screenshots.xml =================================================================== --- trunk/src/site/screenshots.xml 2006-10-24 23:00:51 UTC (rev 75) +++ trunk/src/site/screenshots.xml 2006-10-25 13:02:16 UTC (rev 76) @@ -13,5 +13,8 @@ <section name="Without Tree"> <img src="images/JTreeMap.png" alt="Screenshot without displaying the tree"/> </section> + <section name="JTreeMap Example with TM3 file"> + <img src="images/tm3example.png" alt="Screenshot of the example with a loaded TM3"/> + </section> </body> </document> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <be...@us...> - 2006-10-24 23:01:20
|
Revision: 75 http://svn.sourceforge.net/jtreemap/?rev=75&view=rev Author: benoitx Date: 2006-10-24 16:00:51 -0700 (Tue, 24 Oct 2006) Log Message: ----------- Added header and footer. Modified Paths: -------------- trunk/KTreeMap/.classpath trunk/KTreeMap/qalab.xml trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/ITreeMapColorProvider.java trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/ITreeMapProvider.java trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/KTreeMap.java trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/SplitByNumber.java trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/SplitBySlice.java trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/SplitBySortedWeight.java trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/SplitByWeight.java trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/SplitSquarified.java trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/SplitStrategy.java trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/TreeMapNode.java trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/TreeMapNodeBuilder.java trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/example/BuilderTM3.java trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/example/BuilderXML.java trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/example/HSBTreeMapColorProvider.java trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/example/KTreeMapView.java trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/example/ResourceManager.java trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/example/TM3Bean.java trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/example/TM3TreeMapProvider.java trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/example/XMLBean.java trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/example/XMLTreeMapProvider.java Modified: trunk/KTreeMap/.classpath =================================================================== --- trunk/KTreeMap/.classpath 2006-10-24 22:19:05 UTC (rev 74) +++ trunk/KTreeMap/.classpath 2006-10-24 23:00:51 UTC (rev 75) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src"/> + <classpathentry kind="src" path="src/main/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="output" path="bin"/> + <classpathentry kind="output" path="target/classes"/> </classpath> Modified: trunk/KTreeMap/qalab.xml =================================================================== --- trunk/KTreeMap/qalab.xml 2006-10-24 22:19:05 UTC (rev 74) +++ trunk/KTreeMap/qalab.xml 2006-10-24 23:00:51 UTC (rev 75) @@ -144,6 +144,7 @@ <result date="2006-10-24" statvalue="1" type="findbugs"/> <result date="2006-10-24" statvalue="1" type="findbugs"/> <result date="2006-10-24" statvalue="1" type="findbugs"/> + <result date="2006-10-24" statvalue="1" type="findbugs"/> <result date="2006-10-24" statvalue="47" type="checkstyle"/> <result date="2006-10-24" statvalue="1" type="findbugs"/> <result date="2006-10-24" statvalue="1" type="findbugs"/> Modified: trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/ITreeMapColorProvider.java =================================================================== --- trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/ITreeMapColorProvider.java 2006-10-24 22:19:05 UTC (rev 74) +++ trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/ITreeMapColorProvider.java 2006-10-24 23:00:51 UTC (rev 75) @@ -1,3 +1,35 @@ +/* + * 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.ktreemap; import org.eclipse.jface.viewers.IColorProvider; @@ -13,5 +45,21 @@ * @param style style * @return a Composite for the color legend of a KTreeMap */ - public Composite getLegend(Composite parent, int style); + Composite getLegend(Composite parent, int style); } +/* + * 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/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/ITreeMapProvider.java =================================================================== --- trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/ITreeMapProvider.java 2006-10-24 22:19:05 UTC (rev 74) +++ trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/ITreeMapProvider.java 2006-10-24 23:00:51 UTC (rev 75) @@ -1,3 +1,35 @@ +/* + * 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.ktreemap; /** @@ -11,19 +43,35 @@ * @param node TreeMapNode * @return the label of the node */ - public String getLabel(TreeMapNode node); + String getLabel(TreeMapNode node); /** * Get the label of the value * @param value value of the node (TreeMapNode.getValue()) * @return the label of the value */ - public String getValueLabel(Object value); + String getValueLabel(Object value); /** * Get the double value of the value * @param value value of the node (TreeMapNode.getValue()) * @return the double value of the value */ - public double getDoubleValue(Object value); + double getDoubleValue(Object value); } +/* + * 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/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/KTreeMap.java =================================================================== --- trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/KTreeMap.java 2006-10-24 22:19:05 UTC (rev 74) +++ trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/KTreeMap.java 2006-10-24 23:00:51 UTC (rev 75) @@ -1,3 +1,35 @@ +/* + * 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.ktreemap; import org.eclipse.swt.SWT; @@ -542,7 +574,21 @@ dest.setWidth(rootWidth); } } - } - } +/* + * 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/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/SplitByNumber.java =================================================================== --- trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/SplitByNumber.java 2006-10-24 22:19:05 UTC (rev 74) +++ trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/SplitByNumber.java 2006-10-24 23:00:51 UTC (rev 75) @@ -1,3 +1,35 @@ +/* + * 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.ktreemap; import java.util.List; @@ -37,5 +69,20 @@ } return weight; } - } +/* + * 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/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/SplitBySlice.java =================================================================== --- trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/SplitBySlice.java 2006-10-24 22:19:05 UTC (rev 74) +++ trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/SplitBySlice.java 2006-10-24 23:00:51 UTC (rev 75) @@ -1,5 +1,34 @@ /* - * Created on 3 nov. 2005 + * 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.ktreemap; @@ -106,6 +135,21 @@ } } } - } } +/* + * 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/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/SplitBySortedWeight.java =================================================================== --- trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/SplitBySortedWeight.java 2006-10-24 22:19:05 UTC (rev 74) +++ trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/SplitBySortedWeight.java 2006-10-24 23:00:51 UTC (rev 75) @@ -1,3 +1,35 @@ +/* + * 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.ktreemap; import java.util.ArrayList; @@ -59,5 +91,20 @@ } } } - } +/* + * 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/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/SplitByWeight.java =================================================================== --- trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/SplitByWeight.java 2006-10-24 22:19:05 UTC (rev 74) +++ trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/SplitByWeight.java 2006-10-24 23:00:51 UTC (rev 75) @@ -1,3 +1,35 @@ +/* + * 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.ktreemap; import java.util.Iterator; @@ -49,5 +81,20 @@ } } } - } +/* + * 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/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/SplitSquarified.java =================================================================== --- trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/SplitSquarified.java 2006-10-24 22:19:05 UTC (rev 74) +++ trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/SplitSquarified.java 2006-10-24 23:00:51 UTC (rev 75) @@ -1,5 +1,34 @@ /* - * Created on 3 nov. 2005 + * 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.ktreemap; @@ -179,3 +208,19 @@ } } +/* + * 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/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/SplitStrategy.java =================================================================== --- trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/SplitStrategy.java 2006-10-24 22:19:05 UTC (rev 74) +++ trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/SplitStrategy.java 2006-10-24 23:00:51 UTC (rev 75) @@ -1,3 +1,35 @@ +/* + * 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.ktreemap; import java.util.ArrayList; @@ -162,7 +194,21 @@ } } } - } - } +/* + * 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/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/TreeMapNode.java =================================================================== --- trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/TreeMapNode.java 2006-10-24 22:19:05 UTC (rev 74) +++ trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/TreeMapNode.java 2006-10-24 23:00:51 UTC (rev 75) @@ -1,3 +1,35 @@ +/* + * 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.ktreemap; import java.util.ArrayList; @@ -330,3 +362,19 @@ this.parent = parent; } } +/* + * 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/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/TreeMapNodeBuilder.java =================================================================== --- trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/TreeMapNodeBuilder.java 2006-10-24 22:19:05 UTC (rev 74) +++ trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/TreeMapNodeBuilder.java 2006-10-24 23:00:51 UTC (rev 75) @@ -1,3 +1,35 @@ +/* + * 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.ktreemap; /** @@ -67,3 +99,19 @@ */ public abstract double getWeight(Object value); } +/* + * 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/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/example/BuilderTM3.java =================================================================== --- trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/example/BuilderTM3.java 2006-10-24 22:19:05 UTC (rev 74) +++ trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/example/BuilderTM3.java 2006-10-24 23:00:51 UTC (rev 75) @@ -1,5 +1,34 @@ /* - * Created on 22 nov. 2005 + * 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.ktreemap.example; @@ -191,5 +220,20 @@ public static void setFieldWeight(String fieldWeight) { BuilderTM3.fieldWeight = fieldWeight; } - } +/* + * 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/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/example/BuilderXML.java =================================================================== --- trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/example/BuilderXML.java 2006-10-24 22:19:05 UTC (rev 74) +++ trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/example/BuilderXML.java 2006-10-24 23:00:51 UTC (rev 75) @@ -1,3 +1,35 @@ +/* + * 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.ktreemap.example; import java.io.File; @@ -119,5 +151,20 @@ } return 0; } - } +/* + * 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/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/example/HSBTreeMapColorProvider.java =================================================================== --- trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/example/HSBTreeMapColorProvider.java 2006-10-24 22:19:05 UTC (rev 74) +++ trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/example/HSBTreeMapColorProvider.java 2006-10-24 23:00:51 UTC (rev 75) @@ -1,5 +1,34 @@ /* - * HSBTreeMapColorProvider.java Created on Feb 17, 2006 + * 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.ktreemap.example; @@ -340,3 +369,19 @@ } } } +/* + * 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/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/example/KTreeMapView.java =================================================================== --- trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/example/KTreeMapView.java 2006-10-24 22:19:05 UTC (rev 74) +++ trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/example/KTreeMapView.java 2006-10-24 23:00:51 UTC (rev 75) @@ -1,3 +1,35 @@ +/* + * 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.ktreemap.example; import java.io.File; @@ -658,7 +690,21 @@ kTreeMap.zoom(this.node); kTreeMap.redraw(); } - } - -} \ No newline at end of file +} +/* + * 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/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/example/ResourceManager.java =================================================================== --- trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/example/ResourceManager.java 2006-10-24 22:19:05 UTC (rev 74) +++ trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/example/ResourceManager.java 2006-10-24 23:00:51 UTC (rev 75) @@ -1,3 +1,35 @@ +/* + * 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.ktreemap.example; import java.io.File; @@ -408,4 +440,20 @@ URL url = new URL(installURL, name); return url; } -} \ No newline at end of file +} +/* + * 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/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/example/TM3Bean.java =================================================================== --- trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/example/TM3Bean.java 2006-10-24 22:19:05 UTC (rev 74) +++ trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/example/TM3Bean.java 2006-10-24 23:00:51 UTC (rev 75) @@ -1,3 +1,35 @@ +/* + * 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.ktreemap.example; import java.text.SimpleDateFormat; @@ -88,5 +120,20 @@ public void setLabel(String label) { this.label = label; } - } +/* + * 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/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/example/TM3TreeMapProvider.java =================================================================== --- trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/example/TM3TreeMapProvider.java 2006-10-24 22:19:05 UTC (rev 74) +++ trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/example/TM3TreeMapProvider.java 2006-10-24 23:00:51 UTC (rev 75) @@ -1,3 +1,35 @@ +/* + * 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.ktreemap.example; import java.util.Date; @@ -53,5 +85,20 @@ public static void setValueField(String valueField) { TM3TreeMapProvider.valueField = valueField; } - } +/* + * 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/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/example/XMLBean.java =================================================================== --- trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/example/XMLBean.java 2006-10-24 22:19:05 UTC (rev 74) +++ trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/example/XMLBean.java 2006-10-24 23:00:51 UTC (rev 75) @@ -1,3 +1,35 @@ +/* + * 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.ktreemap.example; /** @@ -44,3 +76,19 @@ this.weight = weight; } } +/* + * 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/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/example/XMLTreeMapProvider.java =================================================================== --- trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/example/XMLTreeMapProvider.java 2006-10-24 22:19:05 UTC (rev 74) +++ trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/example/XMLTreeMapProvider.java 2006-10-24 23:00:51 UTC (rev 75) @@ -1,3 +1,35 @@ +/* + * 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.ktreemap.example; import net.sf.jtreemap.ktreemap.ITreeMapProvider; @@ -28,5 +60,20 @@ public String getValueLabel(Object value) { return "" + getDoubleValue(value); } - } +/* + * 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 + */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <be...@us...> - 2006-10-24 22:19:35
|
Revision: 74 http://svn.sourceforge.net/jtreemap/?rev=74&view=rev Author: benoitx Date: 2006-10-24 15:19:05 -0700 (Tue, 24 Oct 2006) Log Message: ----------- Added Header & Footer 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/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/DemoUtil.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/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 19:51:07 UTC (rev 73) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/ColorProvider.java 2006-10-24 22:19:05 UTC (rev 74) @@ -1,5 +1,5 @@ /* - * ObjectLab, http://www.objectlab.co.uk/open is sponsoring the ObjectLab Kit. + * 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. @@ -62,3 +62,19 @@ */ 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/DefaultToolTip.java =================================================================== --- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/DefaultToolTip.java 2006-10-24 19:51:07 UTC (rev 73) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/DefaultToolTip.java 2006-10-24 22:19:05 UTC (rev 74) @@ -1,5 +1,34 @@ /* - * Created on 28 sept. 2005 + * 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; @@ -61,5 +90,20 @@ g.drawString(this.jTreeMap.getActiveLeaf().getLabelValue(), TOOLTIP_OFFSET, this.getHeight() - TOOLTIP_OFFSET); } } - } +/* + * 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/DefaultToolTipBuilder.java =================================================================== --- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/DefaultToolTipBuilder.java 2006-10-24 19:51:07 UTC (rev 73) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/DefaultToolTipBuilder.java 2006-10-24 22:19:05 UTC (rev 74) @@ -1,5 +1,34 @@ -/** +/* + * 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; @@ -46,3 +75,19 @@ return instance; } } +/* + * 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/DefaultValue.java =================================================================== --- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/DefaultValue.java 2006-10-24 19:51:07 UTC (rev 73) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/DefaultValue.java 2006-10-24 22:19:05 UTC (rev 74) @@ -1,5 +1,34 @@ /* - * Created on 10 oct. 2005 + * 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; @@ -74,5 +103,20 @@ // ignore } - } +/* + * 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/IToolTipBuilder.java =================================================================== --- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/IToolTipBuilder.java 2006-10-24 19:51:07 UTC (rev 73) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/IToolTipBuilder.java 2006-10-24 22:19:05 UTC (rev 74) @@ -1,6 +1,34 @@ /* - * Created on 6 mars 2006 + * 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; @@ -21,4 +49,20 @@ * @return the instance of the JToolTip */ JToolTip getToolTip(); -} \ No newline at end of file +} +/* + * 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 2006-10-24 19:51:07 UTC (rev 73) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/JTreeMap.java 2006-10-24 22:19:05 UTC (rev 74) @@ -1,3 +1,35 @@ +/* + * 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; @@ -620,3 +652,19 @@ } } } +/* + * 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/SplitByNumber.java =================================================================== --- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitByNumber.java 2006-10-24 19:51:07 UTC (rev 73) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitByNumber.java 2006-10-24 22:19:05 UTC (rev 74) @@ -1,3 +1,35 @@ +/* + * 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.util.Vector; @@ -42,5 +74,20 @@ } return weight; } - } +/* + * 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/SplitBySlice.java =================================================================== --- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitBySlice.java 2006-10-24 19:51:07 UTC (rev 73) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitBySlice.java 2006-10-24 22:19:05 UTC (rev 74) @@ -1,5 +1,34 @@ /* - * Created on 3 nov. 2005 + * 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; @@ -117,3 +146,19 @@ } } +/* + * 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/SplitBySortedWeight.java =================================================================== --- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitBySortedWeight.java 2006-10-24 19:51:07 UTC (rev 73) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitBySortedWeight.java 2006-10-24 22:19:05 UTC (rev 74) @@ -1,3 +1,35 @@ +/* + * 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.util.Vector; @@ -30,5 +62,20 @@ workOutWeight(v1, v2, vClone, sumWeight); } - } +/* + * 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/SplitByWeight.java =================================================================== --- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitByWeight.java 2006-10-24 19:51:07 UTC (rev 73) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitByWeight.java 2006-10-24 22:19:05 UTC (rev 74) @@ -1,3 +1,35 @@ +/* + * 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.util.Vector; @@ -21,25 +53,20 @@ workOutWeight(v, v1, v2, sumWeight); } - - /* - * private double workoutWeight(final Vector<TreeMapNode> v, final Vector<TreeMapNode> - * v1, final Vector<TreeMapNode> v2, double memWeight, final double - * sumWeight) { double elemWeight; for (final Iterator<TreeMapNode> i = - * v.iterator(); i.hasNext();) { TreeMapNode tmn = i.next(); elemWeight = - * tmn.getWeight(); // if adding the current element pass the middle of - * total weight if (memWeight + elemWeight >= sumWeight / 2) { // we look at - * the finest split (the nearest of the middle of // weight) if (((sumWeight / - * 2) - memWeight) > ((memWeight + elemWeight) - (sumWeight / 2))) { // if - * it is after the add, we add the element to the first // Vector memWeight += - * elemWeight; v1.addElement(tmn); } else { // we must have at least 1 - * element in the first vector if (v1.isEmpty()) { v1.addElement(tmn); } - * else { // if it is before the add, we add the element to the // second - * Vector v2.addElement(tmn); } } // then we fill the second Vector qith the - * rest of elements while (i.hasNext()) { tmn = i.next(); - * v2.addElement(tmn); } } else { // we add in the first vector while we - * don't reach the middle of // weight memWeight += elemWeight; - * v1.addElement(tmn); } } return memWeight; } - * - */ } +/* + * 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/SplitSquarified.java =================================================================== --- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitSquarified.java 2006-10-24 19:51:07 UTC (rev 73) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitSquarified.java 2006-10-24 22:19:05 UTC (rev 74) @@ -1,5 +1,34 @@ /* - * Created on 3 nov. 2005 + * 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; @@ -192,5 +221,20 @@ } return xCalc; } - } +/* + * 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/SplitStrategy.java =================================================================== --- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitStrategy.java 2006-10-24 19:51:07 UTC (rev 73) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitStrategy.java 2006-10-24 22:19:05 UTC (rev 74) @@ -1,3 +1,35 @@ +/* + * 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.io.Serializable; @@ -209,3 +241,19 @@ } } } +/* + * 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/TreeMapNode.java =================================================================== --- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/TreeMapNode.java 2006-10-24 19:51:07 UTC (rev 73) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/TreeMapNode.java 2006-10-24 22:19:05 UTC (rev 74) @@ -1,3 +1,35 @@ +/* + * 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.util.Enumeration; @@ -358,3 +390,19 @@ this.y = y; } } +/* + * 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/TreeMapNodeBuilder.java =================================================================== --- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/TreeMapNodeBuilder.java 2006-10-24 19:51:07 UTC (rev 73) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/TreeMapNodeBuilder.java 2006-10-24 22:19:05 UTC (rev 74) @@ -1,3 +1,35 @@ +/* + * 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.io.Serializable; @@ -73,3 +105,19 @@ return this.root; } } +/* + * 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/UniqueColorProvider.java =================================================================== --- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/UniqueColorProvider.java 2006-10-24 19:51:07 UTC (rev 73) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/UniqueColorProvider.java 2006-10-24 22:19:05 UTC (rev 74) @@ -1,6 +1,34 @@ /* - * Created on 7 oct. 2005 + * 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; @@ -101,3 +129,19 @@ } } } +/* + * 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/Value.java =================================================================== --- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/Value.java 2006-10-24 19:51:07 UTC (rev 73) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/Value.java 2006-10-24 22:19:05 UTC (rev 74) @@ -1,3 +1,35 @@ +/* + * 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.io.Serializable; @@ -85,3 +117,19 @@ throw new IllegalArgumentException(); } } +/* + * 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/ValuePercent.java =================================================================== --- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/ValuePercent.java 2006-10-24 19:51:07 UTC (rev 73) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/ValuePercent.java 2006-10-24 22:19:05 UTC (rev 74) @@ -1,3 +1,35 @@ +/* + * 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: ColorProvider.java 69 2006-10-24 16:20:20Z benoitx $ + * + * 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.text.NumberFormat; @@ -62,5 +94,20 @@ } return this.nf.format(this.value) + " %"; } - } +/* + * 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/BuilderTM3.java =================================================================== --- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/example/BuilderTM3.java 2006-10-24 19:51:07 UTC (rev 73) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/example/BuilderTM3.java 2006-10-24 22:19:05 UTC (rev 74) @@ -1,5 +1,34 @@ /* - * Created on 22 nov. 2005 + * 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.example; @@ -256,7 +285,21 @@ in.close(); } } - } - } +/* + * 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/BuilderXML.java =================================================================== --- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/example/BuilderXML.java 2006-10-24 19:51:07 UTC (rev 73) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/example/BuilderXML.java 2006-10-24 22:19:05 UTC (rev 74) @@ -1,3 +1,35 @@ +/* + * 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.example; import java.io.File; @@ -116,3 +148,19 @@ } } } +/* + * 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/DemoUtil.java =================================================================== --- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/example/DemoUtil.java 2006-10-24 19:51:07 UTC (rev 73) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/example/DemoUtil.java 2006-10-24 22:19:05 UTC (rev 74) @@ -1,5 +1,34 @@ -/** +/* + * 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: ColorProvider.java 69 2006-10-24 16:20:20Z benoitx $ + * + * 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.example; @@ -161,3 +190,19 @@ return builder.getRoot(); } } +/* + * 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 2006-10-24 19:51:07 UTC (rev 73) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/example/JTreeMapAppletExample.java 2006-10-24 22:19:05 UTC (rev 74) @@ -1,5 +1,34 @@ /* - * Created on 28 oct. 2005 + * 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.example; @@ -83,102 +112,20 @@ return this.jContentPane; } - - /** - * This method build a TreeMap root.<BR> - * This methode may be replaced by one who get the root from a servlet or a - * jdbc client or something else... - * - * @return the root of the TreeMap. - * - * public static TreeMapNode buildDemoRoot() { final TreeMapNodeBuilder - * builder = new TreeMapNodeBuilder(); - * - * final TreeMapNode root = builder.buildBranch("Root", null); final - * TreeMapNode tmn1 = builder.buildBranch("branch1", root); final - * TreeMapNode tmn11 = builder.buildBranch("branch11", tmn1); Value value = - * new ValuePercent(0.0); builder.buildLeaf("leaf111", 1.0, value, tmn11); - * value = new ValuePercent(-5.0); builder.buildLeaf("leaf112", 2.0, value, - * tmn11); value = new ValuePercent(2.0); builder.buildLeaf("leaf113", 0.5, - * value, tmn11); value = new ValuePercent(2.0); - * builder.buildLeaf("leaf114", 3.0, value, tmn11); value = new - * ValuePercent(-5.0); builder.buildLeaf("leaf115", 0.25, value, tmn11); - * final TreeMapNode tmn12 = builder.buildBranch("branch12", tmn1); value = - * new ValuePercent(1.0); builder.buildLeaf("leaf121", 1.0, value, tmn12); - * value = new ValuePercent(5.0); builder.buildLeaf("leaf122", 2.0, value, - * tmn12); value = new ValuePercent(2.0); builder.buildLeaf("leaf123", 0.5, - * value, tmn12); value = new ValuePercent(-2.0); - * builder.buildLeaf("leaf124", 3.0, value, tmn12); value = new - * ValuePercent(5.0); builder.buildLeaf("leaf125", 0.25, value, tmn12); - * final TreeMapNode tmn13 = builder.buildBranch("branch13", tmn1); value = - * new ValuePercent(1.0); builder.buildLeaf("leaf131", 1.0, value, tmn13); - * value = new ValuePercent(5.0); builder.buildLeaf("leaf132", 2.0, value, - * tmn13); value = new ValuePercent(2.0); builder.buildLeaf("leaf133", 0.5, - * value, tmn13); value = new ValuePercent(2.0); - * builder.buildLeaf("leaf134", 3.0, value, tmn13); value = new - * ValuePercent(2.0); builder.buildLeaf("leaf14", 3.0, value, tmn1); value = - * new ValuePercent(-5.0); builder.buildLeaf("leaf15", 2.0, value, tmn1); - * final TreeMapNode tmn2 = builder.buildBranch("branch2", root); final - * TreeMapNode tmn21 = builder.buildBranch("branch21", tmn2); value = new - * ValuePercent(-1.0); builder.buildLeaf("leaf211", 1.0, value, tmn21); - * value = new ValuePercent(-5.0); builder.buildLeaf("leaf212", 2.0, value, - * tmn21); value = new ValuePercent(2.0); builder.buildLeaf("leaf213", 0.5, - * value, tmn21); value = new ValuePercent(2.0); - * builder.buildLeaf("leaf214", 3.0, value, tmn21); value = new - * ValuePercent(5.0); builder.buildLeaf("leaf215", 0.25, value, tmn21); - * final TreeMapNode tmn22 = builder.buildBranch("branch22", tmn2); value = - * new ValuePercent(1.0); builder.buildLeaf("leaf221", 1.0, value, tmn22); - * value = new ValuePercent(5.0); builder.buildLeaf("leaf222", 2.0, value, - * tmn22); value = new ValuePercent(2.0); builder.buildLeaf("leaf223", 0.5, - * value, tmn22); value = new ValuePercent(2.0); - * builder.buildLeaf("leaf224", 3.0, value, tmn22); final TreeMapNode tmn3 = - * builder.buildBranch("branch3", root); final TreeMapNode tmn31 = - * builder.buildBranch("branch31", tmn3); value = new ValuePercent(-1.0); - * builder.buildLeaf("leaf311", 1.0, value, tmn31); value = new - * ValuePercent(-5.0); builder.buildLeaf("leaf312", 2.0, value, tmn31); - * value = new ValuePercent(-2.0); builder.buildLeaf("leaf313", 0.5, value, - * tmn31); value = new ValuePercent(-2.0); builder.buildLeaf("leaf314", 3.0, - * value, tmn31); value = new ValuePercent(-5.0); - * builder.buildLeaf("leaf315", 0.25, value, tmn31); final TreeMapNode tmn32 = - * builder.buildBranch("branch32", tmn3); value = new ValuePercent(-1.0); - * builder.buildLeaf("leaf321", 1.0, value, tmn32); value = new - * ValuePercent(-5.0); builder.buildLeaf("leaf322", 2.0, value, tmn32); - * value = new ValuePercent(2.0); builder.buildLeaf("leaf323", 0.5, value, - * tmn32); value = new ValuePercent(2.0); builder.buildLeaf("leaf324", 3.0, - * value, tmn32); value = new ValuePercent(-5.0); - * builder.buildLeaf("leaf325", 0.25, value, tmn32); final TreeMapNode tmn33 = - * builder.buildBranch("branch33", tmn3); value = new ValuePercent(-1.0); - * builder.buildLeaf("leaf331", 1.0, value, tmn33); value = new - * ValuePercent(5.0); builder.buildLeaf("leaf332", 2.0, value, tmn33); value = - * new ValuePercent(2.0); builder.buildLeaf("leaf333", 0.5, value, tmn33); - * value = new ValuePercent(-2.0); builder.buildLeaf("leaf334", 3.0, value, - * tmn33); final TreeMapNode tmn34 = builder.buildBranch("branch34", tmn3); - * value = new ValuePercent(-1.0); builder.buildLeaf("leaf341", 1.0, value, - * tmn34); value = new ValuePercent(5.0); builder.buildLeaf("leaf342", 2.0, - * value, tmn34); value = new ValuePercent(-2.0); - * builder.buildLeaf("leaf343", 0.5, value, tmn34); final TreeMapNode tmn4 = - * builder.buildBranch("branch4", root); final TreeMapNode tmn41 = - * builder.buildBranch("branch41", tmn4); value = new ValuePercent(1.0); - * builder.buildLeaf("leaf411", 1.0, value, tmn41); value = new - * ValuePercent(5.0); builder.buildLeaf("leaf412", 2.0, value, tmn41); value = - * new ValuePercent(2.0); builder.buildLeaf("leaf413", 0.5, value, tmn41); - * value = new ValuePercent(2.0); builder.buildLeaf("leaf414", 3.0, value, - * tmn41); value = new ValuePercent(-5.0); builder.buildLeaf("leaf415", - * 0.25, value, tmn41); final TreeMapNode tmn42 = - * builder.buildBranch("branch42", tmn4); value = new ValuePercent(1.0); - * builder.buildLeaf("leaf421", 1.0, value, tmn42); value = new - * ValuePercent(5.0); builder.buildLeaf("leaf422", 2.0, value, tmn42); value = - * new ValuePercent(2.0); builder.buildLeaf("leaf423", 0.5, value, tmn42); - * value = new ValuePercent(2.0); builder.buildLeaf("leaf424", 3.0, value, - * tmn42); value = new ValuePercent(-5.0); builder.buildLeaf("leaf425", - * 0.25, value, tmn42); final TreeMapNode tmn43 = - * builder.buildBranch("branch43", tmn4); value = new ValuePercent(1.0); - * builder.buildLeaf("leaf431", 1.0, value, tmn43); value = new - * ValuePercent(-5.0); builder.buildLeaf("leaf432", 2.0, value, tmn43); - * value = new ValuePercent(2.0); builder.buildLeaf("leaf433", 0.5, value, - * tmn43); value = new ValuePercent(0.0); builder.buildLeaf("leaf434", 3.0, - * value, tmn43); - * - * return builder.getRoot(); } - */ } +/* + * ObjectLab is supporing JTreeMap + * + * Based in London, we are world leaders in the des... [truncated message content] |
From: <be...@us...> - 2006-10-24 19:51:19
|
Revision: 73 http://svn.sourceforge.net/jtreemap/?rev=73&view=rev Author: benoitx Date: 2006-10-24 12:51:07 -0700 (Tue, 24 Oct 2006) Log Message: ----------- Added signature mechanism. Modified Paths: -------------- trunk/JTreeMap/maven.xml trunk/KTreeMap/qalab.xml trunk/common-build/project.xml Added Paths: ----------- trunk/JTreeMap/codesignature.keystore Added: trunk/JTreeMap/codesignature.keystore =================================================================== (Binary files differ) Property changes on: trunk/JTreeMap/codesignature.keystore ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/JTreeMap/maven.xml =================================================================== --- trunk/JTreeMap/maven.xml 2006-10-24 16:59:11 UTC (rev 72) +++ trunk/JTreeMap/maven.xml 2006-10-24 19:51:07 UTC (rev 73) @@ -13,6 +13,13 @@ xmlns:define="jelly:define" xmlns:doc="doc" xmlns:util="jelly:util" xmlns:log="jelly:log"> - <goal name="jt:build" prereqs="jar:install" /> + <goal name="jt:build" prereqs="jar:install"> + <signjar lazy="true" storepass="password" alias="mykey" + keystore="codesignature.keystore"> + <fileset dir="target"> + <include name="*.jar" /> + </fileset> + </signjar> + </goal> <goal name="jt:rebuild" prereqs="clean,jt:build" /> </project> Modified: trunk/KTreeMap/qalab.xml =================================================================== --- trunk/KTreeMap/qalab.xml 2006-10-24 16:59:11 UTC (rev 72) +++ trunk/KTreeMap/qalab.xml 2006-10-24 19:51:07 UTC (rev 73) @@ -142,6 +142,8 @@ <result date="2006-10-24" statvalue="1" type="findbugs"/> <result date="2006-10-24" statvalue="1" type="findbugs"/> <result date="2006-10-24" statvalue="1" type="findbugs"/> + <result date="2006-10-24" statvalue="1" type="findbugs"/> + <result date="2006-10-24" statvalue="1" type="findbugs"/> <result date="2006-10-24" statvalue="47" type="checkstyle"/> <result date="2006-10-24" statvalue="1" type="findbugs"/> <result date="2006-10-24" statvalue="1" type="findbugs"/> Modified: trunk/common-build/project.xml =================================================================== --- trunk/common-build/project.xml 2006-10-24 16:59:11 UTC (rev 72) +++ trunk/common-build/project.xml 2006-10-24 19:51:07 UTC (rev 73) @@ -173,7 +173,7 @@ <report>maven-simian-plugin</report> <report>maven-cobertura-plugin</report> <report>maven-qalab-plugin</report> - <report>maven-javadoc-plugin</report> + <report>maven-ydoc-plugin</report> <report>maven-jdepend-plugin</report> <report>maven-faq-plugin</report> <report>maven-junit-report-plugin</report> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <be...@us...> - 2006-10-24 16:59:24
|
Revision: 72 http://svn.sourceforge.net/jtreemap/?rev=72&view=rev Author: benoitx Date: 2006-10-24 09:59:11 -0700 (Tue, 24 Oct 2006) Log Message: ----------- Modified Paths: -------------- trunk/JTreeMap/qalab.xml trunk/KTreeMap/qalab.xml Modified: trunk/JTreeMap/qalab.xml =================================================================== --- trunk/JTreeMap/qalab.xml 2006-10-24 16:41:47 UTC (rev 71) +++ trunk/JTreeMap/qalab.xml 2006-10-24 16:59:11 UTC (rev 72) @@ -234,8 +234,6 @@ <result date="2006-10-23" statvalue="2" type="findbugs"/> <result date="2006-10-23" statvalue="2" type="findbugs"/> <result date="2006-10-23" statvalue="2" type="findbugs"/> - <result date="2006-10-24" statvalue="2" type="findbugs"/> - <result date="2006-10-24" statvalue="2" type="findbugs"/> <result date="2006-10-24" statvalue="1" type="checkstyle"/> </file> <file id="net_sf_jtreemap_swing_example_RandomColorProvider.java" path="net/sf/jtreemap/swing/example/RandomColorProvider.java"> Modified: trunk/KTreeMap/qalab.xml =================================================================== --- trunk/KTreeMap/qalab.xml 2006-10-24 16:41:47 UTC (rev 71) +++ trunk/KTreeMap/qalab.xml 2006-10-24 16:59:11 UTC (rev 72) @@ -140,6 +140,8 @@ <result date="2006-10-23" statvalue="1" type="findbugs"/> <result date="2006-10-23" statvalue="1" type="findbugs"/> <result date="2006-10-24" statvalue="1" type="findbugs"/> + <result date="2006-10-24" statvalue="1" type="findbugs"/> + <result date="2006-10-24" statvalue="1" type="findbugs"/> <result date="2006-10-24" statvalue="47" type="checkstyle"/> <result date="2006-10-24" statvalue="1" type="findbugs"/> <result date="2006-10-24" statvalue="1" type="findbugs"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <be...@us...> - 2006-10-24 16:42:00
|
Revision: 71 http://svn.sourceforge.net/jtreemap/?rev=71&view=rev Author: benoitx Date: 2006-10-24 09:41:47 -0700 (Tue, 24 Oct 2006) Log Message: ----------- Moved remotely Added Paths: ----------- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/provider/icons/ Removed Paths: ------------- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/example/icons/ Copied: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/provider/icons (from rev 70, trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/example/icons) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <be...@us...> - 2006-10-24 16:39:28
|
Revision: 70 http://svn.sourceforge.net/jtreemap/?rev=70&view=rev Author: benoitx Date: 2006-10-24 09:39:13 -0700 (Tue, 24 Oct 2006) Log Message: ----------- tidy up Modified Paths: -------------- trunk/src/site/generic-jtreemap.jnlp Modified: trunk/src/site/generic-jtreemap.jnlp =================================================================== --- trunk/src/site/generic-jtreemap.jnlp 2006-10-24 16:20:20 UTC (rev 69) +++ trunk/src/site/generic-jtreemap.jnlp 2006-10-24 16:39:13 UTC (rev 70) @@ -2,9 +2,9 @@ <jnlp spec="1.0+" codebase="http://jtreemap.sourceforge.net" href="jtreemap.jnlp"> <information> <title>JTreeMap Example</title> - <vendor>Jense</vendor> + <vendor>L.Dutheil and ObjectLab Financial</vendor> <homepage href="http://jtreemap.sourceforge.net/index.html"/> - <description></description> + <description>A JTreeMap demo application that can load TM3 and XML files</description> <description kind="short">JTreeMap Example</description> <icon href="images/jtreemap.gif"/> <offline-allowed/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <be...@us...> - 2006-10-24 16:20:40
|
Revision: 69 http://svn.sourceforge.net/jtreemap/?rev=69&view=rev Author: benoitx Date: 2006-10-24 09:20:20 -0700 (Tue, 24 Oct 2006) Log Message: ----------- Fix the icons on style Modified Paths: -------------- trunk/JTreeMap/.project trunk/JTreeMap/qalab.xml trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/ColorProvider.java trunk/JTreeMap/src/site/style/maven-objectlabkit.css trunk/KTreeMap/qalab.xml trunk/KTreeMap/src/site/style/maven-objectlabkit.css trunk/common-build/project.xml trunk/src/site/index.xml trunk/src/site/style/maven-objectlabkit.css Modified: trunk/JTreeMap/.project =================================================================== --- trunk/JTreeMap/.project 2006-10-24 16:05:26 UTC (rev 68) +++ trunk/JTreeMap/.project 2006-10-24 16:20:20 UTC (rev 69) @@ -1,18 +1,23 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<projectDescription> - <name>jtreemap</name> - <comment>JTreeMap is a Java Swing component which reprensents hierarchical structure in a Treemap</comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> \ No newline at end of file +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>jtreemap</name> + <comment>JTreeMap is a Java Swing component which reprensents hierarchical structure in a Treemap</comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>edu.umd.cs.findbugs.plugin.eclipse.findbugsBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>edu.umd.cs.findbugs.plugin.eclipse.findbugsNature</nature> + </natures> +</projectDescription> Modified: trunk/JTreeMap/qalab.xml =================================================================== --- trunk/JTreeMap/qalab.xml 2006-10-24 16:05:26 UTC (rev 68) +++ trunk/JTreeMap/qalab.xml 2006-10-24 16:20:20 UTC (rev 69) @@ -236,7 +236,6 @@ <result date="2006-10-23" statvalue="2" type="findbugs"/> <result date="2006-10-24" statvalue="2" type="findbugs"/> <result date="2006-10-24" statvalue="2" type="findbugs"/> - <result date="2006-10-24" statvalue="2" type="findbugs"/> <result date="2006-10-24" statvalue="1" type="checkstyle"/> </file> <file id="net_sf_jtreemap_swing_example_RandomColorProvider.java" path="net/sf/jtreemap/swing/example/RandomColorProvider.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 16:05:26 UTC (rev 68) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/ColorProvider.java 2006-10-24 16:20:20 UTC (rev 69) @@ -1,3 +1,35 @@ +/* + * ObjectLab, http://www.objectlab.co.uk/open is sponsoring the ObjectLab Kit. + * + * 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; @@ -29,5 +61,4 @@ * @return a legend JPanel */ public abstract JPanel getLegendPanel(); - } Modified: trunk/JTreeMap/src/site/style/maven-objectlabkit.css =================================================================== --- trunk/JTreeMap/src/site/style/maven-objectlabkit.css 2006-10-24 16:05:26 UTC (rev 68) +++ trunk/JTreeMap/src/site/style/maven-objectlabkit.css 2006-10-24 16:20:20 UTC (rev 69) @@ -78,11 +78,11 @@ font-size: 12px; padding-top: 2px; } - +/* div#navcolumn li { background: #eeeeee !important; } - +*/ div#navcolumn div a { color: #002070; font-size: 11px; Modified: trunk/KTreeMap/qalab.xml =================================================================== --- trunk/KTreeMap/qalab.xml 2006-10-24 16:05:26 UTC (rev 68) +++ trunk/KTreeMap/qalab.xml 2006-10-24 16:20:20 UTC (rev 69) @@ -139,6 +139,7 @@ <result date="2006-10-23" statvalue="47" type="checkstyle"/> <result date="2006-10-23" statvalue="1" type="findbugs"/> <result date="2006-10-23" statvalue="1" type="findbugs"/> + <result date="2006-10-24" statvalue="1" type="findbugs"/> <result date="2006-10-24" statvalue="47" type="checkstyle"/> <result date="2006-10-24" statvalue="1" type="findbugs"/> <result date="2006-10-24" statvalue="1" type="findbugs"/> Modified: trunk/KTreeMap/src/site/style/maven-objectlabkit.css =================================================================== --- trunk/KTreeMap/src/site/style/maven-objectlabkit.css 2006-10-24 16:05:26 UTC (rev 68) +++ trunk/KTreeMap/src/site/style/maven-objectlabkit.css 2006-10-24 16:20:20 UTC (rev 69) @@ -78,11 +78,11 @@ font-size: 12px; padding-top: 2px; } - +/* div#navcolumn li { background: #eeeeee !important; } - +*/ div#navcolumn div a { color: #002070; font-size: 11px; Modified: trunk/common-build/project.xml =================================================================== --- trunk/common-build/project.xml 2006-10-24 16:05:26 UTC (rev 68) +++ trunk/common-build/project.xml 2006-10-24 16:20:20 UTC (rev 69) @@ -29,7 +29,7 @@ <groupId>net.sf.jtreemap</groupId> <currentVersion>1.1.0</currentVersion> <organization> - <name>ObjectLab Financial Ltd</name> + <name>L. Dutheil and ObjectLab Financial Ltd</name> <url>http://www.objectlab.co.uk</url> <logo> http://www.objectlab.co.uk/images/objectlab-web-noblue.gif @@ -173,7 +173,7 @@ <report>maven-simian-plugin</report> <report>maven-cobertura-plugin</report> <report>maven-qalab-plugin</report> - <report>maven-ydoc-plugin</report> + <report>maven-javadoc-plugin</report> <report>maven-jdepend-plugin</report> <report>maven-faq-plugin</report> <report>maven-junit-report-plugin</report> Modified: trunk/src/site/index.xml =================================================================== --- trunk/src/site/index.xml 2006-10-24 16:05:26 UTC (rev 68) +++ trunk/src/site/index.xml 2006-10-24 16:20:20 UTC (rev 69) @@ -59,7 +59,7 @@ </subsection> - <subsection name="So, what is on offer?"> + <subsection name="Which JDK?"> <p>1.5+, get over it :-)</p> </subsection> @@ -81,7 +81,7 @@ <p>JTreeMap releases a basic demo application, you can open XML and TM3 files. The application can be launched via (see <a href="jtreemap.jnlp">WebStart</a>) or this way: java -jar jtreemap-1.1.0.jar</p> <p>The accepted file formats are: XML of the following format:</p> - <div class="code"><pre> + <div class="source"><pre> <?xml version='1.0' encoding='ISO-8859-1'?> <!ELEMENT root (label,(branch |leaf)*)> <!ELEMENT branch (label,(branch|leaf)*)> @@ -92,7 +92,7 @@ </pre></div> <p>XML Example:</p> - <div class="code"><pre> + <div class="source"><pre> <?xml version='1.0' encoding='ISO-8859-1'?> <!DOCTYPE root SYSTEM "TreeMap.dtd" > <root> @@ -125,7 +125,7 @@ </pre></div> <p>In the field of treemapping, there is also a standard file format called TM3, which is TAB delimited:</p> - <div class="code"><pre> + <div class="source"><pre> Length (Miles) Traffic Lights Speed Limit Repairs per week FLOAT INTEGER INTEGER FLOAT 12.5 4 40 2.3 Roads Highway Route 1 @@ -140,7 +140,7 @@ <subsection name="As an component in your application"> <p>The library provided allows you to integrate the treemap in your java app</p> - <div class="code"><pre> + <div class="source"><pre> // // Build the Tree with JTreeMap classes Modified: trunk/src/site/style/maven-objectlabkit.css =================================================================== --- trunk/src/site/style/maven-objectlabkit.css 2006-10-24 16:05:26 UTC (rev 68) +++ trunk/src/site/style/maven-objectlabkit.css 2006-10-24 16:20:20 UTC (rev 69) @@ -78,11 +78,11 @@ font-size: 12px; padding-top: 2px; } - +/* div#navcolumn li { background: #eeeeee !important; } - +*/ div#navcolumn div a { color: #002070; font-size: 11px; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <be...@us...> - 2006-10-24 16:07:39
|
Revision: 68 http://svn.sourceforge.net/jtreemap/?rev=68&view=rev Author: benoitx Date: 2006-10-24 09:05:26 -0700 (Tue, 24 Oct 2006) Log Message: ----------- Modified Paths: -------------- trunk/src/site/changes.xml Modified: trunk/src/site/changes.xml =================================================================== --- trunk/src/site/changes.xml 2006-10-24 15:59:12 UTC (rev 67) +++ trunk/src/site/changes.xml 2006-10-24 16:05:26 UTC (rev 68) @@ -1,13 +1,11 @@ <?xml version="1.0"?> -<!-- - --> - <document> <properties> <title>Changes</title> </properties> <body> <release version="1.1.0" date="In SVN" description="Re-org"> + <action dev="benoitx" type="fix">Code is now gone through Checkstyle, PMD, FindBugs and Simian...</action> <action dev="benoitx" type="add">Moved org.jense to official package net.sf.jtreemap (sorry, it breaks your code but we must do this to release on iBiblio.org, the official Maven repository).</action> <action dev="benoitx" type="add">Maven Build.</action> <action dev="marchy" type="add">Move to Subversion.</action> @@ -24,7 +22,7 @@ <action dev="jense128" type="add">The ToolTip can be personalized.</action> <action dev="jense128" type="add">Add the ColorProvider contribution of Andy Adamczak is added to the release.</action> <action dev="jense128" type="fix">The example is improved.</action> - <action dev="jense128" type="fix">Fix bugs. </action> + <action dev="jense128" type="fix">Fix bugs.</action> </release> <release version="1.0-beta" date="2005-11-24" description="First Beta"> <action dev="jense128" type="fix">The JTreeMap now fits the window/frame/panel. </action> @@ -33,7 +31,7 @@ <action dev="jense128" type="add">The example is improved too.</action> </release> <release version="0.9.6" date="2005-11-11" description="Maintenance"> - <action dev="jense128" type="fix">resolve some bugs.This seems to be the final release. If you have any suggestions, there are welcome </action> + <action dev="jense128" type="fix">Resolve some bugs.This seems to be the final release. If you have any suggestions, there are welcome </action> </release> <release version="0.9.5" date="2005-11-07" description="More Examples"> <action dev="jense128" type="add">More examples. Can load your own xml file from the example.More split strategies.Improved code</action> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <be...@us...> - 2006-10-24 16:07:39
|
Revision: 67 http://svn.sourceforge.net/jtreemap/?rev=67&view=rev Author: benoitx Date: 2006-10-24 08:59:12 -0700 (Tue, 24 Oct 2006) Log Message: ----------- A few more Checkstyle fixes. Modified Paths: -------------- trunk/JTreeMap/qalab.xml trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/TreeMapNode.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/KTreeMap/qalab.xml Modified: trunk/JTreeMap/qalab.xml =================================================================== --- trunk/JTreeMap/qalab.xml 2006-10-24 15:37:27 UTC (rev 66) +++ trunk/JTreeMap/qalab.xml 2006-10-24 15:59:12 UTC (rev 67) @@ -26,6 +26,7 @@ <summaryresult date="2006-10-23" filecount="27" statvalue="307" type="checkstyle"/> <summaryresult date="2006-10-23" filecount="14" statvalue="35" type="findbugs"/> <summaryresult date="2006-10-23" filecount="4" statvalue="280" type="simian"/> + <summaryresult date="2006-10-24" filecount="29" statvalue="62" type="checkstyle"/> </summary> <file id="org_jense_swing_jtreemap_package.html" path="org/jense/swing/jtreemap/package.html"> <result date="2006-10-17" statvalue="1" type="checkstyle"/> @@ -233,6 +234,10 @@ <result date="2006-10-23" statvalue="2" type="findbugs"/> <result date="2006-10-23" statvalue="2" type="findbugs"/> <result date="2006-10-23" statvalue="2" type="findbugs"/> + <result date="2006-10-24" statvalue="2" type="findbugs"/> + <result date="2006-10-24" statvalue="2" type="findbugs"/> + <result date="2006-10-24" statvalue="2" type="findbugs"/> + <result date="2006-10-24" statvalue="1" type="checkstyle"/> </file> <file id="net_sf_jtreemap_swing_example_RandomColorProvider.java" path="net/sf/jtreemap/swing/example/RandomColorProvider.java"> <result date="2006-10-23" statvalue="10" type="checkstyle"/> @@ -250,4 +255,18 @@ <result date="2006-10-23" statvalue="7" type="checkstyle"/> <result date="2006-10-23" statvalue="2" type="findbugs"/> </file> + <file id="net_sf_jtreemap_swing_SplitByNumber.java" path="net/sf/jtreemap/swing/SplitByNumber.java"/> + <file id="net_sf_jtreemap_swing_SplitBySlice.java" path="net/sf/jtreemap/swing/SplitBySlice.java"/> + <file id="net_sf_jtreemap_swing_SplitBySortedWeight.java" path="net/sf/jtreemap/swing/SplitBySortedWeight.java"/> + <file id="net_sf_jtreemap_swing_SplitByWeight.java" path="net/sf/jtreemap/swing/SplitByWeight.java"/> + <file id="net_sf_jtreemap_swing_example_DemoUtil.java" path="net/sf/jtreemap/swing/example/DemoUtil.java"> + <result date="2006-10-24" statvalue="57" type="checkstyle"/> + </file> + <file + id="net_sf_jtreemap_swing_provider_HSBTreeMapColorProvider.java" path="net/sf/jtreemap/swing/provider/HSBTreeMapColorProvider.java"> + <result date="2006-10-24" statvalue="2" type="checkstyle"/> + </file> + <file id="net_sf_jtreemap_swing_provider_RedGreenColorProvider.java" path="net/sf/jtreemap/swing/provider/RedGreenColorProvider.java"> + <result date="2006-10-24" statvalue="2" type="checkstyle"/> + </file> </qalab> Modified: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/TreeMapNode.java =================================================================== --- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/TreeMapNode.java 2006-10-24 15:37:27 UTC (rev 66) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/TreeMapNode.java 2006-10-24 15:59:12 UTC (rev 67) @@ -17,10 +17,12 @@ */ public class TreeMapNode extends DefaultMutableTreeNode { + private static final int DEFAULT_BORDER_SIZE = 3; + private static final long serialVersionUID = 742372833853976103L; // max border between two nodes of the same level - private static int border = 3; + private static int border = DEFAULT_BORDER_SIZE; private int height; 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 2006-10-24 15:37:27 UTC (rev 66) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/provider/HSBTreeMapColorProvider.java 2006-10-24 15:59:12 UTC (rev 67) @@ -24,6 +24,8 @@ * @author Andy Adamczak */ public class HSBTreeMapColorProvider extends ColorProvider { + private static final int HSBVAL_SIZE = 3; + /** * */ @@ -159,7 +161,7 @@ // reds in this color space, so use the // hue/saturation // constructions for grey scales. - float[] hsbvals = new float[3]; + float[] hsbvals = new float[HSBVAL_SIZE]; hsbvals = Color.RGBtoHSB(positiveColor.getRed(), positiveColor.getGreen(), positiveColor.getBlue(), hsbvals); positiveHue = hsbvals[0]; @@ -236,19 +238,26 @@ * @return the converted value */ private double adjustValue(final double value) { + double ret = value; switch (colorDistribution) { case Log: - return Math.log1p(value); + ret = Math.log1p(value); + break; case Exp: - return Math.exp(value); + ret = Math.exp(value); + break; case SquareRoot: - return Math.sqrt(value); + ret = Math.sqrt(value); + break; case CubicRoot: - return Math.cbrt(value); + ret = Math.cbrt(value); + break; default: // Linear - return value; + ret = value; + break; } + return ret; } /** 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 2006-10-24 15:37:27 UTC (rev 66) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/provider/RandomColorProvider.java 2006-10-24 15:59:12 UTC (rev 67) @@ -105,6 +105,8 @@ * @author Laurent Dutheil */ protected class Legend extends JPanel { + private static final int OFFSET = 3; + private static final int X_OFFSET = 15; private static final int INITIAL_X_POS = 20; @@ -134,7 +136,7 @@ g.setColor(color); g.fillRect(this.x, Legend.Y, Legend.WIDTH, Legend.HEIGHT); g.setColor(Color.black); - x = x + Legend.WIDTH + 3; + x = x + Legend.WIDTH + OFFSET; g.drawString(value.getLabel(), x, yString); x = x + fm.stringWidth(value.getLabel()) + X_OFFSET; } Modified: trunk/KTreeMap/qalab.xml =================================================================== --- trunk/KTreeMap/qalab.xml 2006-10-24 15:37:27 UTC (rev 66) +++ trunk/KTreeMap/qalab.xml 2006-10-24 15:59:12 UTC (rev 67) @@ -25,6 +25,10 @@ <summaryresult date="2006-10-23" filecount="1" statvalue="4" type="pmd"/> <summaryresult date="2006-10-23" filecount="6" statvalue="7" type="findbugs"/> <summaryresult date="2006-10-23" filecount="2" statvalue="34" type="simian"/> + <summaryresult date="2006-10-24" filecount="22" statvalue="136" type="checkstyle"/> + <summaryresult date="2006-10-24" filecount="1" statvalue="4" type="pmd"/> + <summaryresult date="2006-10-24" filecount="6" statvalue="7" type="findbugs"/> + <summaryresult date="2006-10-24" filecount="2" statvalue="34" type="simian"/> </summary> <file id="org_jense_ktreemap_example_package.html" path="org/jense/ktreemap/example/package.html"> <result date="2006-10-18" statvalue="1" type="checkstyle"/> @@ -88,34 +92,45 @@ </file> <file id="net_sf_jtreemap_ktreemap_package.html" path="net/sf/jtreemap/ktreemap/package.html"> <result date="2006-10-23" statvalue="1" type="checkstyle"/> + <result date="2006-10-24" statvalue="1" type="checkstyle"/> </file> <file id="net_sf_jtreemap_ktreemap_example_package.html" path="net/sf/jtreemap/ktreemap/example/package.html"> <result date="2006-10-23" statvalue="1" type="checkstyle"/> + <result date="2006-10-24" statvalue="1" type="checkstyle"/> </file> <file id="net_sf_jtreemap_ktreemap_ITreeMapColorProvider.java" path="net/sf/jtreemap/ktreemap/ITreeMapColorProvider.java"> <result date="2006-10-23" statvalue="1" type="checkstyle"/> + <result date="2006-10-24" statvalue="1" type="checkstyle"/> </file> <file id="net_sf_jtreemap_ktreemap_ITreeMapProvider.java" path="net/sf/jtreemap/ktreemap/ITreeMapProvider.java"> <result date="2006-10-23" statvalue="3" type="checkstyle"/> + <result date="2006-10-24" statvalue="3" type="checkstyle"/> </file> <file id="net_sf_jtreemap_ktreemap_KTreeMap.java" path="net/sf/jtreemap/ktreemap/KTreeMap.java"> <result date="2006-10-23" statvalue="12" type="checkstyle"/> + <result date="2006-10-24" statvalue="12" type="checkstyle"/> </file> <file id="net_sf_jtreemap_ktreemap_SplitSquarified.java" path="net/sf/jtreemap/ktreemap/SplitSquarified.java"> <result date="2006-10-23" statvalue="12" type="checkstyle"/> + <result date="2006-10-24" statvalue="12" type="checkstyle"/> </file> <file id="net_sf_jtreemap_ktreemap_SplitStrategy.java" path="net/sf/jtreemap/ktreemap/SplitStrategy.java"> <result date="2006-10-23" statvalue="3" type="checkstyle"/> + <result date="2006-10-24" statvalue="3" type="checkstyle"/> </file> <file id="net_sf_jtreemap_ktreemap_TreeMapNode.java" path="net/sf/jtreemap/ktreemap/TreeMapNode.java"> <result date="2006-10-23" statvalue="4" type="checkstyle"/> + <result date="2006-10-24" statvalue="4" type="checkstyle"/> </file> <file id="net_sf_jtreemap_ktreemap_example_BuilderTM3.java" path="net/sf/jtreemap/ktreemap/example/BuilderTM3.java"> <result date="2006-10-23" statvalue="1" type="checkstyle"/> <result date="2006-10-23" statvalue="1" type="findbugs"/> + <result date="2006-10-24" statvalue="1" type="checkstyle"/> + <result date="2006-10-24" statvalue="1" type="findbugs"/> </file> <file id="net_sf_jtreemap_ktreemap_example_BuilderXML.java" path="net/sf/jtreemap/ktreemap/example/BuilderXML.java"> <result date="2006-10-23" statvalue="2" type="checkstyle"/> + <result date="2006-10-24" statvalue="2" type="checkstyle"/> </file> <file id="net_sf_jtreemap_ktreemap_example_HSBTreeMapColorProvider.java" path="net/sf/jtreemap/ktreemap/example/HSBTreeMapColorProvider.java"> @@ -124,18 +139,28 @@ <result date="2006-10-23" statvalue="47" type="checkstyle"/> <result date="2006-10-23" statvalue="1" type="findbugs"/> <result date="2006-10-23" statvalue="1" type="findbugs"/> + <result date="2006-10-24" statvalue="47" type="checkstyle"/> + <result date="2006-10-24" statvalue="1" type="findbugs"/> + <result date="2006-10-24" statvalue="1" type="findbugs"/> </file> <file id="net_sf_jtreemap_ktreemap_example_KTreeMapView.java" path="net/sf/jtreemap/ktreemap/example/KTreeMapView.java"> <result date="2006-10-23" statvalue="15" type="checkstyle"/> <result date="2006-10-23" statvalue="1" type="findbugs"/> + <result date="2006-10-24" statvalue="15" type="checkstyle"/> + <result date="2006-10-24" statvalue="1" type="findbugs"/> </file> <file id="net_sf_jtreemap_ktreemap_example_ResourceManager.java" path="net/sf/jtreemap/ktreemap/example/ResourceManager.java"> <result date="2006-10-23" statvalue="32" type="checkstyle"/> <result date="2006-10-23" statvalue="4" type="pmd"/> <result date="2006-10-23" statvalue="1" type="findbugs"/> + <result date="2006-10-24" statvalue="32" type="checkstyle"/> + <result date="2006-10-24" statvalue="4" type="pmd"/> + <result date="2006-10-24" statvalue="1" type="findbugs"/> </file> <file id="net_sf_jtreemap_ktreemap_example_TM3Bean.java" path="net/sf/jtreemap/ktreemap/example/TM3Bean.java"> <result date="2006-10-23" statvalue="2" type="checkstyle"/> <result date="2006-10-23" statvalue="2" type="findbugs"/> + <result date="2006-10-24" statvalue="2" type="checkstyle"/> + <result date="2006-10-24" statvalue="2" type="findbugs"/> </file> </qalab> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <be...@us...> - 2006-10-24 15:37:49
|
Revision: 66 http://svn.sourceforge.net/jtreemap/?rev=66&view=rev Author: benoitx Date: 2006-10-24 08:37:27 -0700 (Tue, 24 Oct 2006) Log Message: ----------- Worked on checkstyle issues. Modified Paths: -------------- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/DefaultToolTip.java trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/DefaultValue.java trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/JTreeMap.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/JTreeMapAppletExample.java trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/example/JTreeMapExample.java Added Paths: ----------- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/ValuePercent.java trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/example/DemoUtil.java trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/example/package.html trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/package.html trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/provider/ 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/ZoomPopupMenu.java trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/provider/package.html Removed Paths: ------------- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/example/HSBTreeMapColorProvider.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/DefaultToolTip.java =================================================================== --- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/DefaultToolTip.java 2006-10-24 11:38:30 UTC (rev 65) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/DefaultToolTip.java 2006-10-24 15:37:27 UTC (rev 66) @@ -16,6 +16,12 @@ * @author Laurent DUTHEIL */ public class DefaultToolTip extends JToolTip { + private static final int TOOLTIP_OFFSET = 5; + + private static final int DEFAULT_VALUE_SIZE = 10; + + private static final int DEFAULT_LABEL_SIZE = 14; + private static final long serialVersionUID = -2492627777999093973L; private JTreeMap jTreeMap; @@ -32,8 +38,8 @@ */ public DefaultToolTip(final JTreeMap jTreeMap) { this.jTreeMap = jTreeMap; - this.labelFont = new Font("Default", Font.BOLD, 14); - this.valueFont = new Font("Default", Font.PLAIN, 10); + this.labelFont = new Font("Default", Font.BOLD, DEFAULT_LABEL_SIZE); + this.valueFont = new Font("Default", Font.PLAIN, DEFAULT_VALUE_SIZE); final int width = 160; final int height = getFontMetrics(this.labelFont).getHeight() + getFontMetrics(this.valueFont).getHeight(); @@ -50,9 +56,9 @@ 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.drawString(this.jTreeMap.getActiveLeaf().getLabel(), TOOLTIP_OFFSET, g.getFontMetrics(this.labelFont).getAscent()); g.setFont(this.valueFont); - g.drawString(this.jTreeMap.getActiveLeaf().getLabelValue(), 5, this.getHeight() - 5); + g.drawString(this.jTreeMap.getActiveLeaf().getLabelValue(), TOOLTIP_OFFSET, this.getHeight() - TOOLTIP_OFFSET); } } 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 11:38:30 UTC (rev 65) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/DefaultValue.java 2006-10-24 15:37:27 UTC (rev 66) @@ -14,6 +14,7 @@ * */ private static final long serialVersionUID = 367321198951855282L; + private double value; /** 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 11:38:30 UTC (rev 65) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/JTreeMap.java 2006-10-24 15:37:27 UTC (rev 66) @@ -33,9 +33,17 @@ * @author Laurent Dutheil */ public class JTreeMap extends JComponent { + 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 transparencyColor = new Color(204, 204, 204, 128); + private static final Color TRANSPARENCY_COLOR = new Color(204, 204, 204, 128); // active leaf private TreeMapNode activeLeaf = null; @@ -87,21 +95,21 @@ final ToolTipManager ttm = ToolTipManager.sharedInstance(); ttm.setInitialDelay(0); ttm.setReshowDelay(0); - ttm.setDismissDelay(100000); + ttm.setDismissDelay(DISMISS_DELAY_MS); ttm.setEnabled(true); ttm.setLightWeightPopupEnabled(true); - this.setToolTipText(""); + setToolTipText(""); // the default DefaultToolTipBuilder - this.toolTipBuilder = new DefaultToolTipBuilder(this); + toolTipBuilder = new DefaultToolTipBuilder(this); - this.zoom = new Zoom(); + zoom = new Zoom(); - this.setRoot(root); - this.setStrategy(strategy); - this.setColorProvider(new UniqueColorProvider()); + setRoot(root); + setStrategy(strategy); + setColorProvider(new UniqueColorProvider()); - this.addMouseMotionListener(new HandleMouseMotion()); + addMouseMotionListener(new HandleMouseMotion()); } /** @@ -109,14 +117,14 @@ * The positions of the root must be calculated first. */ public void calculatePositions() { - if (this.getStrategy() != null && this.displayedRoot != null) { - this.getStrategy().calculatePositions(this.displayedRoot); + if (this.getStrategy() != null && displayedRoot != null) { + getStrategy().calculatePositions(this.displayedRoot); } } @Override public JToolTip createToolTip() { - return this.toolTipBuilder.getToolTip(); + return toolTipBuilder.getToolTip(); } /** @@ -159,13 +167,13 @@ 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) { + if (item.getWidth() - BORDER_FOR_FONT <= 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) { + if (nbChar > MAX_NUM_CHAR) { // and add "..." at the end - label = label.substring(0, nbChar - 3) + "..."; + label = label.substring(0, nbChar - MAX_NUM_CHAR) + "..."; } else { // if it is not enough large, we display nothing label = ""; @@ -204,18 +212,18 @@ // add the labels (level -1) g.setFont(this.getFont()); if (this.displayedRoot.isLeaf()) { - drawLabel(g, this.displayedRoot); + drawLabel(g, displayedRoot); } else { - for (final Enumeration e = this.displayedRoot.children(); e.hasMoreElements();) { + for (final Enumeration e = displayedRoot.children(); e.hasMoreElements();) { drawLabel(g, (TreeMapNode) (e.nextElement())); } } /* 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()); + // int depth = item.getLevel() - displayedRoot.getLevel(); + // float newSize = Math.max(20, getFont().getSize2D()); // java.awt.Font labelFont = - // this.getFont().deriveFont(java.awt.Font.BOLD, + // getFont().deriveFont(java.awt.Font.BOLD, // newSize - 3 * depth); // g.setFont(labelFont); // if (depth > 2) { @@ -237,7 +245,7 @@ * @return Returns the activeLeaf. */ public TreeMapNode getActiveLeaf() { - return this.activeLeaf; + return activeLeaf; } /** @@ -246,7 +254,7 @@ * @return the ColorProvider */ public ColorProvider getColorProvider() { - return this.colorProvider; + return colorProvider; } /** @@ -259,7 +267,7 @@ * @return the displayed root */ public TreeMapNode getDisplayedRoot() { - return this.displayedRoot; + return displayedRoot; } /** @@ -268,7 +276,7 @@ * @return the root */ public TreeMapNode getRoot() { - return this.root; + return root; } /** @@ -277,30 +285,31 @@ * @return the SplitStrategy */ public SplitStrategy getStrategy() { - return this.strategy; + return strategy; } @Override public Point getToolTipLocation(final MouseEvent event) { int posX; int posY; - final JToolTip toolTip = this.createToolTip(); - final int XMax = this.displayedRoot.getX() + this.displayedRoot.getWidth(); - final int YMin = this.displayedRoot.getY(); + final JToolTip toolTip = createToolTip(); + final int xMax = displayedRoot.getX() + displayedRoot.getWidth(); + final int yMin = 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; + if (this.activeLeaf.getWidth() >= toolTip.getWidth() + 2 * INSET + && activeLeaf.getHeight() >= toolTip.getHeight() + 2 * INSET) { + posX = activeLeaf.getX() + INSET; + posY = activeLeaf.getY() + INSET; } else { - posX = this.activeLeaf.getX() + this.activeLeaf.getWidth() + 4; - posY = this.activeLeaf.getY() - toolTip.getHeight() - 4; + posX = activeLeaf.getX() + activeLeaf.getWidth() + INSET; + posY = activeLeaf.getY() - toolTip.getHeight() - INSET; } - if (posY < YMin + 4) { - posY = YMin + 4; + if (posY < yMin + INSET) { + posY = yMin + INSET; } - if ((posX + toolTip.getWidth() > XMax - 4) && (this.activeLeaf.getX() >= toolTip.getWidth() + 4)) { - posX = this.activeLeaf.getX() - 4 - toolTip.getWidth(); + if ((posX + toolTip.getWidth() > xMax - INSET) && (this.activeLeaf.getX() >= toolTip.getWidth() + INSET)) { + posX = activeLeaf.getX() - INSET - toolTip.getWidth(); } return new Point(posX, posY); @@ -321,29 +330,30 @@ final Insets insets = getInsets(); final int border = TreeMapNode.getBorder(); - this.root.setDimension(this.root.getX(), this.root.getY(), width - border - insets.left - insets.right, height - border + root.setDimension(this.root.getX(), 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 + displayedRoot.setDimension(this.displayedRoot.getX(), displayedRoot.getY(), width - border - insets.left - insets.right, height - border - insets.top - insets.bottom); } - this.calculatePositions(); + 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); + g.fillRect(this.displayedRoot.getX(), displayedRoot.getY(), displayedRoot.getWidth() + border, displayedRoot + .getHeight() + + border); // the JTreeMapExample - draw(g, this.displayedRoot); + draw(g, displayedRoot); // reveal the active leaf if (this.activeLeaf != null) { - reveal(g, this.activeLeaf); + reveal(g, activeLeaf); } // the labels - drawLabels(g, this.displayedRoot); + drawLabels(g, displayedRoot); } } @@ -358,7 +368,7 @@ */ protected void reveal(final Graphics g, final TreeMapNode item) { if (item.isLeaf()) { - g.setColor(transparencyColor); + g.setColor(TRANSPARENCY_COLOR); g.fillRect(item.getX(), item.getY(), item.getWidth(), item.getHeight()); } } @@ -371,7 +381,7 @@ */ public void setActiveLeaf(final TreeMapNode newActiveLeaf) { if (newActiveLeaf == null || newActiveLeaf.isLeaf()) { - this.activeLeaf = newActiveLeaf; + activeLeaf = newActiveLeaf; } } @@ -384,17 +394,17 @@ public void setBorder(final Border border) { // Substract the previous border insets Insets insets = getInsets(); - this.displayedRoot.setDimension(this.displayedRoot.getX() - insets.left, this.displayedRoot.getY() - insets.top, - this.displayedRoot.getWidth() + insets.left + insets.right, this.displayedRoot.getHeight() + insets.top - + insets.bottom); + displayedRoot.setDimension(this.displayedRoot.getX() - insets.left, displayedRoot.getY() - insets.top, displayedRoot + .getWidth() + + insets.left + insets.right, displayedRoot.getHeight() + insets.top + insets.bottom); super.setBorder(border); // Add the new border insets insets = getInsets(); - this.displayedRoot.setDimension(this.displayedRoot.getX() + insets.left, this.displayedRoot.getY() + insets.top, - this.displayedRoot.getWidth() - insets.left - insets.right, this.displayedRoot.getHeight() - insets.top - - insets.bottom); + displayedRoot.setDimension(this.displayedRoot.getX() + insets.left, displayedRoot.getY() + insets.top, displayedRoot + .getWidth() + - insets.left - insets.right, displayedRoot.getHeight() - insets.top - insets.bottom); } /** @@ -404,7 +414,7 @@ * the new ColorPorvider */ public void setColorProvider(final ColorProvider newColorProvider) { - this.colorProvider = newColorProvider; + colorProvider = newColorProvider; } /** @@ -418,7 +428,7 @@ * new DiplayedRoot */ public void setDisplayedRoot(final TreeMapNode newDisplayedRoot) { - this.displayedRoot = newDisplayedRoot; + displayedRoot = newDisplayedRoot; } /** @@ -428,11 +438,11 @@ * the new root to set */ public void setRoot(final TreeMapNode newRoot) { - this.root = newRoot; + root = newRoot; final Insets insets = getInsets(); - this.root.setX(insets.left); - this.root.setY(insets.top); - this.setDisplayedRoot(this.root); + root.setX(insets.left); + root.setY(insets.top); + setDisplayedRoot(this.root); } @@ -443,7 +453,7 @@ * the new strategy to set */ public void setStrategy(final SplitStrategy newStrat) { - this.strategy = newStrat; + strategy = newStrat; } /** @@ -464,14 +474,14 @@ * true if you want to keep proportions, else false */ public void setZoomKeepProportion(final boolean keepProportion) { - this.zoom.setKeepProportion(keepProportion); + zoom.setKeepProportion(keepProportion); } /** * Undo the zoom to display the root. */ public void unzoom() { - this.zoom.undo(); + zoom.undo(); } /** @@ -484,7 +494,7 @@ // undo the last zoom unzoom(); - this.zoom.execute(dest); + zoom.execute(dest); } /** @@ -530,7 +540,7 @@ * Constructor */ public Zoom() { - this.enable = true; + enable = true; } /** @@ -547,7 +557,7 @@ JTreeMap.this.setDisplayedRoot(dest); - this.enable = false; + enable = false; } } @@ -555,7 +565,7 @@ * @return Returns the keepProportion. */ public boolean isKeepProportion() { - return this.keepProportion; + return keepProportion; } /** @@ -605,10 +615,8 @@ public void undo() { if (!this.enable) { JTreeMap.this.setDisplayedRoot(JTreeMap.this.getRoot()); - this.enable = true; + enable = true; } } - } - } Modified: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitBySortedWeight.java =================================================================== --- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitBySortedWeight.java 2006-10-24 11:38:30 UTC (rev 65) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitBySortedWeight.java 2006-10-24 15:37:27 UTC (rev 66) @@ -1,6 +1,5 @@ package net.sf.jtreemap.swing; -import java.util.Iterator; import java.util.Vector; /** @@ -25,46 +24,11 @@ @Override public void splitElements(final Vector<TreeMapNode> v, final Vector<TreeMapNode> v1, final Vector<TreeMapNode> v2) { final Vector<TreeMapNode> vClone = new Vector<TreeMapNode>(v); - double memWeight = 0.0; final double sumWeight = sumWeight(v); - double elemWeight = 0.0; sortVector(vClone); - for (final Iterator<TreeMapNode> i = vClone.iterator(); i.hasNext();) { - TreeMapNode tmn = i.next(); - elemWeight = tmn.getWeight(); - // if adding the current element pass the middle of total weight - if (memWeight + elemWeight >= sumWeight / 2) { - // we look at the finest split (the nearest of the middle of - // weight) - if (((sumWeight / 2) - memWeight) > ((memWeight + elemWeight) - (sumWeight / 2))) { - // if it is after the add, we add the element to the first - // Vector - memWeight += elemWeight; - v1.addElement(tmn); - } else { - // we must have at least 1 element in the first vector - if (v1.isEmpty()) { - v1.addElement(tmn); - } else { - // if it is before the add, we add the element to the - // second Vector - v2.addElement(tmn); - } - } - // then we fill the second Vector qith the rest of elements - while (i.hasNext()) { - tmn = i.next(); - v2.addElement(tmn); - } - } else { - // we add in the first vector while we don't reach the middle of - // weight - memWeight += elemWeight; - v1.addElement(tmn); - } - } + 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 2006-10-24 11:38:30 UTC (rev 65) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitByWeight.java 2006-10-24 15:37:27 UTC (rev 66) @@ -1,6 +1,5 @@ package net.sf.jtreemap.swing; -import java.util.Iterator; import java.util.Vector; /** @@ -18,44 +17,29 @@ @Override public void splitElements(final Vector<TreeMapNode> v, final Vector<TreeMapNode> v1, final Vector<TreeMapNode> v2) { - double memWeight = 0.0; final double sumWeight = sumWeight(v); - double elemWeight = 0.0; - for (final Iterator<TreeMapNode> i = v.iterator(); i.hasNext();) { - TreeMapNode tmn = i.next(); - elemWeight = tmn.getWeight(); - // if adding the current element pass the middle of total weight - if (memWeight + elemWeight >= sumWeight / 2) { - // we look at the finest split (the nearest of the middle of - // weight) - if (((sumWeight / 2) - memWeight) > ((memWeight + elemWeight) - (sumWeight / 2))) { - // if it is after the add, we add the element to the first - // Vector - memWeight += elemWeight; - v1.addElement(tmn); - } else { - // we must have at least 1 element in the first vector - if (v1.isEmpty()) { - v1.addElement(tmn); - } else { - // if it is before the add, we add the element to the - // second Vector - v2.addElement(tmn); - } - } - // then we fill the second Vector qith the rest of elements - while (i.hasNext()) { - tmn = i.next(); - v2.addElement(tmn); - } - } else { - // we add in the first vector while we don't reach the middle of - // weight - memWeight += elemWeight; - v1.addElement(tmn); - } - } + workOutWeight(v, v1, v2, sumWeight); } + /* + * private double workoutWeight(final Vector<TreeMapNode> v, final Vector<TreeMapNode> + * v1, final Vector<TreeMapNode> v2, double memWeight, final double + * sumWeight) { double elemWeight; for (final Iterator<TreeMapNode> i = + * v.iterator(); i.hasNext();) { TreeMapNode tmn = i.next(); elemWeight = + * tmn.getWeight(); // if adding the current element pass the middle of + * total weight if (memWeight + elemWeight >= sumWeight / 2) { // we look at + * the finest split (the nearest of the middle of // weight) if (((sumWeight / + * 2) - memWeight) > ((memWeight + elemWeight) - (sumWeight / 2))) { // if + * it is after the add, we add the element to the first // Vector memWeight += + * elemWeight; v1.addElement(tmn); } else { // we must have at least 1 + * element in the first vector if (v1.isEmpty()) { v1.addElement(tmn); } + * else { // if it is before the add, we add the element to the // second + * Vector v2.addElement(tmn); } } // then we fill the second Vector qith the + * rest of elements while (i.hasNext()) { tmn = i.next(); + * v2.addElement(tmn); } } else { // we add in the first vector while we + * don't reach the middle of // weight memWeight += elemWeight; + * v1.addElement(tmn); } } return memWeight; } + * + */ } Modified: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitSquarified.java =================================================================== --- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitSquarified.java 2006-10-24 11:38:30 UTC (rev 65) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitSquarified.java 2006-10-24 15:37:27 UTC (rev 66) @@ -16,12 +16,26 @@ */ private static final long serialVersionUID = 1711898915283018450L; - private int w1, h1; + private int w1; - private int x, y, w, h; + private int h1; - private int x2, y2, w2, h2; + private int x; + private int y; + + private int w; + + private int h; + + private int x2; + + private int y2; + + private int w2; + + private int h2; + @Override public void splitElements(final Vector<TreeMapNode> v, final Vector<TreeMapNode> v1, final Vector<TreeMapNode> v2) { int mid = 0; @@ -106,13 +120,13 @@ splitElements(vClone, v1, v2); // before the recurence, we have to "save" the values for the 2nd // Vector - final int x2 = this.x2; - final int y2 = this.y2; - final int w2 = this.w2; - final int h2 = this.h2; + final int prevX2 = this.x2; + final int prevY2 = this.y2; + final int prevW2 = this.w2; + final int prevH2 = this.h2; SplitBySlice.splitInSlice(x0, y0, this.w1, this.h1, v1, sumWeight(v1)); calculateChildren(v1); - calculatePositionsRec(x2, y2, w2, h2, sumWeight(v2), v2); + calculatePositionsRec(prevX2, prevY2, prevW2, prevH2, sumWeight(v2), v2); } } @@ -133,16 +147,16 @@ if (node.isLeaf()) { node.setX(node.getX() + TreeMapNode.getBorder()); node.setY(node.getY() + TreeMapNode.getBorder()); - int w = node.getWidth() - TreeMapNode.getBorder(); - if (w < 0) { - w = 0; + int width = node.getWidth() - TreeMapNode.getBorder(); + if (width < 0) { + width = 0; } - int h = node.getHeight() - TreeMapNode.getBorder(); - if (h < 0) { - h = 0; + int height = node.getHeight() - TreeMapNode.getBorder(); + if (height < 0) { + height = 0; } - node.setHeight(h); - node.setWidth(w); + node.setHeight(height); + node.setWidth(width); } else { // if this is not a leaf, calculation for the children int bSub; @@ -154,17 +168,17 @@ bSub = 0; } - int w = node.getWidth() - bSub; - if (w < 0) { - w = 0; + int width = node.getWidth() - bSub; + if (width < 0) { + width = 0; } - int h = node.getHeight() - bSub; - if (h < 0) { - h = 0; + int height = node.getHeight() - bSub; + if (height < 0) { + height = 0; } TreeMapNode.setBorder(TreeMapNode.getBorder() - bSub); - calculatePositionsRec(node.getX() + bSub, node.getY() + bSub, w, h, node.getWeight(), node.getChildren()); + calculatePositionsRec(node.getX() + bSub, node.getY() + bSub, width, height, node.getWeight(), node.getChildren()); TreeMapNode.setBorder(TreeMapNode.getBorder() + bSub); } @@ -172,11 +186,11 @@ } private double normAspect(final double big, final double small, final double a, final double b) { - final double x = aspect(big, small, a, b); - if (x < 1) { - return 1 / x; + final double xCalc = aspect(big, small, a, b); + if (xCalc < 1) { + return 1 / xCalc; } - return x; + return xCalc; } } Modified: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitStrategy.java =================================================================== --- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitStrategy.java 2006-10-24 11:38:30 UTC (rev 65) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitStrategy.java 2006-10-24 15:37:27 UTC (rev 66) @@ -1,6 +1,7 @@ package net.sf.jtreemap.swing; import java.io.Serializable; +import java.util.Iterator; import java.util.Vector; /** @@ -112,13 +113,18 @@ // we split the Vector according to the selected strategy final Vector<TreeMapNode> v1 = new Vector<TreeMapNode>(); final Vector<TreeMapNode> v2 = new Vector<TreeMapNode>(); - double weight1, weight2; // poids des 2 vecteurs + double weight1; + double weight2; // poids des 2 vecteurs this.splitElements(v, v1, v2); weight1 = this.sumWeight(v1); weight2 = this.sumWeight(v2); - int w1, w2, h1, h2; - int x2, y2; + int w1; + int w2; + int h1; + int h2; + int x2; + int y2; // if width is greater than height, we split the width if (w0 > h0) { w1 = (int) (w0 * weight1 / weight0); @@ -163,4 +169,43 @@ } + 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();) { + TreeMapNode tmn = i.next(); + elemWeight = tmn.getWeight(); + // if adding the current element pass the middle of total weight + if (memWeight + elemWeight >= sumWeight / 2) { + // we look at the finest split (the nearest of the middle of + // weight) + if (((sumWeight / 2) - memWeight) > ((memWeight + elemWeight) - (sumWeight / 2))) { + // if it is after the add, we add the element to the first + // Vector + memWeight += elemWeight; + v1.addElement(tmn); + } else { + // we must have at least 1 element in the first vector + if (v1.isEmpty()) { + v1.addElement(tmn); + } else { + // if it is before the add, we add the element to the + // second Vector + v2.addElement(tmn); + } + } + // then we fill the second Vector qith the rest of elements + while (i.hasNext()) { + tmn = i.next(); + v2.addElement(tmn); + } + } else { + // we add in the first vector while we don't reach the middle of + // weight + memWeight += elemWeight; + v1.addElement(tmn); + } + } + } } Modified: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/TreeMapNode.java =================================================================== --- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/TreeMapNode.java 2006-10-24 11:38:30 UTC (rev 65) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/TreeMapNode.java 2006-10-24 15:37:27 UTC (rev 66) @@ -97,25 +97,25 @@ * get the active leaf.<BR> * null if the passed position is not in this tree. * - * @param x + * @param xParam * x-coordinate - * @param y + * @param yParam * y-coordinate * @return active leaf */ - public TreeMapNode getActiveLeaf(final int x, final int y) { + public TreeMapNode getActiveLeaf(final int xParam, final int yParam) { if (this.isLeaf()) { - if ((x >= this.getX()) && (x <= this.getX() + this.getWidth()) && (y >= this.getY()) - && (y <= this.getY() + this.getHeight())) { + if ((xParam >= this.getX()) && (xParam <= this.getX() + this.getWidth()) && (yParam >= this.getY()) + && (yParam <= this.getY() + this.getHeight())) { return this; } } else { for (final Enumeration e = this.children(); e.hasMoreElements();) { final TreeMapNode node = (TreeMapNode) (e.nextElement()); - if ((x >= node.getX()) && (x <= node.getX() + node.getWidth()) && (y >= node.getY()) - && (y <= node.getY() + node.getHeight())) { - return node.getActiveLeaf(x, y); + if ((xParam >= node.getX()) && (xParam <= node.getX() + node.getWidth()) && (yParam >= node.getY()) + && (yParam <= node.getY() + node.getHeight())) { + return node.getActiveLeaf(xParam, yParam); } } } @@ -126,18 +126,18 @@ * get the first child which fits the position.<BR> * null if the passed position is not in this tree. * - * @param x + * @param xParam * x-coordinate - * @param y + * @param yParam * y-coordinate * @return the first child which fits the position. */ - public TreeMapNode getChild(final int x, final int y) { + public TreeMapNode getChild(final int xParam, final int yParam) { if (!this.isLeaf()) { for (final Enumeration e = this.children(); e.hasMoreElements();) { final TreeMapNode node = (TreeMapNode) (e.nextElement()); - if ((x >= node.getX()) && (x <= node.getX() + node.getWidth()) && (y >= node.getY()) - && (y <= node.getY() + node.getHeight())) { + if ((xParam >= node.getX()) && (xParam <= node.getX() + node.getWidth()) && (yParam >= node.getY()) + && (yParam <= node.getY() + node.getHeight())) { return node; } } @@ -240,20 +240,20 @@ /** * set the position and the size. * - * @param x + * @param xParam * x-coordinate - * @param y + * @param yParam * y-coordinate - * @param width + * @param widthParam * the new width - * @param height + * @param heightParam * the new height */ - public void setDimension(final int x, final int y, final int width, final int height) { - this.x = x; - this.y = y; - this.width = width; - this.height = height; + public void setDimension(final int xParam, final int yParam, final int widthParam, final int heightParam) { + this.x = xParam; + this.y = yParam; + this.width = widthParam; + this.height = heightParam; } /** @@ -279,27 +279,27 @@ /** * set the position. * - * @param x + * @param xParam * x-coordinate - * @param y + * @param yParam * y-coordinate */ - public void setPosition(final int x, final int y) { - this.x = x; - this.y = y; + public void setPosition(final int xParam, final int yParam) { + this.x = xParam; + this.y = yParam; } /** * set size. * - * @param width + * @param widthParam * the new width - * @param height + * @param heightParam * the new height */ - public void setSize(final int width, final int height) { - this.width = width; - this.height = height; + public void setSize(final int widthParam, final int heightParam) { + this.width = widthParam; + this.height = heightParam; } /** Modified: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/TreeMapNodeBuilder.java =================================================================== --- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/TreeMapNodeBuilder.java 2006-10-24 11:38:30 UTC (rev 65) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/TreeMapNodeBuilder.java 2006-10-24 15:37:27 UTC (rev 66) @@ -13,6 +13,7 @@ * */ private static final long serialVersionUID = -1340499387405510692L; + private TreeMapNode root; /** Modified: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/UniqueColorProvider.java =================================================================== --- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/UniqueColorProvider.java 2006-10-24 11:38:30 UTC (rev 65) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/UniqueColorProvider.java 2006-10-24 15:37:27 UTC (rev 66) @@ -22,7 +22,7 @@ */ private static final long serialVersionUID = -7571926934516139432L; - private final static Color defaultColor = new Color(153, 153, 51); + private static final Color DEFAULT_COLOR = new Color(153, 153, 51); private Color color; @@ -32,7 +32,7 @@ * Constructor. */ public UniqueColorProvider() { - this.color = defaultColor; + this.color = DEFAULT_COLOR; } /** @@ -74,6 +74,14 @@ * @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"; @@ -82,14 +90,14 @@ * Constructor. */ public Legend() { - this.setPreferredSize(new java.awt.Dimension(100, 40)); + 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, 20, 20); + g.drawString(Legend.TEXT, LEGEND_X_POS, LEGEND_Y_POS); } } } Modified: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/Value.java =================================================================== --- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/Value.java 2006-10-24 11:38:30 UTC (rev 65) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/Value.java 2006-10-24 15:37:27 UTC (rev 66) @@ -9,6 +9,9 @@ */ public abstract class Value implements Comparable, Serializable { + private static final int SHIFT = 32; + private static final int PRIME = 31; + /** * get the double value. * @@ -41,11 +44,10 @@ @Override public int hashCode() { - final int PRIME = 31; int result = super.hashCode(); long temp; temp = Double.doubleToLongBits(getValue()); - result = PRIME * result + (int) (temp ^ (temp >>> 32)); + result = PRIME * result + (int) (temp ^ (temp >>> SHIFT)); return result; } Added: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/ValuePercent.java =================================================================== --- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/ValuePercent.java (rev 0) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/ValuePercent.java 2006-10-24 15:37:27 UTC (rev 66) @@ -0,0 +1,66 @@ +package net.sf.jtreemap.swing; + +import java.text.NumberFormat; + + +/** + * class who can display the values of elements of a JTreeMap with pourcent + * + * @author Laurent Dutheil + */ + +public class ValuePercent extends Value { + /** + * + */ + private static final long serialVersionUID = 1087258219010392928L; + + private double value; + + private NumberFormat nf; + + /** + * Constructor of ValuePercent + */ + public ValuePercent() { + this.nf = NumberFormat.getInstance(); + this.nf.setMaximumFractionDigits(2); + this.nf.setMinimumFractionDigits(2); + this.nf.setMinimumIntegerDigits(1); + } + + /** + * Constructor of ValuePercent + * + * @param value + * double value + */ + public ValuePercent(final double value) { + this(); + this.value = value; + } + + @Override + public void setValue(final double d) { + this.value = d; + } + + @Override + public void setLabel(final String stLibelle) { + // ignore + } + + @Override + public double getValue() { + return this.value; + } + + @Override + public String getLabel() { + if (this.value >= 0) { + return "+" + this.nf.format(this.value) + " %"; + } + return this.nf.format(this.value) + " %"; + } + +} 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 2006-10-24 11:38:30 UTC (rev 65) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/example/BuilderTM3.java 2006-10-24 15:37:27 UTC (rev 66) @@ -56,11 +56,11 @@ private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("MM/dd/yyyy"); - private static final LinkedList<String> fieldNames = new LinkedList<String>(); + private static final LinkedList<String> FIELD_NAMES = new LinkedList<String>(); - private static final LinkedList<String> fieldTypes = new LinkedList<String>(); + private static final LinkedList<String> FIELD_TYPES = new LinkedList<String>(); - private static final HashMap<TreeMapNode, HashMap<String, Object>> values = new HashMap<TreeMapNode, HashMap<String, Object>>(); + private static final HashMap<TreeMapNode, HashMap<String, Object>> VALUES = new HashMap<TreeMapNode, HashMap<String, Object>>(); private TreeMapNodeBuilder builder; @@ -81,10 +81,10 @@ */ public String[] getNumberFields() { final TreeSet<String> result = new TreeSet<String>(); - for (int i = 0; i < fieldNames.size(); i++) { - final String type = fieldTypes.get(i); + for (int i = 0; i < FIELD_NAMES.size(); i++) { + final String type = FIELD_TYPES.get(i); if (INTEGER.equals(type) || FLOAT.equals(type)) { - result.add(fieldNames.get(i)); + result.add(FIELD_NAMES.get(i)); } } return result.toArray(new String[1]); @@ -100,19 +100,19 @@ } /** - * Set the values of all the JTreeMapNode with the values of the fieldName. + * Set the VALUES of all the JTreeMapNode with the VALUES of the fieldName. * * @param fieldName - * name of the field to set the values + * name of the field to set the VALUES */ public void setValues(final String fieldName) { if ("".equals(fieldName)) { - for (final TreeMapNode node : values.keySet()) { + for (final TreeMapNode node : VALUES.keySet()) { node.setValue(new DefaultValue(0)); } } else { - for (final TreeMapNode node : values.keySet()) { - final HashMap<String, Object> mapNodeValues = values.get(node); + for (final TreeMapNode node : VALUES.keySet()) { + final HashMap<String, Object> mapNodeValues = VALUES.get(node); final Object value = mapNodeValues.get(fieldName); if (value instanceof Number) { final Number number = (Number) value; @@ -126,19 +126,19 @@ } /** - * Set the weights of all the JTreeMapNode with the values of the fieldName. + * Set the weights of all the JTreeMapNode with the VALUES of the fieldName. * * @param fieldName * name of the field to set the weights */ public void setWeights(final String fieldName) { if ("".equals(fieldName)) { - for (final TreeMapNode node : values.keySet()) { + for (final TreeMapNode node : VALUES.keySet()) { node.setWeight(1); } } else { - for (final TreeMapNode node : values.keySet()) { - final HashMap<String, Object> mapNodeValues = values.get(node); + for (final TreeMapNode node : VALUES.keySet()) { + final HashMap<String, Object> mapNodeValues = VALUES.get(node); final Object value = mapNodeValues.get(fieldName); if (value instanceof Number) { final Number number = (Number) value; @@ -155,7 +155,7 @@ * @param st * StringTokenizer which contains the hierarchy path * @param mapNodeValues - * HashMap with fields and their values + * HashMap with fields and their VALUES */ private void createNodes(final StringTokenizer st, final HashMap<String, Object> mapNodeValues) { // read the hierarchy path @@ -188,8 +188,8 @@ // create the leaf final TreeMapNode leaf = this.builder.buildLeaf(hierarchyPath.getLast(), 1, new DefaultValue(), node); - // each leaf is associated to their values - values.put(leaf, mapNodeValues); + // each leaf is associated to their VALUES + VALUES.put(leaf, mapNodeValues); } /** @@ -205,32 +205,32 @@ // read the field names line = in.readLine(); StringTokenizer st = new StringTokenizer(line, "\t"); - fieldNames.clear(); + FIELD_NAMES.clear(); while (st.hasMoreTokens()) { - fieldNames.add(st.nextToken()); + FIELD_NAMES.add(st.nextToken()); } // read the field types line = in.readLine(); st = new StringTokenizer(line, "\t"); - fieldTypes.clear(); + FIELD_TYPES.clear(); while (st.hasMoreTokens()) { - fieldTypes.add(st.nextToken()); + FIELD_TYPES.add(st.nextToken()); } - // read the values - values.clear(); + // read the VALUES + VALUES.clear(); while ((line = in.readLine()) != null) { st = new StringTokenizer(line, "\t"); final HashMap<String, Object> mapNodeValues = new HashMap<String, Object>(); - // the values are formated - for (int i = 0; i < fieldNames.size(); i++) { + // the VALUES are formated + for (int i = 0; i < FIELD_NAMES.size(); i++) { Object value; - if (FLOAT.equals(fieldTypes.get(i))) { + if (FLOAT.equals(FIELD_TYPES.get(i))) { value = new Double(Double.parseDouble(st.nextToken())); - } else if (INTEGER.equals(fieldTypes.get(i))) { + } else if (INTEGER.equals(FIELD_TYPES.get(i))) { value = new Integer(Integer.parseInt(st.nextToken())); - } else if (DATE.equals(fieldTypes.get(i))) { + } else if (DATE.equals(FIELD_TYPES.get(i))) { try { value = DATE_FORMAT.parse(st.nextToken()); } catch (final ParseException e) { @@ -239,7 +239,7 @@ } else { value = st.nextToken(); } - mapNodeValues.put(fieldNames.get(i), value); + mapNodeValues.put(FIELD_NAMES.get(i), value); } // if we have not the path (the node names of parents) 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 2006-10-24 11:38:30 UTC (rev 65) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/example/BuilderXML.java 2006-10-24 15:37:27 UTC (rev 66) @@ -11,6 +11,7 @@ import net.sf.jtreemap.swing.TreeMapNode; import net.sf.jtreemap.swing.TreeMapNodeBuilder; import net.sf.jtreemap.swing.Value; +import net.sf.jtreemap.swing.ValuePercent; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -90,12 +91,10 @@ final double weight = Double.valueOf(weightString).doubleValue(); this.builder.buildLeaf(label, weight, value, tmn); - } } } - } private void parse(final String stFileName) throws ParseException { @@ -115,7 +114,5 @@ } catch (final IOException e) { throw new ParseException("The file don't correspond to the TreeMap.dtd (" + e.getMessage() + ")", 0); } - } - } Added: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/example/DemoUtil.java =================================================================== --- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/example/DemoUtil.java (rev 0) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/example/DemoUtil.java 2006-10-24 15:37:27 UTC (rev 66) @@ -0,0 +1,163 @@ +/** + * + */ +package net.sf.jtreemap.swing.example; + +import net.sf.jtreemap.swing.TreeMapNode; +import net.sf.jtreemap.swing.TreeMapNodeBuilder; +import net.sf.jtreemap.swing.Value; +import net.sf.jtreemap.swing.ValuePercent; + +/** + * @author xhensevb + * + */ +public final class DemoUtil { + private DemoUtil() { + } + + /** + * This method build a default TreeMap root. <BR> + * This methode may be replaced by one who get the root from a servlet or a + * jdbc client or something else... + * + * @return the root of the TreeMap. + */ + public static TreeMapNode buildDemoRoot() { + final TreeMapNodeBuilder builder = new TreeMapNodeBuilder(); + + final TreeMapNode rootNode = builder.buildBranch("Root", null); + final TreeMapNode tmn1 = builder.buildBranch("branch1", rootNode); + final TreeMapNode tmn11 = builder.buildBranch("branch11", tmn1); + Value value = new ValuePercent(0.45); + builder.buildLeaf("leaf111", 1.0, value, tmn11); + value = new ValuePercent(-5.0); + builder.buildLeaf("leaf112", 2.0, value, tmn11); + value = new ValuePercent(2.0); + builder.buildLeaf("leaf113", 0.5, value, tmn11); + value = new ValuePercent(2.0); + builder.buildLeaf("leaf114", 3.0, value, tmn11); + value = new ValuePercent(-5.0); + builder.buildLeaf("leaf115", 0.25, value, tmn11); + final TreeMapNode tmn12 = builder.buildBranch("branch12", tmn1); + value = new ValuePercent(1.0); + builder.buildLeaf("leaf121", 1.0, value, tmn12); + value = new ValuePercent(5.0); + builder.buildLeaf("leaf122", 2.0, value, tmn12); + value = new ValuePercent(2.0); + builder.buildLeaf("leaf123", 0.5, value, tmn12); + value = new ValuePercent(-2.0); + builder.buildLeaf("leaf124", 3.0, value, tmn12); + value = new ValuePercent(0.0); + builder.buildLeaf("leaf125", 0.25, value, tmn12); + final TreeMapNode tmn13 = builder.buildBranch("branch13", tmn1); + value = new ValuePercent(1.0); + builder.buildLeaf("leaf131", 1.0, value, tmn13); + value = new ValuePercent(5.0); + builder.buildLeaf("leaf132", 2.0, value, tmn13); + value = new ValuePercent(2.0); + builder.buildLeaf("leaf133", 0.5, value, tmn13); + value = new ValuePercent(2.0); + builder.buildLeaf("leaf134", 3.0, value, tmn13); + value = new ValuePercent(2.0); + builder.buildLeaf("leaf14", 3.0, value, tmn1); + value = new ValuePercent(-5.0); + builder.buildLeaf("leaf15", 2.0, value, tmn1); + final TreeMapNode tmn2 = builder.buildBranch("branch2", rootNode); + final TreeMapNode tmn21 = builder.buildBranch("branch21", tmn2); + value = new ValuePercent(-1.0); + builder.buildLeaf("leaf211", 1.0, value, tmn21); + value = new ValuePercent(-5.0); + builder.buildLeaf("leaf212", 2.0, value, tmn21); + value = new ValuePercent(2.0); + builder.buildLeaf("leaf213", 0.5, value, tmn21); + value = new ValuePercent(2.0); + builder.buildLeaf("leaf214", 3.0, value, tmn21); + value = new ValuePercent(5.0); + builder.buildLeaf("leaf215", 0.25, value, tmn21); + final TreeMapNode tmn22 = builder.buildBranch("branch22", tmn2); + value = new ValuePercent(1.0); + builder.buildLeaf("leaf221", 1.0, value, tmn22); + value = new ValuePercent(5.0); + builder.buildLeaf("leaf222", 2.0, value, tmn22); + value = new ValuePercent(2.0); + builder.buildLeaf("leaf223", 0.5, value, tmn22); + value = new ValuePercent(2.0); + builder.buildLeaf("leaf224", 3.0, value, tmn22); + final TreeMapNode tmn3 = builder.buildBranch("branch3", rootNode); + final TreeMapNode tmn31 = builder.buildBranch("branch31", tmn3); + value = new ValuePercent(-1.0); + builder.buildLeaf("leaf311", 1.0, value, tmn31); + value = new ValuePercent(-5.0); + builder.buildLeaf("leaf312", 2.0, value, tmn31); + value = new ValuePercent(-2.0); + builder.buildLeaf("leaf313", 0.5, value, tmn31); + value = new ValuePercent(-2.0); + builder.buildLeaf("leaf314", 3.0, value, tmn31); + value = new ValuePercent(-5.0); + builder.buildLeaf("leaf315", 0.25, value, tmn31); + final TreeMapNode tmn32 = builder.buildBranch("branch32", tmn3); + value = new ValuePercent(-1.0); + builder.buildLeaf("leaf321", 1.0, value, tmn32); + value = new ValuePercent(-5.0); + builder.buildLeaf("leaf322", 2.0, value, tmn32); + value = new ValuePercent(0.0); + builder.buildLeaf("leaf323", 0.5, value, tmn32); + value = new ValuePercent(2.0); + builder.buildLeaf("leaf324", 3.0, value, tmn32); + value = new ValuePercent(-5.0); + builder.buildLeaf("leaf325", 0.25, value, tmn32); + final TreeMapNode tmn33 = builder.buildBranch("branch33", tmn3); + value = new ValuePercent(-1.0); + builder.buildLeaf("leaf331", 1.0, value, tmn33); + value = new ValuePercent(5.0); + builder.buildLeaf("leaf332", 2.0, value, tmn33); + value = new ValuePercent(2.0); + builder.buildLeaf("leaf333", 0.5, value, tmn33); + value = new ValuePercent(-2.0); + builder.buildLeaf("leaf334", 3.0, value, tmn33); + final TreeMapNode tmn34 = builder.buildBranch("branch34", tmn3); + value = new ValuePercent(-1.0); + builder.buildLeaf("leaf341", 1.0, value, tmn34); + value = new ValuePercent(5.0); + builder.buildLeaf("leaf342", 2.0, value, tmn34); + value = new ValuePercent(-2.0); + builder.buildLeaf("leaf343", 0.5, value, tmn34); + final TreeMapNode tmn4 = builder.buildBranch("branch4", rootNode); + final TreeMapNode tmn41 = builder.buildBranch("branch41", tmn4); + value = new ValuePercent(1.0); + builder.buildLeaf("leaf411", 1.0, value, tmn41); + value = new ValuePercent(5.0); + builder.buildLeaf("leaf412", 2.0, value, tmn41); + value = new ValuePercent(2.0); + builder.buildLeaf("leaf413", 0.5, value, tmn41); + value = new ValuePercent(2.0); + builder.buildLeaf("leaf414", 3.0, value, tmn41); + value = new ValuePercent(-5.0); + builder.buildLeaf("leaf415", 0.25, value, tmn41); + final TreeMapNode tmn42 = builder.buildBranch("branch42", tmn4); + value = new ValuePercent(1.0); + builder.buildLeaf("leaf421", 1.0, value, tmn42); + value = new ValuePercent(5.0); + builder.buildLeaf("leaf422", 2.0, value, tmn42); + value = new ValuePercent(2.0); + builder.buildLeaf("leaf423", 0.5, value, tmn42); + value = new ValuePercent(2.0); + builder.buildLeaf("leaf424", 3.0, value, tmn42); + value = new ValuePercent(-5.0); + builder.buildLeaf("leaf425", 0.25, value, tmn42); + final TreeMapNode tmn43 = builder.buildBranch("branch43", tmn4); + value = new ValuePercent(1.0); + builder.buildLeaf("leaf431", 1.0, value, tmn43); + value = new ValuePercent(-5.0); + builder.buildLeaf("leaf432", 2.0, value, tmn43); + value = new ValuePercent(2.0); + builder.buildLeaf("leaf433", 0.5, value, tmn43); + value = new ValuePercent(0.0); + builder.buildLeaf("leaf434", 3.0, value, tmn43); + value = new ValuePercent(0.0); + builder.buildLeaf("leaf5", 5.0, value, rootNode); + + return builder.getRoot(); + } +} Deleted: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/example/HSBTreeMapColorProvider.java =================================================================== --- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/example/HSBTreeMapColorProvider.java 2006-10-24 11:38:30 UTC (rev 65) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/example/HSBTreeMapColorProvider.java 2006-10-24 15:37:27 UTC (rev 66) @@ -1,391 +0,0 @@ -/* - * HSBTreeMapColorProvider.java Created on Feb 17, 2006 - */ -package net.sf.jtreemap.swing.example; - -import java.awt.Color; -import java.awt.Graphics; -import java.util.Enumeration; - -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; -import net.sf.jtreemap.swing.Value; - -/** - * An HSB color space color provider for JTreeMap. Uses a specified function to - * map the values onto the HSB color space. The default is a linear function, - * but in my experience one of the logarithmic ones works best for this color - * space. - * - * @author Andy Adamczak - */ -public class HSBTreeMapColorProvider extends ColorProvider { - /** - * - */ - private static final long serialVersionUID = 5009655580804320847L; - /** - * @author Andy Adamczak - */ - public enum ColorDistributionTypes { - /** - * - */ - Linear, - /** - * - */ - Log, - /** - * - */ - Exp, - /** - * - */ - SquareRoot, - /** - * - */ - CubicRoot - } - - /** - * @param treeMap - * @param color - */ - public HSBTreeMapColorProvider(final JTreeMap treeMap, final Color color) - { - this(treeMap, ColorDistributionTypes.Linear, color, color); - } - - /** - * @param treeMap - * @param colorDistribution - * @param color - */ - public HSBTre... [truncated message content] |
From: <be...@us...> - 2006-10-24 11:38:59
|
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 JTreeMapExample - draw(g, this.displayedRoot); - // reveal the active leaf - if (this.activeLeaf != null) { - reveal(g, this.activeLeaf); - } - // the labels - drawLabels(g, this.displayedRoot); + /** + * 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; } - } - - /** - * reveal the item. - * - * @param g Graphics where you have to draw - * @param item TreeMapNode to reveal - */ - protected void reveal(Graphics g, TreeMapNode item) { - if (item.isLeaf()) { - g.setColor(transparencyColor); - g.fillRect(item.getX(), item.getY(), item.getWidth(), item.getHeight()); + /** + * get the root. + * + * @return the root + */ + public TreeMapNode getRoot() { + return this.root; } - } - /** - * set the active leaf. - * - * @param newActiveLeaf the new active leaf - */ - public void setActiveLeaf(TreeMapNode newActiveLeaf) { - if (newActiveLeaf == null || newActiveLeaf.isLeaf()) { - this.activeLeaf = newActiveLeaf; + /** + * get the SplitStrategy. + * + * @return the SplitStrategy + */ + public SplitStrategy getStrategy() { + return this.strategy; } - } - /* - * (non-Javadoc) - * - * @see javax.swing.JComponent#setBorder(javax.swing.border.Border) - */ - @Override - public void setBorder(Border border) { - // Substract the previous border insets - Insets insets = getInsets(); - this.displayedRoot.setDimension(this.displayedRoot.getX() - insets.left, - this.displayedRoot.getY() - insets.top, this.displayedRoot.getWidth() - + insets.left + insets.right, this.displayedRoot.getHeight() - + insets.top + insets.bottom); + @Override + public Point getToolTipLocation(final MouseEvent event) { + int posX; + int posY; + final JToolTip toolTip = this.createToolTip(); + final int XMax = this.displayedRoot.getX() + this.displayedRoot.getWidth(); + final 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; + } - super.setBorder(border); + 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(); + } - // Add the new border insets - insets = getInsets(); - this.displayedRoot.setDimension(this.displayedRoot.getX() + insets.left, - this.displayedRoot.getY() + insets.top, this.displayedRoot.getWidth() - - insets.left - insets.right, this.displayedRoot.getHeight() - - insets.top - insets.bottom); - } + return new Point(posX, posY); + } + return null; + } - /** - * set the ColorProvider. - * - * @param newColorProvider the new ColorPorvider - */ - public void setColorProvider(ColorProvider newColorProvider) { - this.colorProvider = newColorProvider; - } + /* + * (non-Javadoc) + * + * @see javax.swing.JComponent#paintComponent(java.awt.Graphics) + */ + @Override + protected void paintComponent(final Graphics g) { + super.paintComponent(g); + final int width = getSize().width; + final int height = getSize().height; + final Insets insets = getInsets(); - /** - * set 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> - * - * @param newDisplayedRoot new DiplayedRoot - */ - public void setDisplayedRoot(TreeMapNode newDisplayedRoot) { - this.displayedRoot = newDisplayedRoot; - } + final 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); - /** - * set the new root. - * - * @param newRoot the new root to set - */ - public void setRoot(TreeMapNode newRoot) { - this.root = newRoot; - Insets insets = getInsets(); - this.root.setX(insets.left); - this.root.setY(insets.top); - this.setDisplayedRoot(this.root); + 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); + } - } + this.calculatePositions(); - /** - * set the new strategy. - * - * @param newStrat the new strategy to set - */ - public void setStrategy(SplitStrategy newStrat) { - this.strategy = newStrat; - } + 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 JTreeMapExample + draw(g, this.displayedRoot); + // reveal the active leaf + if (this.activeLeaf != null) { + reveal(g, this.activeLeaf); + } + // the labels + drawLabels(g, this.displayedRoot); + } - /** - * Set the builder of the toolTip.<BR> - * - * @param toolTipBuilder The toolTipBuilder to set. - */ - public void setToolTipBuilder(IToolTipBuilder toolTipBuilder) { - this.toolTipBuilder = toolTipBuilder; - } + } - /** - * When you zoom the jTreeMap, you have the choice to keep proportions or not. - * - * @param keepProportion true if you want to keep proportions, else false - */ - public void setZoomKeepProportion(boolean keepProportion) { - this.zoom.setKeepProportion(keepProportion); - } + /** + * reveal the item. + * + * @param g + * Graphics where you have to draw + * @param item + * TreeMapNode to reveal + */ + protected void reveal(final Graphics g, final TreeMapNode item) { + if (item.isLeaf()) { + g.setColor(transparencyColor); + g.fillRect(item.getX(), item.getY(), item.getWidth(), item.getHeight()); + } + } - /** - * Undo the zoom to display the root. - */ - public void unzoom() { - this.zoom.undo(); - } + /** + * set the active leaf. + * + * @param newActiveLeaf + * the new active leaf + */ + public void setActiveLeaf(final TreeMapNode newActiveLeaf) { + if (newActiveLeaf == null || newActiveLeaf.isLeaf()) { + this.activeLeaf = newActiveLeaf; + } + } - /** - * Zoom the JTreeMap to the dest node. - * - * @param dest node we want to zoom - */ - public void zoom(TreeMapNode dest) { - // undo the last zoom - unzoom(); + /* + * (non-Javadoc) + * + * @see javax.swing.JComponent#setBorder(javax.swing.border.Border) + */ + @Override + public void setBorder(final Border border) { + // Substract the previous border insets + Insets insets = getInsets(); + this.displayedRoot.setDimension(this.displayedRoot.getX() - insets.left, this.displayedRoot.getY() - insets.top, + this.displayedRoot.getWidth() + insets.left + insets.right, this.displayedRoot.getHeight() + insets.top + + insets.bottom); - this.zoom.execute(dest); - } + super.setBorder(border); - /** - * Listener who define the active leaf and set the tooltip text. - * - * @author Laurent Dutheil - */ - protected class HandleMouseMotion extends MouseMotionAdapter { + // Add the new border insets + insets = getInsets(); + this.displayedRoot.setDimension(this.displayedRoot.getX() + insets.left, this.displayedRoot.getY() + insets.top, + this.displayedRoot.getWidth() - insets.left - insets.right, this.displayedRoot.getHeight() - insets.top + - insets.bottom); + } - @Override - public void mouseMoved(MouseEvent e) { - if (getDisplayedRoot().children().hasMoreElements()) { - TreeMapNode t = getDisplayedRoot().getActiveLeaf(e.getX(), e.getY()); - if (t != null && !t.equals(getActiveLeaf())) { - setActiveLeaf(t); - repaint(); - } - if (t != null) { - setToolTipText(t.getLabel() + " " + t.getValue().getValue()); - } else { - setToolTipText(null); - } - } + /** + * set the ColorProvider. + * + * @param newColorProvider + * the new ColorPorvider + */ + public void setColorProvider(final ColorProvider newColorProvider) { + this.colorProvider = newColorProvider; } - } - /** - * Class who zoom and unzoom the JTreeMap. - * - * @author Laurent Dutheil - */ - private class Zoom { - private boolean enable; - private boolean keepProportion = false; - /** - * Constructor + * set 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> + * + * @param newDisplayedRoot + * new DiplayedRoot */ - public Zoom() { - this.enable = true; + public void setDisplayedRoot(final TreeMapNode newDisplayedRoot) { + this.displayedRoot = newDisplayedRoot; } /** - * Execute the zoom. - * @param dest TreeMapNode where you want to zoom + * set the new root. + * + * @param newRoot + * the new root to set */ - public void execute(TreeMapNode dest) { - if (this.enable) { - JTreeMap.this.setActiveLeaf(null); + public void setRoot(final TreeMapNode newRoot) { + this.root = newRoot; + final Insets insets = getInsets(); + this.root.setX(insets.left); + this.root.setY(insets.top); + this.setDisplayedRoot(this.root); - setNewDimension(dest); + } - JTreeMap.this.setDisplayedRoot(dest); + /** + * set the new strategy. + * + * @param newStrat + * the new strategy to set + */ + public void setStrategy(final SplitStrategy newStrat) { + this.strategy = newStrat; + } - this.enable = false; - } + /** + * Set the builder of the toolTip.<BR> + * + * @param toolTipBuilder + * The toolTipBuilder to set. + */ + public void setToolTipBuilder(final IToolTipBuilder toolTipBuilder) { + this.toolTipBuilder = toolTipBuilder; } /** - * @return Returns the keepProportion. + * When you zoom the jTreeMap, you have the choice to keep proportions or + * not. + * + * @param keepProportion + * true if you want to keep proportions, else false */ - public boolean isKeepProportion() { - return this.keepProportion; + public void setZoomKeepProportion(final boolean keepProportion) { + this.zoom.setKeepProportion(keepProportion); } /** - * @param keepProportion The keepProportion to set. + * Undo the zoom to display the root. */ - public void setKeepProportion(boolean keepProportion) { - this.keepProportion = keepProportion; + public void unzoom() { + this.zoom.undo(); } /** - * set the new dimensions of the dest root - * @param dest the root to dimension + * Zoom the JTreeMap to the dest node. + * + * @param dest + * node we want to zoom */ - protected void setNewDimension(TreeMapNode dest) { - dest.setX(JTreeMap.this.getRoot().getX()); - dest.setY(JTreeMap.this.getRoot().getY()); + public void zoom(final TreeMapNode dest) { + // undo the last zoom + unzoom(); - int rootWidth = JTreeMap.this.getRoot().getWidth(); - int rootHeight = JTreeMap.this.getRoot().getHeight(); + this.zoom.execute(dest); + } - if (isKeepProportion()) { - int destHeight = dest.getHeight(); - int destWidth = dest.getWidth(); - float divWidth = (float) destWidth / (float) rootWidth; - float divHeight = (float) destHeight / (float) rootHeight; + /** + * Listener who define the active leaf and set the tooltip text. + * + * @author Laurent Dutheil + */ + protected class HandleMouseMotion extends MouseMotionAdapter { - if (divWidth >= divHeight) { - dest.setHeight(Math.round(destHeight / divWidth)); - dest.setWidth(rootWidth); - } else { - dest.setHeight(rootHeight); - dest.setWidth(Math.round(destWidth / divHeight)); + @Override + 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())) { + setActiveLeaf(t); + repaint(); + } + if (t != null) { + setToolTipText(t.getLabel() + " " + t.getValue().getValue()); + } else { + setToolTipText(null); + } + } } - - } else { - dest.setHeight(rootHeight); - dest.setWidth(rootWidth); - } } /** - * undo the zoom. + * Class who zoom and unzoom the JTreeMap. + * + * @author Laurent Dutheil */ - public void undo() { - if (!this.enable) { - JTreeMap.this.setDisplayedRoot(JTreeMap.this.getRoot()); - this.enable = true; - } + private class Zoom implements Serializable { + /** + * + */ + private static final long serialVersionUID = 6708828099608367996L; + + private boolean enable; + + private boolean keepProportion = false; + + /** + * Constructor + */ + public Zoom() { + this.enable = true; + } + + /** + * Execute the zoom. + * + * @param dest + * TreeMapNode where you want to zoom + */ + public void execute(final TreeMapNode dest) { + if (this.enable) { + JTreeMap.this.setActiveLeaf(null); + + setNewDimension(dest); + + JTreeMap.this.setDisplayedRoot(dest); + + this.enable = false; + } + } + + /** + * @return Returns the keepProportion. + */ + public boolean isKeepProportion() { + return this.keepProportion; + } + + /** + * @param keepProportion + * The keepProportion to set. + */ + public void setKeepProportion(final boolean keepProportion) { + this.keepProportion = keepProportion; + } + + /** + * set the new dimensions of the dest root + * + * @param dest + * the root to dimension + */ + protected void setNewDimension(final TreeMapNode dest) { + dest.setX(JTreeMap.this.getRoot().getX()); + dest.setY(JTreeMap.this.getRoot().getY()); + + final int rootWidth = JTreeMap.this.getRoot().getWidth(); + final int rootHeight = JTreeMap.this.getRoot().getHeight(); + + if (isKeepProportion()) { + final int destHeight = dest.getHeight(); + final int destWidth = dest.getWidth(); + final float divWidth = (float) destWidth / (float) rootWidth; + final float divHeight = (float) destHeight / (float) rootHeight; + + if (divWidth >= divHeight) { + dest.setHeight(Math.round(destHeight / divWidth)); + dest.setWidth(rootWidth); + } else { + dest.setHeight(rootHeight); + dest.setWidth(Math.round(destWidth / divHeight)); + } + + } else { + dest.setHeight(rootHeight); + dest.setWidth(rootWidth); + } + } + + /** + * undo the zoom. + */ + public void undo() { + if (!this.enable) { + JTreeMap.this.setDisplayedRoot(JTreeMap.this.getRoot()); + this.enable = true; + } + } + } - } - } Modified: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitByNumber.java =================================================================== --- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitByNumber.java 2006-10-24 10:28:55 UTC (rev 64) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitByNumber.java 2006-10-24 11:38:30 UTC (rev 65) @@ -4,38 +4,43 @@ /** * Strategy who split the elements in 2 groups of same cardinal. - * + * * @author Laurent DUTHEIL */ public class SplitByNumber extends SplitStrategy { - @Override - public void splitElements(Vector<TreeMapNode> v, Vector<TreeMapNode> v1, Vector<TreeMapNode> v2) { - int size = v.size(); - int middle = size / 2; - int index = 0; - //we add first elements to v1 - for (; index < middle; index++) { - v1.addElement(v.elementAt(index)); + /** + * + */ + private static final long serialVersionUID = -6484279333222332702L; + + @Override + public void splitElements(final Vector<TreeMapNode> v, final Vector<TreeMapNode> v1, final Vector<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)); + } + // we add last elements to v2 + for (; index < size; index++) { + v2.addElement(v.elementAt(index)); + } } - //we add last elements to v2 - for (; index < size; index++) { - v2.addElement(v.elementAt(index)); - } - } - @Override - public double sumWeight(Vector<TreeMapNode> v) { - //all the elements must have the same weight - double weight = 0.0; - for (TreeMapNode node : v) { - if (node.isLeaf()) { - weight += 1; - } else { - weight += this.sumWeight(node.getChildren()); - } + @Override + public double sumWeight(final Vector<TreeMapNode> v) { + // all the elements must have the same weight + double weight = 0.0; + for (final TreeMapNode node : v) { + if (node.isLeaf()) { + weight += 1; + } else { + weight += this.sumWeight(node.getChildren()); + } + } + return weight; } - return weight; - } } Modified: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitBySlice.java =================================================================== --- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitBySlice.java 2006-10-24 10:28:55 UTC (rev 64) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitBySlice.java 2006-10-24 11:38:30 UTC (rev 65) @@ -7,105 +7,113 @@ /** * Split the treemap by slice - * + * * @author Laurent DUTHEIL */ public class SplitBySlice extends SplitStrategy { - /** - * Calculate the dimension of the elements of the Vector. - * - * @param x0 x-coordinate - * @param y0 y-coordinate - * @param w0 width - * @param h0 height - * @param v elements to split in the dimensions before - * @param sumWeight sum of the weights - */ - public static void splitInSlice(int x0, int y0, int w0, int h0, - Vector<TreeMapNode> v, double sumWeight) { - int offset = 0; - boolean vertical = h0 > w0; + /** + * + */ + private static final long serialVersionUID = 8484486418097321160L; - for (TreeMapNode node : v) { - if (vertical) { - node.setX(x0); - node.setWidth(w0); - node.setY(y0 + offset); - node.setHeight((int) Math.round(h0 * node.getWeight() / sumWeight)); - offset = offset + node.getHeight(); - } else { - node.setX(x0 + offset); - node.setWidth((int) Math.round(w0 * node.getWeight() / sumWeight)); - node.setY(y0); - node.setHeight(h0); - offset = offset + node.getWidth(); - } - } + /** + * Calculate the dimension of the elements of the Vector. + * + * @param x0 + * x-coordinate + * @param y0 + * y-coordinate + * @param w0 + * width + * @param h0 + * height + * @param v + * elements to split in the dimensions before + * @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) { + int offset = 0; + boolean vertical = h0 > w0; - // Because of the Math.round(), we adjust the last element to fit the - // correctly the JTreeMap - if (!v.isEmpty()) { - TreeMapNode node = v.lastElement(); - if (vertical && h0 != offset) { - node.setHeight(node.getHeight() - offset + h0); - } else if (!vertical && w0 != offset) { - node.setWidth(node.getWidth() - offset + w0); - } + for (final TreeMapNode node : v) { + if (vertical) { + node.setX(x0); + node.setWidth(w0); + node.setY(y0 + offset); + node.setHeight((int) Math.round(h0 * node.getWeight() / sumWeight)); + offset = offset + node.getHeight(); + } else { + node.setX(x0 + offset); + node.setWidth((int) Math.round(w0 * node.getWeight() / sumWeight)); + node.setY(y0); + node.setHeight(h0); + offset = offset + node.getWidth(); + } + } + + // Because of the Math.round(), we adjust the last element to fit the + // correctly the JTreeMap + if (!v.isEmpty()) { + final TreeMapNode node = v.lastElement(); + if (vertical && h0 != offset) { + node.setHeight(node.getHeight() - offset + h0); + } else if (!vertical && w0 != offset) { + node.setWidth(node.getWidth() - offset + w0); + } + } } - } - /* - * (non-Javadoc) - * - * @see net.sf.jtreemap.swing.SplitStrategy#splitElements(java.util.Vector, - * java.util.Vector, java.util.Vector) - */ - @Override - public void splitElements(Vector<TreeMapNode> v, Vector<TreeMapNode> v1, - Vector<TreeMapNode> v2) { - // ignore + /* + * (non-Javadoc) + * + * @see net.sf.jtreemap.swing.SplitStrategy#splitElements(java.util.Vector, + * java.util.Vector, java.util.Vector) + */ + @Override + public void splitElements(final Vector<TreeMapNode> v, final Vector<TreeMapNode> v1, final Vector<TreeMapNode> v2) { + // ignore - } + } - /* - * (non-Javadoc) - * - * @see net.sf.jtreemap.swing.SplitStrategy#calculatePositionsRec(int, int, - * int, int, double, java.util.Vector) - */ - @Override - protected void calculatePositionsRec(int x0, int y0, int w0, int h0, - double weight0, Vector<TreeMapNode> v) { + /* + * (non-Javadoc) + * + * @see net.sf.jtreemap.swing.SplitStrategy#calculatePositionsRec(int, int, + * 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) { - SplitBySlice.splitInSlice(x0, y0, w0, h0, v, weight0); + SplitBySlice.splitInSlice(x0, y0, w0, h0, v, weight0); - for (TreeMapNode node : v) { - if (node.isLeaf()) { - node.setX(node.getX() + TreeMapNode.getBorder()); - node.setY(node.getY() + TreeMapNode.getBorder()); - node.setHeight(node.getHeight() - TreeMapNode.getBorder()); - node.setWidth(node.getWidth() - TreeMapNode.getBorder()); - } else { - // 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()); - 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()); - TreeMapNode.setBorder(1); - } else { - calculatePositionsRec(node.getX(), node.getY(), node.getWidth(), node - .getHeight(), node.getWeight(), node.getChildren()); + for (final TreeMapNode node : v) { + if (node.isLeaf()) { + node.setX(node.getX() + TreeMapNode.getBorder()); + node.setY(node.getY() + TreeMapNode.getBorder()); + node.setHeight(node.getHeight() - TreeMapNode.getBorder()); + node.setWidth(node.getWidth() - TreeMapNode.getBorder()); + } else { + // 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()); + 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()); + TreeMapNode.setBorder(1); + } else { + calculatePositionsRec(node.getX(), node.getY(), node.getWidth(), node.getHeight(), node.getWeight(), node + .getChildren()); + } + } } - } + } - - } } Modified: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitBySortedWeight.java =================================================================== --- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitBySortedWeight.java 2006-10-24 10:28:55 UTC (rev 64) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitBySortedWeight.java 2006-10-24 11:38:30 UTC (rev 65) @@ -11,51 +11,60 @@ * <p> * The heaviest elements are on the top left of the JTreeMap. The lightest * elements are on the bottom right of the JTreeMap - * + * * @author Laurent Dutheil */ public class SplitBySortedWeight extends SplitStrategy { - @Override - public void splitElements(Vector<TreeMapNode> v, Vector<TreeMapNode> v1, Vector<TreeMapNode> v2) { - Vector<TreeMapNode> vClone = new Vector<TreeMapNode>(v); - double memWeight = 0.0; - double sumWeight = sumWeight(v); - double elemWeight = 0.0; + /** + * + */ + private static final long serialVersionUID = 1600419780258843122L; - sortVector(vClone); + @Override + public void splitElements(final Vector<TreeMapNode> v, final Vector<TreeMapNode> v1, final Vector<TreeMapNode> v2) { + final Vector<TreeMapNode> vClone = new Vector<TreeMapNode>(v); + double memWeight = 0.0; + final double sumWeight = sumWeight(v); + double elemWeight = 0.0; - for (Iterator<TreeMapNode> i = vClone.iterator(); i.hasNext();) { - TreeMapNode tmn = i.next(); - elemWeight = tmn.getWeight(); - // if adding the current element pass the middle of total weight - if (memWeight + elemWeight >= sumWeight / 2) { - // we look at the finest split (the nearest of the middle of weight) - if (((sumWeight / 2) - memWeight) > ((memWeight + elemWeight) - (sumWeight / 2))) { - // if it is after the add, we add the element to the first Vector - memWeight += elemWeight; - v1.addElement(tmn); - } else { - // we must have at least 1 element in the first vector - if (v1.isEmpty()) { - v1.addElement(tmn); - } else { - // if it is before the add, we add the element to the second Vector - v2.addElement(tmn); - } + sortVector(vClone); + + for (final Iterator<TreeMapNode> i = vClone.iterator(); i.hasNext();) { + TreeMapNode tmn = i.next(); + elemWeight = tmn.getWeight(); + // if adding the current element pass the middle of total weight + if (memWeight + elemWeight >= sumWeight / 2) { + // we look at the finest split (the nearest of the middle of + // weight) + if (((sumWeight / 2) - memWeight) > ((memWeight + elemWeight) - (sumWeight / 2))) { + ... [truncated message content] |
From: <be...@us...> - 2006-10-24 10:29:12
|
Revision: 64 http://svn.sourceforge.net/jtreemap/?rev=64&view=rev Author: benoitx Date: 2006-10-24 03:28:55 -0700 (Tue, 24 Oct 2006) Log Message: ----------- better doco. Modified Paths: -------------- trunk/JTreeMap/TreeMap.xml trunk/src/site/index.xml trunk/src/site/navigation.xml trunk/src/site/press/press-release-1.1.0.txt Modified: trunk/JTreeMap/TreeMap.xml =================================================================== --- trunk/JTreeMap/TreeMap.xml 2006-10-23 23:24:32 UTC (rev 63) +++ trunk/JTreeMap/TreeMap.xml 2006-10-24 10:28:55 UTC (rev 64) @@ -1,6 +1,5 @@ <?xml version='1.0' encoding='ISO-8859-1'?> <!DOCTYPE root SYSTEM "TreeMap.dtd" > - <root> <label>Root</label> <branch> Modified: trunk/src/site/index.xml =================================================================== --- trunk/src/site/index.xml 2006-10-23 23:24:32 UTC (rev 63) +++ trunk/src/site/index.xml 2006-10-24 10:28:55 UTC (rev 64) @@ -5,7 +5,7 @@ </properties> <head> <meta name="description" - content="JTreeMap is a Java Java component which reprensents hierarchical structure in a Treemap/heatmap, released under the business-friendly Apache 2.0 license." + content="JTreeMap is a Java swing component which represents hierarchical structure in a Treemap/heatmap, released under the business-friendly Apache 2.0 license." /> <meta name="keywords" @@ -20,27 +20,196 @@ </head> <body> <!-- The body of the document contains a number of sections --> - <section name="Introduction"> + <section name="How to represent a tree in a map?"> - <p>How to represent a tree in a map</p> - - <p>JTreeMap is a Java Swing component which reprensents hierarchical structure in a Treemap. This is <a href="http://en.wikipedia.org/wiki/Treemapping">treemapping</a>.</p> - + <p><img src="http://sourceforge.net/dbimage.php?id=44184" style="float:left"/>How to represent and visualize a lot of information at a glance is a hot topic in IT. + A <strong>Treemap</strong>, also known as <strong>Heatmap</strong>, is an important tool for this. A TreeMap graphically represents a hierarchical structure. + Typically, the hierarchy will involve a tree of nodes of different sizes and different colours.</p> + + <p>A Heatmap/Treemap is great to see a lot of information in one glance. It can be interactive and allow you to drill down into some section of the hierarchy. More on treemapping <a href="http://en.wikipedia.org/wiki/Treemapping">on Wikipedia</a>.</p> + + <p> + <ul><li>Each box on the chart may be contained in another box (e.g. Microsoft and Sun in the Technology box, CitiGroup in Banking, etc hence the hierachical view.</li> + <li>The size is usually determined by the relative size of a parameter in comparison to the full size of the chart (i.e. the 'bigger' X, the bigger it is on the chart).</li> + <li>The colour shows another dimension in the parameters, like a movement in time (i.e. conventionally the greener, the bigger the increase; the 'redder', the bigger the decrease!).</li></ul></p> + <p>A tree structure may includes more or less important elements. -For example, in a tree structure of files, there can be files of big size. -It can be then interesting to know which repertory is the most important on a hard disk. +For example, in a tree structure of files, there can be big files or small files. +It can be then interesting to know which directory is the biggest on a hard disk, at a glance!. But, in a treeview, we can't distinguish the significant elements. -<a href="http://www.cs.umd.edu/hcil/treemap/">Treemap</a> makes it possible to represent each element in a rectangle of more or less big size according to its importance in the tree structure. +<a href="http://www.cs.umd.edu/hcil/treemap/">Treemap</a> makes it possible to represent each element in a rectangle of more or less big size +according to its importance in the tree structure. Moreover, we can add a code color which makes it possible to introduce new information into the representation of the tree structure.</p> <p>For example, you can use Treemap to see : <ul> -<li>which is the most important repertory on your hard disk.</li> -<li>if your portofolio of stocks is well distributed between the various branches of industry.</li> -<li>the map of the market (<a href="http://www.smartmoney.com/marketmap/">smartmoney.com</a>) </li> +<li>which is the most important directory on your hard disk.</li> +<li>if your portfolio of stocks is well distributed between the various industry sectors.</li> +<li>the map of the entire stock market (<a href="http://www.smartmoney.com/marketmap/">smartmoney.com</a>) </li> </ul> </p> + + <subsection name="So, what is on offer?"> + + <p>We believe that JTreemap is the only java, open-source and <strong>maintained</strong> library for treemapping. JTreeMap components are released under the business-friendly Apache 2.0 license.</p> + + <p>JTreeMap releases 2 components: + <ul><li>a Java Swing component JTreeMap and a demo app.</li> + <li>a SWT/Eclipse Plugin component, KTreeMap</li></ul></p> + + </subsection> + + <subsection name="So, what is on offer?"> + <p>1.5+, get over it :-)</p> + </subsection> + + <subsection name="UML?"> + <p>We are using yDoc to generate a 'javadoc-like' documentation per module with the added twist of UML diagrams:</p> + <ul> + <li><a href="multiproject/jtreemap/apidocs/index.html">UML for JTreeMap</a></li> + <li><a href="multiproject/net.sf.jtreemap.ktreemap/apidocs/index.html">UML for KTreeMap</a></li> + </ul> + </subsection> + </section> + + <section name="How do I use it?"> + + <p>You have 2 options: as an application or as a demo.</p> + + <subsection name="As an application"> + <p>JTreeMap releases a basic demo application, you can open XML and TM3 files. The application can be launched via (see <a href="jtreemap.jnlp">WebStart</a>) or + this way: java -jar jtreemap-1.1.0.jar</p> + <p>The accepted file formats are: XML of the following format:</p> + <div class="code"><pre> + <?xml version='1.0' encoding='ISO-8859-1'?> + <!ELEMENT root (label,(branch |leaf)*)> + <!ELEMENT branch (label,(branch|leaf)*)> + <!ELEMENT leaf (label,weight,value) > + <!ELEMENT label (#PCDATA) > + <!ELEMENT weight (#PCDATA) > + <!ELEMENT value (#PCDATA) > + </pre></div> + + <p>XML Example:</p> + <div class="code"><pre> +<?xml version='1.0' encoding='ISO-8859-1'?> +<!DOCTYPE root SYSTEM "TreeMap.dtd" > +<root> + <label>Root</label> + <branch> + <label>branch1</label> + <branch> + <label>branch11</label> + <leaf> + <label>leaf111</label> + <weight>1.0</weight> + <value>0.5</value> + </leaf> + </branch> + <branch> + <label>branch12</label> + <leaf> + <label>leaf121</label> + <weight>1.0</weight> + <value>1.0</value> + </leaf> + <leaf> + <label>leaf122</label> + <weight>2.0</weight> + <value>5.0</value> + </leaf> + </branch> + </branch> +</root> + </pre></div> + + <p>In the field of treemapping, there is also a standard file format called TM3, which is TAB delimited:</p> + <div class="code"><pre> +Length (Miles) Traffic Lights Speed Limit Repairs per week +FLOAT INTEGER INTEGER FLOAT +12.5 4 40 2.3 Roads Highway Route 1 +11.2 3 45 1.4 Roads Highway Route 5 +35.7 0 65 5.3 Roads Interstate I-300 +201.4 0 65 11.4 Roads Interstate I-234 +1.3 5 25 0.1 Roads Street Main St. +3.4 7 35 0.4 Roads Street Broad St. + </pre></div> + + </subsection> + + <subsection name="As an component in your application"> + <p>The library provided allows you to integrate the treemap in your java app</p> + <div class="code"><pre> + +// +// Build the Tree with JTreeMap classes +// +TreeMapNodeBuilder builder = new TreeMapNodeBuilder(); +TreeMapNode buildingRoot = builder.buildBranch("branch1", null); +TreeMapNode box1 = builder.buildBranch("box1", buildingRoot); + +double currentValue = 50; +double previousValue = 40; +TreeMapNode leaf1 = builder.buildLeaf("leaf1", currentValue, new ValuePercent(currentValue / previousValue), box1); +... + +TreeMapNode root = builder.getRoot(); + +// +// Build the JTreeMap +// +JTreeMap jTreeMap = new JTreeMap(root); +jTreeMap.setFont(new Font(null, Font.BOLD, 10)); +jTreeMap.setPreferredSize(new Dimension(600, 400)); +jTreeMap.setBorder(BorderFactory.createEtchedBorder(EtchedBorder.LOWERED)); + +// add a popup menu to zoom the JTreeMap +new ZoomPopupMenu(jTreeMap); + +final HSBTreeMapColorProvider provider = new HSBTreeMapColorProvider(jTreeMap, + HSBTreeMapColorProvider.ColorDistributionTypes.Log, Color.GREEN, Color.RED); +jTreeMap.setColorProvider(provider); + +// +// put in a tree view with a JTree on the left and a JTreeMap on the right +// +JPanel view = new JPanel(); + +JSplitPane splitPaneCenter = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT); +view.add(splitPaneCenter, BorderLayout.CENTER); + +JScrollPane jScrollPane1 = new JScrollPane(); +splitPaneCenter.setLeftComponent(jScrollPane1); +splitPaneCenter.setRightComponent(jTreeMap); + +DefaultTreeModel treeModel = new DefaultTreeModel(root); +final JTree treeView = new JTree(treeModel); +jScrollPane1.getViewport().add(treeView); +jScrollPane1.setPreferredSize(new Dimension(140, jTreeMap.getRoot().getHeight())); +treeView.addTreeSelectionListener(new TreeSelectionListener() { + public void valueChanged(TreeSelectionEvent e) { + // for each selected elements ont the treeView, we zoom the JTreeMap + TreeMapNode dest = (TreeMapNode) treeView.getLastSelectedPathComponent(); + + // if the element is a leaf, we select the parent + if (dest != null && dest.isLeaf()) { + dest = (TreeMapNode) dest.getParent(); + } + if (dest == null) { + return; + } + + jTreeMap.zoom(dest); + jTreeMap.repaint(); + } +}); +... + + </pre></div> + </subsection> + </section> + </body> </document> \ No newline at end of file Modified: trunk/src/site/navigation.xml =================================================================== --- trunk/src/site/navigation.xml 2006-10-23 23:24:32 UTC (rev 63) +++ trunk/src/site/navigation.xml 2006-10-24 10:28:55 UTC (rev 64) @@ -8,6 +8,7 @@ <item name="WebStart Example" href="jtreemap.jnlp" /> <item name="Screenshots" href="screenshots.html" /> <item name="News" href="changes-report.html" /> + <item name="In the Press" href="press/index.html" /> <item name="Sitemap" href="sitemap.html" /> <item name="StatSVN" href="./statsvn" /> <item name="JTreeMap library" href="./multiproject/jtreemap/index.html" /> @@ -23,8 +24,7 @@ <menu name="Links"> <item name="QALab" href="http://qalab.sourceforge.net/" /> <item name="ObjectLab Kit" href="http://objectlabkit.sourceforge.net/" /> - <item name="ObjectLab" href="http://www.objectlab.co.uk" /> - + <item name="ObjectLab" href="http://www.objectlab.co.uk" /> <item name="hcil Treemap" href="http://www.cs.umd.edu/hcil/treemap/"/> </menu> <footer> Modified: trunk/src/site/press/press-release-1.1.0.txt =================================================================== --- trunk/src/site/press/press-release-1.1.0.txt 2006-10-23 23:24:32 UTC (rev 63) +++ trunk/src/site/press/press-release-1.1.0.txt 2006-10-24 10:28:55 UTC (rev 64) @@ -5,6 +5,14 @@ http://jtreemap.sourceforge.net +How to represent and visualize a lot of information at a glance is a +hot topic in IT. A Treemap, also known as Heatmap, is an important tool +for this. A TreeMap graphically represents a hierarchical structure. + +Typically, the hierarchy will involve a tree of nodes of different sizes +and different colours. The size and colours are determined by parameters +such as the relative importance of a node in comparison to the full size. + JTreeMap is released under the business friendly Apache License v2.0. It is available immediately for download via SourceForge or the Maven Central @@ -14,9 +22,6 @@ The library is small, lightweight and does not force you to adopt a framework. - - - . . . This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <be...@us...> - 2006-10-23 23:24:47
|
Revision: 63 http://svn.sourceforge.net/jtreemap/?rev=63&view=rev Author: benoitx Date: 2006-10-23 16:24:32 -0700 (Mon, 23 Oct 2006) Log Message: ----------- Added eclipse project. Modified Paths: -------------- trunk/src/site/changes.xml Added Paths: ----------- trunk/JTreeMap/.classpath trunk/JTreeMap/.project Property Changed: ---------------- trunk/ trunk/JTreeMap/ Property changes on: trunk ___________________________________________________________________ Name: svn:ignore - target velocity.log logfile.log + target logfile.log Property changes on: trunk/JTreeMap ___________________________________________________________________ Name: svn:ignore - target + target *.log Added: trunk/JTreeMap/.classpath =================================================================== --- trunk/JTreeMap/.classpath (rev 0) +++ trunk/JTreeMap/.classpath 2006-10-23 23:24:32 UTC (rev 63) @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> + </classpathentry> + <classpathentry excluding="" kind="src" path="src/main/java"> + </classpathentry> + <classpathentry kind="output" path="target/classes"> + </classpathentry> +</classpath> \ No newline at end of file Added: trunk/JTreeMap/.project =================================================================== --- trunk/JTreeMap/.project (rev 0) +++ trunk/JTreeMap/.project 2006-10-23 23:24:32 UTC (rev 63) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<projectDescription> + <name>jtreemap</name> + <comment>JTreeMap is a Java Swing component which reprensents hierarchical structure in a Treemap</comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> \ No newline at end of file Modified: trunk/src/site/changes.xml =================================================================== --- trunk/src/site/changes.xml 2006-10-23 22:19:47 UTC (rev 62) +++ trunk/src/site/changes.xml 2006-10-23 23:24:32 UTC (rev 63) @@ -8,6 +8,7 @@ </properties> <body> <release version="1.1.0" date="In SVN" description="Re-org"> + <action dev="benoitx" type="add">Moved org.jense to official package net.sf.jtreemap (sorry, it breaks your code but we must do this to release on iBiblio.org, the official Maven repository).</action> <action dev="benoitx" type="add">Maven Build.</action> <action dev="marchy" type="add">Move to Subversion.</action> </release> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <be...@us...> - 2006-10-23 22:20:11
|
Revision: 62 http://svn.sourceforge.net/jtreemap/?rev=62&view=rev Author: benoitx Date: 2006-10-23 15:19:47 -0700 (Mon, 23 Oct 2006) Log Message: ----------- Added objectlabkit css Modified Paths: -------------- trunk/JTreeMap/qalab.xml trunk/KTreeMap/qalab.xml trunk/common-build/project.properties Added Paths: ----------- trunk/JTreeMap/src/site/style/maven-objectlabkit.css trunk/KTreeMap/src/site/style/maven-objectlabkit.css trunk/src/site/style/maven-objectlabkit.css Modified: trunk/JTreeMap/qalab.xml =================================================================== --- trunk/JTreeMap/qalab.xml 2006-10-23 21:58:57 UTC (rev 61) +++ trunk/JTreeMap/qalab.xml 2006-10-23 22:19:47 UTC (rev 62) @@ -221,6 +221,14 @@ <result date="2006-10-23" statvalue="60" type="checkstyle"/> </file> <file id="net_sf_jtreemap_swing_example_JTreeMapExample.java" path="net/sf/jtreemap/swing/example/JTreeMapExample.java"> + <result date="2006-10-23" statvalue="2" type="findbugs"/> + <result date="2006-10-23" statvalue="2" type="findbugs"/> + <result date="2006-10-23" statvalue="2" type="findbugs"/> + <result date="2006-10-23" statvalue="2" type="findbugs"/> + <result date="2006-10-23" statvalue="2" type="findbugs"/> + <result date="2006-10-23" statvalue="2" type="findbugs"/> + <result date="2006-10-23" statvalue="2" type="findbugs"/> + <result date="2006-10-23" statvalue="2" type="findbugs"/> <result date="2006-10-23" statvalue="75" type="checkstyle"/> <result date="2006-10-23" statvalue="2" type="findbugs"/> <result date="2006-10-23" statvalue="2" type="findbugs"/> Added: trunk/JTreeMap/src/site/style/maven-objectlabkit.css =================================================================== --- trunk/JTreeMap/src/site/style/maven-objectlabkit.css (rev 0) +++ trunk/JTreeMap/src/site/style/maven-objectlabkit.css 2006-10-23 22:19:47 UTC (rev 62) @@ -0,0 +1,146 @@ +body, select, input, li { + background: #ffffff; + color: #002070; + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 12px; +} + +a img { + border: 0; +} + +a:link, a:visited { + color: #0020d0; + text-decoration: underline; +} + +a:hover { + color: #0000ff !important; +} + +a.externalLink, a.externalLink:link, a.externalLink:visited, a.externalLink:active, a.externalLink:hover { + background: url(../images/external.png) right center no-repeat; + padding-right: 15px; +} + +a.newWindow, a.newWindow:link, a.newWindow:visited, a.newWindow:active, a.newWindow:hover { + background: url(../images/newwindow.png) right center no-repeat; + padding-right: 18px; +} + +h2 { + padding: 2px 5px; + border: 1px solid #c0c0c0; + color: #002070; + background-color: #eeeeee; + font-weight: bold; + font-size: 16px; +} + +h3 { + padding: 2px 5px; + border: 1px solid #aaaaaa; + color: #002070; + background-color: #eeeeee; + font-size: 14px; +} + +p { + line-height: 1.3em; + font-size: small; +} + +#breadcrumbs { + background: url(../images/grayBar.jpg); + border: 1px solid #c0c0c0; + height: 17px; +} + +#breadcrumbs a { + font-size: 11px; + font-weight: bold; + margin: 0px 2px; + text-decoration: none; +} + +#leftColumn { + border: 1px solid #999999; + border-top: 0; + border-left: 0; + background: #eeeeee; +} + +div#navcolumn { + font-size: 12px; +} + +div#navcolumn h5 { + font-size: 12px; + padding-top: 2px; +} + +div#navcolumn li { + background: #eeeeee !important; +} + +div#navcolumn div a { + color: #002070; + font-size: 11px; + text-decoration: none; +} + +table.bodyTable th { + color: #ffffff; + background-color: #bbb; + text-align: left; + font-weight: bold; +} + +table.bodyTable th { + color: #ffffff; + background-color: #bbb; + text-align: left; + font-weight: bold; +} + +table.bodyTable a { + text-decoration : none; +} + +table.bodyTable tr.a { + background-color: #ddd; + text-decoration : none; +} + +table.bodyTable tr.b { + background-color: #eee; +} + +.source { + background: #ffffdd; + border: 1px solid #999999; + color: #000000; + font-size: 12px !important; + margin-left: 10px; + margin-right: 10px; + padding: 5px 5px 5px 7px; +} + + +.xright, #projectLogo img, #projectLogo span{ + float:right; + color: #0020a0; +} + +#footer { + padding: 10px; + margin: 20px 0px 20px 0px; + border-top: solid #ccc 1px; + color: #333333; +} + +.subsectionTitle { + font-size: 13px; + font-weight: bold; + color: #666; +} Modified: trunk/KTreeMap/qalab.xml =================================================================== --- trunk/KTreeMap/qalab.xml 2006-10-23 21:58:57 UTC (rev 61) +++ trunk/KTreeMap/qalab.xml 2006-10-23 22:19:47 UTC (rev 62) @@ -119,6 +119,8 @@ </file> <file id="net_sf_jtreemap_ktreemap_example_HSBTreeMapColorProvider.java" path="net/sf/jtreemap/ktreemap/example/HSBTreeMapColorProvider.java"> + <result date="2006-10-23" statvalue="1" type="findbugs"/> + <result date="2006-10-23" statvalue="1" type="findbugs"/> <result date="2006-10-23" statvalue="47" type="checkstyle"/> <result date="2006-10-23" statvalue="1" type="findbugs"/> <result date="2006-10-23" statvalue="1" type="findbugs"/> Added: trunk/KTreeMap/src/site/style/maven-objectlabkit.css =================================================================== --- trunk/KTreeMap/src/site/style/maven-objectlabkit.css (rev 0) +++ trunk/KTreeMap/src/site/style/maven-objectlabkit.css 2006-10-23 22:19:47 UTC (rev 62) @@ -0,0 +1,146 @@ +body, select, input, li { + background: #ffffff; + color: #002070; + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 12px; +} + +a img { + border: 0; +} + +a:link, a:visited { + color: #0020d0; + text-decoration: underline; +} + +a:hover { + color: #0000ff !important; +} + +a.externalLink, a.externalLink:link, a.externalLink:visited, a.externalLink:active, a.externalLink:hover { + background: url(../images/external.png) right center no-repeat; + padding-right: 15px; +} + +a.newWindow, a.newWindow:link, a.newWindow:visited, a.newWindow:active, a.newWindow:hover { + background: url(../images/newwindow.png) right center no-repeat; + padding-right: 18px; +} + +h2 { + padding: 2px 5px; + border: 1px solid #c0c0c0; + color: #002070; + background-color: #eeeeee; + font-weight: bold; + font-size: 16px; +} + +h3 { + padding: 2px 5px; + border: 1px solid #aaaaaa; + color: #002070; + background-color: #eeeeee; + font-size: 14px; +} + +p { + line-height: 1.3em; + font-size: small; +} + +#breadcrumbs { + background: url(../images/grayBar.jpg); + border: 1px solid #c0c0c0; + height: 17px; +} + +#breadcrumbs a { + font-size: 11px; + font-weight: bold; + margin: 0px 2px; + text-decoration: none; +} + +#leftColumn { + border: 1px solid #999999; + border-top: 0; + border-left: 0; + background: #eeeeee; +} + +div#navcolumn { + font-size: 12px; +} + +div#navcolumn h5 { + font-size: 12px; + padding-top: 2px; +} + +div#navcolumn li { + background: #eeeeee !important; +} + +div#navcolumn div a { + color: #002070; + font-size: 11px; + text-decoration: none; +} + +table.bodyTable th { + color: #ffffff; + background-color: #bbb; + text-align: left; + font-weight: bold; +} + +table.bodyTable th { + color: #ffffff; + background-color: #bbb; + text-align: left; + font-weight: bold; +} + +table.bodyTable a { + text-decoration : none; +} + +table.bodyTable tr.a { + background-color: #ddd; + text-decoration : none; +} + +table.bodyTable tr.b { + background-color: #eee; +} + +.source { + background: #ffffdd; + border: 1px solid #999999; + color: #000000; + font-size: 12px !important; + margin-left: 10px; + margin-right: 10px; + padding: 5px 5px 5px 7px; +} + + +.xright, #projectLogo img, #projectLogo span{ + float:right; + color: #0020a0; +} + +#footer { + padding: 10px; + margin: 20px 0px 20px 0px; + border-top: solid #ccc 1px; + color: #333333; +} + +.subsectionTitle { + font-size: 13px; + font-weight: bold; + color: #666; +} Modified: trunk/common-build/project.properties =================================================================== --- trunk/common-build/project.properties 2006-10-23 21:58:57 UTC (rev 61) +++ trunk/common-build/project.properties 2006-10-23 22:19:47 UTC (rev 62) @@ -63,7 +63,7 @@ ## ## Y D O C ## -maven.ydoc.packages=com.pz.* +maven.ydoc.packages=net.sf.jtreemap.* #maven.build.dest = ${basedir}/classes # ------------------------------------------------------------------------ @@ -83,7 +83,7 @@ #maven.xdoc.theme.url=http://maven.apache.org/maven-1.x/style/maven-stylus.css #maven.xdoc.theme.url=http://maven.apache.org/style/maven-stylus.css -maven.xdoc.theme=objectlab +maven.xdoc.theme=objectlabkit maven.docs.src=${basedir}/src/site # Added: trunk/src/site/style/maven-objectlabkit.css =================================================================== --- trunk/src/site/style/maven-objectlabkit.css (rev 0) +++ trunk/src/site/style/maven-objectlabkit.css 2006-10-23 22:19:47 UTC (rev 62) @@ -0,0 +1,146 @@ +body, select, input, li { + background: #ffffff; + color: #002070; + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 12px; +} + +a img { + border: 0; +} + +a:link, a:visited { + color: #0020d0; + text-decoration: underline; +} + +a:hover { + color: #0000ff !important; +} + +a.externalLink, a.externalLink:link, a.externalLink:visited, a.externalLink:active, a.externalLink:hover { + background: url(../images/external.png) right center no-repeat; + padding-right: 15px; +} + +a.newWindow, a.newWindow:link, a.newWindow:visited, a.newWindow:active, a.newWindow:hover { + background: url(../images/newwindow.png) right center no-repeat; + padding-right: 18px; +} + +h2 { + padding: 2px 5px; + border: 1px solid #c0c0c0; + color: #002070; + background-color: #eeeeee; + font-weight: bold; + font-size: 16px; +} + +h3 { + padding: 2px 5px; + border: 1px solid #aaaaaa; + color: #002070; + background-color: #eeeeee; + font-size: 14px; +} + +p { + line-height: 1.3em; + font-size: small; +} + +#breadcrumbs { + background: url(../images/grayBar.jpg); + border: 1px solid #c0c0c0; + height: 17px; +} + +#breadcrumbs a { + font-size: 11px; + font-weight: bold; + margin: 0px 2px; + text-decoration: none; +} + +#leftColumn { + border: 1px solid #999999; + border-top: 0; + border-left: 0; + background: #eeeeee; +} + +div#navcolumn { + font-size: 12px; +} + +div#navcolumn h5 { + font-size: 12px; + padding-top: 2px; +} + +div#navcolumn li { + background: #eeeeee !important; +} + +div#navcolumn div a { + color: #002070; + font-size: 11px; + text-decoration: none; +} + +table.bodyTable th { + color: #ffffff; + background-color: #bbb; + text-align: left; + font-weight: bold; +} + +table.bodyTable th { + color: #ffffff; + background-color: #bbb; + text-align: left; + font-weight: bold; +} + +table.bodyTable a { + text-decoration : none; +} + +table.bodyTable tr.a { + background-color: #ddd; + text-decoration : none; +} + +table.bodyTable tr.b { + background-color: #eee; +} + +.source { + background: #ffffdd; + border: 1px solid #999999; + color: #000000; + font-size: 12px !important; + margin-left: 10px; + margin-right: 10px; + padding: 5px 5px 5px 7px; +} + + +.xright, #projectLogo img, #projectLogo span{ + float:right; + color: #0020a0; +} + +#footer { + padding: 10px; + margin: 20px 0px 20px 0px; + border-top: solid #ccc 1px; + color: #333333; +} + +.subsectionTitle { + font-size: 13px; + font-weight: bold; + color: #666; +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <be...@us...> - 2006-10-23 22:00:15
|
Revision: 61 http://svn.sourceforge.net/jtreemap/?rev=61&view=rev Author: benoitx Date: 2006-10-23 14:58:57 -0700 (Mon, 23 Oct 2006) Log Message: ----------- Move to net.sf.jtreemap as the root package name for everything. Modified Paths: -------------- trunk/JTreeMap/build.xml trunk/JTreeMap/project.xml trunk/JTreeMap/qalab.xml 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 trunk/JTreeMap/src/site/navigation.xml trunk/KTreeMap/.project trunk/KTreeMap/META-INF/MANIFEST.MF trunk/KTreeMap/project.xml trunk/KTreeMap/qalab.xml trunk/KTreeMap/src/main/conf/meta-inf/manifest.mf trunk/KTreeMap/src/main/conf/plugin.xml trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/ITreeMapColorProvider.java trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/ITreeMapProvider.java trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/KTreeMap.java trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/SplitByNumber.java trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/SplitBySlice.java trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/SplitBySortedWeight.java trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/SplitByWeight.java trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/SplitSquarified.java trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/SplitStrategy.java trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/TreeMapNode.java trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/TreeMapNodeBuilder.java trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/example/BuilderTM3.java trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/example/BuilderXML.java trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/example/HSBTreeMapColorProvider.java trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/example/KTreeMapView.java trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/example/ResourceManager.java trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/example/TM3Bean.java trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/example/TM3TreeMapProvider.java trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/example/XMLBean.java trunk/KTreeMap/src/main/java/net/sf/jtreemap/ktreemap/example/XMLTreeMapProvider.java trunk/common-build/project.xml trunk/project.properties trunk/src/site/generic-appletsample.xml trunk/src/site/generic-jtreemap.jnlp trunk/src/site/navigation.xml Modified: trunk/JTreeMap/build.xml =================================================================== --- trunk/JTreeMap/build.xml 2006-10-23 21:45:31 UTC (rev 60) +++ trunk/JTreeMap/build.xml 2006-10-23 21:58:57 UTC (rev 61) @@ -35,7 +35,7 @@ <include name="**/*.gif" /> </fileset> <manifest> - <attribute name="Main-Class" value="org.jense.swing.jtreemap.example.JTreeMapExample" /> + <attribute name="Main-Class" value="net.sf.jtreemap.swing.example.JTreeMapExample" /> </manifest> </jar> </target> @@ -60,7 +60,7 @@ </target> <target name="javadoc"> - <javadoc packagenames="org.jense.swing.jtreemap.*,org.jense.swing.jtreemap.example.*" sourcepath="src" defaultexcludes="yes" destdir="doc" author="true" version="true" use="true" windowtitle="JTreeMap"> + <javadoc packagenames="net.sf.jtreemap.swing.*,net.sf.jtreemap.swing.example.*" sourcepath="src" defaultexcludes="yes" destdir="doc" author="true" version="true" use="true" windowtitle="JTreeMap"> <doctitle> <![CDATA[<h1>JTreeMap</h1>]]></doctitle> <tag name="todo" scope="all" description="To do:" /> Modified: trunk/JTreeMap/project.xml =================================================================== --- trunk/JTreeMap/project.xml 2006-10-23 21:45:31 UTC (rev 60) +++ trunk/JTreeMap/project.xml 2006-10-23 21:58:57 UTC (rev 61) @@ -26,7 +26,7 @@ <extend>../common-build/project.xml</extend> <name>JTreeMap</name> <artifactId>jtreemap</artifactId> - <package>org.jense.swing.jtreemap</package> + <package>net.sf.jtreemap</package> <shortDescription>JTreeMap is a Java Swing component which reprensents hierarchical structure in a Treemap.</shortDescription> <description> JTreeMap is a Java Swing component which reprensents hierarchical structure in a Treemap Modified: trunk/JTreeMap/qalab.xml =================================================================== --- trunk/JTreeMap/qalab.xml 2006-10-23 21:45:31 UTC (rev 60) +++ trunk/JTreeMap/qalab.xml 2006-10-23 21:58:57 UTC (rev 61) @@ -23,6 +23,9 @@ <summaryresult date="2006-10-18" filecount="27" statvalue="307" type="checkstyle"/> <summaryresult date="2006-10-18" filecount="14" statvalue="35" type="findbugs"/> <summaryresult date="2006-10-18" filecount="4" statvalue="280" type="simian"/> + <summaryresult date="2006-10-23" filecount="27" statvalue="307" type="checkstyle"/> + <summaryresult date="2006-10-23" filecount="14" statvalue="35" type="findbugs"/> + <summaryresult date="2006-10-23" filecount="4" statvalue="280" type="simian"/> </summary> <file id="org_jense_swing_jtreemap_package.html" path="org/jense/swing/jtreemap/package.html"> <result date="2006-10-17" statvalue="1" type="checkstyle"/> @@ -129,6 +132,8 @@ <result date="2006-10-18" statvalue="2" type="findbugs"/> <result date="2006-10-18" statvalue="2" type="findbugs"/> <result date="2006-10-18" statvalue="2" type="findbugs"/> + <result date="2006-10-18" statvalue="2" type="findbugs"/> + <result date="2006-10-18" statvalue="2" type="findbugs"/> <result date="2006-10-18" statvalue="75" type="checkstyle"/> <result date="2006-10-18" statvalue="2" type="findbugs"/> <result date="2006-10-18" statvalue="2" type="findbugs"/> @@ -159,4 +164,82 @@ <result date="2006-10-18" statvalue="7" type="checkstyle"/> <result date="2006-10-18" statvalue="2" type="findbugs"/> </file> + <file id="net_sf_jtreemap_swing_package.html" path="net/sf/jtreemap/swing/package.html"> + <result date="2006-10-23" statvalue="1" type="checkstyle"/> + </file> + <file id="net_sf_jtreemap_swing_example_package.html" path="net/sf/jtreemap/swing/example/package.html"> + <result date="2006-10-23" statvalue="1" type="checkstyle"/> + </file> + <file id="net_sf_jtreemap_swing_DefaultToolTip.java" path="net/sf/jtreemap/swing/DefaultToolTip.java"> + <result date="2006-10-23" statvalue="7" type="checkstyle"/> + </file> + <file id="net_sf_jtreemap_swing_DefaultToolTipBuilder.java" path="net/sf/jtreemap/swing/DefaultToolTipBuilder.java"> + <result date="2006-10-23" statvalue="1" type="checkstyle"/> + </file> + <file id="net_sf_jtreemap_swing_DefaultValue.java" path="net/sf/jtreemap/swing/DefaultValue.java"> + <result date="2006-10-23" statvalue="1" type="checkstyle"/> + <result date="2006-10-23" statvalue="1" type="findbugs"/> + </file> + <file id="net_sf_jtreemap_swing_IToolTipBuilder.java" path="net/sf/jtreemap/swing/IToolTipBuilder.java"> + <result date="2006-10-23" statvalue="1" type="checkstyle"/> + </file> + <file id="net_sf_jtreemap_swing_JTreeMap.java" path="net/sf/jtreemap/swing/JTreeMap.java"> + <result date="2006-10-23" statvalue="23" type="checkstyle"/> + <result date="2006-10-23" statvalue="5" type="findbugs"/> + </file> + <file id="net_sf_jtreemap_swing_SplitSquarified.java" path="net/sf/jtreemap/swing/SplitSquarified.java"> + <result date="2006-10-23" statvalue="12" type="checkstyle"/> + </file> + <file id="net_sf_jtreemap_swing_SplitStrategy.java" path="net/sf/jtreemap/swing/SplitStrategy.java"> + <result date="2006-10-23" statvalue="3" type="checkstyle"/> + </file> + <file id="net_sf_jtreemap_swing_TreeMapNode.java" path="net/sf/jtreemap/swing/TreeMapNode.java"> + <result date="2006-10-23" statvalue="17" type="checkstyle"/> + <result date="2006-10-23" statvalue="1" type="findbugs"/> + </file> + <file id="net_sf_jtreemap_swing_UniqueColorProvider.java" path="net/sf/jtreemap/swing/UniqueColorProvider.java"> + <result date="2006-10-23" statvalue="7" type="checkstyle"/> + <result date="2006-10-23" statvalue="2" type="findbugs"/> + </file> + <file id="net_sf_jtreemap_swing_Value.java" path="net/sf/jtreemap/swing/Value.java"> + <result date="2006-10-23" statvalue="1" type="checkstyle"/> + <result date="2006-10-23" statvalue="2" type="findbugs"/> + </file> + <file id="net_sf_jtreemap_swing_example_BuilderTM3.java" path="net/sf/jtreemap/swing/example/BuilderTM3.java"> + <result date="2006-10-23" statvalue="1" type="checkstyle"/> + <result date="2006-10-23" statvalue="1" type="findbugs"/> + </file> + <file id="net_sf_jtreemap_swing_example_BuilderXML.java" path="net/sf/jtreemap/swing/example/BuilderXML.java"> + <result date="2006-10-23" statvalue="2" type="checkstyle"/> + </file> + <file + id="net_sf_jtreemap_swing_example_HSBTreeMapColorProvider.java" path="net/sf/jtreemap/swing/example/HSBTreeMapColorProvider.java"> + <result date="2006-10-23" statvalue="61" type="checkstyle"/> + <result date="2006-10-23" statvalue="5" type="findbugs"/> + </file> + <file id="net_sf_jtreemap_swing_example_JTreeMapAppletExample.java" path="net/sf/jtreemap/swing/example/JTreeMapAppletExample.java"> + <result date="2006-10-23" statvalue="60" type="checkstyle"/> + </file> + <file id="net_sf_jtreemap_swing_example_JTreeMapExample.java" path="net/sf/jtreemap/swing/example/JTreeMapExample.java"> + <result date="2006-10-23" statvalue="75" type="checkstyle"/> + <result date="2006-10-23" statvalue="2" type="findbugs"/> + <result date="2006-10-23" statvalue="2" type="findbugs"/> + <result date="2006-10-23" statvalue="2" type="findbugs"/> + </file> + <file id="net_sf_jtreemap_swing_example_RandomColorProvider.java" path="net/sf/jtreemap/swing/example/RandomColorProvider.java"> + <result date="2006-10-23" statvalue="10" type="checkstyle"/> + <result date="2006-10-23" statvalue="4" type="findbugs"/> + </file> + <file id="net_sf_jtreemap_swing_example_RedGreenColorProvider.java" path="net/sf/jtreemap/swing/example/RedGreenColorProvider.java"> + <result date="2006-10-23" statvalue="15" type="checkstyle"/> + <result date="2006-10-23" statvalue="5" type="findbugs"/> + </file> + <file id="net_sf_jtreemap_swing_example_ValuePercent.java" path="net/sf/jtreemap/swing/example/ValuePercent.java"> + <result date="2006-10-23" statvalue="1" type="checkstyle"/> + <result date="2006-10-23" statvalue="1" type="findbugs"/> + </file> + <file id="net_sf_jtreemap_swing_example_ZoomPopupMenu.java" path="net/sf/jtreemap/swing/example/ZoomPopupMenu.java"> + <result date="2006-10-23" statvalue="7" type="checkstyle"/> + <result date="2006-10-23" statvalue="2" type="findbugs"/> + </file> </qalab> 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-23 21:45:31 UTC (rev 60) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/ColorProvider.java 2006-10-23 21:58:57 UTC (rev 61) @@ -1,10 +1,10 @@ -package org.jense.swing.jtreemap; +package net.sf.jtreemap.swing; import javax.swing.JPanel; import java.awt.Color; /** - * Abstract class with the methods who attribute color to the elements of + * Abstract class with the methods who attribute color to the elements of * JTreeMap. * * @author Laurent DUTHEIL 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-23 21:45:31 UTC (rev 60) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/DefaultToolTip.java 2006-10-23 21:58:57 UTC (rev 61) @@ -1,7 +1,7 @@ /* * Created on 28 sept. 2005 */ -package org.jense.swing.jtreemap; +package net.sf.jtreemap.swing; import java.awt.Color; import java.awt.Dimension; @@ -12,7 +12,7 @@ /** * Default ToolTip for the jTreeMap. - * + * * @author Laurent DUTHEIL */ public class DefaultToolTip extends JToolTip { @@ -23,7 +23,7 @@ /** * Constructor. - * + * * @param jTreeMap the jTreeMap who display the tooltip */ public DefaultToolTip(JTreeMap jTreeMap) { 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-23 21:45:31 UTC (rev 60) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/DefaultToolTipBuilder.java 2006-10-23 21:58:57 UTC (rev 61) @@ -1,24 +1,24 @@ /** - * + * */ -package org.jense.swing.jtreemap; +package net.sf.jtreemap.swing; import javax.swing.JToolTip; /** * Default class to build the DefaultToolTip displayed by the JTreeMap.<BR> - * - * @see org.jense.swing.jtreemap.DefaultToolTip + * + * @see net.sf.jtreemap.swing.DefaultToolTip * @author Laurent DUTHEIL * */ public class DefaultToolTipBuilder implements IToolTipBuilder { private static JToolTip instance = null; private JTreeMap jTreeMap; - + /** * Constructor. - * + * * @param jTreeMap the linked JTreeMap */ public DefaultToolTipBuilder(JTreeMap jTreeMap) { @@ -26,7 +26,7 @@ } /* (non-Javadoc) - * @see org.jense.swing.jtreemap.IToolTipBuilder#getToolTip() + * @see net.sf.jtreemap.swing.IToolTipBuilder#getToolTip() */ public JToolTip getToolTip() { if (instance == null) { 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-23 21:45:31 UTC (rev 60) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/DefaultValue.java 2006-10-23 21:58:57 UTC (rev 61) @@ -1,12 +1,12 @@ /* * Created on 10 oct. 2005 */ -package org.jense.swing.jtreemap; +package net.sf.jtreemap.swing; /** * Default Value <BR> * The getLabel() method returns the "" + getValue() - * + * * @author Laurent DUTHEIL */ public class DefaultValue extends Value { @@ -21,7 +21,7 @@ /** * Constructor. - * + * * @param value double value */ public DefaultValue(double value) { @@ -30,8 +30,8 @@ /* * (non-Javadoc) - * - * @see org.jense.swing.jtreemap.Value#getValue() + * + * @see net.sf.jtreemap.swing.Value#getValue() */ @Override public double getValue() { @@ -40,8 +40,8 @@ /* * (non-Javadoc) - * - * @see org.jense.swing.jtreemap.Value#getLabel() + * + * @see net.sf.jtreemap.swing.Value#getLabel() */ @Override public String getLabel() { @@ -50,8 +50,8 @@ /* * (non-Javadoc) - * - * @see org.jense.swing.jtreemap.Value#setValue(double) + * + * @see net.sf.jtreemap.swing.Value#setValue(double) */ @Override public void setValue(double value) { @@ -60,8 +60,8 @@ /* * (non-Javadoc) - * - * @see org.jense.swing.jtreemap.Value#setLabel(java.lang.String) + * + * @see net.sf.jtreemap.swing.Value#setLabel(java.lang.String) */ @Override public void setLabel(String newLabel) { 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-23 21:45:31 UTC (rev 60) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/IToolTipBuilder.java 2006-10-23 21:58:57 UTC (rev 61) @@ -2,14 +2,14 @@ * Created on 6 mars 2006 * */ -package org.jense.swing.jtreemap; +package net.sf.jtreemap.swing; import javax.swing.JToolTip; /** * Interface used to build your own JToolTip for the jTreeMap. - * - * @see org.jense.swing.jtreemap.JTreeMap#setToolTipBuilder(IToolTipBuilder) + * + * @see net.sf.jtreemap.swing.JTreeMap#setToolTipBuilder(IToolTipBuilder) * @author Laurent DUTHEIL */ public interface IToolTipBuilder { @@ -17,7 +17,7 @@ /** * 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(); 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-23 21:45:31 UTC (rev 60) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/JTreeMap.java 2006-10-23 21:58:57 UTC (rev 61) @@ -1,4 +1,4 @@ -package org.jense.swing.jtreemap; +package net.sf.jtreemap.swing; import java.util.Enumeration; import java.awt.Color; @@ -27,8 +27,8 @@ * <p> * So, in a JTreeMap, you can see the size and the value of an element in a * tree. - * - * @see org.jense.swing.jtreemap.TreeMapNode + * + * @see net.sf.jtreemap.swing.TreeMapNode * @author Laurent Dutheil */ public class JTreeMap extends JComponent { @@ -53,7 +53,7 @@ * 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 @@ -65,7 +65,7 @@ /** * 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 @@ -109,7 +109,7 @@ /** * draw the item. - * + * * @param g Graphics where you have to draw * @param item item to draw */ @@ -129,7 +129,7 @@ * 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 */ @@ -178,7 +178,7 @@ * 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 */ @@ -214,7 +214,7 @@ /** * get the active leaf (the one under the mouse). - * + * * @return Returns the activeLeaf. */ public TreeMapNode getActiveLeaf() { @@ -223,7 +223,7 @@ /** * get the ColorProvider. - * + * * @return the ColorProvider */ public ColorProvider getColorProvider() { @@ -236,7 +236,7 @@ * 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() { @@ -245,7 +245,7 @@ /** * get the root. - * + * * @return the root */ public TreeMapNode getRoot() { @@ -254,7 +254,7 @@ /** * get the SplitStrategy. - * + * * @return the SplitStrategy */ public SplitStrategy getStrategy() { @@ -293,7 +293,7 @@ /* * (non-Javadoc) - * + * * @see javax.swing.JComponent#paintComponent(java.awt.Graphics) */ @Override @@ -313,7 +313,7 @@ - insets.left - insets.right, height - border - insets.top - insets.bottom); } - + this.calculatePositions(); if (this.displayedRoot.children().hasMoreElements()) { @@ -337,7 +337,7 @@ /** * reveal the item. - * + * * @param g Graphics where you have to draw * @param item TreeMapNode to reveal */ @@ -350,7 +350,7 @@ /** * set the active leaf. - * + * * @param newActiveLeaf the new active leaf */ public void setActiveLeaf(TreeMapNode newActiveLeaf) { @@ -361,7 +361,7 @@ /* * (non-Javadoc) - * + * * @see javax.swing.JComponent#setBorder(javax.swing.border.Border) */ @Override @@ -385,7 +385,7 @@ /** * set the ColorProvider. - * + * * @param newColorProvider the new ColorPorvider */ public void setColorProvider(ColorProvider newColorProvider) { @@ -398,7 +398,7 @@ * This may be not the root of the jTreeMap. After a zoom, the displayed root * can be the root of an under-tree. * </p> - * + * * @param newDisplayedRoot new DiplayedRoot */ public void setDisplayedRoot(TreeMapNode newDisplayedRoot) { @@ -407,7 +407,7 @@ /** * set the new root. - * + * * @param newRoot the new root to set */ public void setRoot(TreeMapNode newRoot) { @@ -421,7 +421,7 @@ /** * set the new strategy. - * + * * @param newStrat the new strategy to set */ public void setStrategy(SplitStrategy newStrat) { @@ -430,7 +430,7 @@ /** * Set the builder of the toolTip.<BR> - * + * * @param toolTipBuilder The toolTipBuilder to set. */ public void setToolTipBuilder(IToolTipBuilder toolTipBuilder) { @@ -439,7 +439,7 @@ /** * When you zoom the jTreeMap, you have the choice to keep proportions or not. - * + * * @param keepProportion true if you want to keep proportions, else false */ public void setZoomKeepProportion(boolean keepProportion) { @@ -455,7 +455,7 @@ /** * Zoom the JTreeMap to the dest node. - * + * * @param dest node we want to zoom */ public void zoom(TreeMapNode dest) { @@ -467,7 +467,7 @@ /** * Listener who define the active leaf and set the tooltip text. - * + * * @author Laurent Dutheil */ protected class HandleMouseMotion extends MouseMotionAdapter { @@ -488,10 +488,10 @@ } } } - + /** * Class who zoom and unzoom the JTreeMap. - * + * * @author Laurent Dutheil */ private class Zoom { Modified: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitByNumber.java =================================================================== --- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitByNumber.java 2006-10-23 21:45:31 UTC (rev 60) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitByNumber.java 2006-10-23 21:58:57 UTC (rev 61) @@ -1,4 +1,4 @@ -package org.jense.swing.jtreemap; +package net.sf.jtreemap.swing; import java.util.Vector; @@ -23,7 +23,7 @@ v2.addElement(v.elementAt(index)); } } - + @Override public double sumWeight(Vector<TreeMapNode> v) { //all the elements must have the same weight Modified: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitBySlice.java =================================================================== --- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitBySlice.java 2006-10-23 21:45:31 UTC (rev 60) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitBySlice.java 2006-10-23 21:58:57 UTC (rev 61) @@ -1,20 +1,20 @@ /* * Created on 3 nov. 2005 */ -package org.jense.swing.jtreemap; +package net.sf.jtreemap.swing; import java.util.Vector; /** * Split the treemap by slice - * + * * @author Laurent DUTHEIL */ public class SplitBySlice extends SplitStrategy { /** * Calculate the dimension of the elements of the Vector. - * + * * @param x0 x-coordinate * @param y0 y-coordinate * @param w0 width @@ -57,8 +57,8 @@ /* * (non-Javadoc) - * - * @see org.jense.swing.jtreemap.SplitStrategy#splitElements(java.util.Vector, + * + * @see net.sf.jtreemap.swing.SplitStrategy#splitElements(java.util.Vector, * java.util.Vector, java.util.Vector) */ @Override @@ -70,8 +70,8 @@ /* * (non-Javadoc) - * - * @see org.jense.swing.jtreemap.SplitStrategy#calculatePositionsRec(int, int, + * + * @see net.sf.jtreemap.swing.SplitStrategy#calculatePositionsRec(int, int, * int, int, double, java.util.Vector) */ @Override Modified: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitBySortedWeight.java =================================================================== --- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitBySortedWeight.java 2006-10-23 21:45:31 UTC (rev 60) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitBySortedWeight.java 2006-10-23 21:58:57 UTC (rev 61) @@ -1,4 +1,4 @@ -package org.jense.swing.jtreemap; +package net.sf.jtreemap.swing; import java.util.Iterator; import java.util.Vector; @@ -11,7 +11,7 @@ * <p> * The heaviest elements are on the top left of the JTreeMap. The lightest * elements are on the bottom right of the JTreeMap - * + * * @author Laurent Dutheil */ Modified: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitByWeight.java =================================================================== --- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitByWeight.java 2006-10-23 21:45:31 UTC (rev 60) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitByWeight.java 2006-10-23 21:58:57 UTC (rev 61) @@ -1,11 +1,11 @@ -package org.jense.swing.jtreemap; +package net.sf.jtreemap.swing; import java.util.Iterator; import java.util.Vector; /** * Strategy who split the elements in 2 groups of equivalent weight. - * + * * @author Laurent Dutheil */ Modified: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitSquarified.java =================================================================== --- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitSquarified.java 2006-10-23 21:45:31 UTC (rev 60) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitSquarified.java 2006-10-23 21:58:57 UTC (rev 61) @@ -1,13 +1,13 @@ /* * Created on 3 nov. 2005 */ -package org.jense.swing.jtreemap; +package net.sf.jtreemap.swing; import java.util.Vector; /** * The Squarified split strategy - * + * * @author Laurent DUTHEIL */ public class SplitSquarified extends SplitStrategy { @@ -75,8 +75,8 @@ /* * (non-Javadoc) - * - * @see org.jense.swing.jtreemap.SplitStrategy#calculatePositionsRec(int, int, + * + * @see net.sf.jtreemap.swing.SplitStrategy#calculatePositionsRec(int, int, * int, int, double, java.util.Vector) */ @Override @@ -116,7 +116,7 @@ /** * Execute the recurence for the children of the elements of the vector.<BR> * Add also the borders if necessary - * + * * @param v Vector with the elements to calculate */ private void calculateChildren(Vector<TreeMapNode> v) { @@ -144,7 +144,7 @@ } else { bSub = 0; } - + int w = node.getWidth() - bSub; if (w < 0) { w = 0; @@ -153,7 +153,7 @@ if (h < 0) { h = 0; } - + TreeMapNode.setBorder(TreeMapNode.getBorder() - bSub); calculatePositionsRec(node.getX() + bSub, node.getY() + bSub, w, h, node.getWeight(), node .getChildren()); Modified: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitStrategy.java =================================================================== --- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitStrategy.java 2006-10-23 21:45:31 UTC (rev 60) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitStrategy.java 2006-10-23 21:58:57 UTC (rev 61) @@ -1,4 +1,4 @@ -package org.jense.swing.jtreemap; +package net.sf.jtreemap.swing; import java.util.Vector; @@ -8,14 +8,14 @@ * The split is done by dichotomy. We split the elements in 2 groups with a * defined strategy (for example : take care of the weight of the elements) * <p> - * + * * @author Laurent Dutheil */ public abstract class SplitStrategy { /** * calculate the positions for all the elements of the root. - * + * * @param root the root to calculate */ public void calculatePositions(TreeMapNode root) { @@ -32,7 +32,7 @@ /** * split the elements of a JTreeMap. - * + * * @param v Vector with the elements to split (arg IN) * @param v1 first Vector of the split (arg OUT) * @param v2 second Vector of the split (arg OUT) @@ -44,7 +44,7 @@ * Sum the weight of elements. <BR> * You can override this method if you want to apply a coef on the weights or * to cancel the effect of weight on the strategy. - * + * * @param v Vector with the elements to sum * @return the sum of the weight of elements */ @@ -142,7 +142,7 @@ /** * Sort the elements by descending weight. - * + * * @param v Vector with the elements to be sorted */ protected void sortVector(Vector<TreeMapNode> v) { Modified: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/TreeMapNode.java =================================================================== --- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/TreeMapNode.java 2006-10-23 21:45:31 UTC (rev 60) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/TreeMapNode.java 2006-10-23 21:58:57 UTC (rev 61) @@ -1,4 +1,4 @@ -package org.jense.swing.jtreemap; +package net.sf.jtreemap.swing; import java.util.Enumeration; import java.util.Vector; @@ -7,12 +7,12 @@ /** * Node of a JTreeMap.<BR> - * + * * If the node is a branch, only the label is set.<BR> * If the node is a leaf, we need a label, a weight and a value. * <p> * You can also use a TreeMapNode in a JTree. - * + * * @author Laurent Dutheil */ @@ -26,10 +26,10 @@ private int width; private int x; private int y; - + /** * Get the max border between two nodes of the same level. - * + * * @return Returns the border. */ public static int getBorder() { @@ -38,7 +38,7 @@ /** * Set the max border between two nodes of the same level. - * + * * @param border The border to set. */ public static void setBorder(int border) { @@ -48,7 +48,7 @@ /** * Constructor for a branch. - * + * * @param label label of the branch. */ public TreeMapNode(String label) { @@ -58,7 +58,7 @@ /** * Constructor for a leaf. - * + * * @param label label of the leaf. * @param weight weight of the leaf (if negative, we take the absolute value). * @param value Value associ\xE9e \xE0 la feuille @@ -73,7 +73,7 @@ /** * add a new child to the node. - * + * * @param newChild new child */ public void add(TreeMapNode newChild) { @@ -84,7 +84,7 @@ /** * get the active leaf.<BR> * null if the passed position is not in this tree. - * + * * @param x x-coordinate * @param y y-coordinate * @return active leaf @@ -107,11 +107,11 @@ } return null; } - + /** * get the first child which fits the position.<BR> * null if the passed position is not in this tree. - * + * * @param x x-coordinate * @param y y-coordinate * @return the first child which fits the position. @@ -125,14 +125,14 @@ return node; } } - + } return null; } /** * get a Vector with the children. - * + * * @return Vector with the children */ @SuppressWarnings("unchecked") @@ -142,7 +142,7 @@ /** * get the height. - * + * * @return the height */ public int getHeight() { @@ -151,7 +151,7 @@ /** * get the label. - * + * * @return the label */ public String getLabel() { @@ -160,7 +160,7 @@ /** * get the label of the Value. - * + * * @return the label of the Value */ public String getLabelValue() { @@ -169,7 +169,7 @@ /** * get the Value. - * + * * @return the value */ public Value getValue() { @@ -178,7 +178,7 @@ /** * get the double Value. - * + * * @return the double value */ public double getDoubleValue() { @@ -187,7 +187,7 @@ /** * get the weight. - * + * * @return the weight */ public double getWeight() { @@ -196,7 +196,7 @@ /** * get the width. - * + * * @return the width */ public int getWidth() { @@ -205,7 +205,7 @@ /** * get the x-coordinate. - * + * * @return the x-coordinate */ public int getX() { @@ -214,7 +214,7 @@ /** * get the y-coordinate. - * + * * @return the y-coordinate */ public int getY() { @@ -223,7 +223,7 @@ /** * set the position and the size. - * + * * @param x x-coordinate * @param y y-coordinate * @param width the new width @@ -238,7 +238,7 @@ /** * set the height. - * + * * @param height la nouvelle valeur de height */ public void setHeight(int height) { @@ -247,7 +247,7 @@ /** * set the label. - * + * * @param label the new label */ public void setLabel(String label) { @@ -256,7 +256,7 @@ /** * set the position. - * + * * @param x x-coordinate * @param y y-coordinate */ @@ -267,7 +267,7 @@ /** * set size. - * + * * @param width the new width * @param height the new height */ @@ -278,7 +278,7 @@ /** * set the Value. - * + * * @param value the new Value */ public void setValue(Value value) { @@ -287,7 +287,7 @@ /** * set the weight of the node and update the parents. - * + * * @param weight the new weight */ public void setWeight(double weight) { @@ -301,7 +301,7 @@ /** * set the width. - * + * * @param width la nouvelle valeur de width */ public void setWidth(int width) { @@ -310,7 +310,7 @@ /** * set the x-coordinate. - * + * * @param x the new x-coordinate */ public void setX(int x) { @@ -319,7 +319,7 @@ /** * set the y-coordinate. - * + * * @param y the new y-coordinate */ public void setY(int y) { Modified: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/TreeMapNodeBuilder.java =================================================================== --- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/TreeMapNodeBuilder.java 2006-10-23 21:45:31 UTC (rev 60) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/TreeMapNodeBuilder.java 2006-10-23 21:58:57 UTC (rev 61) @@ -1,8 +1,8 @@ -package org.jense.swing.jtreemap; +package net.sf.jtreemap.swing; /** * Tree builder for a JTreeMap. - * + * * @author Laurent Dutheil */ @@ -14,7 +14,7 @@ * If the parent is null, the build node become the root if and only if the * tree have no root yet. If the parent is null and if the root is already * build, the node will NOT be added to the tree. - * + * * @param label label of the node * @param parent father of the node * @return the created node @@ -34,7 +34,7 @@ * If the parent is null, the build node become the root if and only if the * tree have no root yet. If the parent is null and if the root is already * build, the node will NOT be added to the tree. - * + * * @param label label of the leaf * @param weight weight of the leaf * @param value Value of the leaf @@ -54,7 +54,7 @@ /** * get the build tree. - * + * * @return the root of the tree */ public TreeMapNode getRoot() { Modified: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/UniqueColorProvider.java =================================================================== --- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/UniqueColorProvider.java 2006-10-23 21:45:31 UTC (rev 60) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/UniqueColorProvider.java 2006-10-23 21:58:57 UTC (rev 61) @@ -2,7 +2,7 @@ * Created on 7 oct. 2005 * */ -package org.jense.swing.jtreemap; +package net.sf.jtreemap.swing; import java.awt.Color; import java.awt.Graphics; @@ -12,7 +12,7 @@ /** * Color Provider by default.<BR> * All values are associated to a unique color. - * + * * @author Laurent DUTHEIL * */ @@ -20,7 +20,7 @@ private final static Color defaultColor = new Color(153,153,51); private Color color; private JPanel legend; - + /** * Constructor. */ @@ -35,9 +35,9 @@ public UniqueColorProvider(Color color) { this.color = color; } - + /* (non-Javadoc) - * @see org.jense.swing.jtreemap.ColorProvider#getColor(double) + * @see net.sf.jtreemap.swing.ColorProvider#getColor(double) */ @Override public Color getColor(Value value) { @@ -45,7 +45,7 @@ } /* (non-Javadoc) - * @see org.jense.swing.jtreemap.ColorProvider#getLegendPanel() + * @see net.sf.jtreemap.swing.ColorProvider#getLegendPanel() */ @Override public JPanel getLegendPanel() { @@ -56,13 +56,13 @@ } /** * Panel with the legend. - * + * * @author Laurent Dutheil */ private class Legend extends JPanel { private static final long serialVersionUID = -8046211081305644785L; private String text = "Unique Color Provider"; - + /** * Constructor. */ @@ -70,7 +70,7 @@ this.setPreferredSize(new java.awt.Dimension(100, 40)); } - + @Override public void paint(Graphics g) { g.setColor(Color.black); Modified: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/Value.java =================================================================== --- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/Value.java 2006-10-23 21:45:31 UTC (rev 60) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/Value.java 2006-10-23 21:58:57 UTC (rev 61) @@ -1,4 +1,4 @@ -package org.jense.swing.jtreemap; +package net.sf.jtreemap.swing; /** @@ -35,7 +35,7 @@ *@param newLabel the new label */ public abstract void setLabel(String newLabel); - + /* (non-Javadoc) * @see java.lang.Object#equals(java.lang.Object) */ @@ -47,7 +47,7 @@ } return false; } - + /* (non-Javadoc) * @see java.lang.Comparable#compareTo(java.lang.Object) */ 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 2006-10-23 21:45:31 UTC (rev 60) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/example/BuilderTM3.java 2006-10-23 21:58:57 UTC (rev 61) @@ -1,7 +1,7 @@ /* * Created on 22 nov. 2005 */ -package org.jense.swing.jtreemap.example; +package net.sf.jtreemap.swing.example; import java.io.BufferedReader; import java.io.File; @@ -16,15 +16,15 @@ import java.util.StringTokenizer; import java.util.TreeSet; -import org.jense.swing.jtreemap.DefaultValue; -import org.jense.swing.jtreemap.TreeMapNode; -import org.jense.swing.jtreemap.TreeMapNodeBuilder; +import net.sf.jtreemap.swing.DefaultValue; +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> * how to create your own TM3 data file </a> from hcil Treemap site. - * + * * @author Laurent DUTHEIL */ public class BuilderTM3 { @@ -53,7 +53,7 @@ /** * Constructor - * + * * @param tm3File tm3 file * @throws IOException */ @@ -78,7 +78,7 @@ /** * get the build root. - * + * * @return the build root */ public TreeMapNode getRoot() { 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 2006-10-23 21:45:31 UTC (rev 60) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/example/BuilderXML.java 2006-10-23 21:58:57 UTC (rev 61) @@ -1,4 +1,4 @@ -package org.jense.swing.jtreemap.example; +package net.sf.jtreemap.swing.example; import java.io.File; import java.io.IOException; @@ -8,7 +8,7 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; -import org.jense.swing.jtreemap.*; +import net.sf.jtreemap.swing.*; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -17,7 +17,7 @@ /** * Parse a XML file to build the tree. <BR> - * + * * @author Laurent Dutheil */ @@ -32,7 +32,7 @@ /** * Constructor - * + * * @param stFileName XML file name * @throws ParseException if the file don't correspond to the TreeMap.dtd */ @@ -43,7 +43,7 @@ /** * get the build root - * + * * @return the build root */ public TreeMapNode getRoot() { Modified: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/example/HSBTreeMapColorProvider.java =================================================================== --- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/example/HSBTreeMapColorProvider.java 2006-10-23 21:45:31 UTC (rev 60) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/example/HSBTreeMapColorProvider.java 2006-10-23 21:58:57 UTC (rev 61) @@ -1,7 +1,7 @@ /* * HSBTreeMapColorProvider.java Created on Feb 17, 2006 */ -package org.jense.swing.jtreemap.example; +package net.sf.jtreemap.swing.example; import java.awt.Color; import java.awt.Graphics; @@ -9,18 +9,18 @@ import javax.swing.JPanel; -import org.jense.swing.jtreemap.ColorProvider; -import org.jense.swing.jtreemap.DefaultValue; -import org.jense.swing.jtreemap.JTreeMap; -import org.jense.swing.jtreemap.TreeMapNode; -import org.jense.swing.jtreemap.Value; +import net.sf.jtreemap.swing.ColorProvider; +import net.sf.jtreemap.swing.DefaultValue; +import net.sf.jtreemap.swing.JTreeMap; +import net.sf.jtreemap.swing.TreeMapNode; +import net.sf.jtreemap.swing.Value; /** * An HSB color space color provider for JTreeMap. Uses a specified function to * map the values onto the HSB color space. The default is a linear function, * but in my experience one of the logarithmic ones works best for this color * space. - * + * * @author Andy Adamczak */ public class HSBTreeMapColorProvider extends ColorProvider { @@ -29,23 +29,23 @@ */ public enum ColorDistributionTypes { /** - * + * */ Linear, /** - * + * */ Log, /** - * + * */ Exp, /** - * + * */ SquareRoot, /** - * + * */ CubicRoot } @@ -145,8 +145,8 @@ /* * (non-Javadoc) - * - * @see org.jense.swing.jtreemap.ColorProvider#getLegendPanel() + * + * @see net.sf.jtreemap.swing.ColorProvider#getLegendPanel() */ @Override public JPanel getLegendPanel() @@ -176,7 +176,7 @@ // hue/saturation // constructions for grey scales. float[] hsbvals = new float[3]; - + hsbvals = Color.RGBtoHSB(positiveColor.getRed(), positiveColor.getGreen(), positiveColor.getBlue(), hsbvals); m_positiveHue = hsbvals[0]; m_positiveSaturation = 1f; @@ -211,8 +211,8 @@ /* * (non-Javadoc) - * - * @see org.jense.swing.jtreemap.ColorProvider#getColor(org.jense.swing.jtreemap.Value) + * + * @see net.sf.jtreemap.swing.ColorProvider#getColor(net.sf.jtreemap.swing.Value) */ @Override public Color getColor(Value value) @@ -245,7 +245,7 @@ /** * Given a value, maps that value to a new value using the specified math function - * + * * @param value * the value to convert * @return the converted value @@ -269,7 +269,7 @@ /** * Set the max and the min values in the tree map - * + * * @param root * root of the JTreeMap */ @@ -336,7 +336,7 @@ private ColorDistributionTypes m_colorDistribution = ColorDistributionTypes.Linear; /** * Panel with the legend - * + * * @author Laurent Dutheil */ private class Legend extends JPanel { 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 2006-10-23 21:45:31 UTC (rev 60) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/example/JTreeMapAppletExample.java 2006-10-23 21:58:57 UTC (rev 61) @@ -1,22 +1,22 @@ /* * Created on 28 oct. 2005 */ -package org.jense.swing.jtreemap.example; +package net.sf.jtreemap.swing.example; import java.awt.BorderLayout; import java.awt.Font; import javax.swing.JApplet; -import org.jense.swing.jtreemap.JTreeMap; -import org.jense.swing.jtreemap.SplitBySortedWeight; -import org.jense.swing.jtreemap.TreeMapNode; -import org.jense.swing.jtreemap.TreeMapNodeBuilder; -import org.jense.swing.jtreemap.Value; +import net.sf.jtreemap.swing.JTreeMap; +import net.sf.jtreemap.swing.SplitBySortedWeight; +import net.sf.jtreemap.swing.TreeMapNode; +import net.sf.jtreemap.swing.TreeMapNodeBuilder; +import net.sf.jtreemap.swing.Value; /** * Test of JTreeMap in a JApplet - * + * * @author Laurent Dutheil */ public class JTreeMapAppletExample extends JApplet { @@ -34,7 +34,7 @@ /* * (non-Javadoc) - * + * * @see java.applet.Applet#start() */ @Override @@ -50,7 +50,7 @@ new ZoomPopupMenu(this.jTreeMap); getJContentPane().add(this.jTreeMap, BorderLayout.CENTER); - + } /** @@ -64,7 +64,7 @@ /** * This method initializes jContentPane - * + * * @return javax.swing.JPanel */ private javax.swing.JPanel getJContentPane() { @@ -84,7 +84,7 @@ */ private TreeMapNode getRoot() { TreeMapNodeBuilder builder = new TreeMapNodeBuilder(); - + TreeMapNode root = builder.buildBranch("Root", null); TreeMapNode tmn1 = builder.buildBranch("branch1", root); TreeMapNode tmn11 = builder.buildBranch("branch11", tmn1); @@ -214,7 +214,7 @@ builder.buildLeaf("leaf433",0.5, value, tmn43); value = new ValuePercent(0.0); builder.buildLeaf("leaf434",3.0, value, tmn43); - + return builder.getRoot(); } } 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 2006-10-23 21:45:31 UTC (rev 60) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/example/JTreeMapExample.java 2006-10-23 21:58:57 UTC (rev 61) @@ -1,4 +1,4 @@ -package org.jense.swing.jtreemap.example; +package net.sf.jtreemap.swing.example; import java.awt.*; import javax.swing.*; @@ -16,11 +16,11 @@ import javax.swing.filechooser.FileFilter; import javax.swing.tree.DefaultTreeModel; -import org.jense.swing.jtreemap.*; +import net.sf.jtreemap.swing.*; /** * Test of JTreeMap - * + * * @author Laurent Dutheil */ public class JTreeMapExample extends JFrame implements ActionListener { @@ -63,7 +63,7 @@ * same level */ // TreeMapNode.setBorder(5); - + // add a popup menu to zoom the JTreeMap this.zoomPopup = new ZoomPopupMenu(this.jTreeMap); @@ -78,7 +78,7 @@ /** * main - * + * * @param args command line */ public static void main(String[] args) { @@ -89,7 +89,7 @@ /* * (non-Javadoc) - * + * * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) */ public void actionPerformed(ActionEvent e) { @@ -129,7 +129,7 @@ /** * Set the tm3 file - * + * * @param path the path of the tm3 file */ public void setTm3File(String path) { @@ -151,7 +151,7 @@ /** * Set the xml file corresponding to the TreeMap.dtd - * + * * @param xmlFileName xml file name */ public void setXmlFile(String xmlFileName) { @@ -173,7 +173,7 @@ /** * Code to execute before closing the window - * + * * @param e WindowEvent */ protected void this_windowClosing(WindowEvent e) { @@ -410,12 +410,12 @@ * This method build a default TreeMap root. <BR> * This methode may be replaced by one who get the root from a servlet or a * jdbc client or something else... - * + * * @return the root of the TreeMap. */ private TreeMapNode getDefaultRoot() { TreeMapNodeBuilder builder = new TreeMapNodeBuilder(); - + TreeMapNode root = builder.buildBranch("Root", null); TreeMapNode tmn1 = builder.buildBranch("branch1", root); TreeMapNode tmn11 = builder.buildBranch("branch11", tmn1); @@ -547,13 +547,13 @@ builder.buildLeaf("leaf434", 3.0, value, tmn43); value = new ValuePercent(0.0); builder.buildLeaf("leaf5", 5.0, value, root); - + return builder.getRoot(); } /** * init the window - * + * * @throws Exception */ private void initGUI() throws Exception { Modified: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/example/RandomColorProvider.java =================================================================== --- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/example/RandomColorProvider.java 2006-10-23 21:45:31 UTC (rev 60) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/example/RandomColorProvider.java 2006-10-23 21:58:57 UTC (rev 61) @@ -1,7 +1,7 @@ /* * Created on 4 nov. 2005 */ -package org.jense.swing.jtreemap.example; +package net.sf.jtreemap.swing.example; import java.awt.Color; import java.awt.Dimension; @@ -12,10 +12,10 @@ import javax.swing.JPanel; -import org.jense.swing.jtreemap.ColorProvider; -import org.jense.swing.jtreemap.JTreeMap; -import org.jense.swing.jtreemap.TreeMapNode; -import org.jense.swing.jtreemap.Value; +import net.sf.jtreemap.swing.ColorProvider; +import net.sf.jtreemap.swing.JTreeMap; +import net.sf.jtreemap.swing.TreeMapNode; +import net.sf.jtreemap.swing.Value; /** * <p> @@ -32,13 +32,13 @@ 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(204, 204, 51), new Color(205, 102, 204), new Color(51, 153, 255), new Color(153, 102, 0) }; private int cursor = 0; protected TreeMap<Value, Color> mapping = new TreeMap<Value, Color>(); private JPanel legend; protected JTreeMap jTreeMap; - + /** * Constructor * @param jTreeMap jTreeMap to color @@ -48,8 +48,8 @@ } /* * (non-Javadoc) - * - * @see org.jense.swing.jtreemap.ColorProvider#getColor(double) + * + * @see net.sf.jtreemap.swing.ColorProvider#getColor(double) */ @Override public Color getColor(Value value) { @@ -78,8 +78,8 @@ /* * (non-Javadoc) - * - * @see org.jense.swing.jtreemap.ColorProvider#getLegendPanel() + * + * @see net.sf.jtreemap.swing.ColorProvider#getLegendPanel() */ @Override public JPanel getLegendPanel() { @@ -91,7 +91,7 @@ /** * Panel with the legend - * + * * @author Laurent Dutheil */ protected class Legend extends JPanel { Modified: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/example/RedGreenColorProvider.java =================================================================== --- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/example/RedGreenColorProvider.java 2006-10-23 21:45:31 UTC (rev 60) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/example/RedGreenColorProvider.java 2006-10-23 21:58:57 UTC (rev 61) @@ -1,11 +1,11 @@ -package org.jense.swing.jtreemap.example; +package net.sf.jtreemap.swing.example; import javax.swing.JPanel; -import org.jense.swing.jtreemap.ColorProvider; -import org.jense.swing.jtreemap.JTreeMap; -import org.jense.swing.jtreemap.TreeMapNode; -import org.jense.swing.jtreemap.Value; +import net.sf.jtreemap.swing.ColorProvider; +import net.sf.jtreemap.swing.JTreeMap; +import net.sf.jtreemap.swing.TreeMapNode; +import net.sf.jtreemap.swing.Value; import java.awt.Color; import java.awt.Graphics; @@ -13,7 +13,7 @@ /** * ColorProvider who, with a max absolute value M, choose the color between * values -M and M. - * + * * @author Laurent Dutheil */ @@ -27,7 +27,7 @@ /** * Constructor - * + * * @param jTreeMap the JTreeMap to color */ public RedGreenColorProvider(JTreeMap jTreeMap) { @@ -106,7 +106,7 @@ /** * Panel with the legend - * + * * @author Laurent Dutheil */ private class Legend extends JPanel { Modified: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/example/ValuePercent.java =================================================================== --- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/example/ValuePercent.java 2006-10-23 21:45:31 UTC (rev 60) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/example/ValuePercent.java 2006-10-23 21:58:57 UTC (rev 61) @@ -1,12 +1,12 @@ -package org.jense.swing.jtreemap.example; +package net.sf.jtreemap.swing.example; import java.text.NumberFormat; -import org.jense.swing.jtreemap.Value; +import net.sf.jtreemap.swing.Value; /** * class who can display the values of elements of a JTreeMap with pourcent - * + * * @author Laurent Dutheil */ @@ -26,7 +26,7 @@ /** * Constructor of ValuePercent - * + * * @param value double value */ public ValuePercent(double value) { Modified: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/example/ZoomPopupMenu.java =================================================================== --- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/example/ZoomPopupMenu.java 2006-10-23 21:45:31 UTC (rev 60) +++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/example/ZoomPopupMenu.java 2006-10-23 21:58:57 UTC (rev 61) @@ -1,7 +1,7 @@ /* * Created on 28 oct. 2005 */ -package org.jense.swing.jtreemap.example; +package net.sf.jtreemap.swing.example; import java.awt.event.ActionEvent; import java.awt.event.MouseAdapter; @@ -13,14 +13,14 @@ import javax.swing.ImageIcon; import javax.swing.JPopupMenu; -import org.jense.swing.jtreemap.JTreeMap; -import org.jense.swing.jtreemap.TreeMapNode; +import net.sf.jtreemap.swing.JTreeMap; +import net.sf.jtreemap.swing.TreeMapNode; /** * PopupMenu which permits to zoom the JTreeMap<BR> * The menuItems are the ancestors and the children of the displayed TreeMapNode * of the JTreeMap - * + * * @author Laurent Dutheil */ public class ZoomPopupMenu extends JPopupMenu { @@ -53,7 +53,7 @@ /* * (non-Javadoc) - * + * * @see java.awt.event.MouseListener#mouseClicked(java.awt.event.MouseEvent) */ @Override @@ -114,7 +114,7 @@ /* * (non-Javadoc) - * + * * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) */ public void actionPerformed(ActionEvent e) { @@ -125,7 +125,7 @@ /* * (non-Javadoc) - * + * * @see javax.swing.Action#isEnabled() */ @Override Modified: trunk/JTreeMap/src/site/navigation.xml =================================================================== --- trunk/JTreeMap/src/site/navigation.xml 2006-10-23 21:45:31 UTC (rev 60) +++ trunk/JTreeMap/src/site/navigation.xml 2006-10-23 21:58:57 UTC (rev 61) @@ -9,7 +9,7 @@ <links> <item name="Page on Sourceforge" href="http://jtreemap.sourceforge.net" /> <item name="Main Page" href="../../index.html" /> - <item name="KTreeMap" href="../org.jense.ktreemap/index.html" /> + <item name="KTreeMap" href="../net.sf.jtreemap.ktreemap/index.html" /> </links> <sitemap/> <search/> Modified: trunk/KTreeMap/.project =================================================================== --- trunk/KTreeMap/.project 2006-10-23 21:45:31 UTC (rev 60) +++ trunk/KTreeMap/.project 2006-10-23 21:58:57 UTC (rev 61) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>org.jense.ktreemap</name> + <name>net.sf.jtreemap.ktreemap</name> <comment></comment> <projects> </projects> Modified: trunk/KTreeMap/META-INF/MANIFEST.MF =================================================================== --- trunk/KTreeMap/META-INF/MANIFEST.MF 2006-10-23 21:45:31 UTC (rev 60) +++ trunk/KTreeMap/META-INF/MANIFEST.MF 2006-10-23 21:58:57 UTC (rev 61) @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: KTreeMap Plug-in -Bundle-SymbolicName: org.jense.ktreemap;singleton:=true +Bundle-SymbolicName: net.sf.jtreemap.ktreemap;singleton:=true Bundle-Version: 1.0.0 Bundle-Vendor: Jense Bundle-Localization: plugin Modified: trunk/KTreeMap/project.xml =================================================================== --- trunk/KTreeMap/project.xml 2006-10-23 21:45:31 UTC (rev 60) +++ trunk/KTreeMap/project.xml 2006-10-23 21:58:57 UTC (rev 61) @@ -25,8 +25,8 @@ <project> <extend>../common-build/project.xml</extend> <name>KTreeMap</name> - <artifactId>org.jense.ktreemap</artifactId> - <package>org.jense.ktreemap</package> + <artifactId>net.sf.jtreemap.ktreemap</artifactId> + <package>net.sf.jtreemap.ktreemap</package> <shortDescription>KTreeMap is a Java SWT component which reprensents hierarchical structure in a Treemap.</shortDescription> <description> KTreeMap is a Java SWT component which represents hierarchical structure in a Treemap Modified: trunk/KTreeMap/qalab.xml =================================================================== --- trunk/KTreeMap/qalab.xml 2006-10-23 21:45:31 UTC (rev 60) +++ trunk/KTreeMap/qalab.xml 2006-10-23 21:58:57 UTC (rev 61) @@ -21,6 +21,10 @@ <summaryresult date="2006-10-18" filecount="1" statvalue="4" type="pmd"/> <summaryresult date="2006-10-18" filecount="6" statvalue="7" type="findbugs"/> <summaryresult date="2006-10-18" filecount="2" statvalue="34" type="simian"/> + <summaryresult date="2006-10-23" filecount="22" statvalue="136" type="checkstyle"/> + <summaryresult date="2006-10-23" filecount="1" statvalue="4" type="pmd"/> + <summaryresult date="2006-10-23" filecount="6" sta... [truncated message content] |
From: <be...@us...> - 2006-10-23 21:45:49
|
Revision: 60 http://svn.sourceforge.net/jtreemap/?rev=60&view=rev Author: benoitx Date: 2006-10-23 14:45:31 -0700 (Mon, 23 Oct 2006) Log Message: ----------- Removed file/folder Removed Paths: ------------- trunk/KTreeMap/src/main/java/org/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |