[Jfreechart-commit] jfreechart/source/org/jfree/chart/plot CategoryPlot.java, 1.23.2.15, 1.23.2.16

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

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

Modified Files:
      Tag: STABLE_1-0-0
	CategoryPlot.java 
Log Message:
2007-03-13  David Gilbert  <dav...@ob...>

	* source/org/jfree/chart/plot/CategoryPlot.java
	(draw): Moved annotation drawing up to point where clipping still
	applies.



Index: CategoryPlot.java
===================================================================
RCS file: /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/plot/CategoryPlot.java,v
retrieving revision 1.23.2.15
retrieving revision 1.23.2.16
diff -C2 -d -r1.23.2.15 -r1.23.2.16
*** CategoryPlot.java	13 Mar 2007 11:08:44 -0000	1.23.2.15
--- CategoryPlot.java	13 Mar 2007 11:38:12 -0000	1.23.2.16
***************
*** 146,150 ****
   *               ignored) (DG);
   * 13-Mar-2007 : Added null argument checks for setRangeCrosshairPaint() and
!  *               setRangeCrosshairStroke() (DG);
   * 
   */
--- 146,151 ----
   *               ignored) (DG);
   * 13-Mar-2007 : Added null argument checks for setRangeCrosshairPaint() and
!  *               setRangeCrosshairStroke(), fixed clipping for 
!  *               anntotations (DG);
   * 
   */
***************
*** 2612,2615 ****
--- 2613,2627 ----
              }
          }
+         // draw the foreground markers...
+         for (int i = 0; i < this.renderers.size(); i++) {
+             drawDomainMarkers(g2, dataArea, i, Layer.FOREGROUND);
+         }
+         for (int i = 0; i < this.renderers.size(); i++) {
+             drawRangeMarkers(g2, dataArea, i, Layer.FOREGROUND);
+         }
+ 
+         // draw the annotations (if any)...
+         drawAnnotations(g2, dataArea);
+ 
          g2.setClip(savedClip);
          g2.setComposite(originalComposite);
***************
*** 2627,2641 ****
          }
  
-         // draw the foreground markers...
-         for (int i = 0; i < this.renderers.size(); i++) {
-             drawDomainMarkers(g2, dataArea, i, Layer.FOREGROUND);
-         }
-         for (int i = 0; i < this.renderers.size(); i++) {
-             drawRangeMarkers(g2, dataArea, i, Layer.FOREGROUND);
-         }
- 
-         // draw the annotations (if any)...
-         drawAnnotations(g2, dataArea);
- 
          // draw an outline around the plot area...
          if (getRenderer() != null) {
--- 2639,2642 ----
***************
*** 2898,2902 ****
              while (iterator.hasNext()) {
                  CategoryAnnotation annotation 
!                     = (CategoryAnnotation) iterator.next();
                  annotation.draw(g2, this, dataArea, getDomainAxis(), 
                          getRangeAxis());
--- 2899,2903 ----
              while (iterator.hasNext()) {
                  CategoryAnnotation annotation 
!                         = (CategoryAnnotation) iterator.next();
                  annotation.draw(g2, this, dataArea, getDomainAxis(), 
                          getRangeAxis());