jfreechart-commit — Receives automatic notification of all CVS commits

[Jfreechart-commit] SF.net SVN: jfreechart:[3272] branches/jfreechart-1.0.x-branch/source/org/ jfree/chart/ChartPanel.java

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

Revision: 3272
          http://sourceforge.net/p/jfreechart/code/3272
Author:   mungady
Date:     2014-07-29 09:38:54 +0000 (Tue, 29 Jul 2014)
Log Message:
-----------
Minor source formatting.

Modified Paths:
--------------
    branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartPanel.java

Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartPanel.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartPanel.java	2014-07-29 09:37:18 UTC (rev 3271)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartPanel.java	2014-07-29 09:38:54 UTC (rev 3272)
@@ -2,7 +2,7 @@
  * JFreeChart : a free chart library for the Java(tm) platform
  * ===========================================================
  *
- * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors.
+ * (C) Copyright 2000-2014, by Object Refinery Limited and Contributors.
  *
  * Project Info:  http://www.jfree.org/jfreechart/index.html
  *
@@ -27,7 +27,7 @@
  * ---------------
  * ChartPanel.java
  * ---------------
- * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors.
+ * (C) Copyright 2000-2014, by Object Refinery Limited and Contributors.
  *
  * Original Author:  David Gilbert (for Object Refinery Limited);
  * Contributor(s):   Andrzej Porebski;
@@ -556,7 +556,7 @@
      * @since 1.0.13
      */
     private List overlays;
-
+    
     /**
      * Constructs a panel that displays the specified chart.
      *
@@ -1541,7 +1541,7 @@
             return;
         }
         Graphics2D g2 = (Graphics2D) g.create();
-
+        
         // first determine the size of the chart rendering area...
         Dimension size = getSize();
         Insets insets = getInsets();
@@ -1624,8 +1624,7 @@
                     this.chart.draw(bufferG2, chartArea, this.anchor,
                             this.info);
                     bufferG2.setTransform(saved);
-                }
-                else {
+                } else {
                     this.chart.draw(bufferG2, bufferArea, this.anchor,
                             this.info);
                 }
@@ -1635,11 +1634,7 @@
             // zap the buffer onto the panel...
             g2.drawImage(this.chartBuffer, insets.left, insets.top, this);
 
-        }
-
-        // or redrawing the chart every time...
-        else {
-
+        } else { // redrawing the chart every time...
             AffineTransform saved = g2.getTransform();
             g2.translate(insets.left, insets.top);
             if (scale) {
@@ -1668,7 +1663,6 @@
         this.anchor = null;
         this.verticalTraceLine = null;
         this.horizontalTraceLine = null;
-
     }
 
     /**

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jfreechart-commit] SF.net SVN: jfreechart:[3271] branches/jfreechart-1.0.x-branch/source/org/ jfree/chart/JFreeChart.java

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

Revision: 3271
          http://sourceforge.net/p/jfreechart/code/3271
Author:   mungady
Date:     2014-07-29 09:37:18 +0000 (Tue, 29 Jul 2014)
Log Message:
-----------
Minor Javadoc update.

Modified Paths:
--------------
    branches/jfreechart-1.0.x-branch/source/org/jfree/chart/JFreeChart.java

Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/JFreeChart.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/JFreeChart.java	2014-07-29 09:36:35 UTC (rev 3270)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/JFreeChart.java	2014-07-29 09:37:18 UTC (rev 3271)
@@ -460,11 +460,10 @@
 
     /**
      * Sets the rendering hints for the chart.  These will be added (using the
-     * Graphics2D.addRenderingHints() method) near the start of the
-     * JFreeChart.draw() method.
+     * {@code Graphics2D.addRenderingHints()} method) near the start of the
+     * {@code JFreeChart.draw()} method.
      *
-     * @param renderingHints  the rendering hints (<code>null</code> not
-     *                        permitted).
+     * @param renderingHints  the rendering hints ({@code null} not permitted).
      *
      * @see #getRenderingHints()
      */

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jfreechart-commit] SF.net SVN: jfreechart:[3270] branches/jfreechart-1.0.x-branch/source/org/ jfree/chart/plot/CategoryPlot.java

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

Revision: 3270
          http://sourceforge.net/p/jfreechart/code/3270
Author:   mungady
Date:     2014-07-29 09:36:35 +0000 (Tue, 29 Jul 2014)
Log Message:
-----------
Minor Javadoc update.

Modified Paths:
--------------
    branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/CategoryPlot.java

Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/CategoryPlot.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/CategoryPlot.java	2014-07-29 09:31:49 UTC (rev 3269)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/CategoryPlot.java	2014-07-29 09:36:35 UTC (rev 3270)
@@ -3957,8 +3957,8 @@
     /**
      * Draws the range gridlines for the plot, if they are visible.
      *
-     * @param g2  the graphics device.
-     * @param dataArea  the area inside the axes.
+     * @param g2  the graphics device ({@code null} not permitted).
+     * @param dataArea  the area inside the axes ({@code null} not permitted).
      * @param ticks  the ticks.
      *
      * @see #drawDomainGridlines(Graphics2D, Rectangle2D)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jfreechart-commit] SF.net SVN: jfreechart:[3269] branches/jfreechart-1.0.x-branch/source/org/ jfree/chart/fx/demo/TimeSeriesChartFXDemo1.java

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

Revision: 3269
          http://sourceforge.net/p/jfreechart/code/3269
Author:   mungady
Date:     2014-07-29 09:31:49 +0000 (Tue, 29 Jul 2014)
Log Message:
-----------
Remove unused import.

Modified Paths:
--------------
    branches/jfreechart-1.0.x-branch/source/org/jfree/chart/fx/demo/TimeSeriesChartFXDemo1.java

Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/fx/demo/TimeSeriesChartFXDemo1.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/fx/demo/TimeSeriesChartFXDemo1.java	2014-07-29 09:29:43 UTC (rev 3268)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/fx/demo/TimeSeriesChartFXDemo1.java	2014-07-29 09:31:49 UTC (rev 3269)
@@ -45,7 +45,6 @@
 import org.jfree.chart.JFreeChart;
 import org.jfree.chart.block.BlockBorder;
 import org.jfree.chart.fx.ChartViewer;
-import org.jfree.chart.plot.PlotOrientation;
 import org.jfree.chart.plot.XYPlot;
 import org.jfree.chart.renderer.xy.XYItemRenderer;
 import org.jfree.chart.renderer.xy.XYLineAndShapeRenderer;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jfreechart-commit] SF.net SVN: jfreechart:[3268] branches/jfreechart-1.0.x-branch/source/org/ jfree/chart/ChartHints.java

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

Revision: 3268
          http://sourceforge.net/p/jfreechart/code/3268
Author:   mungady
Date:     2014-07-29 09:29:43 +0000 (Tue, 29 Jul 2014)
Log Message:
-----------
Updated Javadocs.

Modified Paths:
--------------
    branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartHints.java

Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartHints.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartHints.java	2014-07-29 07:22:12 UTC (rev 3267)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartHints.java	2014-07-29 09:29:43 UTC (rev 3268)
@@ -43,11 +43,11 @@
 import java.util.Map;
 
 /**
- * Special rendering hints that can be used internally by JFreeChart to provide
- * links between rendered items and the chart elements that they represent.
- * Most <code>Graphics2D</code> implementations will ignore these hints but
- * some, for example JFreeSVG's SVGGraphics2D class, will use the hints to
- * drive the output content.
+ * Special rendering hints that can be used internally by JFreeChart or by
+ * specialised implementations of the {@code Graphics2D} API.  For example,
+ * JFreeSVG's {@code SVGGraphics2D} class, will use the 
+ * {@code KEY_BEGIN_ELEMENT} and {@code KEY_END_ELEMENT} hints to drive the 
+ * output content.
  * 
  * @since 1.0.18
  */

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jfreechart-commit] SF.net SVN: jfreechart:[3267] branches/jfreechart-1.0.x-branch/ant

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

Revision: 3267
          http://sourceforge.net/p/jfreechart/code/3267
Author:   mungady
Date:     2014-07-29 07:22:12 +0000 (Tue, 29 Jul 2014)
Log Message:
-----------
Build source jars as per patch in bug #960

Modified Paths:
--------------
    branches/jfreechart-1.0.x-branch/ant/build-swt.xml
    branches/jfreechart-1.0.x-branch/ant/build.xml

Modified: branches/jfreechart-1.0.x-branch/ant/build-swt.xml
===================================================================
--- branches/jfreechart-1.0.x-branch/ant/build-swt.xml	2014-07-29 07:12:06 UTC (rev 3266)
+++ branches/jfreechart-1.0.x-branch/ant/build-swt.xml	2014-07-29 07:22:12 UTC (rev 3267)
@@ -76,9 +76,26 @@
 
     </target>
 
+    <!-- Generate the JFreeChart SWT source code jar -->
+    <target name="source-jar-swt" depends="initialise"
+            description="Package the JFreeChart SWT source code in a jar">
+        <!-- create a temp build directory -->
+        <mkdir dir="${basedir}/source-jar-swt"/>
+        <!-- copy source code -->
+        <copy todir="${basedir}/source-jar-swt/">
+            <fileset dir="${basedir}/swt"/>
+        </copy>
+        <!-- make the jar -->
+        <jar jarfile="${basedir}/lib/${jfreechart.name}-${jfreechart.version}-swt-src.jar"
+             basedir="${basedir}/source-jar-swt">
+        </jar>
+        <!-- delete the temp directory -->
+        <delete dir="${basedir}/source-jar-swt"/>
+    </target>
+
     <!-- ALL -->
     <target name="all"
-            depends="compile-swtgraphics,compile-swt"
+            depends="compile-swtgraphics,compile-swt,source-jar-swt"
             description="Compiles and package in jar files all the SWT related code in JFreeChart.">
 
     </target>

Modified: branches/jfreechart-1.0.x-branch/ant/build.xml
===================================================================
--- branches/jfreechart-1.0.x-branch/ant/build.xml	2014-07-29 07:12:06 UTC (rev 3266)
+++ branches/jfreechart-1.0.x-branch/ant/build.xml	2014-07-29 07:22:12 UTC (rev 3267)
@@ -137,7 +137,28 @@
         <delete dir="${basedir}/build" />
     </target>
 
+    <!-- Generate the JFreeChart source code jar -->
+    <target name="source-jar" depends="initialise"
+            description="Package the JFreeChart source code in a jar">
 
+        <!-- create a temp build directory -->
+        <mkdir dir="${basedir}/source-jar"/>
+
+        <!-- copy source code -->
+        <copy todir="${basedir}/source-jar/">
+            <fileset dir="${basedir}/source"/>
+        </copy>
+
+        <!-- make the jar -->
+        <jar jarfile="${basedir}/lib/${jfreechart.name}-${jfreechart.version}-src.jar"
+             basedir="${basedir}/source-jar">
+        </jar>
+
+        <!-- delete the temp directory -->
+        <delete dir="${basedir}/source-jar"/>
+
+    </target>
+
     <!-- Generate the JFreeChart API HTML pages -->
     <target name="javadoc"
             description="Generate the Javadoc HTML pages."
@@ -381,7 +402,7 @@
 
     <!-- ALL -->
     <target name="all"
-            depends="compile,compile-experimental,zip-javadocs,zip,targz,maven-bundle"
+            depends="compile,compile-experimental,zip-javadocs,zip,targz,maven-bundle,source-jar"
             description="Compiles JFreeChart, builds the jar files, generates the Javadoc HTML pages and creates distribution files (.zip and .tar.gz).">
 
         <!-- delete the temporary distribution directory -->

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jfreechart-commit] SF.net SVN: jfreechart:[3266] branches/jfreechart-1.0.x-branch/tests/org/ jfree/chart/JFreeChartTest.java

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

Revision: 3266
          http://sourceforge.net/p/jfreechart/code/3266
Author:   mungady
Date:     2014-07-29 07:12:06 +0000 (Tue, 29 Jul 2014)
Log Message:
-----------
Added testBug942().

Modified Paths:
--------------
    branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/JFreeChartTest.java

Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/JFreeChartTest.java
===================================================================
--- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/JFreeChartTest.java	2014-07-24 14:41:37 UTC (rev 3265)
+++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/JFreeChartTest.java	2014-07-29 07:12:06 UTC (rev 3266)
@@ -2,7 +2,7 @@
  * JFreeChart : a free chart library for the Java(tm) platform
  * ===========================================================
  *
- * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors.
+ * (C) Copyright 2000-2014, by Object Refinery Limited and Contributors.
  *
  * Project Info:  http://www.jfree.org/jfreechart/index.html
  *
@@ -27,7 +27,7 @@
  * -------------------
  * JFreeChartTest.java
  * -------------------
- * (C) Copyright 2002-2013, by Object Refinery Limited.
+ * (C) Copyright 2002-2014, by Object Refinery Limited.
  *
  * Original Author:  David Gilbert (for Object Refinery Limited);
  * Contributor(s):   -;
@@ -40,6 +40,7 @@
  *               null titles cannot be created (DG);
  * 24-Nov-2005 : Removed OldLegend (DG);
  * 16-May-2007 : Added some new tests (DG);
+ * 29-Jul-2014 : Added testBug942() (DG);
  *
  */
 
@@ -469,6 +470,13 @@
         this.lastChartChangeEvent = null;
     }
 
+    @Test
+    public void testBug942() throws Exception {
+        final String title = "Pie Chart Demo 1\n\n\ntestnew line";
+        assertEquals(title, ChartFactory.createPieChart(title, 
+                new DefaultPieDataset()).getTitle().getText());
+    }
+
     /** The last ChartChangeEvent received. */
     private ChartChangeEvent lastChartChangeEvent;
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jfreechart-commit] SF.net SVN: jfreechart:[3265] branches/jfreechart-1.0.x-branch/pom.xml

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

Revision: 3265
          http://sourceforge.net/p/jfreechart/code/3265
Author:   mungady
Date:     2014-07-24 14:41:37 +0000 (Thu, 24 Jul 2014)
Log Message:
-----------
Remove deps not required.

Modified Paths:
--------------
    branches/jfreechart-1.0.x-branch/pom.xml

Modified: branches/jfreechart-1.0.x-branch/pom.xml
===================================================================
--- branches/jfreechart-1.0.x-branch/pom.xml	2014-07-24 13:07:29 UTC (rev 3264)
+++ branches/jfreechart-1.0.x-branch/pom.xml	2014-07-24 14:41:37 UTC (rev 3265)
@@ -78,12 +78,6 @@
         </dependency>
 
         <dependency>
-            <groupId>xml-apis</groupId>
-            <artifactId>xml-apis</artifactId>
-            <version>1.3.04</version>
-        </dependency>
-
-        <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
             <version>2.5</version>
@@ -96,13 +90,6 @@
             <version>4.11</version>
             <scope>test</scope>
         </dependency>
-        
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-core</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>
 
     </dependencies>
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jfreechart-commit] SF.net SVN: jfreechart:[3264] branches/jfreechart-1.0.x-branch/pom.xml

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

Revision: 3264
          http://sourceforge.net/p/jfreechart/code/3264
Author:   mungady
Date:     2014-07-24 13:07:29 +0000 (Thu, 24 Jul 2014)
Log Message:
-----------
Updated pom file.

Modified Paths:
--------------
    branches/jfreechart-1.0.x-branch/pom.xml

Modified: branches/jfreechart-1.0.x-branch/pom.xml
===================================================================
--- branches/jfreechart-1.0.x-branch/pom.xml	2014-07-22 12:42:00 UTC (rev 3263)
+++ branches/jfreechart-1.0.x-branch/pom.xml	2014-07-24 13:07:29 UTC (rev 3264)
@@ -10,14 +10,14 @@
 
     <artifactId>jfreechart</artifactId>
     <groupId>org.jfree</groupId>
-    <version>1.0.17-SNAPSHOT</version>
+    <version>1.0.19-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <!-- this is required to host it on Sonatype's OSSRH -->
     <parent>
         <groupId>org.sonatype.oss</groupId>
         <artifactId>oss-parent</artifactId>
-        <version>7</version>
+        <version>9</version>
     </parent>
 
     <organization>
@@ -74,7 +74,7 @@
         <dependency>
             <groupId>org.jfree</groupId>
             <artifactId>jcommon</artifactId>
-            <version>1.0.17</version>
+            <version>1.0.21</version>
         </dependency>
 
         <dependency>
@@ -106,6 +106,13 @@
 
     </dependencies>
 
+    <distributionManagement>
+      <snapshotRepository>
+        <id>ossrh</id>
+        <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+      </snapshotRepository>
+    </distributionManagement>    
+    
     <build>
         <sourceDirectory>source</sourceDirectory>
         <testSourceDirectory>tests</testSourceDirectory>
@@ -122,42 +129,18 @@
         </resources>
 
         <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>animal-sniffer-maven-plugin</artifactId>
-                <version>1.7</version>
-                <configuration>
-                    <signature>
-                        <groupId>org.codehaus.mojo.signature</groupId>
-                        <artifactId>java16</artifactId>
-                        <version>1.0</version>
-                    </signature>
-                </configuration>
-            </plugin>
           
             <plugin>
-                <inherited>true</inherited>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.8</version>
-                <executions>
-                    <execution>
-                        <id>attach-javadoc</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
+                <version>3.1</version>
                 <configuration>
                     <source>${project.source.level}</source>
                     <target>${project.target.level}</target>
                     <encoding>${project.build.sourceEncoding}</encoding>
+                    <excludes>
+                      <exclude>org/jfree/chart/fx/**</exclude>
+                    </excludes>                
                 </configuration>
             </plugin>
 
@@ -179,22 +162,62 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
-                <version>2.5</version>
+                <version>2.6</version>
                 <configuration>
                     <encoding>${project.build.sourceEncoding}</encoding>
                 </configuration>
             </plugin>
 
             <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-gpg-plugin</artifactId>
+              <version>1.5</version>
+              <executions>
+                <execution>
+                  <id>sign-artifacts</id>
+                  <phase>verify</phase>
+                  <goals>
+                    <goal>sign</goal>
+                  </goals>
+                </execution>
+              </executions>
+            </plugin>
+
+            <plugin>
+              <groupId>org.sonatype.plugins</groupId>
+              <artifactId>nexus-staging-maven-plugin</artifactId>
+              <version>1.6.2</version>
+              <extensions>true</extensions>
+              <configuration>
+                <serverId>ossrh</serverId>
+                <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+                <autoReleaseAfterClose>false</autoReleaseAfterClose>
+              </configuration>
+            </plugin>            
+      
+            <plugin>
               <groupId>org.codehaus.mojo</groupId>
               <artifactId>cobertura-maven-plugin</artifactId>
               <version>2.5.1</version>
             </plugin>
 
             <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>animal-sniffer-maven-plugin</artifactId>
+                <version>1.7</version>
+                <configuration>
+                    <signature>
+                        <groupId>org.codehaus.mojo.signature</groupId>
+                        <artifactId>java16</artifactId>
+                        <version>1.0</version>
+                    </signature>
+                </configuration>
+            </plugin>
+          
+            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>
-                <version>2.3</version>
+                <version>3.4</version>
             </plugin>
         </plugins>
     </build>
@@ -204,7 +227,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.8</version>
+                <version>2.9.1</version>
             </plugin>
 
             <plugin>
@@ -232,4 +255,48 @@
         <project.source.level>1.6</project.source.level>
         <project.target.level>1.6</project.target.level>
     </properties>
+
+  <profiles>
+    <profile> 
+      <id>release</id>
+      <build>
+        <plugins>
+          <plugin>
+            <inherited>true</inherited>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <version>2.9.1</version>
+            <executions>
+              <execution>
+                <id>attach-javadoc</id>
+                <goals>
+                  <goal>jar</goal>
+                </goals>
+              </execution>
+            </executions>
+            <configuration>
+              <sourceFileExcludes>
+                <exclude>org/jfree/chart/fx/**</exclude>
+              </sourceFileExcludes>
+            </configuration>
+          </plugin>
+
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-source-plugin</artifactId>
+            <version>2.2.1</version>
+            <executions>
+              <execution>
+                <id>attach-sources</id>
+                <goals>
+                  <goal>jar-no-fork</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
 </project>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jfreechart-commit] SF.net SVN: jfreechart:[3263] branches/jfreechart-1.0.x-branch/source/org/ jfree/chart/fx/FXGraphics2D.java

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

Revision: 3263
          http://sourceforge.net/p/jfreechart/code/3263
Author:   mungady
Date:     2014-07-22 12:42:00 +0000 (Tue, 22 Jul 2014)
Log Message:
-----------
2014-07-21  David Gilbert  <dav...@ob...>

    * org/jfree/chart/fx/FXGraphics2D.java
    (draw): Check KEY_STROKE_CONTROL hint for line and rectangle drawing.

Modified Paths:
--------------
    branches/jfreechart-1.0.x-branch/source/org/jfree/chart/fx/FXGraphics2D.java

Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/fx/FXGraphics2D.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/fx/FXGraphics2D.java	2014-07-22 12:41:31 UTC (rev 3262)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/fx/FXGraphics2D.java	2014-07-22 12:42:00 UTC (rev 3263)
@@ -663,6 +663,20 @@
                     rr.getHeight(), rr.getArcWidth(), rr.getArcHeight());
         } else if (s instanceof Rectangle2D) {
             Rectangle2D r = (Rectangle2D) s;
+            if (s instanceof Rectangle) {
+                // special case - if the underlying rectangle uses ints we
+                // need to create one that uses doubles
+                r = new Rectangle2D.Double(r.getX(), r.getY(), r.getWidth(), 
+                        r.getHeight());
+            }
+            Object hint = getRenderingHint(RenderingHints.KEY_STROKE_CONTROL);
+            if (hint != RenderingHints.VALUE_STROKE_PURE) {
+                double x = Math.rint(r.getX()) - 0.5;
+                double y = Math.rint(r.getY()) - 0.5;
+                double w = Math.floor(r.getWidth());
+                double h = Math.floor(r.getHeight());
+                r.setRect(x, y, w, h);
+            }
             this.gc.strokeRect(r.getX(), r.getY(), r.getWidth(), r.getHeight());
         } else if (s instanceof Ellipse2D) {
             Ellipse2D e = (Ellipse2D) s;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jfreechart-commit] SF.net SVN: jfreechart:[3262] branches/jfreechart-1.0.x-branch/ChangeLog

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

Revision: 3262
          http://sourceforge.net/p/jfreechart/code/3262
Author:   mungady
Date:     2014-07-22 12:41:31 +0000 (Tue, 22 Jul 2014)
Log Message:
-----------
2014-07-21  David Gilbert  <dav...@ob...>

    * org/jfree/chart/fx/FXGraphics2D.java
    (draw): Check KEY_STROKE_CONTROL hint for line drawing.

Modified Paths:
--------------
    branches/jfreechart-1.0.x-branch/ChangeLog

Modified: branches/jfreechart-1.0.x-branch/ChangeLog
===================================================================
--- branches/jfreechart-1.0.x-branch/ChangeLog	2014-07-22 09:30:25 UTC (rev 3261)
+++ branches/jfreechart-1.0.x-branch/ChangeLog	2014-07-22 12:41:31 UTC (rev 3262)
@@ -1,5 +1,16 @@
 2014-07-21  David Gilbert  <dav...@ob...>
 
+    * org/jfree/chart/fx/FXGraphics2D.java
+    (draw): Check KEY_STROKE_CONTROL hint for line and rectangle drawing.
+
+2014-07-21  David Gilbert  <dav...@ob...>
+
+    Patch #307 by Ulrich Voigt:
+    * org/jfree/chart/plot/FastScatterPlot.java
+    (panDomainAxes): correct the direction of panning.
+
+2014-07-21  David Gilbert  <dav...@ob...>
+
     * org/jfree/chart/plot/CombinedDomainXYPlot.java
     (isRangePannable): New method override,
     (setRangePannable): Likewise,

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jfreechart-commit] SF.net SVN: jfreechart:[3261] branches/jfreechart-1.0.x-branch/source/org/ jfree/chart/fx/FXGraphics2D.java

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

Revision: 3261
          http://sourceforge.net/p/jfreechart/code/3261
Author:   mungady
Date:     2014-07-22 09:30:25 +0000 (Tue, 22 Jul 2014)
Log Message:
-----------
2014-07-21  David Gilbert  <dav...@ob...>

    * org/jfree/chart/fx/FXGraphics2D.java
    (draw): Check KEY_STROKE_CONTROL hint for line drawing.

Modified Paths:
--------------
    branches/jfreechart-1.0.x-branch/source/org/jfree/chart/fx/FXGraphics2D.java

Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/fx/FXGraphics2D.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/fx/FXGraphics2D.java	2014-07-22 07:24:30 UTC (rev 3260)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/fx/FXGraphics2D.java	2014-07-22 09:30:25 UTC (rev 3261)
@@ -107,13 +107,16 @@
  */
 public class FXGraphics2D extends Graphics2D {
     
+    /** The graphics context for the JavaFX canvas. */
     private final GraphicsContext gc;
     
+    /** The number of times the graphics state has been saved. */
     private int saveCount = 0;
     
+    /** A flag to permit clipping to be disabled (since it is buggy). */
     private boolean clippingDisabled = false;
     
-    /** Rendering hints (all ignored). */
+    /** Rendering hints. */
     private final RenderingHints hints;
     
     private Shape clip;
@@ -236,7 +239,8 @@
      * Returns the flag that controls whether or not clipping is actually 
      * applied to the JavaFX canvas.  The default value is currently 
      * {@code false} (the clipping is ENABLED) but since it does not always
-     * work correctly you have the option to disable it.  See <a href="https://javafx-jira.kenai.com/browse/RT-36891">
+     * work correctly you have the option to disable it.  See 
+     * <a href="https://javafx-jira.kenai.com/browse/RT-36891">
      * https://javafx-jira.kenai.com/browse/RT-36891</a> for details (requires 
      * an account).
      * 
@@ -644,6 +648,14 @@
         }
         if (s instanceof Line2D) {
             Line2D l = (Line2D) s;
+            Object hint = getRenderingHint(RenderingHints.KEY_STROKE_CONTROL);
+            if (hint != RenderingHints.VALUE_STROKE_PURE) {
+                double x1 = Math.rint(l.getX1()) - 0.5;
+                double y1 = Math.rint(l.getY1()) - 0.5;
+                double x2 = Math.rint(l.getX2()) - 0.5;
+                double y2 = Math.rint(l.getY2()) - 0.5;
+                l.setLine(x1, y1, x2, y2);
+            }
             this.gc.strokeLine(l.getX1(), l.getY1(), l.getX2(), l.getY2());
         } else if (s instanceof RoundRectangle2D) {
             RoundRectangle2D rr = (RoundRectangle2D) s;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jfreechart-commit] SF.net SVN: jfreechart:[3260] branches/jfreechart-1.0.x-branch/source/org/ jfree/chart/ChartFactory.java

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

Revision: 3260
          http://sourceforge.net/p/jfreechart/code/3260
Author:   mungady
Date:     2014-07-22 07:24:30 +0000 (Tue, 22 Jul 2014)
Log Message:
-----------
Source formatting.

Modified Paths:
--------------
    branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartFactory.java

Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartFactory.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartFactory.java	2014-07-21 14:52:22 UTC (rev 3259)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartFactory.java	2014-07-22 07:24:30 UTC (rev 3260)
@@ -900,8 +900,7 @@
             ItemLabelPosition position2 = new ItemLabelPosition(
                     ItemLabelAnchor.OUTSIDE9, TextAnchor.CENTER_RIGHT);
             renderer.setBaseNegativeItemLabelPosition(position2);
-         }
-        else if (orientation == PlotOrientation.VERTICAL) {
+        } else if (orientation == PlotOrientation.VERTICAL) {
             ItemLabelPosition position1 = new ItemLabelPosition(
                     ItemLabelAnchor.OUTSIDE12, TextAnchor.BOTTOM_CENTER);
             renderer.setBasePositiveItemLabelPosition(position1);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jfreechart-commit] SF.net SVN: jfreechart:[3259] branches/jfreechart-1.0.x-branch/source/org/ jfree/chart/plot/FastScatterPlot.java

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

Revision: 3259
          http://sourceforge.net/p/jfreechart/code/3259
Author:   mungady
Date:     2014-07-21 14:52:22 +0000 (Mon, 21 Jul 2014)
Log Message:
-----------
2014-07-21  David Gilbert  <dav...@ob...>

    Patch #307 by Ulrich Voigt:
    * org/jfree/chart/plot/FastScatterPlot.java
    (panDomainAxes): correct the direction of panning.

Modified Paths:
--------------
    branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/FastScatterPlot.java

Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/FastScatterPlot.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/FastScatterPlot.java	2014-07-21 14:23:50 UTC (rev 3258)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/FastScatterPlot.java	2014-07-21 14:52:22 UTC (rev 3259)
@@ -2,7 +2,7 @@
  * JFreeChart : a free chart library for the Java(tm) platform
  * ===========================================================
  *
- * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors.
+ * (C) Copyright 2000-2014, by Object Refinery Limited and Contributors.
  *
  * Project Info:  http://www.jfree.org/jfreechart/index.html
  *
@@ -27,10 +27,11 @@
  * --------------------
  * FastScatterPlot.java
  * --------------------
- * (C) Copyright 2002-2013, by Object Refinery Limited.
+ * (C) Copyright 2002-2014, by Object Refinery Limited.
  *
  * Original Author:  David Gilbert (for Object Refinery Limited);
  * Contributor(s):   Arnaud Lelievre;
+ *                   Ulrich Voigt (patch #307);
  *
  * Changes
  * -------
@@ -60,6 +61,7 @@
  *               Jess Thrysoee (DG);
  * 26-Mar-2009 : Implemented Pannable, and fixed bug in zooming (DG);
  * 02-Jul-2013 : Use ParamChecks (DG);
+ * 21-Jul-2014 : Fix panning (patch #307 by Ulrich Voigt) (DG);
  *
  */
 
@@ -957,7 +959,7 @@
             return;
         }
         double length = this.domainAxis.getRange().getLength();
-        double adj = -percent * length;
+        double adj = percent * length;
         if (this.domainAxis.isInverted()) {
             adj = -adj;
         }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jfreechart-commit] SF.net SVN: jfreechart:[3258] branches/jfreechart-1.0.x-branch/ChangeLog

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

Revision: 3258
          http://sourceforge.net/p/jfreechart/code/3258
Author:   mungady
Date:     2014-07-21 14:23:50 +0000 (Mon, 21 Jul 2014)
Log Message:
-----------
2014-07-21  David Gilbert  <dav...@ob...>

    * org/jfree/chart/plot/CombinedDomainXYPlot.java
    (isRangePannable): New method override,
    (setRangePannable): Likewise,
    (panRangeAxes): Take subplot flag into account,
    * org/jfree/chart/plot/CombinedRangeXYPlot.java
    (isDomainPannable): New method override,
    (setDomainPannable): Likewise,
    (panDomainAxes): Take subplot flag into account.

Modified Paths:
--------------
    branches/jfreechart-1.0.x-branch/ChangeLog

Modified: branches/jfreechart-1.0.x-branch/ChangeLog
===================================================================
--- branches/jfreechart-1.0.x-branch/ChangeLog	2014-07-21 14:23:28 UTC (rev 3257)
+++ branches/jfreechart-1.0.x-branch/ChangeLog	2014-07-21 14:23:50 UTC (rev 3258)
@@ -1,5 +1,32 @@
+2014-07-21  David Gilbert  <dav...@ob...>
+
+    * org/jfree/chart/plot/CombinedDomainXYPlot.java
+    (isRangePannable): New method override,
+    (setRangePannable): Likewise,
+    (panRangeAxes): Take subplot flag into account,
+    * org/jfree/chart/plot/CombinedRangeXYPlot.java
+    (isDomainPannable): New method override,
+    (setDomainPannable): Likewise,
+    (panDomainAxes): Take subplot flag into account.
+
+2014-07-19  David Gilbert  <dav...@ob...>
+
+    * org/jfree/chart/fx/ChartCanvas.java
+    (draw): Call clearRect(),
+    * org/jfree/chart/fx/FXGraphics2D.java
+    (image): Removed as not used.
+
 2014-07-04  David Gilbert  <dav...@ob...>
 
+    * org/jfree/chart/fx/ChartViewerSkin.java
+    (getRenderingInfo): New method,
+    * org/jfree/chart/fx/ChartViewer.java
+    (getRenderingInfo): New method,
+    * org/jfree/chart/fx/interaction/ZoomHandlerFX.java
+    (handleMouseReleased): Fetch plot rendering info.
+
+2014-07-04  David Gilbert  <dav...@ob...>
+
     * org/jfree/chart/fx/FXGraphics2D.java
     (saveCount): New field,
     (setClip): Add save and restore,

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jfreechart-commit] SF.net SVN: jfreechart:[3257] branches/jfreechart-1.0.x-branch/source/org/ jfree/chart/plot

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

Revision: 3257
          http://sourceforge.net/p/jfreechart/code/3257
Author:   mungady
Date:     2014-07-21 14:23:28 +0000 (Mon, 21 Jul 2014)
Log Message:
-----------
2014-07-21  David Gilbert  <dav...@ob...>

    * org/jfree/chart/plot/CombinedDomainXYPlot.java
    (isRangePannable): New method override,
    (setRangePannable): Likewise,
    (panRangeAxes): Take subplot flag into account,
    * org/jfree/chart/plot/CombinedRangeXYPlot.java
    (isDomainPannable): New method override,
    (setDomainPannable): Likewise,
    (panDomainAxes): Take subplot flag into account.

Modified Paths:
--------------
    branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/CombinedDomainXYPlot.java
    branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/CombinedRangeXYPlot.java

Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/CombinedDomainXYPlot.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/CombinedDomainXYPlot.java	2014-07-21 14:17:29 UTC (rev 3256)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/CombinedDomainXYPlot.java	2014-07-21 14:23:28 UTC (rev 3257)
@@ -92,7 +92,8 @@
  * 11-Aug-2008 : Don't store totalWeight of subplots, calculate it as
  *               required (DG);
  * 21-Dec-2011 : Apply patch 3447161 by Ulrich Voigt and Martin Hoeller (MH);
- *
+ * 21-Jul-2014 : Override isRangePannable() and setRangePannable() - motivated 
+ *               by patch #304 by Ulrich Voigt (DG);
  */
 
 package org.jfree.chart.plot;
@@ -130,7 +131,7 @@
     private static final long serialVersionUID = -7765545541261907383L;
 
     /** Storage for the subplot references. */
-    private List subplots;
+    private List<XYPlot> subplots;
 
     /** The gap between subplots. */
     private double gap = 5.0;
@@ -154,14 +155,11 @@
      * @param domainAxis  the shared axis.
      */
     public CombinedDomainXYPlot(ValueAxis domainAxis) {
-
         super(null,        // no data in the parent plot
               domainAxis,
               null,        // no range axis
               null);       // no renderer
-
-        this.subplots = new java.util.ArrayList();
-
+        this.subplots = new java.util.ArrayList<XYPlot>();
     }
 
     /**
@@ -175,6 +173,59 @@
     }
 
     /**
+     * Returns the gap between subplots, measured in Java2D units.
+     *
+     * @return The gap (in Java2D units).
+     *
+     * @see #setGap(double)
+     */
+    public double getGap() {
+        return this.gap;
+    }
+
+    /**
+     * Sets the amount of space between subplots and sends a
+     * {@link PlotChangeEvent} to all registered listeners.
+     *
+     * @param gap  the gap between subplots (in Java2D units).
+     *
+     * @see #getGap()
+     */
+    public void setGap(double gap) {
+        this.gap = gap;
+        fireChangeEvent();
+    }
+
+    /**
+     * Returns {@code true} if the range is pannable for at least one subplot,
+     * and {@code false} otherwise.
+     * 
+     * @return A boolean. 
+     */
+    @Override
+    public boolean isRangePannable() {
+        for (XYPlot subplot : this.subplots) {
+            if (subplot.isRangePannable()) {
+                return true;
+            }
+        }
+        return false;
+    }
+    
+    /**
+     * Sets the flag, on each of the subplots, that controls whether or not the 
+     * range is pannable.
+     * 
+     * @param pannable  the new flag value. 
+     */
+    @Override
+    public void setRangePannable(boolean pannable) {
+        for (XYPlot subplot : this.subplots) {
+            subplot.setRangePannable(pannable);
+        }        
+    }
+
+    /**
      * Sets the orientation for the plot (also changes the orientation for all
      * the subplots to match).
      *
@@ -235,30 +286,6 @@
     }
 
     /**
-     * Returns the gap between subplots, measured in Java2D units.
-     *
-     * @return The gap (in Java2D units).
-     *
-     * @see #setGap(double)
-     */
-    public double getGap() {
-        return this.gap;
-    }
-
-    /**
-     * Sets the amount of space between subplots and sends a
-     * {@link PlotChangeEvent} to all registered listeners.
-     *
-     * @param gap  the gap between subplots (in Java2D units).
-     *
-     * @see #getGap()
-     */
-    public void setGap(double gap) {
-        this.gap = gap;
-        fireChangeEvent();
-    }
-
-    /**
      * Adds a subplot (with a default 'weight' of 1) and sends a
      * {@link PlotChangeEvent} to all registered listeners.
      * <P>
@@ -584,7 +611,7 @@
      * Pans all range axes by the specified percentage.
      *
      * @param panRange the distance to pan (as a percentage of the axis length).
-     * @param info the plot info
+     * @param info  the plot info ({@code null} not permitted).
      * @param source the source point where the pan action started.
      *
      * @since 1.0.15
@@ -592,17 +619,21 @@
     @Override
     public void panRangeAxes(double panRange, PlotRenderingInfo info,
             Point2D source) {
-
         XYPlot subplot = findSubplot(info, source);
-        if (subplot != null) {
-            PlotRenderingInfo subplotInfo = info.getSubplotInfo(
-                    info.getSubplotIndex(source));
-            if (subplotInfo == null) {
-                return;
-            }
-
-            for (int i = 0; i < subplot.getRangeAxisCount(); i++) {
-                ValueAxis rangeAxis = subplot.getRangeAxis(i);
+        if (subplot == null) {
+            return;
+        }
+        if (!subplot.isRangePannable()) {
+            return;
+        }
+        PlotRenderingInfo subplotInfo = info.getSubplotInfo(
+                info.getSubplotIndex(source));
+        if (subplotInfo == null) {
+            return;
+        }
+        for (int i = 0; i < subplot.getRangeAxisCount(); i++) {
+            ValueAxis rangeAxis = subplot.getRangeAxis(i);
+            if (rangeAxis != null) {
                 rangeAxis.pan(panRange);
             }
         }

Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/CombinedRangeXYPlot.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/CombinedRangeXYPlot.java	2014-07-21 14:17:29 UTC (rev 3256)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/CombinedRangeXYPlot.java	2014-07-21 14:23:28 UTC (rev 3257)
@@ -2,7 +2,7 @@
  * JFreeChart : a free chart library for the Java(tm) platform
  * ===========================================================
  *
- * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors.
+ * (C) Copyright 2000-2014, by Object Refinery Limited and Contributors.
  *
  * Project Info:  http://www.jfree.org/jfreechart/index.html
  *
@@ -27,7 +27,7 @@
  * ------------------------
  * CombinedRangeXYPlot.java
  * ------------------------
- * (C) Copyright 2001-2012, by Bill Kelemen and Contributors.
+ * (C) Copyright 2001-2014, by Bill Kelemen and Contributors.
  *
  * Original Author:  Bill Kelemen;
  * Contributor(s):   David Gilbert (for Object Refinery Limited);
@@ -94,6 +94,8 @@
  * 11-Aug-2008 : Don't store totalWeight of subplots, calculate it as
  *               required (DG);
  * 21-Dec-2011 : Apply patch 3447161 by Ulrich Voigt and Martin Hoeller (MH);
+ * 21-Jul-2014 : Override isDomainPannable() and setDomainPannable() - motivated 
+ *               by patch #304 by Ulrich Voigt (DG);
  *
  */
 
@@ -132,7 +134,7 @@
     private static final long serialVersionUID = -5177814085082031168L;
 
     /** Storage for the subplot references. */
-    private List subplots;
+    private List<XYPlot> subplots;
 
     /** The gap between subplots. */
     private double gap = 5.0;
@@ -153,14 +155,11 @@
      * @param rangeAxis  the shared axis.
      */
     public CombinedRangeXYPlot(ValueAxis rangeAxis) {
-
         super(null, // no data in the parent plot
               null,
               rangeAxis,
               null);
-
-        this.subplots = new java.util.ArrayList();
-
+        this.subplots = new java.util.ArrayList<XYPlot>();
     }
 
     /**
@@ -194,8 +193,37 @@
     public void setGap(double gap) {
         this.gap = gap;
     }
+    
+    /**
+     * Returns {@code true} if the domain is pannable for at least one subplot,
+     * and {@code false} otherwise.
+     * 
+     * @return A boolean. 
+     */
+    @Override
+    public boolean isDomainPannable() {
+        for (XYPlot subplot : this.subplots) {
+            if (subplot.isDomainPannable()) {
+                return true;
+            }
+        }
+        return false;
+    }
 
     /**
+     * Sets the flag, on each of the subplots, that controls whether or not the 
+     * domain is pannable.
+     * 
+     * @param pannable  the new flag value. 
+     */
+    @Override
+    public void setDomainPannable(boolean pannable) {
+        for (XYPlot subplot : this.subplots) {
+            subplot.setDomainPannable(pannable);
+        }        
+    }
+
+    /**
      * Adds a subplot, with a default 'weight' of 1.
      * <br><br>
      * You must ensure that the subplot has a non-null domain axis.  The range
@@ -529,15 +557,21 @@
             Point2D source) {
 
         XYPlot subplot = findSubplot(info, source);
-        if (subplot != null) {
-            PlotRenderingInfo subplotInfo = info.getSubplotInfo(
-                    info.getSubplotIndex(source));
-            if (subplotInfo == null) {
-                return;
-            }
+        if (subplot == null) {
+            return;
+        }
+        if (!subplot.isDomainPannable()) {
+            return;
+        }
+        PlotRenderingInfo subplotInfo = info.getSubplotInfo(
+                info.getSubplotIndex(source));
+        if (subplotInfo == null) {
+            return;
+        }
 
-            for (int i = 0; i < subplot.getDomainAxisCount(); i++) {
-                ValueAxis domainAxis = subplot.getDomainAxis(i);
+        for (int i = 0; i < subplot.getDomainAxisCount(); i++) {
+            ValueAxis domainAxis = subplot.getDomainAxis(i);
+            if (domainAxis != null) {
                 domainAxis.pan(panRange);
             }
         }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jfreechart-commit] SF.net SVN: jfreechart:[3256] branches/jfreechart-1.0.x-branch/source/org/ jfree/chart/plot/XYPlot.java

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

Revision: 3256
          http://sourceforge.net/p/jfreechart/code/3256
Author:   mungady
Date:     2014-07-21 14:17:29 +0000 (Mon, 21 Jul 2014)
Log Message:
-----------
Updated Javadocs.

Modified Paths:
--------------
    branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/XYPlot.java

Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/XYPlot.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/XYPlot.java	2014-07-19 20:03:09 UTC (rev 3255)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/XYPlot.java	2014-07-21 14:17:29 UTC (rev 3256)
@@ -4968,8 +4968,8 @@
     }
 
     /**
-     * Returns <code>true</code> if panning is enabled for the range axes,
-     * and <code>false</code> otherwise.
+     * Returns {@code true} if panning is enabled for the range axis/axes,
+     * and {@code false} otherwise.  The default value is {@code false}.
      *
      * @return A boolean.
      *
@@ -4982,7 +4982,7 @@
 
     /**
      * Sets the flag that enables or disables panning of the plot along
-     * the range axes.
+     * the range axis/axes.
      *
      * @param pannable  the new flag value.
      *

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jfreechart-commit] SF.net SVN: jfreechart:[3255] branches/jfreechart-1.0.x-branch/source/org/ jfree/chart/fx

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

Revision: 3255
          http://sourceforge.net/p/jfreechart/code/3255
Author:   mungady
Date:     2014-07-19 20:03:09 +0000 (Sat, 19 Jul 2014)
Log Message:
-----------
2014-07-19  David Gilbert  <dav...@ob...>

    * org/jfree/chart/fx/ChartCanvas.java
    (draw): Call clearRect(),
    * org/jfree/chart/fx/FXGraphics2D.java
    (image): Removed as not used.

Modified Paths:
--------------
    branches/jfreechart-1.0.x-branch/source/org/jfree/chart/fx/ChartCanvas.java
    branches/jfreechart-1.0.x-branch/source/org/jfree/chart/fx/FXGraphics2D.java

Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/fx/ChartCanvas.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/fx/ChartCanvas.java	2014-07-05 05:39:09 UTC (rev 3254)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/fx/ChartCanvas.java	2014-07-19 20:03:09 UTC (rev 3255)
@@ -35,6 +35,7 @@
  * Changes:
  * --------
  * 25-Jun-2014 : Version 1 (DG);
+ * 19-Jul-2014 : Add clearRect() call for each draw (DG);
  *
  */
 
@@ -47,6 +48,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import javafx.scene.canvas.Canvas;
+import javafx.scene.canvas.GraphicsContext;
 import javafx.scene.control.Tooltip;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.input.ScrollEvent;
@@ -331,15 +333,17 @@
      * information.
      */
     public final void draw() {
-        getGraphicsContext2D().save();
+        GraphicsContext ctx = getGraphicsContext2D();
+        ctx.save();
         double width = getWidth();
         double height = getHeight();
         if (width > 0 && height > 0) {
+            ctx.clearRect(0, 0, width, height);
             this.info = new ChartRenderingInfo();
             this.chart.draw(this.g2, new Rectangle((int) width, (int) height), 
                     this.anchor, this.info);
         }
-        getGraphicsContext2D().restore();
+        ctx.restore();
         this.anchor = null;
     }
  

Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/fx/FXGraphics2D.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/fx/FXGraphics2D.java	2014-07-05 05:39:09 UTC (rev 3254)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/fx/FXGraphics2D.java	2014-07-19 20:03:09 UTC (rev 3255)
@@ -142,10 +142,6 @@
     /** The background color, presently ignored. */
     private Color background = Color.BLACK;
 
-    /** A hidden image used for font metrics. */
-    private final BufferedImage image = new BufferedImage(10, 10, 
-            BufferedImage.TYPE_INT_RGB);
-    
     /**
      * An instance that is lazily instantiated in drawLine and then 
      * subsequently reused to avoid creating a lot of garbage.
@@ -386,7 +382,7 @@
      * Returns the foreground color.  This method exists for backwards
      * compatibility in AWT, you should use the {@link #getPaint()} method.
      * 
-     * @return The foreground color (never <code>null</code>).
+     * @return The foreground color (never {@code null}).
      * 
      * @see #getPaint() 
      */
@@ -400,7 +396,7 @@
      * compatibility in AWT, you should use the 
      * {@link #setPaint(java.awt.Paint)} method.
      * 
-     * @param c  the color (<code>null</code> permitted but ignored). 
+     * @param c  the color ({@code null} permitted but ignored). 
      * 
      * @see #setPaint(java.awt.Paint) 
      */
@@ -419,7 +415,7 @@
     /**
      * Returns a JavaFX color that is equivalent to the specified AWT color.
      * 
-     * @param c  the color (<code>null</code> not permitted).
+     * @param c  the color ({@code null} not permitted).
      * 
      * @return A JavaFX color. 
      */

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jfreechart-commit] SF.net SVN: jfreechart:[3254] branches/jfreechart-1.0.x-branch/ant

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

Revision: 3254
          http://sourceforge.net/p/jfreechart/code/3254
Author:   mungady
Date:     2014-07-05 05:39:09 +0000 (Sat, 05 Jul 2014)
Log Message:
-----------
Remove unnecessary excludes.

Modified Paths:
--------------
    branches/jfreechart-1.0.x-branch/ant/build-fx.xml
    branches/jfreechart-1.0.x-branch/ant/build.xml

Modified: branches/jfreechart-1.0.x-branch/ant/build-fx.xml
===================================================================
--- branches/jfreechart-1.0.x-branch/ant/build-fx.xml	2014-07-05 05:30:31 UTC (rev 3253)
+++ branches/jfreechart-1.0.x-branch/ant/build-fx.xml	2014-07-05 05:39:09 UTC (rev 3254)
@@ -61,7 +61,6 @@
                target="${target.version}">
             <classpath refid="build.classpath" />
             <include name="org/jfree/**"/>
-            <exclude name="org/jfree/chart/xml/**"/>
         </javac>
 
         <!-- copy across .css files (chart-viewer.css) -->
@@ -160,7 +159,6 @@
             <classpath refid="build.classpath" />
             <packageset dir="${basedir}/source" defaultexcludes="yes">
                 <include name="org/jfree/**"/>
-                <exclude name="org/jfree/chart/xml/**"/>
             </packageset>
         </javadoc>
         <!-- copy across .png files -->
@@ -211,7 +209,6 @@
         <copy todir="${basedir}/distribution/source">
             <fileset dir="${basedir}/source">
               <exclude name="**/CVS/*"/>
-              <exclude name="org/jfree/chart/xml/**"/>
             </fileset>
         </copy>
 

Modified: branches/jfreechart-1.0.x-branch/ant/build.xml
===================================================================
--- branches/jfreechart-1.0.x-branch/ant/build.xml	2014-07-05 05:30:31 UTC (rev 3253)
+++ branches/jfreechart-1.0.x-branch/ant/build.xml	2014-07-05 05:39:09 UTC (rev 3254)
@@ -62,7 +62,6 @@
             <classpath refid="build.classpath" />
             <include name="org/jfree/**"/>
             <exclude name="org/jfree/chart/fx/**"/>
-            <exclude name="org/jfree/chart/xml/**"/>
         </javac>
 
         <!-- copy across gorilla.jpg -->
@@ -155,7 +154,6 @@
             <packageset dir="${basedir}/source" defaultexcludes="yes">
                 <include name="org/jfree/**"/>
                 <exclude name="org/jfree/chart/fx/**"/>
-                <exclude name="org/jfree/chart/xml/**"/>
             </packageset>
         </javadoc>
         <!-- copy across .png files -->
@@ -206,7 +204,6 @@
         <copy todir="${basedir}/distribution/source">
             <fileset dir="${basedir}/source">
               <exclude name="**/CVS/*"/>
-              <exclude name="org/jfree/chart/xml/**"/>
             </fileset>
         </copy>
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jfreechart-commit] SF.net SVN: jfreechart:[3253] branches/jfreechart-1.0.x-branch/ant/ build-swt.xml

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

Revision: 3253
          http://sourceforge.net/p/jfreechart/code/3253
Author:   mungady
Date:     2014-07-05 05:30:31 +0000 (Sat, 05 Jul 2014)
Log Message:
-----------
Update version number for next release.

Modified Paths:
--------------
    branches/jfreechart-1.0.x-branch/ant/build-swt.xml

Modified: branches/jfreechart-1.0.x-branch/ant/build-swt.xml
===================================================================
--- branches/jfreechart-1.0.x-branch/ant/build-swt.xml	2014-07-05 05:30:11 UTC (rev 3252)
+++ branches/jfreechart-1.0.x-branch/ant/build-swt.xml	2014-07-05 05:30:31 UTC (rev 3253)
@@ -4,9 +4,9 @@
     <target name="initialise" description="Initialise required settings.">
         <tstamp />
         <property name="jfreechart.name" value="jfreechart" />
-        <property name="jfreechart.version" value="1.0.18-pre" />
+        <property name="jfreechart.version" value="1.0.19" />
         <property name="jcommon.name" value="jcommon" />
-        <property name="jcommon.version" value="1.0.21" />
+        <property name="jcommon.version" value="1.0.22" />
         <property name="builddir" value="${basedir}/build" />
         <property name="jcommon.jar" value="${basedir}/lib/${jcommon.name}-${jcommon.version}.jar"/>
         <property name="jfreechart.jar" value="${basedir}/lib/${jfreechart.name}-${jfreechart.version}.jar"/>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jfreechart-commit] SF.net SVN: jfreechart:[3252] branches/jfreechart-1.0.x-branch/ant/build. xml

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

Revision: 3252
          http://sourceforge.net/p/jfreechart/code/3252
Author:   mungady
Date:     2014-07-05 05:30:11 +0000 (Sat, 05 Jul 2014)
Log Message:
-----------
Update version number for next release.

Modified Paths:
--------------
    branches/jfreechart-1.0.x-branch/ant/build.xml

Modified: branches/jfreechart-1.0.x-branch/ant/build.xml
===================================================================
--- branches/jfreechart-1.0.x-branch/ant/build.xml	2014-07-05 05:29:25 UTC (rev 3251)
+++ branches/jfreechart-1.0.x-branch/ant/build.xml	2014-07-05 05:30:11 UTC (rev 3252)
@@ -20,7 +20,7 @@
     <target name="initialise" description="Initialise required settings.">
         <tstamp />
         <property name="jfreechart.name" value="jfreechart" />
-        <property name="jfreechart.version" value="1.0.18" />
+        <property name="jfreechart.version" value="1.0.19" />
         <property name="jfreechart-bundle-file" value="${jfreechart.name}-${jfreechart.version}-bundle.jar" />
         <property name="jcommon.name" value="jcommon" />
         <property name="jcommon.version" value="1.0.22" />

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jfreechart-commit] SF.net SVN: jfreechart:[3251] branches/jfreechart-1.0.x-branch/ant/build-fx .xml

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

Revision: 3251
          http://sourceforge.net/p/jfreechart/code/3251
Author:   mungady
Date:     2014-07-05 05:29:25 +0000 (Sat, 05 Jul 2014)
Log Message:
-----------
Include chart-viewer.css in jar file.

Modified Paths:
--------------
    branches/jfreechart-1.0.x-branch/ant/build-fx.xml

Modified: branches/jfreechart-1.0.x-branch/ant/build-fx.xml
===================================================================
--- branches/jfreechart-1.0.x-branch/ant/build-fx.xml	2014-07-04 07:46:21 UTC (rev 3250)
+++ branches/jfreechart-1.0.x-branch/ant/build-fx.xml	2014-07-05 05:29:25 UTC (rev 3251)
@@ -20,7 +20,7 @@
     <target name="initialise" description="Initialise required settings.">
         <tstamp />
         <property name="jfreechart.name" value="jfreechart" />
-        <property name="jfreechart.version" value="1.0.18-fx" />
+        <property name="jfreechart.version" value="1.0.19-fx" />
         <property name="jfreechart-bundle-file" value="${jfreechart.name}-${jfreechart.version}-bundle.jar" />
         <property name="jcommon.name" value="jcommon" />
         <property name="jcommon.version" value="1.0.22" />
@@ -64,6 +64,13 @@
             <exclude name="org/jfree/chart/xml/**"/>
         </javac>
 
+        <!-- copy across .css files (chart-viewer.css) -->
+        <copy todir="${basedir}/build/org/jfree/chart/fx/">
+            <fileset dir="${basedir}/source/org/jfree/chart/fx/">
+                <include name="*.css" />
+            </fileset>
+        </copy>
+
         <!-- copy across gorilla.jpg -->
         <copy file="${basedir}/source/org/jfree/chart/gorilla.jpg" tofile="${basedir}/build/org/jfree/chart/gorilla.jpg" />
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jfreechart-commit] SF.net SVN: jfreechart:[3250] branches/jfreechart-1.0.x-branch/source/org/ jfree/chart/fx

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

Revision: 3250
          http://sourceforge.net/p/jfreechart/code/3250
Author:   mungady
Date:     2014-07-04 07:46:21 +0000 (Fri, 04 Jul 2014)
Log Message:
-----------
2014-07-04  David Gilbert  <dav...@ob...>

    * org/jfree/chart/fx/ChartViewerSkin.java
    (getRenderingInfo): New method,
    * org/jfree/chart/fx/ChartViewer.java
    (getRenderingInfo): New method,
    * org/jfree/chart/fx/interaction/ZoomHandlerFX.java
    (handleMouseReleased): Fetch plot rendering info.

Modified Paths:
--------------
    branches/jfreechart-1.0.x-branch/source/org/jfree/chart/fx/ChartViewer.java
    branches/jfreechart-1.0.x-branch/source/org/jfree/chart/fx/ChartViewerSkin.java
    branches/jfreechart-1.0.x-branch/source/org/jfree/chart/fx/interaction/ZoomHandlerFX.java

Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/fx/ChartViewer.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/fx/ChartViewer.java	2014-07-04 07:18:33 UTC (rev 3249)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/fx/ChartViewer.java	2014-07-04 07:46:21 UTC (rev 3250)
@@ -53,6 +53,7 @@
 import javafx.stage.FileChooser;
 import javafx.stage.WindowEvent;
 import org.jfree.chart.ChartMouseEvent;
+import org.jfree.chart.ChartRenderingInfo;
 import org.jfree.chart.JFreeChart;
 import org.jfree.chart.fx.interaction.ChartMouseEventFX;
 import org.jfree.chart.fx.interaction.ChartMouseListenerFX;
@@ -169,6 +170,19 @@
     }
 
     /**
+     * Returns the rendering info from the most recent drawing of the chart.
+     * 
+     * @return The rendering info (possibly {@code null}). 
+     */
+    public ChartRenderingInfo getRenderingInfo() {
+        ChartViewerSkin skin = (ChartViewerSkin) getSkin();
+        if (skin != null) {
+            return skin.getRenderingInfo();
+        }
+        return null;
+    }
+
+    /**
      * Hides the zoom rectangle.  The work is delegated to the control's 
      * current skin.
      */

Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/fx/ChartViewerSkin.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/fx/ChartViewerSkin.java	2014-07-04 07:18:33 UTC (rev 3249)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/fx/ChartViewerSkin.java	2014-07-04 07:46:21 UTC (rev 3250)
@@ -48,6 +48,7 @@
 import javafx.scene.paint.Paint;
 import javafx.scene.shape.Rectangle;
 import org.jfree.chart.ChartMouseEvent;
+import org.jfree.chart.ChartRenderingInfo;
 import org.jfree.chart.JFreeChart;
 import org.jfree.chart.fx.interaction.ChartMouseListenerFX;
 import org.jfree.chart.util.ParamChecks;
@@ -88,6 +89,17 @@
     }
     
     /**
+     * Returns the rendering info from the most recent drawing of the chart.
+     * 
+     * @return The rendering info (possibly {@code null}).
+     * 
+     * @since 1.0.19
+     */
+    public ChartRenderingInfo getRenderingInfo() {
+        return this.canvas.getRenderingInfo();
+    }
+
+    /**
      * Sets the chart displayed by this control.
      * 
      * @param chart  the chart ({@code null} not permitted). 

Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/fx/interaction/ZoomHandlerFX.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/fx/interaction/ZoomHandlerFX.java	2014-07-04 07:18:33 UTC (rev 3249)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/fx/interaction/ZoomHandlerFX.java	2014-07-04 07:46:21 UTC (rev 3250)
@@ -238,12 +238,14 @@
                 double pw1 = percentW(x + w, dataArea);
                 double ph0 = percentH(y, dataArea);
                 double ph1 = percentH(y + h, dataArea);
+                PlotRenderingInfo info 
+                        = this.viewer.getRenderingInfo().getPlotInfo();
                 if (z.getOrientation().isVertical()) {
-                    z.zoomDomainAxes(pw0, pw1, null, endPoint);
-                    z.zoomRangeAxes(1 - ph1, 1 - ph0, null, endPoint);
+                    z.zoomDomainAxes(pw0, pw1, info, endPoint);
+                    z.zoomRangeAxes(1 - ph1, 1 - ph0, info, endPoint);
                 } else {
-                    z.zoomRangeAxes(pw0, pw1, null, endPoint);
-                    z.zoomDomainAxes(1 - ph1, 1 - ph0, null, endPoint);
+                    z.zoomRangeAxes(pw0, pw1, info, endPoint);
+                    z.zoomDomainAxes(1 - ph1, 1 - ph0, info, endPoint);
                 }
                 p.setNotify(saved);
                 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jfreechart-commit] SF.net SVN: jfreechart:[3249] branches/jfreechart-1.0.x-branch/ChangeLog

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

Revision: 3249
          http://sourceforge.net/p/jfreechart/code/3249
Author:   mungady
Date:     2014-07-04 07:18:33 +0000 (Fri, 04 Jul 2014)
Log Message:
-----------
2014-07-04  David Gilbert  <dav...@ob...>

    * org/jfree/chart/fx/FXGraphics2D.java
    (saveCount): New field,
    (setClip): Add save and restore,
    (reapplyAttributes): New private method,
    (clip): Save prior state.

Modified Paths:
--------------
    branches/jfreechart-1.0.x-branch/ChangeLog

Modified: branches/jfreechart-1.0.x-branch/ChangeLog
===================================================================
--- branches/jfreechart-1.0.x-branch/ChangeLog	2014-07-04 07:17:44 UTC (rev 3248)
+++ branches/jfreechart-1.0.x-branch/ChangeLog	2014-07-04 07:18:33 UTC (rev 3249)
@@ -1,3 +1,13 @@
+2014-07-04  David Gilbert  <dav...@ob...>
+
+    * org/jfree/chart/fx/FXGraphics2D.java
+    (saveCount): New field,
+    (setClip): Add save and restore,
+    (reapplyAttributes): New private method,
+    (clip): Save prior state.
+
+----------  JFREECHART 1.0.18 RELEASED ------------------------
+
 2014-07-03  David Gilbert  <dav...@ob...>
 
     * org/jfree/chart/axis/NumberTickUnitSource.java

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jfreechart-commit] SF.net SVN: jfreechart:[3248] branches/jfreechart-1.0.x-branch/source/org/ jfree/chart/fx/FXGraphics2D.java

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

Revision: 3248
          http://sourceforge.net/p/jfreechart/code/3248
Author:   mungady
Date:     2014-07-04 07:17:44 +0000 (Fri, 04 Jul 2014)
Log Message:
-----------
2014-07-04  David Gilbert  <dav...@ob...>

    * org/jfree/chart/fx/FXGraphics2D.java
    (saveCount): New field,
    (setClip): Add save and restore,
    (reapplyAttributes): New private method,
    (clip): Save prior state.

Modified Paths:
--------------
    branches/jfreechart-1.0.x-branch/source/org/jfree/chart/fx/FXGraphics2D.java

Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/fx/FXGraphics2D.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/fx/FXGraphics2D.java	2014-07-03 20:37:18 UTC (rev 3247)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/fx/FXGraphics2D.java	2014-07-04 07:17:44 UTC (rev 3248)
@@ -109,6 +109,8 @@
     
     private final GraphicsContext gc;
     
+    private int saveCount = 0;
+    
     private boolean clippingDisabled = false;
     
     /** Rendering hints (all ignored). */
@@ -1105,14 +1107,33 @@
      */
     @Override
     public void setClip(Shape shape) {
+        boolean restored = false;
+        while (this.saveCount > 0) {
+            this.gc.restore();
+            restored = true;
+            this.saveCount--;
+        }
+        if (restored) {
+            reapplyAttributes();
+        }
         // null is handled fine here...
         this.clip = this.transform.createTransformedShape(shape);
-        if (clip != null) { // FIXME: this is not the correct handling for null
+        if (clip != null) {
+            this.gc.save(); 
+            this.saveCount++;
             shapeToPath(shape);
-            //this.gc.clip();
-        }
+            this.gc.clip();
+        } 
     }
     
+    private void reapplyAttributes() {
+        setPaint(this.paint);
+        setBackground(this.background);
+        setStroke(this.stroke);
+        setFont(this.font);
+        setTransform(this.transform);
+    }
+    
     /**
      * Clips to the intersection of the current clipping region and the
      * specified shape. 
@@ -1135,17 +1156,21 @@
             return;
         }
         Shape ts = this.transform.createTransformedShape(s);
+        Shape clipNew;
         if (!ts.intersects(this.clip.getBounds2D())) {
-            setClip(new Rectangle2D.Double());
+            clipNew = new Rectangle2D.Double();
         } else {
             Area a1 = new Area(ts);
             Area a2 = new Area(this.clip);
             a1.intersect(a2);
-            this.clip = new Path2D.Double(a1);
+            clipNew = new Path2D.Double(a1);
+        }
+        this.clip = clipNew;
+        if (!this.clippingDisabled) {
+            this.gc.save();
+            this.saveCount++;
             shapeToPath(this.clip);
-            if (!this.clippingDisabled) {
-                this.gc.clip();
-            }
+            this.gc.clip();
         }
     }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.