[Jfreechart-commit] jfreechart/source/org/jfree/chart/plot/junit MeterPlotTests.java,1.5,1.6

[David G. <mu...@us...>]

Update of /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/plot/junit
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2449/source/org/jfree/chart/plot/junit

Modified Files:
	MeterPlotTests.java 
Log Message:
2005-11-10  David Gilbert  <dav...@ob...>

	* source/org/jfree/chart/plot/MeterPlot.java
	(tickSize): New field,
	(tickPaint): New field,
	(tickLabelPaint): New field,
	(MeterPlot(ValueDataset)): Initialise new fields,
	(getTickSize): New method,
	(setTickSize): New method,
	(getTickPaint): New method,
	(setTickPaint): New method,
	(getTickLabelPaint): New method,
	(setTickLabelPaint): New method,
	(getLegendItems): Use interval background paint,
	(draw): Call new drawValueLabel() method,
	(drawArcForInterval): Updated for refactored methods,
	(fillArc): Changed from private to protected,
	(drawTicks): Use new tickSize field,
	(drawTick(Graphics2D, Rectangle2D, double)):  Updated for refactored 
	methods,
	(drawTick(Graphics2D, Rectangle2D, double, boolean, Paint, boolean, 
	String)):  Removed special case for current value, and the now 
	redundant method parameters,
	(drawValueLabel): New method,
	(equals): Updated for new fields,
	* source/org/jfree/chart/plot/junit/MeterPlotTests.java:
	(testEquals): Updated for new fields.



Index: MeterPlotTests.java
===================================================================
RCS file: /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/plot/junit/MeterPlotTests.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MeterPlotTests.java	17 Jun 2005 09:26:46 -0000	1.5
--- MeterPlotTests.java	10 Nov 2005 11:51:07 -0000	1.6
***************
*** 17,23 ****
   * License for more details.
   *
!  * You should have received a copy of the GNU Lesser General Public License 
!  * along with this library; if not, write to the Free Software Foundation, 
!  * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
   *
   * [Java is a trademark or registered trademark of Sun Microsystems, Inc. 
--- 17,24 ----
   * License for more details.
   *
!  * You should have received a copy of the GNU Lesser General Public
!  * License along with this library; if not, write to the Free Software
!  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, 
!  * USA.  
   *
   * [Java is a trademark or registered trademark of Sun Microsystems, Inc. 
***************
*** 170,173 ****
--- 171,180 ----
          assertTrue(plot1.equals(plot2));
          
+         // tick label paint
+         plot1.setTickLabelPaint(Color.red);
+         assertFalse(plot1.equals(plot2));
+         plot2.setTickLabelPaint(Color.red);
+         assertTrue(plot1.equals(plot2));        
+         
          // tick label format
          plot1.setTickLabelFormat(new DecimalFormat("0"));
***************
*** 176,179 ****
--- 183,198 ----
          assertTrue(plot1.equals(plot2));
          
+         // tick paint
+         plot1.setTickPaint(Color.green);
+         assertFalse(plot1.equals(plot2));
+         plot2.setTickPaint(Color.green);
+         assertTrue(plot1.equals(plot2));
+         
+         // tick size
+         plot1.setTickSize(1.23);
+         assertFalse(plot1.equals(plot2));
+         plot2.setTickSize(1.23);
+         assertTrue(plot1.equals(plot2));        
+ 
          // meter angle
          plot1.setMeterAngle(22);