From: <mu...@us...> - 2008-09-01 19:07:03
|
Revision: 1418 http://jfreechart.svn.sourceforge.net/jfreechart/?rev=1418&view=rev Author: mungady Date: 2008-09-01 19:07:00 +0000 (Mon, 01 Sep 2008) Log Message: ----------- Kill some tabs. Modified Paths: -------------- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartPanel.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartTheme.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartUtilities.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LegendItem.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 2008-09-01 19:06:42 UTC (rev 1417) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartPanel.java 2008-09-01 19:07:00 UTC (rev 1418) @@ -1927,7 +1927,7 @@ Zoomable z = (Zoomable) p; // we need to guard against this.zoomPoint being null Point2D zp = (this.zoomPoint != null - ? this.zoomPoint : new Point()); + ? this.zoomPoint : new Point()); z.zoomDomainAxes(0.0, this.info.getPlotInfo(), zp); } } @@ -1941,7 +1941,7 @@ Zoomable z = (Zoomable) p; // we need to guard against this.zoomPoint being null Point2D zp = (this.zoomPoint != null - ? this.zoomPoint : new Point()); + ? this.zoomPoint : new Point()); z.zoomRangeAxes(0.0, this.info.getPlotInfo(), zp); } } Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartTheme.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartTheme.java 2008-09-01 19:06:42 UTC (rev 1417) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartTheme.java 2008-09-01 19:07:00 UTC (rev 1418) @@ -53,11 +53,11 @@ */ public interface ChartTheme { - /** - * Applies this theme to the supplied chart. - * - * @param chart the chart (<code>null</code> not permitted). - */ + /** + * Applies this theme to the supplied chart. + * + * @param chart the chart (<code>null</code> not permitted). + */ public void apply(JFreeChart chart); } Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartUtilities.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartUtilities.java 2008-09-01 19:06:42 UTC (rev 1417) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartUtilities.java 2008-09-01 19:07:00 UTC (rev 1418) @@ -106,18 +106,18 @@ */ public abstract class ChartUtilities { - /** - * Applies the current theme to the specified chart. This method is - * provided for convenience, the theme itself is stored in the - * {@link ChartFactory} class. - * - * @param chart the chart (<code>null</code> not permitted). - * - * @since 1.0.11 - */ - public static void applyCurrentTheme(JFreeChart chart) { - ChartFactory.getChartTheme().apply(chart); - } + /** + * Applies the current theme to the specified chart. This method is + * provided for convenience, the theme itself is stored in the + * {@link ChartFactory} class. + * + * @param chart the chart (<code>null</code> not permitted). + * + * @since 1.0.11 + */ + public static void applyCurrentTheme(JFreeChart chart) { + ChartFactory.getChartTheme().apply(chart); + } /** * Writes a chart to an output stream in PNG format. Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LegendItem.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LegendItem.java 2008-09-01 19:06:42 UTC (rev 1417) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LegendItem.java 2008-09-01 19:07:00 UTC (rev 1418) @@ -646,7 +646,7 @@ * @since 1.0.11 */ public Font getLabelFont() { - return this.labelFont; + return this.labelFont; } /** @@ -657,7 +657,7 @@ * @since 1.0.11 */ public void setLabelFont(Font font) { - this.labelFont = font; + this.labelFont = font; } /** @@ -668,7 +668,7 @@ * @since 1.0.11 */ public Paint getLabelPaint() { - return this.labelPaint; + return this.labelPaint; } /** @@ -679,7 +679,7 @@ * @since 1.0.11 */ public void setLabelPaint(Paint paint) { - this.labelPaint = paint; + this.labelPaint = paint; } /** @@ -763,10 +763,10 @@ * @since 1.0.11 */ public void setFillPaint(Paint paint) { - if (paint == null) { - throw new IllegalArgumentException("Null 'paint' argument."); - } - this.fillPaint = paint; + if (paint == null) { + throw new IllegalArgumentException("Null 'paint' argument."); + } + this.fillPaint = paint; } /** @@ -805,10 +805,10 @@ * @since 1.0.11 */ public void setLinePaint(Paint paint) { - if (paint == null) { - throw new IllegalArgumentException("Null 'paint' argument."); - } - this.linePaint = paint; + if (paint == null) { + throw new IllegalArgumentException("Null 'paint' argument."); + } + this.linePaint = paint; } /** @@ -828,10 +828,10 @@ * @since 1.0.11 */ public void setOutlinePaint(Paint paint) { - if (paint == null) { - throw new IllegalArgumentException("Null 'paint' argument."); - } - this.outlinePaint = paint; + if (paint == null) { + throw new IllegalArgumentException("Null 'paint' argument."); + } + this.outlinePaint = paint; } /** @@ -961,10 +961,10 @@ return false; } if (!ObjectUtilities.equal(this.labelFont, that.labelFont)) { - return false; + return false; } if (!PaintUtilities.equal(this.labelPaint, that.labelPaint)) { - return false; + return false; } return true; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mu...@us...> - 2008-09-03 16:03:49
|
Revision: 1478 http://jfreechart.svn.sourceforge.net/jfreechart/?rev=1478&view=rev Author: mungady Date: 2008-09-03 16:03:36 +0000 (Wed, 03 Sep 2008) Log Message: ----------- Whitespace. Modified Paths: -------------- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartColor.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartFrame.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartMouseEvent.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartMouseListener.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartRenderingInfo.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ClipPath.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartColor.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartColor.java 2008-09-03 09:32:38 UTC (rev 1477) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartColor.java 2008-09-03 16:03:36 UTC (rev 1478) @@ -2,32 +2,32 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. + * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] * * --------------- * ChartColor.java * --------------- - * (C) Copyright 2003-2007, by Cameron Riley and Contributors. + * (C) Copyright 2003-2008, by Cameron Riley and Contributors. * * Original Author: Cameron Riley; * Contributor(s): David Gilbert (for Object Refinery Limited); @@ -128,7 +128,7 @@ public static final Color VERY_LIGHT_MAGENTA = new Color(0xFF, 0x80, 0xFF); /** - * Creates a Color with an opaque sRGB with red, green and blue values in + * Creates a Color with an opaque sRGB with red, green and blue values in * range 0-255. * * @param r the red component in range 0x00-0xFF. @@ -141,7 +141,7 @@ /** * Convenience method to return an array of <code>Paint</code> objects that - * represent the pre-defined colors in the <code>Color<code> and + * represent the pre-defined colors in the <code>Color<code> and * <code>ChartColor</code> objects. * * @return An array of objects with the <code>Paint</code> interface. Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartFrame.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartFrame.java 2008-09-03 09:32:38 UTC (rev 1477) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartFrame.java 2008-09-03 16:03:36 UTC (rev 1478) @@ -2,32 +2,32 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. + * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] * * --------------- * ChartFrame.java * --------------- - * (C) Copyright 2001-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2001-2008, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -69,11 +69,11 @@ * * @param title the frame title. * @param chart the chart. - * @param scrollPane if <code>true</code>, put the Chart(Panel) into a + * @param scrollPane if <code>true</code>, put the Chart(Panel) into a * JScrollPane. */ public ChartFrame(String title, JFreeChart chart, boolean scrollPane) { - super(title); + super(title); setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE); this.chartPanel = new ChartPanel(chart); if (scrollPane) { Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartMouseEvent.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartMouseEvent.java 2008-09-03 09:32:38 UTC (rev 1477) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartMouseEvent.java 2008-09-03 16:03:36 UTC (rev 1478) @@ -2,32 +2,32 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. + * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] * * -------------------- * ChartMouseEvent.java * -------------------- - * (C) Copyright 2002-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2002-2008, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): Alex Weber; @@ -54,14 +54,14 @@ /** * A mouse event for a chart that is displayed in a {@link ChartPanel}. - * + * * @see ChartMouseListener */ public class ChartMouseEvent extends EventObject implements Serializable { /** For serialization. */ private static final long serialVersionUID = -682393837314562149L; - + /** The chart that the mouse event relates to. */ private JFreeChart chart; @@ -75,12 +75,12 @@ * Constructs a new event. * * @param chart the source chart (<code>null</code> not permitted). - * @param trigger the mouse event that triggered this event + * @param trigger the mouse event that triggered this event * (<code>null</code> not permitted). - * @param entity the chart entity (if any) under the mouse point + * @param entity the chart entity (if any) under the mouse point * (<code>null</code> permitted). */ - public ChartMouseEvent(JFreeChart chart, MouseEvent trigger, + public ChartMouseEvent(JFreeChart chart, MouseEvent trigger, ChartEntity entity) { super(chart); this.chart = chart; Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartMouseListener.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartMouseListener.java 2008-09-03 09:32:38 UTC (rev 1477) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartMouseListener.java 2008-09-03 16:03:36 UTC (rev 1478) @@ -2,32 +2,32 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. + * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] * * ----------------------- * ChartMouseListener.java * ----------------------- - * (C) Copyright 2002-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2002-2008, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): Alex Weber; @@ -48,9 +48,9 @@ import java.util.EventListener; /** - * The interface that must be implemented by classes that wish to receive + * The interface that must be implemented by classes that wish to receive * {@link ChartMouseEvent} notifications from a {@link ChartPanel}. - * + * * @see ChartPanel#addChartMouseListener(ChartMouseListener) */ public interface ChartMouseListener extends EventListener { @@ -63,7 +63,7 @@ void chartMouseClicked(ChartMouseEvent event); /** - * Callback method for receiving notification of a mouse movement on a + * Callback method for receiving notification of a mouse movement on a * chart. * * @param event information about the event. Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartRenderingInfo.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartRenderingInfo.java 2008-09-03 09:32:38 UTC (rev 1477) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartRenderingInfo.java 2008-09-03 16:03:36 UTC (rev 1478) @@ -2,32 +2,32 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. + * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] * * ----------------------- * ChartRenderingInfo.java * ----------------------- - * (C) Copyright 2002-2007, by Object Refinery Limited. + * (C) Copyright 2002-2008, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -66,12 +66,12 @@ * A structure for storing rendering information from one call to the * JFreeChart.draw() method. * <P> - * An instance of the {@link JFreeChart} class can draw itself within an - * arbitrary rectangle on any <code>Graphics2D</code>. It is assumed that - * client code will sometimes render the same chart in more than one view, so - * the {@link JFreeChart} instance does not retain any information about its - * rendered dimensions. This information can be useful sometimes, so you have - * the option to collect the information at each call to + * An instance of the {@link JFreeChart} class can draw itself within an + * arbitrary rectangle on any <code>Graphics2D</code>. It is assumed that + * client code will sometimes render the same chart in more than one view, so + * the {@link JFreeChart} instance does not retain any information about its + * rendered dimensions. This information can be useful sometimes, so you have + * the option to collect the information at each call to * <code>JFreeChart.draw()</code>, by passing an instance of this * <code>ChartRenderingInfo</code> class. */ @@ -79,23 +79,23 @@ /** For serialization. */ private static final long serialVersionUID = 2751952018173406822L; - + /** The area in which the chart is drawn. */ private transient Rectangle2D chartArea; /** Rendering info for the chart's plot (and subplots, if any). */ private PlotRenderingInfo plotInfo; - /** - * Storage for the chart entities. Since retaining entity information for - * charts with a large number of data points consumes a lot of memory, it - * is intended that you can set this to <code>null</code> to prevent the + /** + * Storage for the chart entities. Since retaining entity information for + * charts with a large number of data points consumes a lot of memory, it + * is intended that you can set this to <code>null</code> to prevent the * information being collected. */ private EntityCollection entities; /** - * Constructs a new ChartRenderingInfo structure that can be used to + * Constructs a new ChartRenderingInfo structure that can be used to * collect information about the dimensions of a rendered chart. */ public ChartRenderingInfo() { @@ -103,8 +103,8 @@ } /** - * Constructs a new instance. If an entity collection is supplied, it will - * be populated with information about the entities in a chart. If it is + * Constructs a new instance. If an entity collection is supplied, it will + * be populated with information about the entities in a chart. If it is * <code>null</code>, no entity information (including tool tips) will * be collected. * @@ -120,7 +120,7 @@ * Returns the area in which the chart was drawn. * * @return The area in which the chart was drawn. - * + * * @see #setChartArea(Rectangle2D) */ public Rectangle2D getChartArea() { @@ -131,7 +131,7 @@ * Sets the area in which the chart was drawn. * * @param area the chart area. - * + * * @see #getChartArea() */ public void setChartArea(Rectangle2D area) { @@ -142,7 +142,7 @@ * Returns the collection of entities maintained by this instance. * * @return The entity collection (possibly <code>null</code>). - * + * * @see #setEntityCollection(EntityCollection) */ public EntityCollection getEntityCollection() { @@ -153,7 +153,7 @@ * Sets the entity collection. * * @param entities the entity collection (<code>null</code> permitted). - * + * * @see #getEntityCollection() */ public void setEntityCollection(EntityCollection entities) { @@ -170,33 +170,33 @@ this.entities.clear(); } } - + /** * Returns the rendering info for the chart's plot. - * + * * @return The rendering info for the plot. - */ + */ public PlotRenderingInfo getPlotInfo() { return this.plotInfo; } - + /** * Tests this object for equality with an arbitrary object. - * + * * @param obj the object to test against (<code>null</code> permitted). - * + * * @return A boolean. */ public boolean equals(Object obj) { if (obj == this) { - return true; + return true; } if (!(obj instanceof ChartRenderingInfo)) { return false; } ChartRenderingInfo that = (ChartRenderingInfo) obj; if (!ObjectUtilities.equal(this.chartArea, that.chartArea)) { - return false; + return false; } if (!ObjectUtilities.equal(this.plotInfo, that.plotInfo)) { return false; @@ -206,12 +206,12 @@ } return true; } - + /** * Returns a clone of this object. - * + * * @return A clone. - * + * * @throws CloneNotSupportedException if the object cannot be cloned. */ public Object clone() throws CloneNotSupportedException { @@ -246,10 +246,10 @@ * @throws IOException if there is an I/O error. * @throws ClassNotFoundException if there is a classpath problem. */ - private void readObject(ObjectInputStream stream) + private void readObject(ObjectInputStream stream) throws IOException, ClassNotFoundException { stream.defaultReadObject(); this.chartArea = (Rectangle2D) SerialUtilities.readShape(stream); } - + } Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ClipPath.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ClipPath.java 2008-09-03 09:32:38 UTC (rev 1477) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ClipPath.java 2008-09-03 16:03:36 UTC (rev 1478) @@ -2,32 +2,32 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. + * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] * * ------------- * ClipPath.java * ------------- - * (C) Copyright 2003, 2004, 2007, by David M. O'Donnell and Contributors. + * (C) Copyright 2003-2008, by David M. O'Donnell and Contributors. * * Original Author: David M. O'Donnell; * Contributor(s): David Gilbert (for Object Refinery Limited); @@ -60,21 +60,21 @@ import org.jfree.ui.RectangleEdge; /** - * This class would typically be used with a - * {@link org.jfree.chart.plot.ContourPlot}. It allows the user to define a - * <code>GeneralPath</code> curve in plot coordinates. This curve can then be - * used mask off or define regions within the contour plot. The data must be + * This class would typically be used with a + * {@link org.jfree.chart.plot.ContourPlot}. It allows the user to define a + * <code>GeneralPath</code> curve in plot coordinates. This curve can then be + * used mask off or define regions within the contour plot. The data must be * sorted. - * - * @deprecated This class is no longer supported (as of version 1.0.4). If - * you are creating contour plots, please try to use {@link XYPlot} and + * + * @deprecated This class is no longer supported (as of version 1.0.4). If + * you are creating contour plots, please try to use {@link XYPlot} and * {@link XYBlockRenderer}. */ public class ClipPath implements Cloneable { /** The x values. */ private double[] xValue = null; - + /** The y values. */ private double[] yValue = null; @@ -90,13 +90,13 @@ /** The fill paint. */ private Paint fillPaint = null; - + /** The draw paint. */ private Paint drawPaint = null; - + /** The draw stroke. */ private Stroke drawStroke = null; - + /** The composite. */ private Composite composite = null; @@ -109,8 +109,8 @@ /** * Constructor for ClipPath. - * Default values are assumed for the fillPath and drawPath options as - * false and true respectively. The fillPaint is set to Color.GRAY, the + * Default values are assumed for the fillPath and drawPath options as + * false and true respectively. The fillPaint is set to Color.GRAY, the * drawColor is Color.BLUE, the stroke is BasicStroke(1) * and the composite is AlphaComposite.Src. * @@ -124,7 +124,7 @@ /** * Constructor for ClipPath. - * The fillPaint is set to Color.GRAY, the drawColor is Color.BLUE, the + * The fillPaint is set to Color.GRAY, the drawColor is Color.BLUE, the * stroke is BasicStroke(1) and the composite is AlphaComposite.Src. * * @param xValue x coordinates of curved to be created @@ -160,8 +160,8 @@ * @param drawStroke the stroke style * @param composite the composite rule */ - public ClipPath(double[] xValue, double[] yValue, boolean fillPath, - boolean drawPath, Paint fillPaint, Paint drawPaint, + public ClipPath(double[] xValue, double[] yValue, boolean fillPath, + boolean drawPath, Paint fillPaint, Paint drawPaint, Stroke drawStroke, Composite composite) { this.xValue = xValue; @@ -233,7 +233,7 @@ * @return The GeneralPath defining the outline */ public GeneralPath generateClipPath(Rectangle2D dataArea, - ValueAxis horizontalAxis, + ValueAxis horizontalAxis, ValueAxis verticalAxis) { GeneralPath generalPath = new GeneralPath(); @@ -261,7 +261,7 @@ /** * Returns the composite. - * + * * @return Composite */ public Composite getComposite() { @@ -270,7 +270,7 @@ /** * Returns the drawPaint. - * + * * @return Paint */ public Paint getDrawPaint() { @@ -279,7 +279,7 @@ /** * Returns the drawPath. - * + * * @return boolean */ public boolean isDrawPath() { @@ -288,7 +288,7 @@ /** * Returns the drawStroke. - * + * * @return Stroke */ public Stroke getDrawStroke() { @@ -297,7 +297,7 @@ /** * Returns the fillPaint. - * + * * @return Paint */ public Paint getFillPaint() { @@ -306,7 +306,7 @@ /** * Returns the fillPath. - * + * * @return boolean */ public boolean isFillPath() { @@ -315,7 +315,7 @@ /** * Returns the xValue. - * + * * @return double[] */ public double[] getXValue() { @@ -324,7 +324,7 @@ /** * Returns the yValue. - * + * * @return double[] */ public double[] getYValue() { @@ -333,7 +333,7 @@ /** * Sets the composite. - * + * * @param composite The composite to set */ public void setComposite(Composite composite) { @@ -342,7 +342,7 @@ /** * Sets the drawPaint. - * + * * @param drawPaint The drawPaint to set */ public void setDrawPaint(Paint drawPaint) { @@ -351,7 +351,7 @@ /** * Sets the drawPath. - * + * * @param drawPath The drawPath to set */ public void setDrawPath(boolean drawPath) { @@ -360,7 +360,7 @@ /** * Sets the drawStroke. - * + * * @param drawStroke The drawStroke to set */ public void setDrawStroke(Stroke drawStroke) { @@ -369,7 +369,7 @@ /** * Sets the fillPaint. - * + * * @param fillPaint The fillPaint to set */ public void setFillPaint(Paint fillPaint) { @@ -378,7 +378,7 @@ /** * Sets the fillPath. - * + * * @param fillPath The fillPath to set */ public void setFillPath(boolean fillPath) { @@ -387,7 +387,7 @@ /** * Sets the xValue. - * + * * @param xValue The xValue to set */ public void setXValue(double[] xValue) { @@ -396,7 +396,7 @@ /** * Sets the yValue. - * + * * @param yValue The yValue to set */ public void setYValue(double[] yValue) { @@ -405,7 +405,7 @@ /** * Returns the clip. - * + * * @return boolean */ public boolean isClip() { @@ -414,19 +414,19 @@ /** * Sets the clip. - * + * * @param clip The clip to set */ public void setClip(boolean clip) { this.clip = clip; } - /** - * Returns a clone of the object (a deeper clone than default to avoid bugs + /** + * Returns a clone of the object (a deeper clone than default to avoid bugs * when setting values in cloned object). - * + * * @return The clone. - * + * * @throws CloneNotSupportedException if cloning is not supported. */ public Object clone() throws CloneNotSupportedException { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mu...@us...> - 2008-09-04 19:57:02
|
Revision: 1507 http://jfreechart.svn.sourceforge.net/jfreechart/?rev=1507&view=rev Author: mungady Date: 2008-09-04 19:56:58 +0000 (Thu, 04 Sep 2008) Log Message: ----------- Whitespace. Modified Paths: -------------- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/Effect3D.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LegendItemSource.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LegendRenderingOrder.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/PaintMap.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/PolarChartPanel.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/StrokeMap.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/Effect3D.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/Effect3D.java 2008-09-04 19:55:46 UTC (rev 1506) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/Effect3D.java 2008-09-04 19:56:58 UTC (rev 1507) @@ -2,32 +2,32 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. + * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] * * ------------- * Effect3D.java * ------------- - * (C) Copyright 2002-2007, by Object Refinery Limited. + * (C) Copyright 2002-2008, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -42,7 +42,7 @@ package org.jfree.chart; /** - * An interface that should be implemented by renderers that use a 3D effect. + * An interface that should be implemented by renderers that use a 3D effect. * This allows the axes to mirror the same effect by querying the renderer. */ public interface Effect3D { Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LegendItemSource.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LegendItemSource.java 2008-09-04 19:55:46 UTC (rev 1506) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LegendItemSource.java 2008-09-04 19:56:58 UTC (rev 1507) @@ -2,32 +2,32 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. + * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] * * --------------------- * LegendItemSource.java * --------------------- - * (C) Copyright 2005, 2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2005-2008, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -41,7 +41,7 @@ package org.jfree.chart; /** - * A source of legend items. A {@link org.jfree.chart.title.LegendTitle} will + * A source of legend items. A {@link org.jfree.chart.title.LegendTitle} will * maintain a list of sources (often just one) from which it obtains legend * items. */ Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LegendRenderingOrder.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LegendRenderingOrder.java 2008-09-04 19:55:46 UTC (rev 1506) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LegendRenderingOrder.java 2008-09-04 19:56:58 UTC (rev 1507) @@ -2,32 +2,32 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. + * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] * * ------------------------- * LegendRenderingOrder.java * ------------------------- - * (C) Copyright 2004-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2004-2008, by Object Refinery Limited and Contributors. * * Original Author: Angel; * Contributor(s): -; @@ -35,7 +35,7 @@ * Changes * ------- * 26-Mar-2004 : Version 1 (DG); - * + * */ package org.jfree.chart; @@ -50,14 +50,14 @@ /** For serialization. */ private static final long serialVersionUID = -3832486612685808616L; - + /** In order. */ - public static final LegendRenderingOrder STANDARD - = new LegendRenderingOrder("LegendRenderingOrder.STANDARD"); + public static final LegendRenderingOrder STANDARD + = new LegendRenderingOrder("LegendRenderingOrder.STANDARD"); /** In reverse order. */ - public static final LegendRenderingOrder REVERSE - = new LegendRenderingOrder("LegendRenderingOrder.REVERSE"); + public static final LegendRenderingOrder REVERSE + = new LegendRenderingOrder("LegendRenderingOrder.REVERSE"); /** The name. */ private String name; @@ -81,7 +81,7 @@ } /** - * Returns <code>true</code> if this object is equal to the specified + * Returns <code>true</code> if this object is equal to the specified * object, and <code>false</code> otherwise. * * @param obj the other object. @@ -101,7 +101,7 @@ } return true; } - + /** * Ensures that serialization returns the unique instances. * @@ -115,7 +115,7 @@ } else if (this.equals(LegendRenderingOrder.REVERSE)) { return LegendRenderingOrder.REVERSE; - } + } return null; } Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/PaintMap.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/PaintMap.java 2008-09-04 19:55:46 UTC (rev 1506) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/PaintMap.java 2008-09-04 19:56:58 UTC (rev 1507) @@ -2,32 +2,32 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. + * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] * * ------------- * PaintMap.java * ------------- - * (C) Copyright 2006, 2007, by Object Refinery Limited. + * (C) Copyright 2006-2008, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -57,12 +57,12 @@ /** * A storage structure that maps <code>Comparable</code> instances with - * <code>Paint</code> instances. + * <code>Paint</code> instances. * <br><br> - * To support cloning and serialization, you should only use keys that are + * To support cloning and serialization, you should only use keys that are * cloneable and serializable. Special handling for the <code>Paint</code> * instances is included in this class. - * + * * @since 1.0.3 */ public class PaintMap implements Cloneable, Serializable { @@ -72,23 +72,23 @@ /** Storage for the keys and values. */ private transient Map store; - + /** * Creates a new (empty) map. */ public PaintMap() { - this.store = new HashMap(); + this.store = new HashMap(); } - + /** - * Returns the paint associated with the specified key, or + * Returns the paint associated with the specified key, or * <code>null</code>. - * + * * @param key the key (<code>null</code> not permitted). - * + * * @return The paint, or <code>null</code>. - * - * @throws IllegalArgumentException if <code>key</code> is + * + * @throws IllegalArgumentException if <code>key</code> is * <code>null</code>. */ public Paint getPaint(Comparable key) { @@ -97,28 +97,28 @@ } return (Paint) this.store.get(key); } - + /** * Returns <code>true</code> if the map contains the specified key, and * <code>false</code> otherwise. - * + * * @param key the key. - * + * * @return <code>true</code> if the map contains the specified key, and * <code>false</code> otherwise. */ public boolean containsKey(Comparable key) { return this.store.containsKey(key); } - + /** - * Adds a mapping between the specified <code>key</code> and + * Adds a mapping between the specified <code>key</code> and * <code>paint</code> values. - * + * * @param key the key (<code>null</code> not permitted). * @param paint the paint. - * - * @throws IllegalArgumentException if <code>key</code> is + * + * @throws IllegalArgumentException if <code>key</code> is * <code>null</code>. */ public void put(Comparable key, Paint paint) { @@ -127,19 +127,19 @@ } this.store.put(key, paint); } - + /** * Resets the map to empty. */ public void clear() { this.store.clear(); } - + /** * Tests this map for equality with an arbitrary object. - * + * * @param obj the object (<code>null</code> permitted). - * + * * @return A boolean. */ public boolean equals(Object obj) { @@ -165,12 +165,12 @@ } return true; } - + /** * Returns a clone of this <code>PaintMap</code>. - * + * * @return A clone of this instance. - * + * * @throws CloneNotSupportedException if any key is not cloneable. */ public Object clone() throws CloneNotSupportedException { @@ -178,7 +178,7 @@ // whereas the paint instances are always immutable so they're OK return super.clone(); } - + /** * Provides serialization support. * @@ -207,7 +207,7 @@ * @throws IOException if there is an I/O error. * @throws ClassNotFoundException if there is a classpath problem. */ - private void readObject(ObjectInputStream stream) + private void readObject(ObjectInputStream stream) throws IOException, ClassNotFoundException { stream.defaultReadObject(); this.store = new HashMap(); @@ -218,5 +218,5 @@ this.store.put(key, paint); } } - + } Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/PolarChartPanel.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/PolarChartPanel.java 2008-09-04 19:55:46 UTC (rev 1506) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/PolarChartPanel.java 2008-09-04 19:56:58 UTC (rev 1507) @@ -2,32 +2,32 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. + * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] * * -------------------- * PolarChartPanel.java * -------------------- - * (C) Copyright 2004, 2007, by Solution Engineering, Inc. and Contributors. + * (C) Copyright 2004-2008, by Solution Engineering, Inc. and Contributors. * * Original Author: Daniel Bridenbecker, Solution Engineering, Inc.; * Contributor(s): David Gilbert (for Object Refinery Limited); @@ -52,12 +52,12 @@ import org.jfree.chart.plot.PolarPlot; /** - * <code>PolarChartPanel</code> is the top level object for using the - * {@link PolarPlot}. Since this class has a <code>JPanel</code> in the - * inheritance hierarchy, one uses this class to integrate the Polar plot into + * <code>PolarChartPanel</code> is the top level object for using the + * {@link PolarPlot}. Since this class has a <code>JPanel</code> in the + * inheritance hierarchy, one uses this class to integrate the Polar plot into * their application. * <p> - * The main modification to <code>ChartPanel</code> is the popup menu. It + * The main modification to <code>ChartPanel</code> is the popup menu. It * removes <code>ChartPanel</code>'s versions of: * <ul> * <li><code>Zoom In</code></li> @@ -70,23 +70,23 @@ // ----------------- // --- Constants --- - // ----------------- - + // ----------------- + /** Zoom in command string. */ private static final String POLAR_ZOOM_IN_ACTION_COMMAND = "Polar Zoom In"; - + /** Zoom out command string. */ - private static final String POLAR_ZOOM_OUT_ACTION_COMMAND + private static final String POLAR_ZOOM_OUT_ACTION_COMMAND = "Polar Zoom Out"; - + /** Auto range command string. */ - private static final String POLAR_AUTO_RANGE_ACTION_COMMAND + private static final String POLAR_AUTO_RANGE_ACTION_COMMAND = "Polar Auto Range"; - + // ------------------------ // --- Member Variables --- // ------------------------ - + // -------------------- // --- Constructors --- // -------------------- @@ -101,7 +101,7 @@ /** * Creates a new panel. - * + * * @param chart the chart. * @param useBuffer buffered? */ @@ -113,7 +113,7 @@ setMaximumDrawWidth(2000); setMaximumDrawHeight(2000); } - + // -------------------------- // --- ChartPanel Methods --- // -------------------------- @@ -126,7 +126,7 @@ checkChart(chart); super.setChart(chart); } - + /** * Creates a popup menu for the panel. * @@ -138,10 +138,10 @@ * @return The popup menu. */ protected JPopupMenu createPopupMenu(boolean properties, - boolean save, - boolean print, + boolean save, + boolean print, boolean zoom) { - + JPopupMenu result = super.createPopupMenu(properties, save, print, zoom); int zoomInIndex = getPopupMenuItem(result, "Zoom In"); int zoomOutIndex = getPopupMenuItem(result, "Zoom Out"); @@ -150,15 +150,15 @@ JMenuItem zoomIn = new JMenuItem("Zoom In"); zoomIn.setActionCommand(POLAR_ZOOM_IN_ACTION_COMMAND); zoomIn.addActionListener(this); - + JMenuItem zoomOut = new JMenuItem("Zoom Out"); zoomOut.setActionCommand(POLAR_ZOOM_OUT_ACTION_COMMAND); zoomOut.addActionListener(this); - + JMenuItem auto = new JMenuItem("Auto Range"); auto.setActionCommand(POLAR_AUTO_RANGE_ACTION_COMMAND); auto.addActionListener(this); - + if (zoomInIndex != -1) { result.remove(zoomInIndex); } @@ -183,7 +183,7 @@ } return result; } - + /** * Handles action events generated by the popup menu. * @@ -191,7 +191,7 @@ */ public void actionPerformed(ActionEvent event) { String command = event.getActionCommand(); - + if (command.equals(POLAR_ZOOM_IN_ACTION_COMMAND)) { PolarPlot plot = (PolarPlot) getChart().getPlot(); plot.zoom(0.5); @@ -216,10 +216,10 @@ // ----------------------- // --- Private Methods --- // ----------------------- - + /** * Test that the chart is using an xy plot with time as the domain axis. - * + * * @param chart the chart. */ private void checkChart(JFreeChart chart) { @@ -228,13 +228,13 @@ throw new IllegalArgumentException("plot is not a PolarPlot"); } } - + /** * Returns the index of an item in a popup menu. - * + * * @param menu the menu. * @param text the label. - * + * * @return The item index. */ private int getPopupMenuItem(JPopupMenu menu, String text) { Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/StrokeMap.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/StrokeMap.java 2008-09-04 19:55:46 UTC (rev 1506) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/StrokeMap.java 2008-09-04 19:56:58 UTC (rev 1507) @@ -2,32 +2,32 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. + * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] * * -------------- * StrokeMap.java * -------------- - * (C) Copyright 2006, 2007, by Object Refinery Limited. + * (C) Copyright 2006-2008, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -55,12 +55,12 @@ /** * A storage structure that maps <code>Comparable</code> instances with - * <code>Stroke</code> instances. + * <code>Stroke</code> instances. * <br><br> - * To support cloning and serialization, you should only use keys that are + * To support cloning and serialization, you should only use keys that are * cloneable and serializable. Special handling for the <code>Stroke</code> * instances is included in this class. - * + * * @since 1.0.3 */ public class StrokeMap implements Cloneable, Serializable { @@ -70,23 +70,23 @@ /** Storage for the keys and values. */ private transient Map store; - + /** * Creates a new (empty) map. */ public StrokeMap() { - this.store = new TreeMap(); + this.store = new TreeMap(); } - + /** - * Returns the stroke associated with the specified key, or + * Returns the stroke associated with the specified key, or * <code>null</code>. - * + * * @param key the key (<code>null</code> not permitted). - * + * * @return The stroke, or <code>null</code>. - * - * @throws IllegalArgumentException if <code>key</code> is + * + * @throws IllegalArgumentException if <code>key</code> is * <code>null</code>. */ public Stroke getStroke(Comparable key) { @@ -95,46 +95,46 @@ } return (Stroke) this.store.get(key); } - + /** * Returns <code>true</code> if the map contains the specified key, and * <code>false</code> otherwise. - * + * * @param key the key. - * + * * @return <code>true</code> if the map contains the specified key, and * <code>false</code> otherwise. */ public boolean containsKey(Comparable key) { return this.store.containsKey(key); } - + /** - * Adds a mapping between the specified <code>key</code> and + * Adds a mapping between the specified <code>key</code> and * <code>stroke</code> values. - * + * * @param key the key (<code>null</code> not permitted). * @param stroke the stroke. */ public void put(Comparable key, Stroke stroke) { - if (key == null) { + if (key == null) { throw new IllegalArgumentException("Null 'key' argument."); } this.store.put(key, stroke); } - + /** * Resets the map to empty. */ public void clear() { this.store.clear(); } - + /** * Tests this map for equality with an arbitrary object. - * + * * @param obj the object (<code>null</code> permitted). - * + * * @return A boolean. */ public boolean equals(Object obj) { @@ -160,12 +160,12 @@ } return true; } - + /** * Returns a clone of this <code>StrokeMap</code>. - * + * * @return A clone of this instance. - * + * * @throws CloneNotSupportedException if any key is not cloneable. */ public Object clone() throws CloneNotSupportedException { @@ -173,7 +173,7 @@ // whereas the stroke instances are always immutable so they're OK return super.clone(); } - + /** * Provides serialization support. * @@ -202,7 +202,7 @@ * @throws IOException if there is an I/O error. * @throws ClassNotFoundException if there is a classpath problem. */ - private void readObject(ObjectInputStream stream) + private void readObject(ObjectInputStream stream) throws IOException, ClassNotFoundException { stream.defaultReadObject(); this.store = new TreeMap(); @@ -213,5 +213,5 @@ this.store.put(key, stroke); } } - + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mu...@us...> - 2008-09-19 01:34:45
|
Revision: 1632 http://jfreechart.svn.sourceforge.net/jfreechart/?rev=1632&view=rev Author: mungady Date: 2008-09-19 08:34:40 +0000 (Fri, 19 Sep 2008) Log Message: ----------- Added sample images in Javadoc descriptions. Modified Paths: -------------- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PiePlot.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/DialPlot.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/BarRenderer.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/LineAndShapeRenderer.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/DeviationRenderer.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PiePlot.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PiePlot.java 2008-09-19 08:34:00 UTC (rev 1631) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PiePlot.java 2008-09-19 08:34:40 UTC (rev 1632) @@ -223,6 +223,11 @@ /** * A plot that displays data in the form of a pie chart, using data from any * class that implements the {@link PieDataset} interface. + * The example shown here is generated by the <code>PieChartDemo2.java</code> + * program included in the JFreeChart Demo Collection: + * <br><br> + * <img src="../../../../images/PiePlotSample.png" + * alt="PiePlotSample.png" /> * <P> * Special notes: * <ol> Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/DialPlot.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/DialPlot.java 2008-09-19 08:34:00 UTC (rev 1631) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/DialPlot.java 2008-09-19 08:34:40 UTC (rev 1632) @@ -67,6 +67,11 @@ /** * A dial plot composed of user-definable layers. + * The example shown here is generated by the <code>DialDemo2.java</code> + * program included in the JFreeChart Demo Collection: + * <br><br> + * <img src="../../../../../images/DialPlotSample.png" + * alt="DialPlotSample.png" /> * * @since 1.0.7 */ Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/BarRenderer.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/BarRenderer.java 2008-09-19 08:34:00 UTC (rev 1631) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/BarRenderer.java 2008-09-19 08:34:40 UTC (rev 1632) @@ -131,6 +131,11 @@ /** * A {@link CategoryItemRenderer} that draws individual data items as bars. + * The example shown here is generated by the <code>BarChartDemo1.java</code> + * program included in the JFreeChart Demo Collection: + * <br><br> + * <img src="../../../../../images/BarRendererSample.png" + * alt="BarRendererSample.png" /> */ public class BarRenderer extends AbstractCategoryItemRenderer implements Cloneable, PublicCloneable, Serializable { Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/LineAndShapeRenderer.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/LineAndShapeRenderer.java 2008-09-19 08:34:00 UTC (rev 1631) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/LineAndShapeRenderer.java 2008-09-19 08:34:40 UTC (rev 1632) @@ -117,6 +117,11 @@ /** * A renderer that draws shapes for each data item, and lines between data * items (for use with the {@link CategoryPlot} class). + * The example shown here is generated by the <code>LineChartDemo1.java</code> + * program included in the JFreeChart Demo Collection: + * <br><br> + * <img src="../../../../../images/LineAndShapeRendererSample.png" + * alt="LineAndShapeRendererSample.png" /> */ public class LineAndShapeRenderer extends AbstractCategoryItemRenderer implements Cloneable, PublicCloneable, Serializable { Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/DeviationRenderer.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/DeviationRenderer.java 2008-09-19 08:34:00 UTC (rev 1631) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/DeviationRenderer.java 2008-09-19 08:34:40 UTC (rev 1632) @@ -66,6 +66,12 @@ * A specialised subclass of the {@link XYLineAndShapeRenderer} that requires * an {@link IntervalXYDataset} and represents the y-interval by shading an * area behind the y-values on the chart. + * The example shown here is generated by the + * <code>DeviationRendererDemo1.java</code> program included in the + * JFreeChart Demo Collection: + * <br><br> + * <img src="../../../../../images/DeviationRendererSample.png" + * alt="DeviationRendererSample.png" /> * * @since 1.0.5 */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mu...@us...> - 2009-06-24 15:44:51
|
Revision: 2157 http://jfreechart.svn.sourceforge.net/jfreechart/?rev=2157&view=rev Author: mungady Date: 2009-06-24 15:44:47 +0000 (Wed, 24 Jun 2009) Log Message: ----------- 2009-06-24 David Gilbert <dav...@ob...> Patch 2809117 by Peter Kolb: * source/org/jfree/chart/annotations/AbstractAnnotation.java: New file, * source/org/jfree/chart/annotations/AbstractXYAnnotation.java: Now extends AbstractAnnotation, * source/org/jfree/chart/annotations/Annotation.java: New file, * source/org/jfree/chart/annotations/CategoryAnnotation.java: Now extends Annotation, * source/org/jfree/chart/annotations/CategoryLineAnnotation.java Now extends AbstractAnnotation, (setCategory1): Fire change event, (setValue1): Likewise, (setCategory2): Likewise, (setValue2): Likewise, (setPaint): Likewise, (setStroke): Likewise, * source/org/jfree/chart/annotations/CategoryPointerAnnotation.java (setAngle): Fire change event, (setTipRadius): Likewise, (setBaseRadius): Likewise, (setLabelOffset): Likewise, (setArrowLength): Likewise, (setArrowWidth): Likewise, (setArrowStroke): Likewise, (setArrowPaint): Likewise, * source/org/jfree/chart/annotations/CategoryTextAnnotation.java (setCategory): Fire change event, (setCategoryAnchor): Likewise, (setValue): Likewise, * source/org/jfree/chart/annotations/TextAnnotation.java (setFont): Fire change event, (setPaint): Likewise, (setTextAnchor): Likewise, (setRotationAnchor): Likewise, (setRotationAngle): Likewise, * source/org/jfree/chart/annotations/XYAnnotation.java: Now extends Annotation, * source/org/jfree/chart/annotations/XYPointerAnnotation.java (setAngle): Fire change event, (setTipRadius): Likewise, (setBaseRadius): Likewise, (setLabelOffset): Likewise, (setArrowLength): Likewise, (setArrowWidth): Likewise, (setArrowStroke): Likewise, (setArrowPaint): Likewise, * source/org/jfree/chart/annotations/XYTextAnnotation.java (setFont): Fire change event, (setPaint): Likewise, (setTextAnchor): Likewise, (setRotationAnchor): Likewise, (setRotationAngle): Likewise, (setX): Likewise, (setY): Likewise, (setBackgroundPaint): Likewise, (setOutlinePaint): Likewise, (setOutlineStroke): Likewise, (setOutlineVisible): Likewise, * source/org/jfree/chart/annotations/XYTitleAnnotation.java (setMaxWidth): Fire change event, (setMaxHeight): Likewise, * source/org/jfree/chart/event/AnnotationChangeEvent.java: New file, * source/org/jfree/chart/event/AnnotationChangeListener.java: New file, * source/org/jfree/chart/plot/CategoryPlot.java (annotationChanged): New method, (addAnnotation): Add listener, (removeAnnotation): Clear listener, (clearAnnotations): Clear listeners, * source/org/jfree/chart/plot/Plot.java (annotationChanged): New method, * source/org/jfree/chart/plot/XYPlot.java (annotationChanged): New method, (addAnnotation): Add listener, (removeAnnotation): Clear listener, (clearAnnotations): Clear listeners, * source/org/jfree/chart/renderer/xy/AbstractXYItemRenderer.java (annotationChanged): New method, (addAnnotation): Add listener, (removeAnnotation): Clear listener, (removeAnnotations): Clear listeners. Modified Paths: -------------- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/AbstractXYAnnotation.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/CategoryAnnotation.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/CategoryLineAnnotation.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/CategoryPointerAnnotation.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/CategoryTextAnnotation.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/TextAnnotation.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYAnnotation.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYBoxAnnotation.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYDataImageAnnotation.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYDrawableAnnotation.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYImageAnnotation.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYLineAnnotation.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYPointerAnnotation.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYPolygonAnnotation.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYShapeAnnotation.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYTextAnnotation.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYTitleAnnotation.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/CategoryPlot.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/Plot.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/XYPlot.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/AbstractXYItemRenderer.java Added Paths: ----------- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/AbstractAnnotation.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/Annotation.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/AnnotationChangeEvent.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/AnnotationChangeListener.java Added: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/AbstractAnnotation.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/AbstractAnnotation.java (rev 0) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/AbstractAnnotation.java 2009-06-24 15:44:47 UTC (rev 2157) @@ -0,0 +1,222 @@ +/* =========================================================== + * JFreeChart : a free chart library for the Java(tm) platform + * =========================================================== + * + * (C) Copyright 2000-2009, by Object Refinery Limited and Contributors. + * + * Project Info: http://www.jfree.org/jfreechart/index.html + * + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or + * (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * 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. + * in the United States and other countries.] + * + * ----------------------- + * AbstractAnnotation.java + * ----------------------- + * (C) Copyright 2009, by Object Refinery Limited and Contributors. + * + * Original Author: Peter Kolb (see patch 2809117); + * Contributor(s): ; + * + * Changes: + * -------- + * 20-Jun-2009 : Version 1 (PK); + * + */ + +package org.jfree.chart.annotations; + +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.Serializable; +import java.util.Arrays; +import java.util.EventListener; +import java.util.List; + +import javax.swing.event.EventListenerList; + +import org.jfree.chart.event.AnnotationChangeEvent; +import org.jfree.chart.event.AnnotationChangeListener; + +/** + * An abstract implementation of the {@link Annotation} interface, containing a + * mechanism for registering change listeners. + * + * @since 1.0.14 + */ +public abstract class AbstractAnnotation implements Annotation, Cloneable, + Serializable { + + /** Storage for registered change listeners. */ + private transient EventListenerList listenerList; + + /** + * A flag that indicates whether listeners should be notified + * about changes of the annotation. + */ + private boolean notify = true; + + /** + * Constructs an annotation. + */ + protected AbstractAnnotation() { + this.listenerList = new EventListenerList(); + } + + /** + * Registers an object to receive notification of changes to the + * annotation. + * + * @param listener the object to register. + * + * @see #removeChangeListener(AnnotationChangeListener) + */ + public void addChangeListener(AnnotationChangeListener listener) { + this.listenerList.add(AnnotationChangeListener.class, listener); + } + + /** + * Deregisters an object so that it no longer receives notification of + * changes to the annotation. + * + * @param listener the object to deregister. + * + * @see #addChangeListener(AnnotationChangeListener) + */ + public void removeChangeListener(AnnotationChangeListener listener) { + this.listenerList.remove(AnnotationChangeListener.class, listener); + } + + /** + * Returns <code>true</code> if the specified object is registered with + * the annotation as a listener. Most applications won't need to call this + * method, it exists mainly for use by unit testing code. + * + * @param listener the listener. + * + * @return A boolean. + * + * @see #addChangeListener(AnnotationChangeListener) + * @see #removeChangeListener(AnnotationChangeListener) + */ + public boolean hasListener(EventListener listener) { + List list = Arrays.asList(this.listenerList.getListenerList()); + return list.contains(listener); + } + + /** + * Notifies all registered listeners that the annotation has changed. + * + * @see #addChangeListener(AnnotationChangeListener) + */ + protected void fireAnnotationChanged() { + if (notify) { + notifyListeners(new AnnotationChangeEvent(this, this)); + } + } + + /** + * Notifies all registered listeners that the annotation has changed. + * + * @param event contains information about the event that triggered the + * notification. + * + * @see #addChangeListener(AnnotationChangeListener) + * @see #removeChangeListener(AnnotationChangeListener) + */ + protected void notifyListeners(AnnotationChangeEvent event) { + + Object[] listeners = this.listenerList.getListenerList(); + for (int i = listeners.length - 2; i >= 0; i -= 2) { + if (listeners[i] == AnnotationChangeListener.class) { + ((AnnotationChangeListener) listeners[i + 1]).annotationChanged( + event); + } + } + + } + + /** + * Returns a flag that indicates whether listeners should be + * notified about changes to the annotation. + * + * @return the flag. + * + * @see #setNotify(boolean) + */ + public boolean getNotify(){ + return this.notify; + } + + /** + * Sets a flag that indicates whether listeners should be notified about + * changes of an annotation. + * + * @param flag the flag + * + * @see #getNotify() + */ + public void setNotify(boolean flag){ + this.notify = flag; + if (notify) { + fireAnnotationChanged(); + } + } + + /** + * Returns a clone of the annotation. The cloned annotation will NOT + * include the {@link AnnotationChangeListener} references that have been + * registered with this annotation. + * + * @return A clone. + * + * @throws CloneNotSupportedException if the annotation does not support + * cloning. + */ + public Object clone() throws CloneNotSupportedException { + AbstractAnnotation clone = (AbstractAnnotation) super.clone(); + clone.listenerList = new EventListenerList(); + return clone; + } + + /** + * Handles serialization. + * + * @param stream the output stream. + * + * @throws IOException if there is an I/O problem. + */ + private void writeObject(ObjectOutputStream stream) throws IOException { + stream.defaultWriteObject(); + } + + /** + * Restores a serialized object. + * + * @param stream the input stream. + * + * @throws IOException if there is an I/O problem. + * @throws ClassNotFoundException if there is a problem loading a class. + */ + private void readObject(ObjectInputStream stream) + throws IOException, ClassNotFoundException { + stream.defaultReadObject(); + this.listenerList = new EventListenerList(); + } + +} Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/AbstractXYAnnotation.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/AbstractXYAnnotation.java 2009-06-24 12:47:26 UTC (rev 2156) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/AbstractXYAnnotation.java 2009-06-24 15:44:47 UTC (rev 2157) @@ -1,205 +1,208 @@ -/* =========================================================== - * JFreeChart : a free chart library for the Java(tm) platform - * =========================================================== - * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. - * - * Project Info: http://www.jfree.org/jfreechart/index.html - * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or - * (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public - * 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. - * in the United States and other countries.] - * - * ------------------------- - * AbstractXYAnnotation.java - * ------------------------- - * (C) Copyright 2004-2008, by Object Refinery Limited. - * - * Original Author: David Gilbert (for Object Refinery Limited); - * Contributor(s): -; - * - * Changes: - * -------- - * 29-Sep-2004 : Version 1 (DG); - * ------------- JFREECHART 1.0.x --------------------------------------------- - * 06-Mar-2007 : Implemented hashCode() (DG); - * - */ - -package org.jfree.chart.annotations; - -import java.awt.Graphics2D; -import java.awt.Shape; -import java.awt.geom.Rectangle2D; - -import org.jfree.chart.axis.ValueAxis; -import org.jfree.chart.entity.EntityCollection; -import org.jfree.chart.entity.XYAnnotationEntity; -import org.jfree.chart.plot.PlotRenderingInfo; -import org.jfree.chart.plot.XYPlot; -import org.jfree.util.ObjectUtilities; - -/** - * The interface that must be supported by annotations that are to be added to - * an {@link XYPlot}. - */ -public abstract class AbstractXYAnnotation implements XYAnnotation { - - /** The tool tip text. */ - private String toolTipText; - - /** The URL. */ - private String url; - - /** - * Creates a new instance that has no tool tip or URL specified. - */ - protected AbstractXYAnnotation() { - this.toolTipText = null; - this.url = null; - } - - /** - * Returns the tool tip text for the annotation. This will be displayed in - * a {@link org.jfree.chart.ChartPanel} when the mouse pointer hovers over - * the annotation. - * - * @return The tool tip text (possibly <code>null</code>). - * - * @see #setToolTipText(String) - */ - public String getToolTipText() { - return this.toolTipText; - } - - /** - * Sets the tool tip text for the annotation. - * - * @param text the tool tip text (<code>null</code> permitted). - * - * @see #getToolTipText() - */ - public void setToolTipText(String text) { - this.toolTipText = text; - } - - /** - * Returns the URL for the annotation. This URL will be used to provide - * hyperlinks when an HTML image map is created for the chart. - * - * @return The URL (possibly <code>null</code>). - * - * @see #setURL(String) - */ - public String getURL() { - return this.url; - } - - /** - * Sets the URL for the annotation. - * - * @param url the URL (<code>null</code> permitted). - * - * @see #getURL() - */ - public void setURL(String url) { - this.url = url; - } - - /** - * Draws the annotation. - * - * @param g2 the graphics device. - * @param plot the plot. - * @param dataArea the data area. - * @param domainAxis the domain axis. - * @param rangeAxis the range axis. - * @param rendererIndex the renderer index. - * @param info if supplied, this info object will be populated with - * entity information. - */ - public abstract void draw(Graphics2D g2, XYPlot plot, Rectangle2D dataArea, - ValueAxis domainAxis, ValueAxis rangeAxis, - int rendererIndex, - PlotRenderingInfo info); - - /** - * A utility method for adding an {@link XYAnnotationEntity} to - * a {@link PlotRenderingInfo} instance. - * - * @param info the plot rendering info (<code>null</code> permitted). - * @param hotspot the hotspot area. - * @param rendererIndex the renderer index. - * @param toolTipText the tool tip text. - * @param urlText the URL text. - */ - protected void addEntity(PlotRenderingInfo info, - Shape hotspot, int rendererIndex, - String toolTipText, String urlText) { - if (info == null) { - return; - } - EntityCollection entities = info.getOwner().getEntityCollection(); - if (entities == null) { - return; - } - XYAnnotationEntity entity = new XYAnnotationEntity(hotspot, - rendererIndex, toolTipText, urlText); - entities.add(entity); - } - - /** - * Tests this annotation for equality with an arbitrary object. - * - * @param obj the object (<code>null</code> permitted). - * - * @return A boolean. - */ - public boolean equals(Object obj) { - if (obj == this) { - return true; - } - if (!(obj instanceof AbstractXYAnnotation)) { - return false; - } - AbstractXYAnnotation that = (AbstractXYAnnotation) obj; - if (!ObjectUtilities.equal(this.toolTipText, that.toolTipText)) { - return false; - } - if (!ObjectUtilities.equal(this.url, that.url)) { - return false; - } - return true; - } - - /** - * Returns a hash code for this instance. - * - * @return A hash code. - */ - public int hashCode() { - int result = 193; - if (this.toolTipText != null) { - result = 37 * result + this.toolTipText.hashCode(); - } - if (this.url != null) { - result = 37 * result + this.url.hashCode(); - } - return result; - } - -} +/* =========================================================== + * JFreeChart : a free chart library for the Java(tm) platform + * =========================================================== + * + * (C) Copyright 2000-2009, by Object Refinery Limited and Contributors. + * + * Project Info: http://www.jfree.org/jfreechart/index.html + * + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or + * (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * 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. + * in the United States and other countries.] + * + * ------------------------- + * AbstractXYAnnotation.java + * ------------------------- + * (C) Copyright 2004-2009, by Object Refinery Limited. + * + * Original Author: David Gilbert (for Object Refinery Limited); + * Contributor(s): Peter Kolb (patch 2809117); + * + * Changes: + * -------- + * 29-Sep-2004 : Version 1 (DG); + * ------------- JFREECHART 1.0.x --------------------------------------------- + * 06-Mar-2007 : Implemented hashCode() (DG); + * 24-Jun-2009 : Now extends AbstractAnnotation (see patch 2809117 by PK) (DG); + * + */ + +package org.jfree.chart.annotations; + +import java.awt.Graphics2D; +import java.awt.Shape; +import java.awt.geom.Rectangle2D; + +import org.jfree.chart.axis.ValueAxis; +import org.jfree.chart.entity.EntityCollection; +import org.jfree.chart.entity.XYAnnotationEntity; +import org.jfree.chart.plot.PlotRenderingInfo; +import org.jfree.chart.plot.XYPlot; +import org.jfree.util.ObjectUtilities; + +/** + * The interface that must be supported by annotations that are to be added to + * an {@link XYPlot}. + */ +public abstract class AbstractXYAnnotation extends AbstractAnnotation + implements XYAnnotation { + + /** The tool tip text. */ + private String toolTipText; + + /** The URL. */ + private String url; + + /** + * Creates a new instance that has no tool tip or URL specified. + */ + protected AbstractXYAnnotation() { + super(); + this.toolTipText = null; + this.url = null; + } + + /** + * Returns the tool tip text for the annotation. This will be displayed in + * a {@link org.jfree.chart.ChartPanel} when the mouse pointer hovers over + * the annotation. + * + * @return The tool tip text (possibly <code>null</code>). + * + * @see #setToolTipText(String) + */ + public String getToolTipText() { + return this.toolTipText; + } + + /** + * Sets the tool tip text for the annotation. + * + * @param text the tool tip text (<code>null</code> permitted). + * + * @see #getToolTipText() + */ + public void setToolTipText(String text) { + this.toolTipText = text; + } + + /** + * Returns the URL for the annotation. This URL will be used to provide + * hyperlinks when an HTML image map is created for the chart. + * + * @return The URL (possibly <code>null</code>). + * + * @see #setURL(String) + */ + public String getURL() { + return this.url; + } + + /** + * Sets the URL for the annotation. + * + * @param url the URL (<code>null</code> permitted). + * + * @see #getURL() + */ + public void setURL(String url) { + this.url = url; + } + + /** + * Draws the annotation. + * + * @param g2 the graphics device. + * @param plot the plot. + * @param dataArea the data area. + * @param domainAxis the domain axis. + * @param rangeAxis the range axis. + * @param rendererIndex the renderer index. + * @param info if supplied, this info object will be populated with + * entity information. + */ + public abstract void draw(Graphics2D g2, XYPlot plot, Rectangle2D dataArea, + ValueAxis domainAxis, ValueAxis rangeAxis, + int rendererIndex, + PlotRenderingInfo info); + + /** + * A utility method for adding an {@link XYAnnotationEntity} to + * a {@link PlotRenderingInfo} instance. + * + * @param info the plot rendering info (<code>null</code> permitted). + * @param hotspot the hotspot area. + * @param rendererIndex the renderer index. + * @param toolTipText the tool tip text. + * @param urlText the URL text. + */ + protected void addEntity(PlotRenderingInfo info, + Shape hotspot, int rendererIndex, + String toolTipText, String urlText) { + if (info == null) { + return; + } + EntityCollection entities = info.getOwner().getEntityCollection(); + if (entities == null) { + return; + } + XYAnnotationEntity entity = new XYAnnotationEntity(hotspot, + rendererIndex, toolTipText, urlText); + entities.add(entity); + } + + /** + * Tests this annotation for equality with an arbitrary object. + * + * @param obj the object (<code>null</code> permitted). + * + * @return A boolean. + */ + public boolean equals(Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof AbstractXYAnnotation)) { + return false; + } + AbstractXYAnnotation that = (AbstractXYAnnotation) obj; + if (!ObjectUtilities.equal(this.toolTipText, that.toolTipText)) { + return false; + } + if (!ObjectUtilities.equal(this.url, that.url)) { + return false; + } + return true; + } + + /** + * Returns a hash code for this instance. + * + * @return A hash code. + */ + public int hashCode() { + int result = 193; + if (this.toolTipText != null) { + result = 37 * result + this.toolTipText.hashCode(); + } + if (this.url != null) { + result = 37 * result + this.url.hashCode(); + } + return result; + } + +} Added: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/Annotation.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/Annotation.java (rev 0) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/Annotation.java 2009-06-24 15:44:47 UTC (rev 2157) @@ -0,0 +1,66 @@ +/* =========================================================== + * JFreeChart : a free chart library for the Java(tm) platform + * =========================================================== + * + * (C) Copyright 2000-2009, by Object Refinery Limited and Contributors. + * + * Project Info: http://www.jfree.org/jfreechart/index.html + * + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or + * (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * 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. + * in the United States and other countries.] + * + * --------------- + * Annotation.java + * --------------- + * (C) Copyright 2009, by Object Refinery Limited and Contributors. + * + * Original Author: Peter Kolb (see patch 2809117); + * Contributor(s): ; + * + * Changes: + * -------- + * 20-Jun-2009 : Version 1 (PK); + * + */ + +package org.jfree.chart.annotations; + +import org.jfree.chart.event.AnnotationChangeListener; + +/** + * The base interface for annotations. All annotations should support the + * {@link AnnotationChangeEvent} mechanism by allowing listeners to register + * and receive notification of any changes to the annotation. + */ +public interface Annotation { + + /** + * Registers an object for notification of changes to the annotation. + * + * @param listener the object to register. + */ + public void addChangeListener(AnnotationChangeListener listener); + + /** + * Deregisters an object for notification of changes to the annotation. + * + * @param listener the object to deregister. + */ + public void removeChangeListener(AnnotationChangeListener listener); + +} Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/CategoryAnnotation.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/CategoryAnnotation.java 2009-06-24 12:47:26 UTC (rev 2156) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/CategoryAnnotation.java 2009-06-24 15:44:47 UTC (rev 2157) @@ -1,69 +1,70 @@ -/* =========================================================== - * JFreeChart : a free chart library for the Java(tm) platform - * =========================================================== - * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. - * - * Project Info: http://www.jfree.org/jfreechart/index.html - * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or - * (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public - * 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. - * in the United States and other countries.] - * - * ----------------------- - * CategoryAnnotation.java - * ----------------------- - * (C) Copyright 2003-2008, by Object Refinery Limited. - * - * Original Author: David Gilbert (for Object Refinery Limited); - * Contributor(s): -; - * - * Changes: - * -------- - * 02-Apr-2003 : Version 1 (DG); - * 02-Jul-2003 : Eliminated Annotation base interface (DG); - * - */ - -package org.jfree.chart.annotations; - -import java.awt.Graphics2D; -import java.awt.geom.Rectangle2D; - -import org.jfree.chart.axis.CategoryAxis; -import org.jfree.chart.axis.ValueAxis; -import org.jfree.chart.plot.CategoryPlot; - -/** - * The interface that must be supported by annotations that are to be added to - * a {@link org.jfree.chart.plot.CategoryPlot}. - */ -public interface CategoryAnnotation { - - /** - * Draws the annotation. - * - * @param g2 the graphics device. - * @param plot the plot. - * @param dataArea the data area. - * @param domainAxis the domain axis. - * @param rangeAxis the range axis. - */ - public void draw(Graphics2D g2, CategoryPlot plot, Rectangle2D dataArea, - CategoryAxis domainAxis, ValueAxis rangeAxis); - -} +/* =========================================================== + * JFreeChart : a free chart library for the Java(tm) platform + * =========================================================== + * + * (C) Copyright 2000-2009, by Object Refinery Limited and Contributors. + * + * Project Info: http://www.jfree.org/jfreechart/index.html + * + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or + * (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * 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. + * in the United States and other countries.] + * + * ----------------------- + * CategoryAnnotation.java + * ----------------------- + * (C) Copyright 2003-2009, by Object Refinery Limited. + * + * Original Author: David Gilbert (for Object Refinery Limited); + * Contributor(s): -; + * + * Changes: + * -------- + * 02-Apr-2003 : Version 1 (DG); + * 02-Jul-2003 : Eliminated Annotation base interface (DG); + * 24-Jun-2009 : Now extends Annotation (see patch 2809117 by PK) (DG); + * + */ + +package org.jfree.chart.annotations; + +import java.awt.Graphics2D; +import java.awt.geom.Rectangle2D; + +import org.jfree.chart.axis.CategoryAxis; +import org.jfree.chart.axis.ValueAxis; +import org.jfree.chart.plot.CategoryPlot; + +/** + * The interface that must be supported by annotations that are to be added to + * a {@link CategoryPlot}. + */ +public interface CategoryAnnotation extends Annotation { + + /** + * Draws the annotation. + * + * @param g2 the graphics device. + * @param plot the plot. + * @param dataArea the data area. + * @param domainAxis the domain axis. + * @param rangeAxis the range axis. + */ + public void draw(Graphics2D g2, CategoryPlot plot, Rectangle2D dataArea, + CategoryAxis domainAxis, ValueAxis rangeAxis); + +} Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/CategoryLineAnnotation.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/CategoryLineAnnotation.java 2009-06-24 12:47:26 UTC (rev 2156) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/CategoryLineAnnotation.java 2009-06-24 15:44:47 UTC (rev 2157) @@ -1,422 +1,438 @@ -/* =========================================================== - * JFreeChart : a free chart library for the Java(tm) platform - * =========================================================== - * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. - * - * Project Info: http://www.jfree.org/jfreechart/index.html - * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or - * (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public - * 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. - * in the United States and other countries.] - * - * --------------------------- - * CategoryLineAnnotation.java - * --------------------------- - * (C) Copyright 2005-2008, by Object Refinery Limited. - * - * Original Author: David Gilbert (for Object Refinery Limited); - * Contributor(s): -; - * - * Changes: - * -------- - * 29-Jul-2005 : Version 1, based on CategoryTextAnnotation (DG); - * ------------- JFREECHART 1.0.x --------------------------------------------- - * 06-Mar-2007 : Reimplemented hashCode() (DG); - * 23-Apr-2008 : Implemented PublicCloneable (DG); - * - */ - -package org.jfree.chart.annotations; - -import java.awt.BasicStroke; -import java.awt.Color; -import java.awt.Graphics2D; -import java.awt.Paint; -import java.awt.Stroke; -import java.awt.geom.Rectangle2D; -import java.io.IOException; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.io.Serializable; - -import org.jfree.chart.HashUtilities; -import org.jfree.chart.axis.CategoryAnchor; -import org.jfree.chart.axis.CategoryAxis; -import org.jfree.chart.axis.ValueAxis; -import org.jfree.chart.plot.CategoryPlot; -import org.jfree.chart.plot.Plot; -import org.jfree.chart.plot.PlotOrientation; -import org.jfree.data.category.CategoryDataset; -import org.jfree.io.SerialUtilities; -import org.jfree.ui.RectangleEdge; -import org.jfree.util.ObjectUtilities; -import org.jfree.util.PaintUtilities; -import org.jfree.util.PublicCloneable; - -/** - * A line annotation that can be placed on a {@link CategoryPlot}. - */ -public class CategoryLineAnnotation implements CategoryAnnotation, - Cloneable, PublicCloneable, Serializable { - - /** For serialization. */ - static final long serialVersionUID = 3477740483341587984L; - - /** The category for the start of the line. */ - private Comparable category1; - - /** The value for the start of the line. */ - private double value1; - - /** The category for the end of the line. */ - private Comparable category2; - - /** The value for the end of the line. */ - private double value2; - - /** The line color. */ - private transient Paint paint = Color.black; - - /** The line stroke. */ - private transient Stroke stroke = new BasicStroke(1.0f); - - /** - * Creates a new annotation that draws a line between (category1, value1) - * and (category2, value2). - * - * @param category1 the category (<code>null</code> not permitted). - * @param value1 the value. - * @param category2 the category (<code>null</code> not permitted). - * @param value2 the value. - * @param paint the line color (<code>null</code> not permitted). - * @param stroke the line stroke (<code>null</code> not permitted). - */ - public CategoryLineAnnotation(Comparable category1, double value1, - Comparable category2, double value2, - Paint paint, Stroke stroke) { - if (category1 == null) { - throw new IllegalArgumentException("Null 'category1' argument."); - } - if (category2 == null) { - throw new IllegalArgumentException("Null 'category2' argument."); - } - if (paint == null) { - throw new IllegalArgumentException("Null 'paint' argument."); - } - if (stroke == null) { - throw new IllegalArgumentException("Null 'stroke' argument."); - } - this.category1 = category1; - this.value1 = value1; - this.category2 = category2; - this.value2 = value2; - this.paint = paint; - this.stroke = stroke; - } - - /** - * Returns the category for the start of the line. - * - * @return The category for the start of the line (never <code>null</code>). - * - * @see #setCategory1(Comparable) - */ - public Comparable getCategory1() { - return this.category1; - } - - /** - * Sets the category for the start of the line. - * - * @param category the category (<code>null</code> not permitted). - * - * @see #getCategory1() - */ - public void setCategory1(Comparable category) { - if (category == null) { - throw new IllegalArgumentException("Null 'category' argument."); - } - this.category1 = category; - } - - /** - * Returns the y-value for the start of the line. - * - * @return The y-value for the start of the line. - * - * @see #setValue1(double) - */ - public double getValue1() { - return this.value1; - } - - /** - * Sets the y-value for the start of the line. - * - * @param value the value. - * - * @see #getValue1() - */ - public void setValue1(double value) { - this.value1 = value; - } - - /** - * Returns the category for the end of the line. - * - * @return The category for the end of the line (never <code>null</code>). - * - * @see #setCategory2(Comparable) - */ - public Comparable getCategory2() { - return this.category2; - } - - /** - * Sets the category for the end of the line. - * - * @param category the category (<code>null</code> not permitted). - * - * @see #getCategory2() - */ - public void setCategory2(Comparable category) { - if (category == null) { - throw new IllegalArgumentException("Null 'category' argument."); - } - this.category2 = category; - } - - /** - * Returns the y-value for the end of the line. - * - * @return The y-value for the end of the line. - * - * @see #setValue2(double) - */ - public double getValue2() { - return this.value2; - } - - /** - * Sets the y-value for the end of the line. - * - * @param value the value. - * - * @see #getValue2() - */ - public void setValue2(double value) { - this.value2 = value; - } - - /** - * Returns the paint used to draw the connecting line. - * - * @return The paint (never <code>null</code>). - * - * @see #setPaint(Paint) - */ - public Paint getPaint() { - return this.paint; - } - - /** - * Sets the paint used to draw the connecting line. - * - * @param paint the paint (<code>null</code> not permitted). - * - * @see #getPaint() - */ - public void setPaint(Paint paint) { - if (paint == null) { - throw new IllegalArgumentException("Null 'paint' argument."); - } - this.paint = paint; - } - - /** - * Returns the stroke used to draw the connecting line. - * - * @return The stroke (never <code>null</code>). - * - * @see #setStroke(Stroke) - */ - public Stroke getStroke() { - return this.stroke; - } - - /** - * Sets the stroke used to draw the connecting line. - * - * @param stroke the stroke (<code>null</code> not permitted). - * - * @see #getStroke() - */ - public void setStroke(Stroke stroke) { - if (stroke == null) { - throw new IllegalArgumentException("Null 'stroke' argument."); - } - this.stroke = stroke; - } - - /** - * Draws the annotation. - * - * @param g2 the graphics device. - * @param plot the plot. - * @param dataArea the data area. - * @param domainAxis the domain axis. - * @param rangeAxis the range axis. - */ - public void draw(Graphics2D g2, CategoryPlot plot, Rectangle2D dataArea, - CategoryAxis domainAxis, ValueAxis rangeAxis) { - - CategoryDataset dataset = plot.getDataset(); - int catIndex1 = dataset.getColumnIndex(this.category1); - int catIndex2 = dataset.getColumnIndex(this.category2); - int catCount = dataset.getColumnCount(); - - double lineX1 = 0.0f; - double lineY1 = 0.0f; - double lineX2 = 0.0f; - double lineY2 = 0.0f; - PlotOrientation orientation = plot.getOrientation(); - RectangleEdge domainEdge = Plot.resolveDomainAxisLocation( - plot.getDomainAxisLocation(), orientation); - RectangleEdge rangeEdge = Plot.resolveRangeAxisLocation( - plot.getRangeAxisLocation(), orientation); - - if (orientation == PlotOrientation.HORIZONTAL) { - lineY1 = domainAxis.getCategoryJava2DCoordinate( - CategoryAnchor.MIDDLE, catIndex1, catCount, dataArea, - domainEdge); - lineX1 = rangeAxis.valueToJava2D(this.value1, dataArea, rangeEdge); - lineY2 = domainAxis.getCategoryJava2DCoordinate( - CategoryAnchor.MIDDLE, catIndex2, catCount, dataArea, - domainEdge); - lineX2 = rangeAxis.valueToJava2D(this.value2, dataArea, rangeEdge); - } - else if (orientation == PlotOrientation.VERTICAL) { - lineX1 = domainAxis.getCategoryJava2DCoordinate( - CategoryAnchor.MIDDLE, catIndex1, catCount, dataArea, - domainEdge); - lineY1 = rangeAxis.valueToJava2D(this.value1, dataArea, rangeEdge); - lineX2 = domainAxis.getCategoryJava2DCoordinate( - CategoryAnchor.MIDDLE, catIndex2, catCount, dataArea, - domainEdge); - lineY2 = rangeAxis.valueToJava2D(this.value2, dataArea, rangeEdge); - } - g2.setPaint(this.paint); - g2.setStroke(this.stroke); - g2.drawLine((int) lineX1, (int) lineY1, (int) lineX2, (int) lineY2); - } - - /** - * Tests this object for equality with another. - * - * @param obj the object (<code>null</code> permitted). - * - * @return <code>true</code> or <code>false</code>. - */ - public boolean equals(Object obj) { - if (obj == this) { - return true; - } - if (!(obj instanceof CategoryLineAnnotation)) { - return false; - } - CategoryLineAnnotation that = (CategoryLineAnnotation) obj; - if (!this.category1.equals(that.getCategory1())) { - return false; - } - if (this.value1 != that.getValue1()) { - return false; - } - if (!this.category2.equals(that.getCategory2())) { - return false; - } - if (this.value2 != that.getValue2()) { - return false; - } - if (!PaintUtilities.equal(this.paint, that.paint)) { - return false; - } - if (!ObjectUtilities.equal(this.stroke, that.stroke)) { - return false; - } - return true; - } - - /** - * Returns a hash code for this instance. - * - * @return A hash code. - */ - public int hashCode() { - int result = 193; - result = 37 * result + this.category1.hashCode(); - long temp = Double.doubleToLongBits(this.value1); - result = 37 * result + (int) (temp ^ (temp >>> 32)); - result = 37 * result + this.category2.hashCode(); - temp = Double.doubleToLongBits(this.value2); - result = 37 * result + (int) (temp ^ (temp >>> 32)); - result = 37 * result + HashUtilities.hashCodeForPaint(this.paint); - result = 37 * result + this.stroke.hashCode(); - return result; - } - - /** - * Returns a clone of the annotation. - * - * @return A clone. - * - * @throws CloneNotSupportedException this class will not throw this - * exception, but subclasses (if any) might. - */ - public Object clone() throws CloneNotSupportedException { - return super.clone(); - } - - /** - * Provides serialization support. - * - * @param stream the output stream. - * - * @throws IOException if there is an I/O error. - */ - private void writeObject(ObjectOutputStream stream) throws IOException { - stream.defaultWriteObject(); - SerialUtilities.writePaint(this.paint, stream); - SerialUtilities.writeStroke(this.stroke, stream); - } - - /** - * Provides serialization support. - * - * @param stream the input stream. - * - * @throws IOException if there is an I/O error. - * @throws ClassNotFoundException if there is a classpath problem. - */ - private void readObject(ObjectInputStream stream) - throws IOException, ClassNotFoundException { - stream.defaultReadObject(); - this.paint = SerialUtilities.readPaint(stream); - this.stroke = SerialUtilities.readStroke(stream); - } - -} +/* =========================================================== + * JFreeChart : a free chart library for the Java(tm) platform + * =========================================================== + * + * (C) Copyright 2000-2009, by Object Refinery Limited and Contributors. + * + * Project Info: http://www.jfree.org/jfreechart/index.html + * + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or + * (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * 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. + * in the United States and other countries.] + * + * --------------------------- + * CategoryLineAnnotation.java + * --------------------------- + * (C) Copyright 2005-2009, by Object Refinery Limited. + * + * Original Author: David Gilbert (for Object Refinery Limited); + * Contributor(s): Peter Kolb (patch 2809117); + * + * Changes: + * -------- + * 29-Jul-2005 : Version 1, based on CategoryTextAnnotation (DG); + * ------------- JFREECHART 1.0.x --------------------------------------------- + * 06-Mar-2007 : Reimplemented hashCode() (DG); + * 23-Apr-2008 : Implemented PublicCloneable (DG); + * 24-Jun-2009 : Now extends AbstractAnnotation (see patch 2809117 by PK) (DG); + * + */ + +package org.jfree.chart.annotations; + +import java.awt.BasicStroke; +import java.awt.Color; +import java.awt.Graphics2D; +import java.awt.Paint; +import java.awt.Stroke; +import java.awt.geom.Rectangle2D; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.Serializable; + +import org.jfree.chart.HashUtilities; +import org.jfree.chart.axis.CategoryAnchor; +import org.jfree.chart.axis.CategoryAxis; +import org.jfree.chart.axis.ValueAxis; +import org.jfree.chart.plot.CategoryPlot; +import org.jfree.chart.plot.Plot; +import org.jfree.chart.plot.PlotOrientation; +import org.jfree.data.category.CategoryDataset; +import org.jfree.io.SerialUtilities; +import org.jfree.ui.RectangleEdge; +import org.jfree.util.ObjectUtilities; +import org.jfree.util.PaintUtilities; +import org.jfree.util.PublicCloneable; + +/** + * A line annotation that can be placed on a {@link CategoryPlot}. + */ +public class CategoryLineAnnotation extends AbstractAnnotation + implements CategoryAnnotation, Cloneable, PublicCloneable, + Serializable { + + /** For serialization. */ + static final long serialVersionUID = 3477740483341587984L; + + /** The category for the start of the line. */ + private Comparable category1; + + /** The value for the start of the line. */ + private double value1; + + /** The category for the end of the line. */ + private Comparable category2; + + /** The value for the end of the line. */ + private double value2; + + /** The line color. */ + private transient Paint paint = Color.black; + + /** The line stroke. */ + private transient Stroke stroke = new BasicStroke(1.0f); + + /** + * Creates a new annotation that draws a line between (category1, value1) + * and (category2, value2). + * + * @param category1 the category (<code>null</code> not permitted). + * @param value1 the value. + * @param category2 the category (<code>null</code> not permitted). + * @param value2 the value. + * @param paint the line color (<code>null</code> not permitted). + * @param stroke the line stroke (<code>null</code> not permitted). + */ + public CategoryLineAnnotation(Comparable category1, double value1, + Comparable category2, double value2, + Paint paint, Stroke stroke) { + super(); + if (category1 == null) { + throw new IllegalArgumentException("Null 'category1' argument."); + } + if (category2 == null) { + throw new IllegalArgumentException("Null 'category2' argument."); + } + if (paint == null) { + throw new IllegalArgumentException("Null 'paint' argument."); + } + if (stroke == null) { + throw new IllegalArgumentException("Null 'stroke' argument."); + } + this.category1 = category1; + this.value1 = value1; + this.category2 = category2; + this.value2 = value2; + this.paint = paint; + this.stroke = stroke; + } + + /** + * Returns the category for the start of the line. + * + * @return The category for the start of the line (never <code>null</code>). + * + * @see #setCategory1(Comparable) + */ + public Comparable getCategory1() { + return this.category1; + } + + /** + * Sets the category for the start of the line and sends an + * {@link AnnotationChangeEvent} to all registered listeners. + * + * + * @param category the category (<code>null</code> not permitted). + * + * @see #getCategory1() + */ + public void setCategory1(Comparable category) { + if (category == null) { + throw new IllegalArgumentException("Null 'category' argument."); + } + this.category1 = category; + fireAnnotationChanged(); + } + + /** + * Returns the y-value for the start of the line. + * + * @return The y-value for the start of the line. + * + * @see #setValue1(double) + */ + public double getValue1() { + return this.value1; + } + + /** + * Sets the y-value for the start of the line and sends an + * {@link AnnotationChangeEvent} to all registered listeners. + * + * @param value the value. + * + * @see #getValue1() + */ + public void setValue1(double value) { + this.value1 = value; + fireAnnotationChanged(); + } + + /** + * Returns the category for the end of the line. + * + * @return The category for the end of the line (never <code>null</code>). + * + * @see #setCategory2(Comparable) + */ + public Comparable getCategory2() { + return this.category2; + } + + /** + * Sets the category for the end of the line and sends an + * {@link AnnotationChangeEvent} to all registered listeners. + * + * @param category the category (<code>null</code> not permitted). + * + * @see #getCategory2() + */ + public void setCategory2(Comparable category) { + if (category == null) { + throw new IllegalArgumentException("Null 'category' argument."); + } + this.category2 = category; + fireAnnotationChanged(); + } + + /** + * Returns the y-value for the end of the line. + * + * @return The y-value for the end of the line. + * + * @see #setValue2(double) + */ + public double getValue2() { + return this.value2; + } + + /** + * Sets the y-value for the end of the line and sends an + * {@link AnnotationChangeEvent} to all registered listeners. + * + * @param value the value. + * + * @see #getValue2() + */ + public void setValue2(double value) { + this.value2 = value; + fireAnnotationChanged(); + } + + /** + * Returns the paint used to draw the connecting line. + * + * @return The paint (never <code>null</code>). + * + * @see #setPaint(Paint) + */ + public Paint getPaint() { + return this.paint; + } + + /** + * Sets the paint used to draw the connecting line and sends an + * {@link AnnotationChangeEvent} to all registered listeners. + * + * @param paint the paint (<code>null</code> not permitted). + * + * @see #getPaint() + */ + public void setPaint(Paint paint) { + if (paint == null) { + throw new IllegalArgumentException("Null 'paint' argument."); + } + this.paint = paint; + fireAnnotationChanged(); + } + + /** + * Returns the stroke used to draw the connecting line. + * + * @return The stroke (never <code>null</code>). + * + * @see #setStroke(Stroke) + */ + public Stroke getStroke() { + return this.stroke; + } + + /** + * Sets the stroke used to draw the connecting line and sends an + * {@link AnnotationChangeEvent} to all registered listeners. + * + * @param stroke the stroke (<code>null</code> not permitted). + * + * @see #getStroke() + */ + public void setStroke(Stroke stroke) { + if (stroke == null) { + throw new IllegalArgumentException("Null 'stroke' argument."); + } + this.stroke = stroke; + fireAnnotationChanged(); + } + + /** + * Draws the annotation. + * + * @param g2 the graphics device. + * @param plot the plot. + * @param dataArea the data area. + * @param domainAxis the domain axis. + * @param rangeAxis the range axis. + */ + public void draw(Graphics2D g2, CategoryPlot plot, Rectangle2D dataArea, + CategoryAxis domainAxis, ValueAxis rangeAxis) { + + CategoryDataset dataset = plot.getDataset(); + int catIndex1 = dataset.getColumnIndex(this.category1); + int catIndex2 = dataset.getColumnIndex(this.category2); + int catCount = dataset.getColumnCount(); + + double lineX1 = 0.0f; + double lineY1 = 0.0f; + double lineX2 = 0.0f; + double lineY2 = 0.0f; + PlotOrientation orientation = plot.getOrientation(); + RectangleEdge domainEdge = Plot.resolveDomainAxisLocation( + plot.getDomainAxisLocation(), orientation); + RectangleEdge rangeEdge = Plot.resolveRangeAxisLocation( + plot.getRangeAxisLocation(), orientation); + + if (orientation == PlotOrientation.HORIZONTAL) { + lineY1 = domainAxis.getCategoryJava2DCoordinate( + CategoryAnchor.MIDDLE, catIndex1, catCount, dataArea, + domainEdge); + lineX1 = rangeAxis.valueToJava2D(this.value1, dataArea, rangeEdge); + lineY2 = domainAxis.getCategoryJava2DCoordinate( + CategoryAnchor.MIDDLE, catIndex2, catCount, dataArea, + domainEdge); + lineX2 = rangeAxis.valueToJava2D(this.value2, dataArea, rangeEdge); + } + else if (orientation == PlotOrientation.VERTICAL) { + lineX1 = domainAxis.getCategoryJava2DCoordinate( + CategoryAnchor.MIDDLE, catIndex1, catCount, dataArea, + domainEdge); + lineY1 = rangeAxis.valueToJava2D(this.value1, dataArea, rangeEdge); ... [truncated message content] |
From: <mu...@us...> - 2009-07-13 12:37:44
|
Revision: 2207 http://jfreechart.svn.sourceforge.net/jfreechart/?rev=2207&view=rev Author: mungady Date: 2009-07-13 12:37:37 +0000 (Mon, 13 Jul 2009) Log Message: ----------- 2009-07-13 David Gilbert <dav...@ob...> * source/org/jfree:chart:plot:CategoryPlot.java (shadowGenerator): New field, (getShadowGenerator): New method, (setShadowGenerator): Likewise, (integerise): New private method, (draw): Apply drop shadow, (equals): Check new field, * source/org/jfree/chart/plot/PiePlot.java (shadowGenerator): New field, (getShadowGenerator): New method, (setShadowGenerator): Likewise, (draw): Apply drop shadow, (drawItem): Skip vector shadow if drop shadow is applied, (drawSimpleLabels): Likewise, (drawLeftLabels): Likewise, (drawRightLabels): Likewise, (equals): Updated for new field, * source/org/jfree/chart/plot/PiePlot3D.java (draw): Apply drop shadow, * source/org/jfree/chart/plot/RingPlot.java (drawItem): Skip vector shadow if drop shadow is applied, * source/org/jfree/chart/plot/XYPlot.java (shadowGenerator): New field, (getShadowGenerator): New method, (setShadowGenerator): Likewise, (integerise): New private method, (draw): Apply drop shadow, (equals): Check new field, * source/org/jfree/chart/util/DefaultShadowGenerator.java: New class, * source/org/jfree/chart/util/ShadowGenerator.java: New class. Modified Paths: -------------- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/CategoryPlot.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PiePlot.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PiePlot3D.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/RingPlot.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/XYPlot.java Added Paths: ----------- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/util/DefaultShadowGenerator.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/util/ShadowGenerator.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 2009-07-13 11:47:11 UTC (rev 2206) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/CategoryPlot.java 2009-07-13 12:37:37 UTC (rev 2207) @@ -174,6 +174,7 @@ * 24-Jun-2009 : Implemented AnnotationChangeListener (see patch 2809117 by * PK) (DG); * 06-Jul-2009 : Fix for cloning of renderers - see bug 2817504 (DG) + * 10-Jul-2009 : Added optional drop shadow generator (DG); * */ @@ -186,15 +187,18 @@ import java.awt.Font; import java.awt.Graphics2D; import java.awt.Paint; +import java.awt.Rectangle; import java.awt.Shape; import java.awt.Stroke; import java.awt.geom.Line2D; import java.awt.geom.Point2D; import java.awt.geom.Rectangle2D; +import java.awt.image.BufferedImage; import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.io.Serializable; +import java.lang.annotation.Annotation; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -206,7 +210,6 @@ import java.util.ResourceBundle; import java.util.Set; import java.util.TreeMap; - import org.jfree.chart.LegendItem; import org.jfree.chart.LegendItemCollection; import org.jfree.chart.annotations.CategoryAnnotation; @@ -229,7 +232,9 @@ import org.jfree.chart.renderer.category.AbstractCategoryItemRenderer; import org.jfree.chart.renderer.category.CategoryItemRenderer; import org.jfree.chart.renderer.category.CategoryItemRendererState; +import org.jfree.chart.util.DefaultShadowGenerator; import org.jfree.chart.util.ResourceBundleWrapper; +import org.jfree.chart.util.ShadowGenerator; import org.jfree.data.Range; import org.jfree.data.category.CategoryDataset; import org.jfree.data.general.Dataset; @@ -541,6 +546,13 @@ private boolean rangePannable; /** + * The shadow generator for the plot (<code>null</code> permitted). + * + * @since 1.0.14 + */ + private ShadowGenerator shadowGenerator; + + /** * Default constructor. */ public CategoryPlot() { @@ -647,6 +659,7 @@ this.annotations = new java.util.ArrayList(); this.rangePannable = false; + this.shadowGenerator = new DefaultShadowGenerator(); } /** @@ -3381,6 +3394,33 @@ } /** + * Returns the shadow generator for the plot, if any. + * + * @return The shadow generator (possibly <code>null</code>). + * + * @since 1.0.14 + */ + public ShadowGenerator getShadowGenerator() { + return this.shadowGenerator; + } + + /** + * Sets the shadow generator for the plot and sends a + * {@link PlotChangeEvent} to all registered listeners. Note that this is + * a btmap drop-shadow generation facility and is separate from the + * vector based show option that is controlled via the + * {@link setShadowPaint()} method. + * + * @param generator the generator (<code>null</code> permitted). + * + * @since 1.0.14 + */ + public void setShadowGenerator(ShadowGenerator generator) { + this.shadowGenerator = generator; + fireChangeEvent(); + } + + /** * Calculates the space required for the domain axis/axes. * * @param g2 the graphics device. @@ -3482,6 +3522,21 @@ } /** + * Trims a rectangle to integer coordinates. + * + * @param rect the incoming rectangle. + * + * @return A rectangle with integer coordinates. + */ + private Rectangle integerise(Rectangle2D rect) { + int x0 = (int) Math.ceil(rect.getMinX()); + int y0 = (int) Math.ceil(rect.getMinY()); + int x1 = (int) Math.floor(rect.getMaxX()); + int y1 = (int) Math.floor(rect.getMaxY()); + return new Rectangle(x0, y0, (x1 - x0), (y1 - y0)); + } + + /** * Calculates the space required for the axes. * * @param g2 the graphics device. @@ -3540,7 +3595,10 @@ AxisSpace space = calculateAxisSpace(g2, area); Rectangle2D dataArea = space.shrink(area, null); this.axisOffset.trim(dataArea); - + dataArea = integerise(dataArea); + if (dataArea.isEmpty()) { + return; + } state.setDataArea(dataArea); createAndAddEntity((Rectangle2D) dataArea.clone(), state, null, null); @@ -3607,6 +3665,18 @@ drawZeroRangeBaseline(g2, dataArea); } + Graphics2D savedG2 = g2; + Rectangle2D savedDataArea = dataArea; + BufferedImage dataImage = null; + if (this.shadowGenerator != null) { + dataImage = new BufferedImage((int) dataArea.getWidth(), + (int)dataArea.getHeight(), BufferedImage.TYPE_INT_ARGB); + g2 = dataImage.createGraphics(); + g2.setRenderingHints(savedG2.getRenderingHints()); + dataArea = new Rectangle(0, 0, dataImage.getWidth(), + dataImage.getHeight()); + } + // draw the markers... for (int i = 0; i < this.renderers.size(); i++) { drawDomainMarkers(g2, dataArea, i, Layer.BACKGROUND); @@ -3647,6 +3717,18 @@ // draw the annotations (if any)... drawAnnotations(g2, dataArea); + if (this.shadowGenerator != null) { + BufferedImage shadowImage = this.shadowGenerator.createDropShadow( + dataImage); + g2 = savedG2; + dataArea = savedDataArea; + g2.drawImage(shadowImage, (int) savedDataArea.getX() + + this.shadowGenerator.calculateOffsetX(), + (int) savedDataArea.getY() + + this.shadowGenerator.calculateOffsetY(), null); + g2.drawImage(dataImage, (int) savedDataArea.getX(), + (int) savedDataArea.getY(), null); + } g2.setClip(savedClip); g2.setComposite(originalComposite); @@ -4756,7 +4838,6 @@ * @return A boolean. */ public boolean equals(Object obj) { - if (obj == this) { return true; } @@ -4930,8 +5011,11 @@ that.rangeZeroBaselineStroke)) { return false; } + if (!ObjectUtilities.equal(this.shadowGenerator, + that.shadowGenerator)) { + return false; + } return super.equals(obj); - } /** Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PiePlot.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PiePlot.java 2009-07-13 11:47:11 UTC (rev 2206) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PiePlot.java 2009-07-13 12:37:37 UTC (rev 2207) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2009, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -27,7 +27,7 @@ * ------------ * PiePlot.java * ------------ - * (C) Copyright 2000-2008, by Andrzej Porebski and Contributors. + * (C) Copyright 2000-2009, by Andrzej Porebski and Contributors. * * Original Author: Andrzej Porebski; * Contributor(s): David Gilbert (for Object Refinery Limited); @@ -162,6 +162,7 @@ * by Christoph Beck (DG); * 18-Dec-2008 : Use ResourceBundleWrapper - see patch 1607918 by * Jess Thrysoee (DG); + * 10-Jul-2009 : Added optional drop shadow generator (DG); * */ @@ -175,6 +176,7 @@ import java.awt.FontMetrics; import java.awt.Graphics2D; import java.awt.Paint; +import java.awt.Rectangle; import java.awt.Shape; import java.awt.Stroke; import java.awt.geom.Arc2D; @@ -184,6 +186,7 @@ import java.awt.geom.Point2D; import java.awt.geom.QuadCurve2D; import java.awt.geom.Rectangle2D; +import java.awt.image.BufferedImage; import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; @@ -205,7 +208,9 @@ import org.jfree.chart.labels.PieToolTipGenerator; import org.jfree.chart.labels.StandardPieSectionLabelGenerator; import org.jfree.chart.urls.PieURLGenerator; +import org.jfree.chart.util.DefaultShadowGenerator; import org.jfree.chart.util.ResourceBundleWrapper; +import org.jfree.chart.util.ShadowGenerator; import org.jfree.data.DefaultKeyedValues; import org.jfree.data.KeyedValues; import org.jfree.data.general.DatasetChangeEvent; @@ -241,7 +246,7 @@ * in a clockwise direction, but these settings can be changed;</li> * <li>negative values in the dataset are ignored;</li> * <li>there are utility methods for creating a {@link PieDataset} from a - * {@link org.jfree.data.category.CategoryDataset};</li> + * {@link CategoryDataset};</li> * </ol> * * @see Plot @@ -502,6 +507,13 @@ */ private double minimumArcAngleToDraw; + /** + * The shadow generator for the plot (<code>null</code> permitted). + * + * @since 1.0.14 + */ + private ShadowGenerator shadowGenerator; + /** The resourceBundle for the localization. */ protected static ResourceBundle localizationResources = ResourceBundleWrapper.getBundle( @@ -595,6 +607,8 @@ this.ignoreNullValues = false; this.ignoreZeroValues = false; + + this.shadowGenerator = new DefaultShadowGenerator(); } /** @@ -2326,6 +2340,33 @@ } /** + * Returns the shadow generator for the plot, if any. + * + * @return The shadow generator (possibly <code>null</code>). + * + * @since 1.0.14 + */ + public ShadowGenerator getShadowGenerator() { + return this.shadowGenerator; + } + + /** + * Sets the shadow generator for the plot and sends a + * {@link PlotChangeEvent} to all registered listeners. Note that this is + * a btmap drop-shadow generation facility and is separate from the + * vector based show option that is controlled via the + * {@link setShadowPaint()} method. + * + * @param generator the generator (<code>null</code> permitted). + * + * @since 1.0.14 + */ + public void setShadowGenerator(ShadowGenerator generator) { + this.shadowGenerator = generator; + fireChangeEvent(); + } + + /** * Initialises the drawing procedure. This method will be called before * the first item is rendered, giving the plot an opportunity to initialise * any state information it wants to maintain. @@ -2388,7 +2429,28 @@ getForegroundAlpha())); if (!DatasetUtilities.isEmptyOrNull(this.dataset)) { + Graphics2D savedG2 = g2; + Rectangle2D savedDataArea = area; + BufferedImage dataImage = null; + if (this.shadowGenerator != null) { + dataImage = new BufferedImage((int) area.getWidth(), + (int) area.getHeight(), BufferedImage.TYPE_INT_ARGB); + g2 = dataImage.createGraphics(); + g2.setRenderingHints(savedG2.getRenderingHints()); + area = new Rectangle(0, 0, dataImage.getWidth(), dataImage.getHeight()); + } drawPie(g2, area, info); + if (this.shadowGenerator != null) { + BufferedImage shadowImage = this.shadowGenerator.createDropShadow(dataImage); + g2 = savedG2; + area = savedDataArea; + g2.drawImage(shadowImage, (int) savedDataArea.getX() + + this.shadowGenerator.calculateOffsetX(), + (int) savedDataArea.getY() + + this.shadowGenerator.calculateOffsetY(), null); + g2.drawImage(dataImage, (int) savedDataArea.getX(), + (int) savedDataArea.getY(), null); + } } else { drawNoDataMessage(g2, area); @@ -2580,7 +2642,7 @@ Arc2D.PIE); if (currentPass == 0) { - if (this.shadowPaint != null) { + if (this.shadowPaint != null && this.shadowGenerator == null) { Shape shadowArc = ShapeUtilities.createTranslatedShape( arc, (float) this.shadowXOffset, (float) this.shadowYOffset); @@ -2694,7 +2756,8 @@ bounds); Shape bg = ShapeUtilities.createTranslatedShape(out, x - bounds.getCenterX(), y - bounds.getCenterY()); - if (this.labelShadowPaint != null) { + if (this.labelShadowPaint != null + && this.shadowGenerator == null) { Shape shadow = ShapeUtilities.createTranslatedShape(bg, this.shadowXOffset, this.shadowYOffset); g2.setPaint(this.labelShadowPaint); @@ -2827,7 +2890,12 @@ labelBox.setBackgroundPaint(this.labelBackgroundPaint); labelBox.setOutlinePaint(this.labelOutlinePaint); labelBox.setOutlineStroke(this.labelOutlineStroke); - labelBox.setShadowPaint(this.labelShadowPaint); + if (this.shadowGenerator == null) { + labelBox.setShadowPaint(this.labelShadowPaint); + } + else { + labelBox.setShadowPaint(null); + } labelBox.setInteriorGap(this.labelPadding); double theta = Math.toRadians( leftKeys.getValue(i).doubleValue()); @@ -2883,7 +2951,12 @@ labelBox.setBackgroundPaint(this.labelBackgroundPaint); labelBox.setOutlinePaint(this.labelOutlinePaint); labelBox.setOutlineStroke(this.labelOutlineStroke); - labelBox.setShadowPaint(this.labelShadowPaint); + if (this.shadowGenerator == null) { + labelBox.setShadowPaint(this.labelShadowPaint); + } + else { + labelBox.setShadowPaint(null); + } labelBox.setInteriorGap(this.labelPadding); double theta = Math.toRadians(keys.getValue(i).doubleValue()); double baseY = state.getPieCenterY() @@ -3186,9 +3259,8 @@ that.sectionOutlinePaintMap)) { return false; } - if (!PaintUtilities.equal( - this.baseSectionOutlinePaint, that.baseSectionOutlinePaint - )) { + if (!PaintUtilities.equal(this.baseSectionOutlinePaint, + that.baseSectionOutlinePaint)) { return false; } if (!ObjectUtilities.equal(this.sectionOutlineStroke, @@ -3199,9 +3271,8 @@ that.sectionOutlineStrokeMap)) { return false; } - if (!ObjectUtilities.equal( - this.baseSectionOutlineStroke, that.baseSectionOutlineStroke - )) { + if (!ObjectUtilities.equal(this.baseSectionOutlineStroke, + that.baseSectionOutlineStroke)) { return false; } if (!PaintUtilities.equal(this.shadowPaint, that.shadowPaint)) { @@ -3310,6 +3381,10 @@ != that.autoPopulateSectionOutlineStroke) { return false; } + if (!ObjectUtilities.equal(this.shadowGenerator, + that.shadowGenerator)) { + return false; + } // can't find any difference... return true; } Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PiePlot3D.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PiePlot3D.java 2009-07-13 11:47:11 UTC (rev 2206) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PiePlot3D.java 2009-07-13 12:37:37 UTC (rev 2207) @@ -79,7 +79,8 @@ * 20-Mar-2008 : Fixed bug 1920854 - multiple redraws of the section * labels (DG); * 19-May-2009 : Fixed FindBugs warnings, patch by Michal Wozniak (DG); - * + * 10-Jul-2009 : Added drop shaow support (DG); + * */ package org.jfree.chart.plot; @@ -92,6 +93,7 @@ import java.awt.Graphics2D; import java.awt.Paint; import java.awt.Polygon; +import java.awt.Rectangle; import java.awt.Shape; import java.awt.Stroke; import java.awt.geom.Arc2D; @@ -99,6 +101,7 @@ import java.awt.geom.Ellipse2D; import java.awt.geom.Point2D; import java.awt.geom.Rectangle2D; +import java.awt.image.BufferedImage; import java.io.Serializable; import java.util.ArrayList; import java.util.Iterator; @@ -243,6 +246,18 @@ Shape savedClip = g2.getClip(); g2.clip(plotArea); + Graphics2D savedG2 = g2; + Rectangle2D savedDataArea = plotArea; + BufferedImage dataImage = null; + if (getShadowGenerator() != null) { + dataImage = new BufferedImage((int) plotArea.getWidth(), + (int) plotArea.getHeight(), BufferedImage.TYPE_INT_ARGB); + g2 = dataImage.createGraphics(); + g2.setRenderingHints(savedG2.getRenderingHints()); + plotArea = new Rectangle(0, 0, dataImage.getWidth(), + dataImage.getHeight()); + originalPlotArea = (Rectangle) plotArea.clone(); + } // adjust the plot area by the interior spacing value double gapPercent = getInteriorGap(); double labelPercent = 0.0; @@ -585,6 +600,19 @@ state); } + if (getShadowGenerator() != null) { + BufferedImage shadowImage = getShadowGenerator().createDropShadow(dataImage); + g2 = savedG2; + plotArea = savedDataArea; + originalPlotArea = savedDataArea; + g2.drawImage(shadowImage, (int) savedDataArea.getX() + + getShadowGenerator().calculateOffsetX(), + (int) savedDataArea.getY() + + getShadowGenerator().calculateOffsetY(), null); + g2.drawImage(dataImage, (int) savedDataArea.getX(), + (int) savedDataArea.getY(), null); + } + g2.setClip(savedClip); g2.setComposite(originalComposite); drawOutline(g2, originalPlotArea); Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/RingPlot.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/RingPlot.java 2009-07-13 11:47:11 UTC (rev 2206) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/RingPlot.java 2009-07-13 12:37:37 UTC (rev 2207) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2009, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -27,7 +27,7 @@ * ------------- * RingPlot.java * ------------- - * (C) Copyright 2004-2008, by Object Refinery Limited. + * (C) Copyright 2004-2009, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limtied); * Contributor(s): Christoph Beck (bug 2121818); @@ -44,7 +44,8 @@ * 12-Oct-2006 : Added configurable section depth (DG); * 14-Feb-2007 : Added notification in setSectionDepth() method (DG); * 23-Sep-2008 : Fix for bug 2121818 by Christoph Beck (DG); - * + * 13-jul-2009 : Added support for shadow generator (DG); + * */ package org.jfree.chart.plot; @@ -400,7 +401,7 @@ Paint shadowPaint = getShadowPaint(); double shadowXOffset = getShadowXOffset(); double shadowYOffset = getShadowYOffset(); - if (shadowPaint != null) { + if (shadowPaint != null && getShadowGenerator() == null) { Shape shadowArc = ShapeUtilities.createTranslatedShape( path, (float) shadowXOffset, (float) shadowYOffset); g2.setPaint(shadowPaint); 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 2009-07-13 11:47:11 UTC (rev 2206) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/XYPlot.java 2009-07-13 12:37:37 UTC (rev 2207) @@ -225,6 +225,7 @@ * 24-Jun-2009 : Added support for annotation events - see patch 2809117 * by PK (DG); * 06-Jul-2009 : Fix for cloning of renderers - see bug 2817504 (DG) + * 10-Jul-2009 : Added optional drop shadow generator (DG); * */ @@ -236,11 +237,13 @@ import java.awt.Composite; import java.awt.Graphics2D; import java.awt.Paint; +import java.awt.Rectangle; import java.awt.Shape; import java.awt.Stroke; import java.awt.geom.Line2D; import java.awt.geom.Point2D; import java.awt.geom.Rectangle2D; +import java.awt.image.BufferedImage; import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; @@ -259,6 +262,7 @@ import org.jfree.chart.LegendItem; import org.jfree.chart.LegendItemCollection; +import org.jfree.chart.annotations.Annotation; import org.jfree.chart.annotations.XYAnnotation; import org.jfree.chart.annotations.XYAnnotationBoundsInfo; import org.jfree.chart.axis.Axis; @@ -278,7 +282,9 @@ import org.jfree.chart.renderer.xy.AbstractXYItemRenderer; import org.jfree.chart.renderer.xy.XYItemRenderer; import org.jfree.chart.renderer.xy.XYItemRendererState; +import org.jfree.chart.util.DefaultShadowGenerator; import org.jfree.chart.util.ResourceBundleWrapper; +import org.jfree.chart.util.ShadowGenerator; import org.jfree.data.Range; import org.jfree.data.general.Dataset; import org.jfree.data.general.DatasetChangeEvent; @@ -301,7 +307,7 @@ * on the plot. By using different renderers, various chart types can be * produced. * <p> - * The {@link org.jfree.chart.ChartFactory} class contains static methods for + * The {@link ChartFactory} class contains static methods for * creating pre-configured charts. */ public class XYPlot extends Plot implements ValueAxisPlot, Pannable, Zoomable, @@ -588,6 +594,13 @@ private boolean rangePannable; /** + * The shadow generator (<code>null</code> permitted). + * + * @since 1.0.14 + */ + private ShadowGenerator shadowGenerator; + + /** * Creates a new <code>XYPlot</code> instance with no dataset, no axes and * no renderer. You should specify these items before using the plot. */ @@ -699,7 +712,7 @@ this.rangeCrosshairValue = 0.0; this.rangeCrosshairStroke = DEFAULT_CROSSHAIR_STROKE; this.rangeCrosshairPaint = DEFAULT_CROSSHAIR_PAINT; - + this.shadowGenerator = null; } /** @@ -3025,6 +3038,33 @@ } /** + * Returns the shadow generator for the plot, if any. + * + * @return The shadow generator (possibly <code>null</code>). + * + * @since 1.0.14 + */ + public ShadowGenerator getShadowGenerator() { + return this.shadowGenerator; + } + + /** + * Sets the shadow generator for the plot and sends a + * {@link PlotChangeEvent} to all registered listeners. Note that this is + * a btmap drop-shadow generation facility and is separate from the + * vector based show option that is controlled via the + * {@link setShadowPaint()} method. + * + * @param generator the generator (<code>null</code> permitted). + * + * @since 1.0.14 + */ + public void setShadowGenerator(ShadowGenerator generator) { + this.shadowGenerator = generator; + fireChangeEvent(); + } + + /** * Calculates the space required for all the axes in the plot. * * @param g2 the graphics device. @@ -3135,6 +3175,21 @@ } /** + * Trims a rectangle to integer coordinates. + * + * @param rect the incoming rectangle. + * + * @return A rectangle with integer coordinates. + */ + private Rectangle integerise(Rectangle2D rect) { + int x0 = (int) Math.ceil(rect.getMinX()); + int y0 = (int) Math.ceil(rect.getMinY()); + int x1 = (int) Math.floor(rect.getMaxX()); + int y1 = (int) Math.floor(rect.getMaxY()); + return new Rectangle(x0, y0, (x1 - x0), (y1 - y0)); + } + + /** * Draws the plot within the specified area on a graphics device. * * @param g2 the graphics device. @@ -3168,6 +3223,11 @@ AxisSpace space = calculateAxisSpace(g2, area); Rectangle2D dataArea = space.shrink(area, null); this.axisOffset.trim(dataArea); + + dataArea = integerise(dataArea); + if (dataArea.isEmpty()) { + return; + } createAndAddEntity((Rectangle2D) dataArea.clone(), info, null, null); if (info != null) { info.setDataArea(dataArea); @@ -3258,6 +3318,18 @@ drawZeroRangeBaseline(g2, dataArea); } + Graphics2D savedG2 = g2; + Rectangle2D savedDataArea = dataArea; + BufferedImage dataImage = null; + if (this.shadowGenerator != null) { + dataImage = new BufferedImage((int) dataArea.getWidth(), + (int)dataArea.getHeight(), BufferedImage.TYPE_INT_ARGB); + g2 = dataImage.createGraphics(); + g2.setRenderingHints(savedG2.getRenderingHints()); + dataArea = new Rectangle(0, 0, dataImage.getWidth(), + dataImage.getHeight()); + } + // draw the markers that are associated with a specific renderer... for (int i = 0; i < this.renderers.size(); i++) { drawDomainMarkers(g2, dataArea, i, Layer.BACKGROUND); @@ -3394,6 +3466,18 @@ } drawAnnotations(g2, dataArea, info); + if (this.shadowGenerator != null) { + BufferedImage shadowImage + = this.shadowGenerator.createDropShadow(dataImage); + g2 = savedG2; + dataArea = savedDataArea; + g2.drawImage(shadowImage, (int) savedDataArea.getX() + + this.shadowGenerator.calculateOffsetX(), + (int) savedDataArea.getY() + + this.shadowGenerator.calculateOffsetY(), null); + g2.drawImage(dataImage, (int) savedDataArea.getX(), + (int) savedDataArea.getY(), null); + } g2.setClip(originalClip); g2.setComposite(originalComposite); @@ -5522,6 +5606,10 @@ return false; } } + if (!ObjectUtilities.equal(this.shadowGenerator, + that.shadowGenerator)) { + return false; + } return super.equals(obj); } Added: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/util/DefaultShadowGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/util/DefaultShadowGenerator.java (rev 0) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/util/DefaultShadowGenerator.java 2009-07-13 12:37:37 UTC (rev 2207) @@ -0,0 +1,325 @@ +/* =========================================================== + * JFreeChart : a free chart library for the Java(tm) platform + * =========================================================== + * + * (C) Copyright 2000-2009, by Object Refinery Limited and Contributors. + * + * Project Info: http://www.jfree.org/jfreechart/index.html + * + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or + * (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * 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. + * in the United States and other countries.] + * + * --------------------------- + * DefaultShadowGenerator.java + * --------------------------- + * (C) Copyright 2009, by Object Refinery Limited and Contributors. + * + * Original Author: David Gilbert (for Object Refinery Limited); + * Contributor(s): -; + * + * Changes: + * -------- + * 10-Jul-2009 : Version 1 (DG); + * + */ + +package org.jfree.chart.util; + +import java.awt.Color; +import java.awt.Graphics2D; +import java.awt.image.BufferedImage; +import java.awt.image.DataBufferInt; +import java.io.Serializable; +import org.jfree.chart.HashUtilities; + +/** + * A default implementation of the {@link ShadowGenerator} interface, based on + * code in a + * <a href="http://www.jroller.com/gfx/entry/fast_or_good_drop_shadows">blog + * post by Romain Guy</a>. + * + * @since 1.0.14 + */ +public class DefaultShadowGenerator implements ShadowGenerator, Serializable { + + /** The shadow size. */ + private int shadowSize; + + /** The shadow color. */ + private Color shadowColor; + + /** The shadow opacity. */ + private float shadowOpacity; + + /** The shadow offset angle (in radians). */ + private double angle; + + /** The shadow offset distance (in Java2D units). */ + private int distance; + + /** + * Creates a new instance with default attributes. + */ + public DefaultShadowGenerator() { + this(5, Color.black, 0.5f, 5, -Math.PI / 4); + } + + /** + * Creates a new instance with the specified attributes. + * + * @param size the shadow size. + * @param color the shadow color. + * @param opacity the shadow opacity. + * @param distance the shadow offset distance. + * @param angle the shadow offset angle (in radians). + */ + public DefaultShadowGenerator(int size, Color color, float opacity, + int distance, double angle) { + if (color == null) { + throw new IllegalArgumentException("Null 'color' argument."); + } + this.shadowSize = size; + this.shadowColor = color; + this.shadowOpacity = opacity; + this.distance = distance; + this.angle = angle; + } + + /** + * Returns the shadow size. + * + * @return The shadow size. + */ + public int getShadowSize() { + return this.shadowSize; + } + + /** + * Returns the shadow color. + * + * @return The shadow color (never <code>null</code>). + */ + public Color getShadowColor() { + return this.shadowColor; + } + + /** + * Returns the shadow opacity. + * + * @return The shadow opacity. + */ + public float getShadowOpacity() { + return this.shadowOpacity; + } + + /** + * Returns the shadow offset distance. + * + * @return The shadow offset distance (in Java2D units). + */ + public int getDistance() { + return this.distance; + } + + /** + * Returns the shadow offset angle (in radians). + * + * @return The angle (in radians). + */ + public double getAngle() { + return this.angle; + } + + /** + * Calculates the x-offset for drawing the shadow image relative to the + * source. + * + * @return The x-offset. + */ + public int calculateOffsetX() { + return (int) (Math.cos(this.angle) * this.distance) - this.shadowSize; + } + + /** + * Calculates the y-offset for drawing the shadow image relative to the + * source. + * + * @return The y-offset. + */ + public int calculateOffsetY() { + return -(int) (Math.sin(this.angle) * this.distance) - this.shadowSize; + } + + /** + * Creates and returns an image containing the drop shadow for the + * specified source image. + * + * @param source the source image. + * + * @return A new image containing the shadow. + */ + public BufferedImage createDropShadow(BufferedImage source) { + BufferedImage subject = new BufferedImage( + source.getWidth() + this.shadowSize * 2, + source.getHeight() + this.shadowSize * 2, + BufferedImage.TYPE_INT_ARGB); + + Graphics2D g2 = subject.createGraphics(); + g2.drawImage(source, null, shadowSize, shadowSize); + g2.dispose(); + applyShadow(subject); + return subject; + } + + /** + * Applies a shadow to the image. + * + * @param image the image. + */ + protected void applyShadow(BufferedImage image) { + int dstWidth = image.getWidth(); + int dstHeight = image.getHeight(); + + int left = (shadowSize - 1) >> 1; + int right = shadowSize - left; + int xStart = left; + int xStop = dstWidth - right; + int yStart = left; + int yStop = dstHeight - right; + + int shadowRgb = shadowColor.getRGB() & 0x00FFFFFF; + + int[] aHistory = new int[shadowSize]; + int historyIdx = 0; + + int aSum; + + int[] dataBuffer = ((DataBufferInt) image.getRaster().getDataBuffer()).getData(); + int lastPixelOffset = right * dstWidth; + float sumDivider = shadowOpacity / shadowSize; + + // horizontal pass + + for (int y = 0, bufferOffset = 0; y < dstHeight; y++, bufferOffset = y * dstWidth) { + aSum = 0; + historyIdx = 0; + for (int x = 0; x < shadowSize; x++, bufferOffset++) { + int a = dataBuffer[bufferOffset] >>> 24; + aHistory[x] = a; + aSum += a; + } + + bufferOffset -= right; + + for (int x = xStart; x < xStop; x++, bufferOffset++) { + int a = (int) (aSum * sumDivider); + dataBuffer[bufferOffset] = a << 24 | shadowRgb; + + // substract the oldest pixel from the sum + aSum -= aHistory[historyIdx]; + + // get the lastest pixel + a = dataBuffer[bufferOffset + right] >>> 24; + aHistory[historyIdx] = a; + aSum += a; + + if (++historyIdx >= shadowSize) { + historyIdx -= shadowSize; + } + } + } + + // vertical pass + for (int x = 0, bufferOffset = 0; x < dstWidth; x++, bufferOffset = x) { + aSum = 0; + historyIdx = 0; + for (int y = 0; y < shadowSize; y++, bufferOffset += dstWidth) { + int a = dataBuffer[bufferOffset] >>> 24; + aHistory[y] = a; + aSum += a; + } + + bufferOffset -= lastPixelOffset; + + for (int y = yStart; y < yStop; y++, bufferOffset += dstWidth) { + int a = (int) (aSum * sumDivider); + dataBuffer[bufferOffset] = a << 24 | shadowRgb; + + // substract the oldest pixel from the sum + aSum -= aHistory[historyIdx]; + + // get the lastest pixel + a = dataBuffer[bufferOffset + lastPixelOffset] >>> 24; + aHistory[historyIdx] = a; + aSum += a; + + if (++historyIdx >= shadowSize) { + historyIdx -= shadowSize; + } + } + } + } + + /** + * Tests this object for equality with an arbitrary object. + * + * @param obj the object (<code>null</code> permitted). + * + * @return The object. + */ + public boolean equals(Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof DefaultShadowGenerator)) { + return false; + } + DefaultShadowGenerator that = (DefaultShadowGenerator) obj; + if (this.shadowSize != that.shadowSize) { + return false; + } + if (!this.shadowColor.equals(that.shadowColor)) { + return false; + } + if (this.shadowOpacity != that.shadowOpacity) { + return false; + } + if (this.distance != that.distance) { + return false; + } + if (this.angle != that.angle) { + return false; + } + return true; + } + + /** + * Returns a hash code for this instance. + * + * @return The hash code. + */ + public int hashCode() { + int hash = HashUtilities.hashCode(17, this.shadowSize); + hash = HashUtilities.hashCode(hash, this.shadowColor); + hash = HashUtilities.hashCode(hash, this.shadowOpacity); + hash = HashUtilities.hashCode(hash, this.distance); + hash = HashUtilities.hashCode(hash, this.angle); + return hash; + } + +} Added: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/util/ShadowGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/util/ShadowGenerator.java (rev 0) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/util/ShadowGenerator.java 2009-07-13 12:37:37 UTC (rev 2207) @@ -0,0 +1,79 @@ +/* =========================================================== + * JFreeChart : a free chart library for the Java(tm) platform + * =========================================================== + * + * (C) Copyright 2000-2009, by Object Refinery Limited and Contributors. + * + * Project Info: http://www.jfree.org/jfreechart/index.html + * + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or + * (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * 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. + * in the United States and other countries.] + * + * -------------------- + * ShadowGenerator.java + * -------------------- + * (C) Copyright 2009, by Object Refinery Limited and Contributors. + * + * Original Author: David Gilbert (for Object Refinery Limited); + * Contributor(s): -; + * + * Changes: + * -------- + * 10-Jul-2009 : Version 1 (DG); + * + */ + +package org.jfree.chart.util; + +import java.awt.image.BufferedImage; + +/** + * An interface that defines the API for a shadow generator. Some plot + * classes use this to create drop shadows. + * + * @since 1.0.14 + */ +public interface ShadowGenerator { + + /** + * Creates and returns an image containing the drop shadow for the + * specified source image. + * + * @param source the source image. + * + * @return A new image containing the shadow. + */ + public BufferedImage createDropShadow(BufferedImage source); + + /** + * Calculates the x-offset for drawing the shadow image relative to the + * source. + * + * @return The x-offset. + */ + public int calculateOffsetX(); + + /** + * Calculates the y-offset for drawing the shadow image relative to the + * source. + * + * @return The y-offset. + */ + public int calculateOffsetY(); + +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mu...@us...> - 2011-10-10 20:26:10
|
Revision: 2301 http://jfreechart.svn.sourceforge.net/jfreechart/?rev=2301&view=rev Author: mungady Date: 2011-10-10 20:26:03 +0000 (Mon, 10 Oct 2011) Log Message: ----------- Fixed Javadoc warnings. Modified Paths: -------------- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PolarPlot.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/XYPlot.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/util/ShadowGenerator.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PolarPlot.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PolarPlot.java 2011-10-10 20:22:19 UTC (rev 2300) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PolarPlot.java 2011-10-10 20:26:03 UTC (rev 2301) @@ -95,7 +95,6 @@ import org.jfree.chart.event.RendererChangeEvent; import org.jfree.chart.event.RendererChangeListener; import org.jfree.chart.renderer.PolarItemRenderer; -import org.jfree.chart.renderer.xy.XYItemRenderer; import org.jfree.chart.util.ResourceBundleWrapper; import org.jfree.data.Range; import org.jfree.data.general.Dataset; @@ -736,9 +735,8 @@ * @return The offset for the angles. * @since 1.0.14 */ - public double getAngleOffset() - { - return angleOffset; + public double getAngleOffset() { + return this.angleOffset; } /** @@ -751,8 +749,7 @@ * @param offset The offset * @since 1.0.14 */ - public void setAngleOffset(double offset) - { + public void setAngleOffset(double offset) { this.angleOffset = offset; fireChangeEvent(); } 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 2011-10-10 20:22:19 UTC (rev 2300) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/XYPlot.java 2011-10-10 20:26:03 UTC (rev 2301) @@ -306,7 +306,7 @@ * on the plot. By using different renderers, various chart types can be * produced. * <p> - * The {@link ChartFactory} class contains static methods for + * The {@link org.jfree.chart.ChartFactory} class contains static methods for * creating pre-configured charts. */ public class XYPlot extends Plot implements ValueAxisPlot, Pannable, Zoomable, @@ -3049,10 +3049,7 @@ /** * Sets the shadow generator for the plot and sends a - * {@link PlotChangeEvent} to all registered listeners. Note that this is - * a btmap drop-shadow generation facility and is separate from the - * vector based show option that is controlled via the - * {@link setShadowPaint()} method. + * {@link PlotChangeEvent} to all registered listeners. * * @param generator the generator (<code>null</code> permitted). * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/util/ShadowGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/util/ShadowGenerator.java 2011-10-10 20:22:19 UTC (rev 2300) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/util/ShadowGenerator.java 2011-10-10 20:26:03 UTC (rev 2301) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2009, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -27,7 +27,7 @@ * -------------------- * ShadowGenerator.java * -------------------- - * (C) Copyright 2009, by Object Refinery Limited and Contributors. + * (C) Copyright 2009, 2011, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mu...@us...> - 2011-10-17 20:17:43
|
Revision: 2330 http://jfreechart.svn.sourceforge.net/jfreechart/?rev=2330&view=rev Author: mungady Date: 2011-10-17 20:17:36 +0000 (Mon, 17 Oct 2011) Log Message: ----------- Fixed Javadoc tags. Modified Paths: -------------- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/StandardChartTheme.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/CategoryAxis.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/NumberAxis.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/Plot.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/AbstractRenderer.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/CategoryItemRenderer.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/XYItemRenderer.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/StandardChartTheme.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/StandardChartTheme.java 2011-10-17 13:08:42 UTC (rev 2329) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/StandardChartTheme.java 2011-10-17 20:17:36 UTC (rev 2330) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2009, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -27,7 +27,7 @@ * ----------------------- * StandardChartTheme.java * ----------------------- - * (C) Copyright 2008, 2009, by Object Refinery Limited. + * (C) Copyright 2008-2011, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -681,7 +681,7 @@ /** * Returns the domain grid line paint. * - * @return The domain grid line paint (never <code>null<code>). + * @return The domain grid line paint (never <code>null</code>). * * @see #setDomainGridlinePaint(Paint) */ Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/CategoryAxis.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/CategoryAxis.java 2011-10-17 13:08:42 UTC (rev 2329) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/CategoryAxis.java 2011-10-17 20:17:36 UTC (rev 2330) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2009, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -27,7 +27,7 @@ * ----------------- * CategoryAxis.java * ----------------- - * (C) Copyright 2000-2009, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert; * Contributor(s): Pady Srinivasan (patch 1217634); @@ -489,7 +489,7 @@ * Adds a tooltip to the specified category and sends an * {@link AxisChangeEvent} to all registered listeners. * - * @param category the category (<code>null<code> not permitted). + * @param category the category (<code>null</code> not permitted). * @param tooltip the tooltip text (<code>null</code> permitted). * * @see #removeCategoryLabelToolTip(Comparable) @@ -524,7 +524,7 @@ * Removes the tooltip for the specified category and sends an * {@link AxisChangeEvent} to all registered listeners. * - * @param category the category (<code>null<code> not permitted). + * @param category the category (<code>null</code> not permitted). * * @see #addCategoryLabelToolTip(Comparable, String) * @see #clearCategoryLabelToolTips() Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/NumberAxis.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/NumberAxis.java 2011-10-17 13:08:42 UTC (rev 2329) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/NumberAxis.java 2011-10-17 20:17:36 UTC (rev 2330) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2009, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -27,7 +27,7 @@ * --------------- * NumberAxis.java * --------------- - * (C) Copyright 2000-2009, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): Laurence Vanhelsuwe; @@ -396,7 +396,7 @@ * The marker band is optional, leave it set to <code>null</code> if you * don't require it. * - * @param band the new band (<code>null<code> permitted). + * @param band the new band (<code>null</code> permitted). * * @see #getMarkerBand() */ Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/Plot.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/Plot.java 2011-10-17 13:08:42 UTC (rev 2329) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/Plot.java 2011-10-17 20:17:36 UTC (rev 2330) @@ -830,7 +830,7 @@ /** * Returns the color used to draw the outline of the plot area. * - * @return The color (possibly <code>null<code>). + * @return The color (possibly <code>null</code>). * * @see #setOutlinePaint(Paint) */ Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/AbstractRenderer.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/AbstractRenderer.java 2011-10-17 13:08:42 UTC (rev 2329) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/AbstractRenderer.java 2011-10-17 20:17:36 UTC (rev 2330) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2009, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -27,7 +27,7 @@ * --------------------- * AbstractRenderer.java * --------------------- - * (C) Copyright 2002-2009, by Object Refinery Limited. + * (C) Copyright 2002-2011, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): Nicolas Brodu; @@ -2005,7 +2005,7 @@ * * @param series the series index (zero based). * - * @return The paint (possibly <code>null<code>). + * @return The paint (possibly <code>null</code>). * * @see #setSeriesItemLabelPaint(int, Paint) */ @@ -2048,7 +2048,7 @@ /** * Returns the base item label paint. * - * @return The paint (never <code>null<code>). + * @return The paint (never <code>null</code>). * * @see #setBaseItemLabelPaint(Paint) */ Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/CategoryItemRenderer.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/CategoryItemRenderer.java 2011-10-17 13:08:42 UTC (rev 2329) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/CategoryItemRenderer.java 2011-10-17 20:17:36 UTC (rev 2330) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -28,7 +28,7 @@ * CategoryItemRenderer.java * ------------------------- * - * (C) Copyright 2001-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2001-2011, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): Mark Watson (www.markwatson.com); @@ -1344,7 +1344,7 @@ * * @param series the series index (zero based). * - * @return The paint (possibly <code>null<code>). + * @return The paint (possibly <code>null</code>). * * @see #setSeriesItemLabelPaint(int, Paint) */ @@ -1366,7 +1366,7 @@ /** * Returns the base item label paint. * - * @return The paint (never <code>null<code>). + * @return The paint (never <code>null</code>). * * @see #setBaseItemLabelPaint(Paint) */ Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/XYItemRenderer.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/XYItemRenderer.java 2011-10-17 13:08:42 UTC (rev 2329) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/XYItemRenderer.java 2011-10-17 20:17:36 UTC (rev 2330) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -27,7 +27,7 @@ * ------------------- * XYItemRenderer.java * ------------------- - * (C) Copyright 2001-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2001-2011, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): Mark Watson (www.markwatson.com); @@ -1021,7 +1021,7 @@ * * @param series the series index (zero based). * - * @return The paint (possibly <code>null<code>). + * @return The paint (possibly <code>null</code>). * * @see #setSeriesItemLabelPaint(int, Paint) */ @@ -1041,7 +1041,7 @@ /** * Returns the base item label paint. * - * @return The paint (never <code>null<code>). + * @return The paint (never <code>null</code>). */ public Paint getBaseItemLabelPaint(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mu...@us...> - 2011-10-18 19:49:39
|
Revision: 2334 http://jfreechart.svn.sourceforge.net/jfreechart/?rev=2334&view=rev Author: mungady Date: 2011-10-18 19:49:32 +0000 (Tue, 18 Oct 2011) Log Message: ----------- Fix tooltip offset when using shadow generator. Modified Paths: -------------- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/demo/BarChartDemo1.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/demo/PieChartDemo1.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/demo/TimeSeriesChartDemo1.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/CategoryPlot.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PiePlot.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PiePlot3D.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/XYPlot.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/demo/BarChartDemo1.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/demo/BarChartDemo1.java 2011-10-18 17:01:44 UTC (rev 2333) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/demo/BarChartDemo1.java 2011-10-18 19:49:32 UTC (rev 2334) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2009, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -27,7 +27,7 @@ * ------------------ * BarChartDemo1.java * ------------------ - * (C) Copyright 2003-2009, by Object Refinery Limited and Contributors. + * (C) Copyright 2003-2011, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): ; Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/demo/PieChartDemo1.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/demo/PieChartDemo1.java 2011-10-18 17:01:44 UTC (rev 2333) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/demo/PieChartDemo1.java 2011-10-18 19:49:32 UTC (rev 2334) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2009, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -27,7 +27,7 @@ * ------------------ * PieChartDemo1.java * ------------------ - * (C) Copyright 2003-2009, by Object Refinery Limited and Contributors. + * (C) Copyright 2003-2011, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): ; @@ -96,7 +96,7 @@ JFreeChart chart = ChartFactory.createPieChart( "Pie Chart Demo 1", // chart title dataset, // data - true, // include legend + true, // include legend true, false ); Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/demo/TimeSeriesChartDemo1.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/demo/TimeSeriesChartDemo1.java 2011-10-18 17:01:44 UTC (rev 2333) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/demo/TimeSeriesChartDemo1.java 2011-10-18 19:49:32 UTC (rev 2334) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2009, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -27,7 +27,7 @@ * ------------------------- * TimeSeriesChartDemo1.java * ------------------------- - * (C) Copyright 2003-2009, by Object Refinery Limited and Contributors. + * (C) Copyright 2003-2011, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): ; 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 2011-10-18 17:01:44 UTC (rev 2333) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/CategoryPlot.java 2011-10-18 19:49:32 UTC (rev 2334) @@ -176,6 +176,7 @@ * 06-Jul-2009 : Fix for cloning of renderers - see bug 2817504 (DG) * 10-Jul-2009 : Added optional drop shadow generator (DG); * 27-Sep-2011 : Fixed annotation import (DG); + * 18-Oct-2011 : Fixed tooltip offset with shadow generator (DG); * */ @@ -3656,15 +3657,13 @@ } Graphics2D savedG2 = g2; - Rectangle2D savedDataArea = dataArea; BufferedImage dataImage = null; if (this.shadowGenerator != null) { dataImage = new BufferedImage((int) dataArea.getWidth(), (int)dataArea.getHeight(), BufferedImage.TYPE_INT_ARGB); g2 = dataImage.createGraphics(); + g2.translate(-dataArea.getX(), -dataArea.getY()); g2.setRenderingHints(savedG2.getRenderingHints()); - dataArea = new Rectangle(0, 0, dataImage.getWidth(), - dataImage.getHeight()); } // draw the markers... @@ -3711,13 +3710,12 @@ BufferedImage shadowImage = this.shadowGenerator.createDropShadow( dataImage); g2 = savedG2; - dataArea = savedDataArea; - g2.drawImage(shadowImage, (int) savedDataArea.getX() + g2.drawImage(shadowImage, (int) dataArea.getX() + this.shadowGenerator.calculateOffsetX(), - (int) savedDataArea.getY() + (int) dataArea.getY() + this.shadowGenerator.calculateOffsetY(), null); - g2.drawImage(dataImage, (int) savedDataArea.getX(), - (int) savedDataArea.getY(), null); + g2.drawImage(dataImage, (int) dataArea.getX(), + (int) dataArea.getY(), null); } g2.setClip(savedClip); g2.setComposite(originalComposite); Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PiePlot.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PiePlot.java 2011-10-18 17:01:44 UTC (rev 2333) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PiePlot.java 2011-10-18 19:49:32 UTC (rev 2334) @@ -165,6 +165,7 @@ * 10-Jul-2009 : Added optional drop shadow generator (DG); * 03-Sep-2009 : Fixed bug where sinmpleLabelOffset is ignored (DG); * 04-Nov-2009 : Add mouse wheel rotation support (DG); + * 18-Oct-2011 : Fixed tooltip offset with shadow generator (DG); * */ @@ -2446,26 +2447,24 @@ if (!DatasetUtilities.isEmptyOrNull(this.dataset)) { Graphics2D savedG2 = g2; - Rectangle2D savedDataArea = area; BufferedImage dataImage = null; if (this.shadowGenerator != null) { dataImage = new BufferedImage((int) area.getWidth(), (int) area.getHeight(), BufferedImage.TYPE_INT_ARGB); g2 = dataImage.createGraphics(); + g2.translate(-area.getX(), -area.getY()); g2.setRenderingHints(savedG2.getRenderingHints()); - area = new Rectangle(0, 0, dataImage.getWidth(), dataImage.getHeight()); } drawPie(g2, area, info); if (this.shadowGenerator != null) { BufferedImage shadowImage = this.shadowGenerator.createDropShadow(dataImage); g2 = savedG2; - area = savedDataArea; - g2.drawImage(shadowImage, (int) savedDataArea.getX() - + this.shadowGenerator.calculateOffsetX(), - (int) savedDataArea.getY() + g2.drawImage(shadowImage, (int) area.getX() + + this.shadowGenerator.calculateOffsetX(), + (int) area.getY() + this.shadowGenerator.calculateOffsetY(), null); - g2.drawImage(dataImage, (int) savedDataArea.getX(), - (int) savedDataArea.getY(), null); + g2.drawImage(dataImage, (int) area.getX(), (int) area.getY(), + null); } } else { Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PiePlot3D.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PiePlot3D.java 2011-10-18 17:01:44 UTC (rev 2333) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PiePlot3D.java 2011-10-18 19:49:32 UTC (rev 2334) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2009, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -81,7 +81,8 @@ * labels (DG); * 19-May-2009 : Fixed FindBugs warnings, patch by Michal Wozniak (DG); * 10-Jul-2009 : Added drop shaow support (DG); - * 10-Oct-2011 : localization fix: bug #3353913 (MH); + * 10-Oct-2011 : Localization fix: bug #3353913 (MH); + * 18-Oct-2011 : Fix tooltip offset with shadow generator (DG); * */ @@ -249,16 +250,14 @@ g2.clip(plotArea); Graphics2D savedG2 = g2; - Rectangle2D savedDataArea = plotArea; BufferedImage dataImage = null; if (getShadowGenerator() != null) { dataImage = new BufferedImage((int) plotArea.getWidth(), (int) plotArea.getHeight(), BufferedImage.TYPE_INT_ARGB); g2 = dataImage.createGraphics(); + g2.translate(-plotArea.getX(), -plotArea.getY()); g2.setRenderingHints(savedG2.getRenderingHints()); - plotArea = new Rectangle(0, 0, dataImage.getWidth(), - dataImage.getHeight()); - originalPlotArea = (Rectangle) plotArea.clone(); + originalPlotArea = (Rectangle2D) plotArea.clone(); } // adjust the plot area by the interior spacing value double gapPercent = getInteriorGap(); @@ -603,16 +602,15 @@ } if (getShadowGenerator() != null) { - BufferedImage shadowImage = getShadowGenerator().createDropShadow(dataImage); + BufferedImage shadowImage + = getShadowGenerator().createDropShadow(dataImage); g2 = savedG2; - plotArea = savedDataArea; - originalPlotArea = savedDataArea; - g2.drawImage(shadowImage, (int) savedDataArea.getX() + g2.drawImage(shadowImage, (int) plotArea.getX() + getShadowGenerator().calculateOffsetX(), - (int) savedDataArea.getY() + (int) plotArea.getY() + getShadowGenerator().calculateOffsetY(), null); - g2.drawImage(dataImage, (int) savedDataArea.getX(), - (int) savedDataArea.getY(), null); + g2.drawImage(dataImage, (int) plotArea.getX(), + (int) plotArea.getY(), null); } g2.setClip(savedClip); 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 2011-10-18 17:01:44 UTC (rev 2333) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/XYPlot.java 2011-10-18 19:49:32 UTC (rev 2334) @@ -226,6 +226,7 @@ * by PK (DG); * 06-Jul-2009 : Fix for cloning of renderers - see bug 2817504 (DG) * 10-Jul-2009 : Added optional drop shadow generator (DG); + * 18-Oct-2011 : Fix tooltip offset with shadow renderer (DG); * */ @@ -3315,15 +3316,13 @@ } Graphics2D savedG2 = g2; - Rectangle2D savedDataArea = dataArea; BufferedImage dataImage = null; if (this.shadowGenerator != null) { dataImage = new BufferedImage((int) dataArea.getWidth(), (int)dataArea.getHeight(), BufferedImage.TYPE_INT_ARGB); g2 = dataImage.createGraphics(); + g2.translate(-dataArea.getX(), -dataArea.getY()); g2.setRenderingHints(savedG2.getRenderingHints()); - dataArea = new Rectangle(0, 0, dataImage.getWidth(), - dataImage.getHeight()); } // draw the markers that are associated with a specific renderer... @@ -3466,13 +3465,12 @@ BufferedImage shadowImage = this.shadowGenerator.createDropShadow(dataImage); g2 = savedG2; - dataArea = savedDataArea; - g2.drawImage(shadowImage, (int) savedDataArea.getX() + g2.drawImage(shadowImage, (int) dataArea.getX() + this.shadowGenerator.calculateOffsetX(), - (int) savedDataArea.getY() + (int) dataArea.getY() + this.shadowGenerator.calculateOffsetY(), null); - g2.drawImage(dataImage, (int) savedDataArea.getX(), - (int) savedDataArea.getY(), null); + g2.drawImage(dataImage, (int) dataArea.getX(), + (int) dataArea.getY(), null); } g2.setClip(originalClip); g2.setComposite(originalComposite); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mu...@us...> - 2011-10-30 17:58:53
|
Revision: 2354 http://jfreechart.svn.sourceforge.net/jfreechart/?rev=2354&view=rev Author: mungady Date: 2011-10-30 17:58:46 +0000 (Sun, 30 Oct 2011) Log Message: ----------- Update headers for Oracle trademarks. Modified Paths: -------------- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartColor.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartFactory.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartFrame.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartMouseEvent.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartMouseListener.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartPanel.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartRenderingInfo.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartTheme.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartTransferable.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartUtilities.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ClipPath.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/DrawableLegendItem.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/Effect3D.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/HashUtilities.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/JFreeChart.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LegendItem.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LegendItemCollection.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LegendItemSource.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LegendRenderingOrder.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/MouseWheelHandler.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/PaintMap.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/PolarChartPanel.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/StandardChartTheme.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/StrokeMap.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartColor.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartColor.java 2011-10-30 14:37:56 UTC (rev 2353) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartColor.java 2011-10-30 17:58:46 UTC (rev 2354) @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * --------------- * ChartColor.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 2011-10-30 14:37:56 UTC (rev 2353) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartFactory.java 2011-10-30 17:58:46 UTC (rev 2354) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ----------------- * ChartFactory.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartFrame.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartFrame.java 2011-10-30 14:37:56 UTC (rev 2353) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartFrame.java 2011-10-30 17:58:46 UTC (rev 2354) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * --------------- * ChartFrame.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartMouseEvent.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartMouseEvent.java 2011-10-30 14:37:56 UTC (rev 2353) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartMouseEvent.java 2011-10-30 17:58:46 UTC (rev 2354) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * -------------------- * ChartMouseEvent.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartMouseListener.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartMouseListener.java 2011-10-30 14:37:56 UTC (rev 2353) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartMouseListener.java 2011-10-30 17:58:46 UTC (rev 2354) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ----------------------- * ChartMouseListener.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 2011-10-30 14:37:56 UTC (rev 2353) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartPanel.java 2011-10-30 17:58:46 UTC (rev 2354) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2009, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * --------------- * ChartPanel.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartRenderingInfo.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartRenderingInfo.java 2011-10-30 14:37:56 UTC (rev 2353) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartRenderingInfo.java 2011-10-30 17:58:46 UTC (rev 2354) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ----------------------- * ChartRenderingInfo.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartTheme.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartTheme.java 2011-10-30 14:37:56 UTC (rev 2353) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartTheme.java 2011-10-30 17:58:46 UTC (rev 2354) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * --------------- * ChartTheme.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartTransferable.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartTransferable.java 2011-10-30 14:37:56 UTC (rev 2353) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartTransferable.java 2011-10-30 17:58:46 UTC (rev 2354) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2009, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ------------------- * ChartSelection.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartUtilities.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartUtilities.java 2011-10-30 14:37:56 UTC (rev 2353) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartUtilities.java 2011-10-30 17:58:46 UTC (rev 2354) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ------------------- * ChartUtilities.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ClipPath.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ClipPath.java 2011-10-30 14:37:56 UTC (rev 2353) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ClipPath.java 2011-10-30 17:58:46 UTC (rev 2354) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ------------- * ClipPath.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/DrawableLegendItem.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/DrawableLegendItem.java 2011-10-30 14:37:56 UTC (rev 2353) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/DrawableLegendItem.java 2011-10-30 17:58:46 UTC (rev 2354) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ----------------------- * DrawableLegendItem.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/Effect3D.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/Effect3D.java 2011-10-30 14:37:56 UTC (rev 2353) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/Effect3D.java 2011-10-30 17:58:46 UTC (rev 2354) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ------------- * Effect3D.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/HashUtilities.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/HashUtilities.java 2011-10-30 14:37:56 UTC (rev 2353) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/HashUtilities.java 2011-10-30 17:58:46 UTC (rev 2354) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ------------------ * HashUtilities.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 2011-10-30 14:37:56 UTC (rev 2353) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/JFreeChart.java 2011-10-30 17:58:46 UTC (rev 2354) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2009, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * --------------- * JFreeChart.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LegendItem.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LegendItem.java 2011-10-30 14:37:56 UTC (rev 2353) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LegendItem.java 2011-10-30 17:58:46 UTC (rev 2354) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2009, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * --------------- * LegendItem.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LegendItemCollection.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LegendItemCollection.java 2011-10-30 14:37:56 UTC (rev 2353) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LegendItemCollection.java 2011-10-30 17:58:46 UTC (rev 2354) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2009, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ------------------------- * LegendItemCollection.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LegendItemSource.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LegendItemSource.java 2011-10-30 14:37:56 UTC (rev 2353) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LegendItemSource.java 2011-10-30 17:58:46 UTC (rev 2354) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * --------------------- * LegendItemSource.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LegendRenderingOrder.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LegendRenderingOrder.java 2011-10-30 14:37:56 UTC (rev 2353) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LegendRenderingOrder.java 2011-10-30 17:58:46 UTC (rev 2354) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ------------------------- * LegendRenderingOrder.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/MouseWheelHandler.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/MouseWheelHandler.java 2011-10-30 14:37:56 UTC (rev 2353) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/MouseWheelHandler.java 2011-10-30 17:58:46 UTC (rev 2354) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2009, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ---------------------- * MouseWheelHandler.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/PaintMap.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/PaintMap.java 2011-10-30 14:37:56 UTC (rev 2353) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/PaintMap.java 2011-10-30 17:58:46 UTC (rev 2354) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ------------- * PaintMap.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/PolarChartPanel.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/PolarChartPanel.java 2011-10-30 14:37:56 UTC (rev 2353) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/PolarChartPanel.java 2011-10-30 17:58:46 UTC (rev 2354) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * -------------------- * PolarChartPanel.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/StandardChartTheme.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/StandardChartTheme.java 2011-10-30 14:37:56 UTC (rev 2353) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/StandardChartTheme.java 2011-10-30 17:58:46 UTC (rev 2354) @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ----------------------- * StandardChartTheme.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/StrokeMap.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/StrokeMap.java 2011-10-30 14:37:56 UTC (rev 2353) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/StrokeMap.java 2011-10-30 17:58:46 UTC (rev 2354) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * -------------- * StrokeMap.java This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mu...@us...> - 2013-07-04 11:31:37
|
Revision: 2753 http://sourceforge.net/p/jfreechart/code/2753 Author: mungady Date: 2013-07-04 11:31:35 +0000 (Thu, 04 Jul 2013) Log Message: ----------- Update copyright notice. Modified Paths: -------------- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/imagemap/DynamicDriveToolTipTagFragmentGenerator.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/imagemap/OverLIBToolTipTagFragmentGenerator.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/imagemap/StandardToolTipTagFragmentGenerator.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/imagemap/StandardURLTagFragmentGenerator.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/imagemap/ToolTipTagFragmentGenerator.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/imagemap/URLTagFragmentGenerator.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/BoxAndWhiskerToolTipGenerator.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/BoxAndWhiskerXYToolTipGenerator.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/CategoryItemLabelGenerator.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/CategorySeriesLabelGenerator.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/CategoryToolTipGenerator.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/ContourToolTipGenerator.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/CrosshairLabelGenerator.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/CustomXYToolTipGenerator.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/HighLowItemLabelGenerator.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/IntervalCategoryItemLabelGenerator.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/IntervalCategoryToolTipGenerator.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/IntervalXYItemLabelGenerator.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/ItemLabelAnchor.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/PieSectionLabelGenerator.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/PieToolTipGenerator.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardCategoryItemLabelGenerator.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardCategoryToolTipGenerator.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardContourToolTipGenerator.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardCrosshairLabelGenerator.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardPieSectionLabelGenerator.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardPieToolTipGenerator.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardXYItemLabelGenerator.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardXYToolTipGenerator.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/SymbolicXYItemLabelGenerator.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/XYItemLabelGenerator.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/XYSeriesLabelGenerator.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/XYToolTipGenerator.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/XYZToolTipGenerator.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/ArrowNeedle.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/LineNeedle.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/LongNeedle.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/MeterNeedle.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/MiddlePinNeedle.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/PinNeedle.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/PlumNeedle.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/PointerNeedle.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/ShipNeedle.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/WindNeedle.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/panel/Overlay.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/imagemap/DynamicDriveToolTipTagFragmentGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/imagemap/DynamicDriveToolTipTagFragmentGenerator.java 2013-07-04 11:27:53 UTC (rev 2752) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/imagemap/DynamicDriveToolTipTagFragmentGenerator.java 2013-07-04 11:31:35 UTC (rev 2753) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/imagemap/OverLIBToolTipTagFragmentGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/imagemap/OverLIBToolTipTagFragmentGenerator.java 2013-07-04 11:27:53 UTC (rev 2752) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/imagemap/OverLIBToolTipTagFragmentGenerator.java 2013-07-04 11:31:35 UTC (rev 2753) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/imagemap/StandardToolTipTagFragmentGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/imagemap/StandardToolTipTagFragmentGenerator.java 2013-07-04 11:27:53 UTC (rev 2752) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/imagemap/StandardToolTipTagFragmentGenerator.java 2013-07-04 11:31:35 UTC (rev 2753) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/imagemap/StandardURLTagFragmentGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/imagemap/StandardURLTagFragmentGenerator.java 2013-07-04 11:27:53 UTC (rev 2752) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/imagemap/StandardURLTagFragmentGenerator.java 2013-07-04 11:31:35 UTC (rev 2753) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/imagemap/ToolTipTagFragmentGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/imagemap/ToolTipTagFragmentGenerator.java 2013-07-04 11:27:53 UTC (rev 2752) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/imagemap/ToolTipTagFragmentGenerator.java 2013-07-04 11:31:35 UTC (rev 2753) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/imagemap/URLTagFragmentGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/imagemap/URLTagFragmentGenerator.java 2013-07-04 11:27:53 UTC (rev 2752) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/imagemap/URLTagFragmentGenerator.java 2013-07-04 11:31:35 UTC (rev 2753) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/BoxAndWhiskerToolTipGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/BoxAndWhiskerToolTipGenerator.java 2013-07-04 11:27:53 UTC (rev 2752) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/BoxAndWhiskerToolTipGenerator.java 2013-07-04 11:31:35 UTC (rev 2753) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/BoxAndWhiskerXYToolTipGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/BoxAndWhiskerXYToolTipGenerator.java 2013-07-04 11:27:53 UTC (rev 2752) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/BoxAndWhiskerXYToolTipGenerator.java 2013-07-04 11:31:35 UTC (rev 2753) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/CategoryItemLabelGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/CategoryItemLabelGenerator.java 2013-07-04 11:27:53 UTC (rev 2752) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/CategoryItemLabelGenerator.java 2013-07-04 11:31:35 UTC (rev 2753) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/CategorySeriesLabelGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/CategorySeriesLabelGenerator.java 2013-07-04 11:27:53 UTC (rev 2752) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/CategorySeriesLabelGenerator.java 2013-07-04 11:31:35 UTC (rev 2753) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/CategoryToolTipGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/CategoryToolTipGenerator.java 2013-07-04 11:27:53 UTC (rev 2752) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/CategoryToolTipGenerator.java 2013-07-04 11:31:35 UTC (rev 2753) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/ContourToolTipGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/ContourToolTipGenerator.java 2013-07-04 11:27:53 UTC (rev 2752) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/ContourToolTipGenerator.java 2013-07-04 11:31:35 UTC (rev 2753) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/CrosshairLabelGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/CrosshairLabelGenerator.java 2013-07-04 11:27:53 UTC (rev 2752) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/CrosshairLabelGenerator.java 2013-07-04 11:31:35 UTC (rev 2753) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/CustomXYToolTipGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/CustomXYToolTipGenerator.java 2013-07-04 11:27:53 UTC (rev 2752) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/CustomXYToolTipGenerator.java 2013-07-04 11:31:35 UTC (rev 2753) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/HighLowItemLabelGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/HighLowItemLabelGenerator.java 2013-07-04 11:27:53 UTC (rev 2752) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/HighLowItemLabelGenerator.java 2013-07-04 11:31:35 UTC (rev 2753) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/IntervalCategoryItemLabelGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/IntervalCategoryItemLabelGenerator.java 2013-07-04 11:27:53 UTC (rev 2752) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/IntervalCategoryItemLabelGenerator.java 2013-07-04 11:31:35 UTC (rev 2753) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/IntervalCategoryToolTipGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/IntervalCategoryToolTipGenerator.java 2013-07-04 11:27:53 UTC (rev 2752) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/IntervalCategoryToolTipGenerator.java 2013-07-04 11:31:35 UTC (rev 2753) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/IntervalXYItemLabelGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/IntervalXYItemLabelGenerator.java 2013-07-04 11:27:53 UTC (rev 2752) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/IntervalXYItemLabelGenerator.java 2013-07-04 11:31:35 UTC (rev 2753) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/ItemLabelAnchor.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/ItemLabelAnchor.java 2013-07-04 11:27:53 UTC (rev 2752) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/ItemLabelAnchor.java 2013-07-04 11:31:35 UTC (rev 2753) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/PieSectionLabelGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/PieSectionLabelGenerator.java 2013-07-04 11:27:53 UTC (rev 2752) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/PieSectionLabelGenerator.java 2013-07-04 11:31:35 UTC (rev 2753) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/PieToolTipGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/PieToolTipGenerator.java 2013-07-04 11:27:53 UTC (rev 2752) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/PieToolTipGenerator.java 2013-07-04 11:31:35 UTC (rev 2753) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardCategoryItemLabelGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardCategoryItemLabelGenerator.java 2013-07-04 11:27:53 UTC (rev 2752) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardCategoryItemLabelGenerator.java 2013-07-04 11:31:35 UTC (rev 2753) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardCategoryToolTipGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardCategoryToolTipGenerator.java 2013-07-04 11:27:53 UTC (rev 2752) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardCategoryToolTipGenerator.java 2013-07-04 11:31:35 UTC (rev 2753) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardContourToolTipGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardContourToolTipGenerator.java 2013-07-04 11:27:53 UTC (rev 2752) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardContourToolTipGenerator.java 2013-07-04 11:31:35 UTC (rev 2753) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardCrosshairLabelGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardCrosshairLabelGenerator.java 2013-07-04 11:27:53 UTC (rev 2752) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardCrosshairLabelGenerator.java 2013-07-04 11:31:35 UTC (rev 2753) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardPieSectionLabelGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardPieSectionLabelGenerator.java 2013-07-04 11:27:53 UTC (rev 2752) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardPieSectionLabelGenerator.java 2013-07-04 11:31:35 UTC (rev 2753) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardPieToolTipGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardPieToolTipGenerator.java 2013-07-04 11:27:53 UTC (rev 2752) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardPieToolTipGenerator.java 2013-07-04 11:31:35 UTC (rev 2753) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardXYItemLabelGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardXYItemLabelGenerator.java 2013-07-04 11:27:53 UTC (rev 2752) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardXYItemLabelGenerator.java 2013-07-04 11:31:35 UTC (rev 2753) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardXYToolTipGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardXYToolTipGenerator.java 2013-07-04 11:27:53 UTC (rev 2752) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardXYToolTipGenerator.java 2013-07-04 11:31:35 UTC (rev 2753) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/SymbolicXYItemLabelGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/SymbolicXYItemLabelGenerator.java 2013-07-04 11:27:53 UTC (rev 2752) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/SymbolicXYItemLabelGenerator.java 2013-07-04 11:31:35 UTC (rev 2753) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/XYItemLabelGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/XYItemLabelGenerator.java 2013-07-04 11:27:53 UTC (rev 2752) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/XYItemLabelGenerator.java 2013-07-04 11:31:35 UTC (rev 2753) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/XYSeriesLabelGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/XYSeriesLabelGenerator.java 2013-07-04 11:27:53 UTC (rev 2752) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/XYSeriesLabelGenerator.java 2013-07-04 11:31:35 UTC (rev 2753) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/XYToolTipGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/XYToolTipGenerator.java 2013-07-04 11:27:53 UTC (rev 2752) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/XYToolTipGenerator.java 2013-07-04 11:31:35 UTC (rev 2753) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/XYZToolTipGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/XYZToolTipGenerator.java 2013-07-04 11:27:53 UTC (rev 2752) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/XYZToolTipGenerator.java 2013-07-04 11:31:35 UTC (rev 2753) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/ArrowNeedle.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/ArrowNeedle.java 2013-07-04 11:27:53 UTC (rev 2752) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/ArrowNeedle.java 2013-07-04 11:31:35 UTC (rev 2753) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/LineNeedle.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/LineNeedle.java 2013-07-04 11:27:53 UTC (rev 2752) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/LineNeedle.java 2013-07-04 11:31:35 UTC (rev 2753) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/LongNeedle.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/LongNeedle.java 2013-07-04 11:27:53 UTC (rev 2752) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/LongNeedle.java 2013-07-04 11:31:35 UTC (rev 2753) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/MeterNeedle.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/MeterNeedle.java 2013-07-04 11:27:53 UTC (rev 2752) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/MeterNeedle.java 2013-07-04 11:31:35 UTC (rev 2753) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/MiddlePinNeedle.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/MiddlePinNeedle.java 2013-07-04 11:27:53 UTC (rev 2752) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/MiddlePinNeedle.java 2013-07-04 11:31:35 UTC (rev 2753) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/PinNeedle.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/PinNeedle.java 2013-07-04 11:27:53 UTC (rev 2752) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/PinNeedle.java 2013-07-04 11:31:35 UTC (rev 2753) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/PlumNeedle.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/PlumNeedle.java 2013-07-04 11:27:53 UTC (rev 2752) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/PlumNeedle.java 2013-07-04 11:31:35 UTC (rev 2753) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/PointerNeedle.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/PointerNeedle.java 2013-07-04 11:27:53 UTC (rev 2752) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/PointerNeedle.java 2013-07-04 11:31:35 UTC (rev 2753) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/ShipNeedle.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/ShipNeedle.java 2013-07-04 11:27:53 UTC (rev 2752) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/ShipNeedle.java 2013-07-04 11:31:35 UTC (rev 2753) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/WindNeedle.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/WindNeedle.java 2013-07-04 11:27:53 UTC (rev 2752) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/WindNeedle.java 2013-07-04 11:31:35 UTC (rev 2753) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/panel/Overlay.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/panel/Overlay.java 2013-07-04 11:27:53 UTC (rev 2752) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/panel/Overlay.java 2013-07-04 11:31:35 UTC (rev 2753) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mu...@us...> - 2013-07-04 11:19:13
|
Revision: 2750 http://sourceforge.net/p/jfreechart/code/2750 Author: mungady Date: 2013-07-04 11:19:09 +0000 (Thu, 04 Jul 2013) Log Message: ----------- Update copyright notice. Modified Paths: -------------- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartColor.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartFrame.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartMouseEvent.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartMouseListener.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartRenderingInfo.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartTransferable.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ClipPath.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/DrawableLegendItem.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/Effect3D.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LegendItemCollection.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LegendItemSource.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LegendRenderingOrder.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/PolarChartPanel.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/AbstractAnnotation.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/AbstractXYAnnotation.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/Annotation.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/CategoryAnnotation.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYAnnotation.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYAnnotationBoundsInfo.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYBoxAnnotation.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYTitleAnnotation.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/AxisState.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/CategoryAnchor.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/CategoryAxis3D.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/CategoryTick.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/ColorBar.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/CompassFormat.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/DateTick.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/DateTickMarkPosition.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/DateTickUnitType.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/LogarithmicAxis.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/MarkerAxisBand.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/ModuloAxis.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/NumberAxis3D.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/NumberTick.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/SegmentedTimeline.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/StandardTickUnitSource.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/TickType.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/TickUnit.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/TickUnitSource.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/TickUnits.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/Timeline.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/ValueTick.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/block/Arrangement.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/block/Block.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/block/BlockFrame.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/block/BlockParams.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/block/BlockResult.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/block/BorderArrangement.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/block/CenterArrangement.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/block/ColumnArrangement.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/block/EmptyBlock.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/block/EntityBlockParams.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/block/EntityBlockResult.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/block/FlowArrangement.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/block/GridArrangement.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/block/LengthConstraintType.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartColor.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartColor.java 2013-07-04 07:39:10 UTC (rev 2749) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartColor.java 2013-07-04 11:19:09 UTC (rev 2750) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartFrame.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartFrame.java 2013-07-04 07:39:10 UTC (rev 2749) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartFrame.java 2013-07-04 11:19:09 UTC (rev 2750) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartMouseEvent.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartMouseEvent.java 2013-07-04 07:39:10 UTC (rev 2749) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartMouseEvent.java 2013-07-04 11:19:09 UTC (rev 2750) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartMouseListener.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartMouseListener.java 2013-07-04 07:39:10 UTC (rev 2749) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartMouseListener.java 2013-07-04 11:19:09 UTC (rev 2750) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartRenderingInfo.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartRenderingInfo.java 2013-07-04 07:39:10 UTC (rev 2749) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartRenderingInfo.java 2013-07-04 11:19:09 UTC (rev 2750) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartTransferable.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartTransferable.java 2013-07-04 07:39:10 UTC (rev 2749) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartTransferable.java 2013-07-04 11:19:09 UTC (rev 2750) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ClipPath.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ClipPath.java 2013-07-04 07:39:10 UTC (rev 2749) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ClipPath.java 2013-07-04 11:19:09 UTC (rev 2750) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/DrawableLegendItem.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/DrawableLegendItem.java 2013-07-04 07:39:10 UTC (rev 2749) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/DrawableLegendItem.java 2013-07-04 11:19:09 UTC (rev 2750) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/Effect3D.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/Effect3D.java 2013-07-04 07:39:10 UTC (rev 2749) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/Effect3D.java 2013-07-04 11:19:09 UTC (rev 2750) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LegendItemCollection.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LegendItemCollection.java 2013-07-04 07:39:10 UTC (rev 2749) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LegendItemCollection.java 2013-07-04 11:19:09 UTC (rev 2750) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LegendItemSource.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LegendItemSource.java 2013-07-04 07:39:10 UTC (rev 2749) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LegendItemSource.java 2013-07-04 11:19:09 UTC (rev 2750) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LegendRenderingOrder.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LegendRenderingOrder.java 2013-07-04 07:39:10 UTC (rev 2749) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LegendRenderingOrder.java 2013-07-04 11:19:09 UTC (rev 2750) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/PolarChartPanel.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/PolarChartPanel.java 2013-07-04 07:39:10 UTC (rev 2749) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/PolarChartPanel.java 2013-07-04 11:19:09 UTC (rev 2750) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/AbstractAnnotation.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/AbstractAnnotation.java 2013-07-04 07:39:10 UTC (rev 2749) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/AbstractAnnotation.java 2013-07-04 11:19:09 UTC (rev 2750) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/AbstractXYAnnotation.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/AbstractXYAnnotation.java 2013-07-04 07:39:10 UTC (rev 2749) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/AbstractXYAnnotation.java 2013-07-04 11:19:09 UTC (rev 2750) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/Annotation.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/Annotation.java 2013-07-04 07:39:10 UTC (rev 2749) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/Annotation.java 2013-07-04 11:19:09 UTC (rev 2750) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/CategoryAnnotation.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/CategoryAnnotation.java 2013-07-04 07:39:10 UTC (rev 2749) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/CategoryAnnotation.java 2013-07-04 11:19:09 UTC (rev 2750) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYAnnotation.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYAnnotation.java 2013-07-04 07:39:10 UTC (rev 2749) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYAnnotation.java 2013-07-04 11:19:09 UTC (rev 2750) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYAnnotationBoundsInfo.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYAnnotationBoundsInfo.java 2013-07-04 07:39:10 UTC (rev 2749) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYAnnotationBoundsInfo.java 2013-07-04 11:19:09 UTC (rev 2750) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYBoxAnnotation.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYBoxAnnotation.java 2013-07-04 07:39:10 UTC (rev 2749) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYBoxAnnotation.java 2013-07-04 11:19:09 UTC (rev 2750) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYTitleAnnotation.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYTitleAnnotation.java 2013-07-04 07:39:10 UTC (rev 2749) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYTitleAnnotation.java 2013-07-04 11:19:09 UTC (rev 2750) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/AxisState.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/AxisState.java 2013-07-04 07:39:10 UTC (rev 2749) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/AxisState.java 2013-07-04 11:19:09 UTC (rev 2750) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/CategoryAnchor.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/CategoryAnchor.java 2013-07-04 07:39:10 UTC (rev 2749) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/CategoryAnchor.java 2013-07-04 11:19:09 UTC (rev 2750) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/CategoryAxis3D.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/CategoryAxis3D.java 2013-07-04 07:39:10 UTC (rev 2749) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/CategoryAxis3D.java 2013-07-04 11:19:09 UTC (rev 2750) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/CategoryTick.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/CategoryTick.java 2013-07-04 07:39:10 UTC (rev 2749) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/CategoryTick.java 2013-07-04 11:19:09 UTC (rev 2750) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/ColorBar.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/ColorBar.java 2013-07-04 07:39:10 UTC (rev 2749) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/ColorBar.java 2013-07-04 11:19:09 UTC (rev 2750) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/CompassFormat.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/CompassFormat.java 2013-07-04 07:39:10 UTC (rev 2749) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/CompassFormat.java 2013-07-04 11:19:09 UTC (rev 2750) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/DateTick.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/DateTick.java 2013-07-04 07:39:10 UTC (rev 2749) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/DateTick.java 2013-07-04 11:19:09 UTC (rev 2750) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/DateTickMarkPosition.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/DateTickMarkPosition.java 2013-07-04 07:39:10 UTC (rev 2749) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/DateTickMarkPosition.java 2013-07-04 11:19:09 UTC (rev 2750) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/DateTickUnitType.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/DateTickUnitType.java 2013-07-04 07:39:10 UTC (rev 2749) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/DateTickUnitType.java 2013-07-04 11:19:09 UTC (rev 2750) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/LogarithmicAxis.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/LogarithmicAxis.java 2013-07-04 07:39:10 UTC (rev 2749) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/LogarithmicAxis.java 2013-07-04 11:19:09 UTC (rev 2750) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/MarkerAxisBand.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/MarkerAxisBand.java 2013-07-04 07:39:10 UTC (rev 2749) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/MarkerAxisBand.java 2013-07-04 11:19:09 UTC (rev 2750) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/ModuloAxis.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/ModuloAxis.java 2013-07-04 07:39:10 UTC (rev 2749) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/ModuloAxis.java 2013-07-04 11:19:09 UTC (rev 2750) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/NumberAxis3D.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/NumberAxis3D.java 2013-07-04 07:39:10 UTC (rev 2749) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/NumberAxis3D.java 2013-07-04 11:19:09 UTC (rev 2750) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/NumberTick.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/NumberTick.java 2013-07-04 07:39:10 UTC (rev 2749) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/NumberTick.java 2013-07-04 11:19:09 UTC (rev 2750) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/SegmentedTimeline.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/SegmentedTimeline.java 2013-07-04 07:39:10 UTC (rev 2749) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/SegmentedTimeline.java 2013-07-04 11:19:09 UTC (rev 2750) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/StandardTickUnitSource.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/StandardTickUnitSource.java 2013-07-04 07:39:10 UTC (rev 2749) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/StandardTickUnitSource.java 2013-07-04 11:19:09 UTC (rev 2750) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/TickType.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/TickType.java 2013-07-04 07:39:10 UTC (rev 2749) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/TickType.java 2013-07-04 11:19:09 UTC (rev 2750) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/TickUnit.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/TickUnit.java 2013-07-04 07:39:10 UTC (rev 2749) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/TickUnit.java 2013-07-04 11:19:09 UTC (rev 2750) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/TickUnitSource.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/TickUnitSource.java 2013-07-04 07:39:10 UTC (rev 2749) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/TickUnitSource.java 2013-07-04 11:19:09 UTC (rev 2750) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/TickUnits.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/TickUnits.java 2013-07-04 07:39:10 UTC (rev 2749) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/TickUnits.java 2013-07-04 11:19:09 UTC (rev 2750) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/Timeline.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/Timeline.java 2013-07-04 07:39:10 UTC (rev 2749) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/Timeline.java 2013-07-04 11:19:09 UTC (rev 2750) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/ValueTick.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/ValueTick.java 2013-07-04 07:39:10 UTC (rev 2749) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/ValueTick.java 2013-07-04 11:19:09 UTC (rev 2750) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/block/Arrangement.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/block/Arrangement.java 2013-07-04 07:39:10 UTC (rev 2749) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/block/Arrangement.java 2013-07-04 11:19:09 UTC (rev 2750) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/block/Block.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/block/Block.java 2013-07-04 07:39:10 UTC (rev 2749) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/block/Block.java 2013-07-04 11:19:09 UTC (rev 2750) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/block/BlockFrame.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/block/BlockFrame.java 2013-07-04 07:39:10 UTC (rev 2749) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/block/BlockFrame.java 2013-07-04 11:19:09 UTC (rev 2750) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/block/BlockParams.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/block/BlockParams.java 2013-07-04 07:39:10 UTC (rev 2749) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/block/BlockParams.java 2013-07-04 11:19:09 UTC (rev 2750) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/block/BlockResult.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/block/BlockResult.java 2013-07-04 07:39:10 UTC (rev 2749) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/block/BlockResult.java 2013-07-04 11:19:09 UTC (rev 2750) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/block/BorderArrangement.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/block/BorderArrangement.java 2013-07-04 07:39:10 UTC (rev 2749) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/block/BorderArrangement.java 2013-07-04 11:19:09 UTC (rev 2750) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/block/CenterArrangement.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/block/CenterArrangement.java 2013-07-04 07:39:10 UTC (rev 2749) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/block/CenterArrangement.java 2013-07-04 11:19:09 UTC (rev 2750) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/block/ColumnArrangement.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/block/ColumnArrangement.java 2013-07-04 07:39:10 UTC (rev 2749) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/block/ColumnArrangement.java 2013-07-04 11:19:09 UTC (rev 2750) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/block/EmptyBlock.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/block/EmptyBlock.java 2013-07-04 07:39:10 UTC (rev 2749) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/block/EmptyBlock.java 2013-07-04 11:19:09 UTC (rev 2750) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/block/EntityBlockParams.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/block/EntityBlockParams.java 2013-07-04 07:39:10 UTC (rev 2749) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/block/EntityBlockParams.java 2013-07-04 11:19:09 UTC (rev 2750) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/block/EntityBlockResult.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/block/EntityBlockResult.java 2013-07-04 07:39:10 UTC (rev 2749) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/block/EntityBlockResult.java 2013-07-04 11:19:09 UTC (rev 2750) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/block/FlowArrangement.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/block/FlowArrangement.java 2013-07-04 07:39:10 UTC (rev 2749) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/block/FlowArrangement.java 2013-07-04 11:19:09 UTC (rev 2750) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/block/GridArrangement.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/block/GridArrangement.java 2013-07-04 07:39:10 UTC (rev 2749) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/block/GridArrangement.java 2013-07-04 11:19:09 UTC (rev 2750) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/block/LengthConstraintType.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/block/LengthConstraintType.java 2013-07-04 07:39:10 UTC (rev 2749) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/block/LengthConstraintType.java 2013-07-04 11:19:09 UTC (rev 2750) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mu...@us...> - 2013-07-04 11:27:35
|
Revision: 2751 http://sourceforge.net/p/jfreechart/code/2751 Author: mungady Date: 2013-07-04 11:27:32 +0000 (Thu, 04 Jul 2013) Log Message: ----------- Update copyright notice. Modified Paths: -------------- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/demo/BarChartDemo1.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/demo/PieChartDemo1.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/demo/TimeSeriesChartDemo1.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/editor/ChartEditor.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/editor/ChartEditorFactory.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/editor/DefaultAxisEditor.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/editor/DefaultChartEditor.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/editor/DefaultChartEditorFactory.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/editor/DefaultColorBarEditor.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/editor/DefaultNumberAxisEditor.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/editor/DefaultPlotEditor.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/editor/DefaultPolarPlotEditor.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/editor/DefaultTitleEditor.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/editor/DefaultValueAxisEditor.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/editor/PaletteChooserPanel.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/editor/PaletteSample.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/encoders/EncoderUtil.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/encoders/ImageEncoder.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/encoders/ImageFormat.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/entity/CategoryLabelEntity.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/entity/ChartEntity.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/entity/ContourEntity.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/entity/EntityCollection.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/entity/LegendItemEntity.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/entity/PieSectionEntity.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/entity/TickLabelEntity.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/entity/XYAnnotationEntity.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/entity/XYItemEntity.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/AnnotationChangeEvent.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/AnnotationChangeListener.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/AxisChangeEvent.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/AxisChangeListener.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/ChartChangeEvent.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/ChartChangeEventType.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/ChartChangeListener.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/ChartProgressEvent.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/ChartProgressListener.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/MarkerChangeEvent.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/MarkerChangeListener.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/OverlayChangeEvent.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/OverlayChangeListener.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/PlotChangeEvent.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/PlotChangeListener.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/RendererChangeEvent.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/RendererChangeListener.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/TitleChangeEvent.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/TitleChangeListener.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/demo/BarChartDemo1.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/demo/BarChartDemo1.java 2013-07-04 11:19:09 UTC (rev 2750) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/demo/BarChartDemo1.java 2013-07-04 11:27:32 UTC (rev 2751) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/demo/PieChartDemo1.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/demo/PieChartDemo1.java 2013-07-04 11:19:09 UTC (rev 2750) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/demo/PieChartDemo1.java 2013-07-04 11:27:32 UTC (rev 2751) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/demo/TimeSeriesChartDemo1.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/demo/TimeSeriesChartDemo1.java 2013-07-04 11:19:09 UTC (rev 2750) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/demo/TimeSeriesChartDemo1.java 2013-07-04 11:27:32 UTC (rev 2751) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/editor/ChartEditor.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/editor/ChartEditor.java 2013-07-04 11:19:09 UTC (rev 2750) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/editor/ChartEditor.java 2013-07-04 11:27:32 UTC (rev 2751) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/editor/ChartEditorFactory.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/editor/ChartEditorFactory.java 2013-07-04 11:19:09 UTC (rev 2750) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/editor/ChartEditorFactory.java 2013-07-04 11:27:32 UTC (rev 2751) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/editor/DefaultAxisEditor.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/editor/DefaultAxisEditor.java 2013-07-04 11:19:09 UTC (rev 2750) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/editor/DefaultAxisEditor.java 2013-07-04 11:27:32 UTC (rev 2751) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/editor/DefaultChartEditor.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/editor/DefaultChartEditor.java 2013-07-04 11:19:09 UTC (rev 2750) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/editor/DefaultChartEditor.java 2013-07-04 11:27:32 UTC (rev 2751) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/editor/DefaultChartEditorFactory.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/editor/DefaultChartEditorFactory.java 2013-07-04 11:19:09 UTC (rev 2750) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/editor/DefaultChartEditorFactory.java 2013-07-04 11:27:32 UTC (rev 2751) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/editor/DefaultColorBarEditor.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/editor/DefaultColorBarEditor.java 2013-07-04 11:19:09 UTC (rev 2750) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/editor/DefaultColorBarEditor.java 2013-07-04 11:27:32 UTC (rev 2751) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/editor/DefaultNumberAxisEditor.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/editor/DefaultNumberAxisEditor.java 2013-07-04 11:19:09 UTC (rev 2750) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/editor/DefaultNumberAxisEditor.java 2013-07-04 11:27:32 UTC (rev 2751) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/editor/DefaultPlotEditor.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/editor/DefaultPlotEditor.java 2013-07-04 11:19:09 UTC (rev 2750) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/editor/DefaultPlotEditor.java 2013-07-04 11:27:32 UTC (rev 2751) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/editor/DefaultPolarPlotEditor.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/editor/DefaultPolarPlotEditor.java 2013-07-04 11:19:09 UTC (rev 2750) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/editor/DefaultPolarPlotEditor.java 2013-07-04 11:27:32 UTC (rev 2751) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/editor/DefaultTitleEditor.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/editor/DefaultTitleEditor.java 2013-07-04 11:19:09 UTC (rev 2750) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/editor/DefaultTitleEditor.java 2013-07-04 11:27:32 UTC (rev 2751) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/editor/DefaultValueAxisEditor.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/editor/DefaultValueAxisEditor.java 2013-07-04 11:19:09 UTC (rev 2750) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/editor/DefaultValueAxisEditor.java 2013-07-04 11:27:32 UTC (rev 2751) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/editor/PaletteChooserPanel.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/editor/PaletteChooserPanel.java 2013-07-04 11:19:09 UTC (rev 2750) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/editor/PaletteChooserPanel.java 2013-07-04 11:27:32 UTC (rev 2751) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/editor/PaletteSample.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/editor/PaletteSample.java 2013-07-04 11:19:09 UTC (rev 2750) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/editor/PaletteSample.java 2013-07-04 11:27:32 UTC (rev 2751) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/encoders/EncoderUtil.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/encoders/EncoderUtil.java 2013-07-04 11:19:09 UTC (rev 2750) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/encoders/EncoderUtil.java 2013-07-04 11:27:32 UTC (rev 2751) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/encoders/ImageEncoder.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/encoders/ImageEncoder.java 2013-07-04 11:19:09 UTC (rev 2750) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/encoders/ImageEncoder.java 2013-07-04 11:27:32 UTC (rev 2751) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/encoders/ImageFormat.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/encoders/ImageFormat.java 2013-07-04 11:19:09 UTC (rev 2750) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/encoders/ImageFormat.java 2013-07-04 11:27:32 UTC (rev 2751) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/entity/CategoryLabelEntity.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/entity/CategoryLabelEntity.java 2013-07-04 11:19:09 UTC (rev 2750) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/entity/CategoryLabelEntity.java 2013-07-04 11:27:32 UTC (rev 2751) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/entity/ChartEntity.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/entity/ChartEntity.java 2013-07-04 11:19:09 UTC (rev 2750) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/entity/ChartEntity.java 2013-07-04 11:27:32 UTC (rev 2751) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/entity/ContourEntity.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/entity/ContourEntity.java 2013-07-04 11:19:09 UTC (rev 2750) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/entity/ContourEntity.java 2013-07-04 11:27:32 UTC (rev 2751) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/entity/EntityCollection.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/entity/EntityCollection.java 2013-07-04 11:19:09 UTC (rev 2750) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/entity/EntityCollection.java 2013-07-04 11:27:32 UTC (rev 2751) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/entity/LegendItemEntity.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/entity/LegendItemEntity.java 2013-07-04 11:19:09 UTC (rev 2750) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/entity/LegendItemEntity.java 2013-07-04 11:27:32 UTC (rev 2751) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/entity/PieSectionEntity.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/entity/PieSectionEntity.java 2013-07-04 11:19:09 UTC (rev 2750) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/entity/PieSectionEntity.java 2013-07-04 11:27:32 UTC (rev 2751) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/entity/TickLabelEntity.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/entity/TickLabelEntity.java 2013-07-04 11:19:09 UTC (rev 2750) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/entity/TickLabelEntity.java 2013-07-04 11:27:32 UTC (rev 2751) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/entity/XYAnnotationEntity.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/entity/XYAnnotationEntity.java 2013-07-04 11:19:09 UTC (rev 2750) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/entity/XYAnnotationEntity.java 2013-07-04 11:27:32 UTC (rev 2751) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/entity/XYItemEntity.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/entity/XYItemEntity.java 2013-07-04 11:19:09 UTC (rev 2750) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/entity/XYItemEntity.java 2013-07-04 11:27:32 UTC (rev 2751) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/AnnotationChangeEvent.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/AnnotationChangeEvent.java 2013-07-04 11:19:09 UTC (rev 2750) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/AnnotationChangeEvent.java 2013-07-04 11:27:32 UTC (rev 2751) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/AnnotationChangeListener.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/AnnotationChangeListener.java 2013-07-04 11:19:09 UTC (rev 2750) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/AnnotationChangeListener.java 2013-07-04 11:27:32 UTC (rev 2751) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/AxisChangeEvent.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/AxisChangeEvent.java 2013-07-04 11:19:09 UTC (rev 2750) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/AxisChangeEvent.java 2013-07-04 11:27:32 UTC (rev 2751) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/AxisChangeListener.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/AxisChangeListener.java 2013-07-04 11:19:09 UTC (rev 2750) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/AxisChangeListener.java 2013-07-04 11:27:32 UTC (rev 2751) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/ChartChangeEvent.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/ChartChangeEvent.java 2013-07-04 11:19:09 UTC (rev 2750) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/ChartChangeEvent.java 2013-07-04 11:27:32 UTC (rev 2751) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/ChartChangeEventType.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/ChartChangeEventType.java 2013-07-04 11:19:09 UTC (rev 2750) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/ChartChangeEventType.java 2013-07-04 11:27:32 UTC (rev 2751) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/ChartChangeListener.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/ChartChangeListener.java 2013-07-04 11:19:09 UTC (rev 2750) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/ChartChangeListener.java 2013-07-04 11:27:32 UTC (rev 2751) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/ChartProgressEvent.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/ChartProgressEvent.java 2013-07-04 11:19:09 UTC (rev 2750) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/ChartProgressEvent.java 2013-07-04 11:27:32 UTC (rev 2751) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/ChartProgressListener.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/ChartProgressListener.java 2013-07-04 11:19:09 UTC (rev 2750) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/ChartProgressListener.java 2013-07-04 11:27:32 UTC (rev 2751) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/MarkerChangeEvent.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/MarkerChangeEvent.java 2013-07-04 11:19:09 UTC (rev 2750) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/MarkerChangeEvent.java 2013-07-04 11:27:32 UTC (rev 2751) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/MarkerChangeListener.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/MarkerChangeListener.java 2013-07-04 11:19:09 UTC (rev 2750) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/MarkerChangeListener.java 2013-07-04 11:27:32 UTC (rev 2751) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/OverlayChangeEvent.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/OverlayChangeEvent.java 2013-07-04 11:19:09 UTC (rev 2750) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/OverlayChangeEvent.java 2013-07-04 11:27:32 UTC (rev 2751) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/OverlayChangeListener.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/OverlayChangeListener.java 2013-07-04 11:19:09 UTC (rev 2750) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/OverlayChangeListener.java 2013-07-04 11:27:32 UTC (rev 2751) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/PlotChangeEvent.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/PlotChangeEvent.java 2013-07-04 11:19:09 UTC (rev 2750) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/PlotChangeEvent.java 2013-07-04 11:27:32 UTC (rev 2751) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/PlotChangeListener.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/PlotChangeListener.java 2013-07-04 11:19:09 UTC (rev 2750) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/PlotChangeListener.java 2013-07-04 11:27:32 UTC (rev 2751) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/RendererChangeEvent.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/RendererChangeEvent.java 2013-07-04 11:19:09 UTC (rev 2750) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/RendererChangeEvent.java 2013-07-04 11:27:32 UTC (rev 2751) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/RendererChangeListener.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/RendererChangeListener.java 2013-07-04 11:19:09 UTC (rev 2750) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/RendererChangeListener.java 2013-07-04 11:27:32 UTC (rev 2751) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/TitleChangeEvent.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/TitleChangeEvent.java 2013-07-04 11:19:09 UTC (rev 2750) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/TitleChangeEvent.java 2013-07-04 11:27:32 UTC (rev 2751) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/TitleChangeListener.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/TitleChangeListener.java 2013-07-04 11:19:09 UTC (rev 2750) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/event/TitleChangeListener.java 2013-07-04 11:27:32 UTC (rev 2751) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mu...@us...> - 2013-07-04 11:46:33
|
Revision: 2755 http://sourceforge.net/p/jfreechart/code/2755 Author: mungady Date: 2013-07-04 11:46:30 +0000 (Thu, 04 Jul 2013) Log Message: ----------- Update copyright notice. Modified Paths: -------------- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/CategoryCrosshairState.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/ContourPlotUtilities.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/ContourValuePlot.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/CrosshairState.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/DatasetRenderingOrder.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/DefaultDrawingSupplier.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/DialShape.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/DrawingSupplier.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/GreyPalette.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/IntervalMarker.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/JThermometer.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/Pannable.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PieLabelDistributor.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PieLabelLinkStyle.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PieLabelRecord.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PiePlotState.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PlotOrientation.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PlotState.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PlotUtilities.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/RainbowPalette.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/SeriesRenderingOrder.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/ValueAxisPlot.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/ValueMarker.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/WaferMapPlot.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/XYCrosshairState.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/Zoomable.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/AbstractDialLayer.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/DialFrame.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/DialLayer.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/DialLayerChangeEvent.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/DialLayerChangeListener.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/DialScale.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/AreaRendererEndType.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/GrayPaintScale.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/NotOutlierException.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/Outlier.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/OutlierList.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/OutlierListCollection.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/PaintScale.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/PolarItemRenderer.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/RendererState.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/WaferMapRenderer.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/BarPainter.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/CategoryItemRenderer.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/CategoryItemRendererState.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/CategoryStepRenderer.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/DefaultCategoryItemRenderer.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/GradientBarPainter.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/IntervalBarRenderer.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/LayeredBarRenderer.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/LevelRenderer.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/LineAndShapeRenderer.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/ScatterRenderer.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/StackedAreaRenderer.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/StackedBarRenderer.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/StandardBarPainter.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/StatisticalBarRenderer.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/StatisticalLineAndShapeRenderer.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/CategoryCrosshairState.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/CategoryCrosshairState.java 2013-07-04 11:38:50 UTC (rev 2754) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/CategoryCrosshairState.java 2013-07-04 11:46:30 UTC (rev 2755) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/ContourPlotUtilities.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/ContourPlotUtilities.java 2013-07-04 11:38:50 UTC (rev 2754) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/ContourPlotUtilities.java 2013-07-04 11:46:30 UTC (rev 2755) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/ContourValuePlot.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/ContourValuePlot.java 2013-07-04 11:38:50 UTC (rev 2754) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/ContourValuePlot.java 2013-07-04 11:46:30 UTC (rev 2755) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/CrosshairState.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/CrosshairState.java 2013-07-04 11:38:50 UTC (rev 2754) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/CrosshairState.java 2013-07-04 11:46:30 UTC (rev 2755) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/DatasetRenderingOrder.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/DatasetRenderingOrder.java 2013-07-04 11:38:50 UTC (rev 2754) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/DatasetRenderingOrder.java 2013-07-04 11:46:30 UTC (rev 2755) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/DefaultDrawingSupplier.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/DefaultDrawingSupplier.java 2013-07-04 11:38:50 UTC (rev 2754) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/DefaultDrawingSupplier.java 2013-07-04 11:46:30 UTC (rev 2755) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/DialShape.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/DialShape.java 2013-07-04 11:38:50 UTC (rev 2754) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/DialShape.java 2013-07-04 11:46:30 UTC (rev 2755) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/DrawingSupplier.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/DrawingSupplier.java 2013-07-04 11:38:50 UTC (rev 2754) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/DrawingSupplier.java 2013-07-04 11:46:30 UTC (rev 2755) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/GreyPalette.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/GreyPalette.java 2013-07-04 11:38:50 UTC (rev 2754) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/GreyPalette.java 2013-07-04 11:46:30 UTC (rev 2755) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/IntervalMarker.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/IntervalMarker.java 2013-07-04 11:38:50 UTC (rev 2754) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/IntervalMarker.java 2013-07-04 11:46:30 UTC (rev 2755) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/JThermometer.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/JThermometer.java 2013-07-04 11:38:50 UTC (rev 2754) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/JThermometer.java 2013-07-04 11:46:30 UTC (rev 2755) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/Pannable.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/Pannable.java 2013-07-04 11:38:50 UTC (rev 2754) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/Pannable.java 2013-07-04 11:46:30 UTC (rev 2755) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PieLabelDistributor.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PieLabelDistributor.java 2013-07-04 11:38:50 UTC (rev 2754) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PieLabelDistributor.java 2013-07-04 11:46:30 UTC (rev 2755) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PieLabelLinkStyle.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PieLabelLinkStyle.java 2013-07-04 11:38:50 UTC (rev 2754) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PieLabelLinkStyle.java 2013-07-04 11:46:30 UTC (rev 2755) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PieLabelRecord.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PieLabelRecord.java 2013-07-04 11:38:50 UTC (rev 2754) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PieLabelRecord.java 2013-07-04 11:46:30 UTC (rev 2755) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PiePlotState.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PiePlotState.java 2013-07-04 11:38:50 UTC (rev 2754) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PiePlotState.java 2013-07-04 11:46:30 UTC (rev 2755) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PlotOrientation.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PlotOrientation.java 2013-07-04 11:38:50 UTC (rev 2754) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PlotOrientation.java 2013-07-04 11:46:30 UTC (rev 2755) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PlotState.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PlotState.java 2013-07-04 11:38:50 UTC (rev 2754) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PlotState.java 2013-07-04 11:46:30 UTC (rev 2755) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PlotUtilities.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PlotUtilities.java 2013-07-04 11:38:50 UTC (rev 2754) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PlotUtilities.java 2013-07-04 11:46:30 UTC (rev 2755) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/RainbowPalette.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/RainbowPalette.java 2013-07-04 11:38:50 UTC (rev 2754) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/RainbowPalette.java 2013-07-04 11:46:30 UTC (rev 2755) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/SeriesRenderingOrder.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/SeriesRenderingOrder.java 2013-07-04 11:38:50 UTC (rev 2754) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/SeriesRenderingOrder.java 2013-07-04 11:46:30 UTC (rev 2755) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/ValueAxisPlot.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/ValueAxisPlot.java 2013-07-04 11:38:50 UTC (rev 2754) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/ValueAxisPlot.java 2013-07-04 11:46:30 UTC (rev 2755) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/ValueMarker.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/ValueMarker.java 2013-07-04 11:38:50 UTC (rev 2754) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/ValueMarker.java 2013-07-04 11:46:30 UTC (rev 2755) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/WaferMapPlot.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/WaferMapPlot.java 2013-07-04 11:38:50 UTC (rev 2754) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/WaferMapPlot.java 2013-07-04 11:46:30 UTC (rev 2755) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/XYCrosshairState.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/XYCrosshairState.java 2013-07-04 11:38:50 UTC (rev 2754) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/XYCrosshairState.java 2013-07-04 11:46:30 UTC (rev 2755) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/Zoomable.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/Zoomable.java 2013-07-04 11:38:50 UTC (rev 2754) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/Zoomable.java 2013-07-04 11:46:30 UTC (rev 2755) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/AbstractDialLayer.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/AbstractDialLayer.java 2013-07-04 11:38:50 UTC (rev 2754) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/AbstractDialLayer.java 2013-07-04 11:46:30 UTC (rev 2755) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/DialFrame.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/DialFrame.java 2013-07-04 11:38:50 UTC (rev 2754) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/DialFrame.java 2013-07-04 11:46:30 UTC (rev 2755) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/DialLayer.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/DialLayer.java 2013-07-04 11:38:50 UTC (rev 2754) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/DialLayer.java 2013-07-04 11:46:30 UTC (rev 2755) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/DialLayerChangeEvent.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/DialLayerChangeEvent.java 2013-07-04 11:38:50 UTC (rev 2754) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/DialLayerChangeEvent.java 2013-07-04 11:46:30 UTC (rev 2755) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/DialLayerChangeListener.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/DialLayerChangeListener.java 2013-07-04 11:38:50 UTC (rev 2754) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/DialLayerChangeListener.java 2013-07-04 11:46:30 UTC (rev 2755) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/DialScale.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/DialScale.java 2013-07-04 11:38:50 UTC (rev 2754) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/DialScale.java 2013-07-04 11:46:30 UTC (rev 2755) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/AreaRendererEndType.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/AreaRendererEndType.java 2013-07-04 11:38:50 UTC (rev 2754) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/AreaRendererEndType.java 2013-07-04 11:46:30 UTC (rev 2755) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/GrayPaintScale.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/GrayPaintScale.java 2013-07-04 11:38:50 UTC (rev 2754) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/GrayPaintScale.java 2013-07-04 11:46:30 UTC (rev 2755) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/NotOutlierException.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/NotOutlierException.java 2013-07-04 11:38:50 UTC (rev 2754) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/NotOutlierException.java 2013-07-04 11:46:30 UTC (rev 2755) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/Outlier.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/Outlier.java 2013-07-04 11:38:50 UTC (rev 2754) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/Outlier.java 2013-07-04 11:46:30 UTC (rev 2755) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/OutlierList.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/OutlierList.java 2013-07-04 11:38:50 UTC (rev 2754) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/OutlierList.java 2013-07-04 11:46:30 UTC (rev 2755) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/OutlierListCollection.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/OutlierListCollection.java 2013-07-04 11:38:50 UTC (rev 2754) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/OutlierListCollection.java 2013-07-04 11:46:30 UTC (rev 2755) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/PaintScale.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/PaintScale.java 2013-07-04 11:38:50 UTC (rev 2754) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/PaintScale.java 2013-07-04 11:46:30 UTC (rev 2755) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/PolarItemRenderer.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/PolarItemRenderer.java 2013-07-04 11:38:50 UTC (rev 2754) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/PolarItemRenderer.java 2013-07-04 11:46:30 UTC (rev 2755) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/RendererState.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/RendererState.java 2013-07-04 11:38:50 UTC (rev 2754) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/RendererState.java 2013-07-04 11:46:30 UTC (rev 2755) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/WaferMapRenderer.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/WaferMapRenderer.java 2013-07-04 11:38:50 UTC (rev 2754) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/WaferMapRenderer.java 2013-07-04 11:46:30 UTC (rev 2755) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/BarPainter.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/BarPainter.java 2013-07-04 11:38:50 UTC (rev 2754) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/BarPainter.java 2013-07-04 11:46:30 UTC (rev 2755) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/CategoryItemRenderer.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/CategoryItemRenderer.java 2013-07-04 11:38:50 UTC (rev 2754) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/CategoryItemRenderer.java 2013-07-04 11:46:30 UTC (rev 2755) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/CategoryItemRendererState.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/CategoryItemRendererState.java 2013-07-04 11:38:50 UTC (rev 2754) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/CategoryItemRendererState.java 2013-07-04 11:46:30 UTC (rev 2755) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/CategoryStepRenderer.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/CategoryStepRenderer.java 2013-07-04 11:38:50 UTC (rev 2754) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/CategoryStepRenderer.java 2013-07-04 11:46:30 UTC (rev 2755) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/DefaultCategoryItemRenderer.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/DefaultCategoryItemRenderer.java 2013-07-04 11:38:50 UTC (rev 2754) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/DefaultCategoryItemRenderer.java 2013-07-04 11:46:30 UTC (rev 2755) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/GradientBarPainter.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/GradientBarPainter.java 2013-07-04 11:38:50 UTC (rev 2754) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/GradientBarPainter.java 2013-07-04 11:46:30 UTC (rev 2755) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/IntervalBarRenderer.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/IntervalBarRenderer.java 2013-07-04 11:38:50 UTC (rev 2754) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/IntervalBarRenderer.java 2013-07-04 11:46:30 UTC (rev 2755) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/LayeredBarRenderer.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/LayeredBarRenderer.java 2013-07-04 11:38:50 UTC (rev 2754) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/LayeredBarRenderer.java 2013-07-04 11:46:30 UTC (rev 2755) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/LevelRenderer.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/LevelRenderer.java 2013-07-04 11:38:50 UTC (rev 2754) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/LevelRenderer.java 2013-07-04 11:46:30 UTC (rev 2755) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/LineAndShapeRenderer.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/LineAndShapeRenderer.java 2013-07-04 11:38:50 UTC (rev 2754) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/LineAndShapeRenderer.java 2013-07-04 11:46:30 UTC (rev 2755) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/ScatterRenderer.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/ScatterRenderer.java 2013-07-04 11:38:50 UTC (rev 2754) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/ScatterRenderer.java 2013-07-04 11:46:30 UTC (rev 2755) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/StackedAreaRenderer.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/StackedAreaRenderer.java 2013-07-04 11:38:50 UTC (rev 2754) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/StackedAreaRenderer.java 2013-07-04 11:46:30 UTC (rev 2755) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/StackedBarRenderer.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/StackedBarRenderer.java 2013-07-04 11:38:50 UTC (rev 2754) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/StackedBarRenderer.java 2013-07-04 11:46:30 UTC (rev 2755) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/StandardBarPainter.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/StandardBarPainter.java 2013-07-04 11:38:50 UTC (rev 2754) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/StandardBarPainter.java 2013-07-04 11:46:30 UTC (rev 2755) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/StatisticalBarRenderer.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/StatisticalBarRenderer.java 2013-07-04 11:38:50 UTC (rev 2754) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/StatisticalBarRenderer.java 2013-07-04 11:46:30 UTC (rev 2755) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/StatisticalLineAndShapeRenderer.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/StatisticalLineAndShapeRenderer.java 2013-07-04 11:38:50 UTC (rev 2754) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/StatisticalLineAndShapeRenderer.java 2013-07-04 11:46:30 UTC (rev 2755) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mu...@us...> - 2013-09-12 15:17:29
|
Revision: 2914 http://sourceforge.net/p/jfreechart/code/2914 Author: mungady Date: 2013-09-12 15:17:26 +0000 (Thu, 12 Sep 2013) Log Message: ----------- 2013-09-12 David Gilbert <dav...@ob...> * org/jfree/chart/LocalizationBundle.properties (FILE_EXISTS_CONFIRM_OVERWRITE): New entry, (PDF_Files): Likewise, (SVG_Files): Likewise, * org/jfree/chart/ChartPanel.java (SAVE_AS_PNG_COMMAND): New field, (SAVE_AS_SVG_COMMAND): Likewise, (SAVE_AS_PDF_COMMAND): Likewise, (actionPerformed): Handle SVG and PDF options, (saveAsSVG): New private method, (generateSVG): New method, (createSVGGraphics2D): New private method, (saveAsPDF): Likewise, (isOrsonPDFAvailable): Likewise, (writeAsPDF): Likewise, (createPopupMenu): Add SVG and PDF options when available, * org/jfree/chart/plot/PiePlot.java (draw): Check for KEY_SUPPRESS_SHADOW_GENERATION rendering hint, * org/jfree/chart/plot/CategoryPlot.java (draw): Likewise, * org/jfree/chart/plot/XYPlot.java (draw): Likewise. Modified Paths: -------------- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartPanel.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LocalizationBundle.properties branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/CategoryPlot.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PiePlot.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/XYPlot.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 2013-09-12 15:16:57 UTC (rev 2913) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartPanel.java 2013-09-12 15:17:26 UTC (rev 2914) @@ -168,6 +168,8 @@ * 05-Jul-2012 : Remove reflection for MouseWheelListener - only needed for * JRE 1.3.1 (DG); * 02-Jul-2013 : Use ParamChecks class (DG); + * 12-Sep-2013 : Provide auto-detection for JFreeSVG and OrsonPDF + * libraries (no compile time dependencies) (DG); * */ @@ -204,11 +206,16 @@ import java.awt.print.Printable; import java.awt.print.PrinterException; import java.awt.print.PrinterJob; +import java.io.BufferedWriter; import java.io.File; +import java.io.FileWriter; import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.io.Serializable; +import java.lang.reflect.Constructor; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; import java.util.EventListener; import java.util.Iterator; import java.util.List; @@ -223,6 +230,7 @@ import javax.swing.SwingUtilities; import javax.swing.ToolTipManager; import javax.swing.event.EventListenerList; +import javax.swing.filechooser.FileNameExtensionFilter; import org.jfree.chart.editor.ChartEditor; import org.jfree.chart.editor.ChartEditorManager; @@ -243,7 +251,6 @@ import org.jfree.chart.util.ParamChecks; import org.jfree.chart.util.ResourceBundleWrapper; import org.jfree.io.SerialUtilities; -import org.jfree.ui.ExtensionFileFilter; /** * A Swing GUI component for displaying a {@link JFreeChart} object. @@ -301,6 +308,15 @@ /** Save action command. */ public static final String SAVE_COMMAND = "SAVE"; + /** Action command to save as PNG. */ + private static final String SAVE_AS_PNG_COMMAND = "SAVE_AS_PNG"; + + /** Action command to save as SVG. */ + private static final String SAVE_AS_SVG_COMMAND = "SAVE_AS_SVG"; + + /** Action command to save as PDF. */ + private static final String SAVE_AS_PDF_COMMAND = "SAVE_AS_PDF"; + /** Print action command. */ public static final String PRINT_COMMAND = "PRINT"; @@ -1371,6 +1387,7 @@ * * @since 1.0.13 */ + @Override public void overlayChanged(OverlayChangeEvent event) { repaint(); } @@ -1399,8 +1416,8 @@ * * @return A tool tip or <code>null</code> if no tooltip is available. */ + @Override public String getToolTipText(MouseEvent e) { - String result = null; if (this.info != null) { EntityCollection entities = this.info.getEntityCollection(); @@ -1415,7 +1432,6 @@ } } return result; - } /** @@ -1703,14 +1719,26 @@ else if (command.equals(COPY_COMMAND)) { doCopy(); } - else if (command.equals(SAVE_COMMAND)) { + else if (command.equals(SAVE_AS_PNG_COMMAND)) { try { doSaveAs(); } catch (IOException e) { - e.printStackTrace(); + JOptionPane.showMessageDialog(this, "I/O error occurred.", + "Save As PNG", JOptionPane.WARNING_MESSAGE); } } + else if (command.equals(SAVE_AS_SVG_COMMAND)) { + try { + saveAsSVG(null); + } catch (IOException e) { + JOptionPane.showMessageDialog(this, "I/O error occurred.", + "Save As SVG", JOptionPane.WARNING_MESSAGE); + } + } + else if (command.equals(SAVE_AS_PDF_COMMAND)) { + saveAsPDF(null); + } else if (command.equals(PRINT_COMMAND)) { createChartPrintJob(); } @@ -2670,12 +2698,12 @@ * @throws IOException if there is an I/O error. */ public void doSaveAs() throws IOException { - JFileChooser fileChooser = new JFileChooser(); fileChooser.setCurrentDirectory(this.defaultDirectoryForSaveAs); - ExtensionFileFilter filter = new ExtensionFileFilter( - localizationResources.getString("PNG_Image_Files"), ".png"); + FileNameExtensionFilter filter = new FileNameExtensionFilter( + localizationResources.getString("PNG_Image_Files"), "png"); fileChooser.addChoosableFileFilter(filter); + fileChooser.setFileFilter(filter); int option = fileChooser.showSaveDialog(this); if (option == JFileChooser.APPROVE_OPTION) { @@ -2688,14 +2716,241 @@ ChartUtilities.saveChartAsPNG(new File(filename), this.chart, getWidth(), getHeight()); } + } + + /** + * Saves the chart in SVG format (a filechooser will be displayed so that + * the user can specify the filename). Note that this method only works + * if the JFreeSVG library is on the classpath...if this library is not + * present, the method will fail. + */ + private void saveAsSVG(File f) throws IOException { + File file = f; + if (file == null) { + JFileChooser fileChooser = new JFileChooser(); + fileChooser.setCurrentDirectory(this.defaultDirectoryForSaveAs); + FileNameExtensionFilter filter = new FileNameExtensionFilter( + localizationResources.getString("SVG_Files"), "svg"); + fileChooser.addChoosableFileFilter(filter); + fileChooser.setFileFilter(filter); + int option = fileChooser.showSaveDialog(this); + if (option == JFileChooser.APPROVE_OPTION) { + String filename = fileChooser.getSelectedFile().getPath(); + if (isEnforceFileExtensions()) { + if (!filename.endsWith(".svg")) { + filename = filename + ".svg"; + } + } + file = new File(filename); + if (file.exists()) { + String fileExists = localizationResources.getString( + "FILE_EXISTS_CONFIRM_OVERWRITE"); + int response = JOptionPane.showConfirmDialog(this, + fileExists, "Save As SVG", + JOptionPane.OK_CANCEL_OPTION); + if (response == JOptionPane.CANCEL_OPTION) { + file = null; + } + } + } + } + + if (file != null) { + // use reflection to get the SVG string + String svg = generateSVG(getWidth(), getHeight()); + BufferedWriter writer = null; + try { + writer = new BufferedWriter(new FileWriter(file)); + writer.write("<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">\n"); + writer.write(svg + "\n"); + writer.flush(); + } finally { + try { + if (writer != null) { + writer.close(); + } + } catch (IOException ex) { + throw new RuntimeException(ex); + } + } + + } } + + /** + * Generates a string containing a rendering of the chart in SVG format. + * This feature is only supported if the JFreeSVG library is included on + * the classpath. + * + * @return A string containing an SVG element for the current chart, or + * <code>null</code> if there is a problem with the method invocation + * by reflection. + * + * @since 1.0.16 + */ + public String generateSVG(int width, int height) { + Graphics2D g2 = createSVGGraphics2D(width, height); + if (g2 == null) { + throw new IllegalStateException("JFreeSVG library is not present."); + } + // we suppress shadow generation, because SVG is a vector format and + // the shadow effect is applied via bitmap effects... + g2.setRenderingHint(JFreeChart.KEY_SUPPRESS_SHADOW_GENERATION, true); + String svg = null; + Rectangle2D drawArea = new Rectangle2D.Double(0, 0, width, height); + this.chart.draw(g2, drawArea); + try { + Method m = g2.getClass().getMethod("getSVGElement"); + svg = (String) m.invoke(g2); + } catch (NoSuchMethodException e) { + // null will be returned + } catch (SecurityException e) { + // null will be returned + } catch (IllegalAccessException e) { + // null will be returned + } catch (IllegalArgumentException e) { + // null will be returned + } catch (InvocationTargetException e) { + // null will be returned + } + return svg; + } + private Graphics2D createSVGGraphics2D(int w, int h) { + try { + Class svgGraphics2d = Class.forName("org.jfree.graphics2d.svg.SVGGraphics2D"); + Constructor ctor = svgGraphics2d.getConstructor(int.class, int.class); + return (Graphics2D) ctor.newInstance(w, h); + } catch (ClassNotFoundException ex) { + return null; + } catch (NoSuchMethodException ex) { + return null; + } catch (SecurityException ex) { + return null; + } catch (InstantiationException ex) { + return null; + } catch (IllegalAccessException ex) { + return null; + } catch (IllegalArgumentException ex) { + return null; + } catch (InvocationTargetException ex) { + return null; + } + } + /** + * Saves the chart in PDF format (a filechooser will be displayed so that + * the user can specify the filename). Note that this method only works + * if the OrsonPDF library is on the classpath...if this library is not + * present, the method will fail. + */ + private void saveAsPDF(File f) { + File file = f; + if (file == null) { + JFileChooser fileChooser = new JFileChooser(); + fileChooser.setCurrentDirectory(this.defaultDirectoryForSaveAs); + FileNameExtensionFilter filter = new FileNameExtensionFilter( + localizationResources.getString("PDF_Files"), "pdf"); + fileChooser.addChoosableFileFilter(filter); + fileChooser.setFileFilter(filter); + + int option = fileChooser.showSaveDialog(this); + if (option == JFileChooser.APPROVE_OPTION) { + String filename = fileChooser.getSelectedFile().getPath(); + if (isEnforceFileExtensions()) { + if (!filename.endsWith(".pdf")) { + filename = filename + ".pdf"; + } + } + file = new File(filename); + if (file.exists()) { + String fileExists = localizationResources.getString( + "FILE_EXISTS_CONFIRM_OVERWRITE"); + int response = JOptionPane.showConfirmDialog(this, + fileExists, "Save As PDF", + JOptionPane.OK_CANCEL_OPTION); + if (response == JOptionPane.CANCEL_OPTION) { + file = null; + } + } + } + } + + if (file != null) { + writeAsPDF(file, getWidth(), getHeight()); + } + } + + /** + * Returns <code>true</code> if OrsonPDF is on the classpath, and + * <code>false</code> otherwise. The OrsonPDF library can be found at + * http://www.object-refinery.com/pdf/ + * + * @return A boolean. + */ + private boolean isOrsonPDFAvailable() { + Class pdfDocumentClass = null; + try { + pdfDocumentClass = Class.forName("com.orsonpdf.PDFDocument"); + } catch (ClassNotFoundException e) { + // pdfDocument class will be null so the function will return false + } + return (pdfDocumentClass != null); + } + + /** + * Writes the current chart to the specified file in PDF format. This + * will only work when the OrsonPDF library is found on the classpath. + * Reflection is used to ensure there is no compile-time dependency on + * OrsonPDF (which is non-free software). + * + * @param file the output file (<code>null</code> not permitted). + * @param w the chart width. + * @param h the chart height. + */ + private void writeAsPDF(File file, int w, int h) { + if (!isOrsonPDFAvailable()) { + throw new IllegalStateException( + "OrsonPDF is not present on the classpath."); + } + ParamChecks.nullNotPermitted(file, "file"); + try { + Class pdfDocClass = Class.forName("com.orsonpdf.PDFDocument"); + Object pdfDoc = pdfDocClass.newInstance(); + Method m = pdfDocClass.getMethod("createPage", Rectangle2D.class); + Rectangle2D rect = new Rectangle(w, h); + Object page = m.invoke(pdfDoc, rect); + Method m2 = page.getClass().getMethod("getGraphics2D"); + Graphics2D g2 = (Graphics2D) m2.invoke(page); + // we suppress shadow generation, because PDF is a vector format and + // the shadow effect is applied via bitmap effects... + g2.setRenderingHint(JFreeChart.KEY_SUPPRESS_SHADOW_GENERATION, true); + Rectangle2D drawArea = new Rectangle2D.Double(0, 0, w, h); + this.chart.draw(g2, drawArea); + Method m3 = pdfDocClass.getMethod("writeToFile", File.class); + m3.invoke(pdfDoc, file); + } catch (ClassNotFoundException ex) { + throw new RuntimeException(ex); + } catch (InstantiationException ex) { + throw new RuntimeException(ex); + } catch (IllegalAccessException ex) { + throw new RuntimeException(ex); + } catch (NoSuchMethodException ex) { + throw new RuntimeException(ex); + } catch (SecurityException ex) { + throw new RuntimeException(ex); + } catch (IllegalArgumentException ex) { + throw new RuntimeException(ex); + } catch (InvocationTargetException ex) { + throw new RuntimeException(ex); + } + } + + /** * Creates a print job for the chart. */ public void createChartPrintJob() { - PrinterJob job = PrinterJob.getPrinterJob(); PageFormat pf = job.defaultPage(); PageFormat pf2 = job.pageDialog(pf); @@ -2710,7 +2965,6 @@ } } } - } /** @@ -2836,11 +3090,26 @@ if (separator) { result.addSeparator(); } - JMenuItem saveItem = new JMenuItem( - localizationResources.getString("Save_as...")); - saveItem.setActionCommand(SAVE_COMMAND); - saveItem.addActionListener(this); - result.add(saveItem); + JMenu saveSubMenu = new JMenu("Save as"); + JMenuItem pngItem = new JMenuItem("PNG..."); + pngItem.setActionCommand("SAVE_AS_PNG"); + pngItem.addActionListener(this); + saveSubMenu.add(pngItem); + + if (createSVGGraphics2D(10, 10) != null) { + JMenuItem svgItem = new JMenuItem("SVG..."); + svgItem.setActionCommand("SAVE_AS_SVG"); + svgItem.addActionListener(this); + saveSubMenu.add(svgItem); + } + + if (isOrsonPDFAvailable()) { + JMenuItem pdfItem = new JMenuItem("PDF..."); + pdfItem.setActionCommand("SAVE_AS_PDF"); + pdfItem.addActionListener(this); + saveSubMenu.add(pdfItem); + } + result.add(saveSubMenu); separator = true; } Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LocalizationBundle.properties =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LocalizationBundle.properties 2013-09-12 15:16:57 UTC (rev 2913) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LocalizationBundle.properties 2013-09-12 15:17:26 UTC (rev 2914) @@ -11,10 +11,13 @@ Chart_Properties=Chart Properties Copy=Copy Domain_Axis=Domain Axis +FILE_EXISTS_CONFIRM_OVERWRITE=The file already exists, are you sure you want to overwrite it? PNG_Image_Files=PNG Image Files +PDF_Files=PDF Files Print...=Print... Properties...=Properties... +Range_Axis=Range Axis Save_as...=Save as... -Range_Axis=Range Axis +SVG_Files=SVG Files Zoom_In=Zoom In Zoom_Out=Zoom Out 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 2013-09-12 15:16:57 UTC (rev 2913) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/CategoryPlot.java 2013-09-12 15:17:26 UTC (rev 2914) @@ -179,6 +179,7 @@ * 18-Oct-2011 : Fixed tooltip offset with shadow generator (DG); * 20-Nov-2011 : Initialise shadow generator as null (DG); * 02-Jul-2013 : Use ParamChecks (DG); + * 12-Sep-2013 : Check for KEY_SUPPRESS_SHADOW_GENERATION rendering hint (DG); * */ @@ -213,6 +214,7 @@ import java.util.ResourceBundle; import java.util.Set; import java.util.TreeMap; +import org.jfree.chart.JFreeChart; import org.jfree.chart.LegendItemCollection; import org.jfree.chart.annotations.Annotation; import org.jfree.chart.annotations.CategoryAnnotation; @@ -670,6 +672,7 @@ * * @return The type. */ + @Override public String getPlotType() { return localizationResources.getString("Category_Plot"); } @@ -681,6 +684,7 @@ * * @see #setOrientation(PlotOrientation) */ + @Override public PlotOrientation getOrientation() { return this.orientation; } @@ -960,7 +964,7 @@ * @return The edge (never <code>null</code>). */ public RectangleEdge getDomainAxisEdge(int index) { - RectangleEdge result = null; + RectangleEdge result; AxisLocation location = getDomainAxisLocation(index); if (location != null) { result = Plot.resolveDomainAxisLocation(location, this.orientation); @@ -1459,7 +1463,7 @@ if (index < 0) { throw new IllegalArgumentException("Negative 'index'."); } - CategoryAxis axis = null; + CategoryAxis axis; List axisIndices = (List) this.datasetToDomainAxesMap.get( new Integer(index)); if (axisIndices != null) { @@ -2183,6 +2187,7 @@ * * @return The legend items. */ + @Override public LegendItemCollection getLegendItems() { if (this.fixedLegendItems != null) { return this.fixedLegendItems; @@ -2210,6 +2215,7 @@ * @param info information about the plot's dimensions. * */ + @Override public void handleClick(int x, int y, PlotRenderingInfo info) { Rectangle2D dataArea = info.getDataArea(); @@ -2241,6 +2247,7 @@ * * @param percent the zoom amount. */ + @Override public void zoom(double percent) { if (percent > 0.0) { @@ -2263,6 +2270,7 @@ * * @since 1.0.14 */ + @Override public void annotationChanged(AnnotationChangeEvent event) { if (getParent() != null) { getParent().annotationChanged(event); @@ -2280,6 +2288,7 @@ * * @param event information about the event (not used here). */ + @Override public void datasetChanged(DatasetChangeEvent event) { int count = this.rangeAxes.size(); @@ -3506,6 +3515,7 @@ * @param state collects info as the chart is drawn (possibly * <code>null</code>). */ + @Override public void draw(Graphics2D g2, Rectangle2D area, Point2D anchor, PlotState parentState, PlotRenderingInfo state) { @@ -3605,7 +3615,9 @@ Graphics2D savedG2 = g2; BufferedImage dataImage = null; - if (this.shadowGenerator != null) { + boolean suppressShadow = Boolean.TRUE.equals(g2.getRenderingHint( + JFreeChart.KEY_SUPPRESS_SHADOW_GENERATION)); + if (this.shadowGenerator != null && !suppressShadow) { dataImage = new BufferedImage((int) dataArea.getWidth(), (int)dataArea.getHeight(), BufferedImage.TYPE_INT_ARGB); g2 = dataImage.createGraphics(); @@ -3653,7 +3665,7 @@ // draw the annotations (if any)... drawAnnotations(g2, dataArea); - if (this.shadowGenerator != null) { + if (this.shadowGenerator != null && !suppressShadow) { BufferedImage shadowImage = this.shadowGenerator.createDropShadow( dataImage); g2 = savedG2; @@ -3730,6 +3742,7 @@ * @param g2 the graphics device. * @param area the area within which the plot should be drawn. */ + @Override public void drawBackground(Graphics2D g2, Rectangle2D area) { fillBackground(g2, area, this.orientation); drawBackgroundImage(g2, area); @@ -3968,7 +3981,7 @@ Stroke gridStroke = null; Paint gridPaint = null; - boolean paintLine = false; + boolean paintLine; Iterator iterator = ticks.iterator(); while (iterator.hasNext()) { paintLine = false; @@ -4167,7 +4180,7 @@ CategoryDataset dataset = getDataset(datasetIndex); CategoryAxis axis = getDomainAxisForDataset(datasetIndex); CategoryItemRenderer renderer = getRenderer(datasetIndex); - Line2D line = null; + Line2D line; if (orientation == PlotOrientation.VERTICAL) { double xx = renderer.getItemMiddle(rowKey, columnKey, dataset, axis, dataArea, RectangleEdge.BOTTOM); @@ -4209,7 +4222,7 @@ if (!axis.getRange().contains(value)) { return; } - Line2D line = null; + Line2D line; if (orientation == PlotOrientation.HORIZONTAL) { double xx = axis.valueToJava2D(value, dataArea, RectangleEdge.BOTTOM); @@ -4237,6 +4250,7 @@ * * @return The data range. */ + @Override public Range getDataRange(ValueAxis axis) { Range result = null; @@ -4512,6 +4526,7 @@ * * @since 1.0.13 */ + @Override public boolean isDomainPannable() { return false; } @@ -4527,6 +4542,7 @@ * * @since 1.0.13 */ + @Override public boolean isRangePannable() { return this.rangePannable; } @@ -4554,6 +4570,7 @@ * * @since 1.0.13 */ + @Override public void panDomainAxes(double percent, PlotRenderingInfo info, Point2D source) { // do nothing, because the plot is not pannable along the domain axes @@ -4568,6 +4585,7 @@ * * @since 1.0.13 */ + @Override public void panRangeAxes(double percent, PlotRenderingInfo info, Point2D source) { if (!isRangePannable()) { @@ -4597,6 +4615,7 @@ * * @see #isRangeZoomable() */ + @Override public boolean isDomainZoomable() { return false; } @@ -4608,6 +4627,7 @@ * * @see #isDomainZoomable() */ + @Override public boolean isRangeZoomable() { return true; } @@ -4620,6 +4640,7 @@ * @param state the plot state. * @param source the source point (in Java2D space) for the zoom. */ + @Override public void zoomDomainAxes(double factor, PlotRenderingInfo state, Point2D source) { // can't zoom domain axis @@ -4634,6 +4655,7 @@ * @param state the plot state. * @param source the source point (in Java2D space) for the zoom. */ + @Override public void zoomDomainAxes(double lowerPercent, double upperPercent, PlotRenderingInfo state, Point2D source) { // can't zoom domain axis @@ -4652,6 +4674,7 @@ * * @since 1.0.7 */ + @Override public void zoomDomainAxes(double factor, PlotRenderingInfo info, Point2D source, boolean useAnchor) { // can't zoom domain axis @@ -4664,6 +4687,7 @@ * @param state the plot state. * @param source the source point (in Java2D space) for the zoom. */ + @Override public void zoomRangeAxes(double factor, PlotRenderingInfo state, Point2D source) { // delegate to other method @@ -4683,6 +4707,7 @@ * * @since 1.0.7 */ + @Override public void zoomRangeAxes(double factor, PlotRenderingInfo info, Point2D source, boolean useAnchor) { @@ -4716,6 +4741,7 @@ * @param state the plot state. * @param source the source point (in Java2D space) for the zoom. */ + @Override public void zoomRangeAxes(double lowerPercent, double upperPercent, PlotRenderingInfo state, Point2D source) { for (int i = 0; i < this.rangeAxes.size(); i++) { @@ -4772,6 +4798,7 @@ * * @return A boolean. */ + @Override public boolean equals(Object obj) { if (obj == this) { return true; @@ -4960,6 +4987,7 @@ * * @throws CloneNotSupportedException if the cloning is not supported. */ + @Override public Object clone() throws CloneNotSupportedException { CategoryPlot clone = (CategoryPlot) super.clone(); Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PiePlot.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PiePlot.java 2013-09-12 15:16:57 UTC (rev 2913) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PiePlot.java 2013-09-12 15:17:26 UTC (rev 2914) @@ -169,6 +169,7 @@ * 20-Nov-2011 : Initialise shadow generator as null (DG); * 01-Jul-2012 : General label once only in drawSimpleLabels() (DG); * 02-Jul-2013 : Use ParamChecks (DG); + * 12-Sep-2013 : Check for KEY_SUPPRESS_SHADOW_GENERATION rendering hint (DG); * */ @@ -202,6 +203,7 @@ import java.util.Map; import java.util.ResourceBundle; import java.util.TreeMap; +import org.jfree.chart.JFreeChart; import org.jfree.chart.LegendItem; import org.jfree.chart.LegendItemCollection; @@ -2394,6 +2396,7 @@ * @param info collects info about the drawing * (<code>null</code> permitted). */ + @Override public void draw(Graphics2D g2, Rectangle2D area, Point2D anchor, PlotState parentState, PlotRenderingInfo info) { @@ -2418,8 +2421,10 @@ if (!DatasetUtilities.isEmptyOrNull(this.dataset)) { Graphics2D savedG2 = g2; + boolean suppressShadow = Boolean.TRUE.equals(g2.getRenderingHint( + JFreeChart.KEY_SUPPRESS_SHADOW_GENERATION)); BufferedImage dataImage = null; - if (this.shadowGenerator != null) { + if (this.shadowGenerator != null && !suppressShadow) { dataImage = new BufferedImage((int) area.getWidth(), (int) area.getHeight(), BufferedImage.TYPE_INT_ARGB); g2 = dataImage.createGraphics(); @@ -2427,8 +2432,9 @@ g2.setRenderingHints(savedG2.getRenderingHints()); } drawPie(g2, area, info); - if (this.shadowGenerator != null) { - BufferedImage shadowImage = this.shadowGenerator.createDropShadow(dataImage); + if (this.shadowGenerator != null && !suppressShadow) { + BufferedImage shadowImage + = this.shadowGenerator.createDropShadow(dataImage); g2 = savedG2; g2.drawImage(shadowImage, (int) area.getX() + this.shadowGenerator.calculateOffsetX(), @@ -2967,6 +2973,7 @@ * * @return The legend items (never <code>null</code>). */ + @Override public LegendItemCollection getLegendItems() { LegendItemCollection result = new LegendItemCollection(); @@ -3269,6 +3276,7 @@ * * @return <code>true</code> or <code>false</code>. */ + @Override public boolean equals(Object obj) { if (obj == this) { return true; @@ -3461,6 +3469,7 @@ * @throws CloneNotSupportedException if some component of the plot does * not support cloning. */ + @Override public Object clone() throws CloneNotSupportedException { PiePlot clone = (PiePlot) super.clone(); if (clone.dataset != null) { 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 2013-09-12 15:16:57 UTC (rev 2913) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/XYPlot.java 2013-09-12 15:17:26 UTC (rev 2914) @@ -227,6 +227,7 @@ * 06-Jul-2009 : Fix for cloning of renderers - see bug 2817504 (DG) * 10-Jul-2009 : Added optional drop shadow generator (DG); * 18-Oct-2011 : Fix tooltip offset with shadow renderer (DG); + * 12-Sep-2013 : Check for KEY_SUPPRESS_SHADOW_GENERATION rendering hint (DG); * */ @@ -260,6 +261,7 @@ import java.util.ResourceBundle; import java.util.Set; import java.util.TreeMap; +import org.jfree.chart.JFreeChart; import org.jfree.chart.LegendItem; import org.jfree.chart.LegendItemCollection; @@ -3035,9 +3037,8 @@ * * @return The required space. */ - protected AxisSpace calculateDomainAxisSpace(Graphics2D g2, - Rectangle2D plotArea, - AxisSpace space) { + protected AxisSpace calculateDomainAxisSpace(Graphics2D g2, + Rectangle2D plotArea, AxisSpace space) { if (space == null) { space = new AxisSpace(); @@ -3082,9 +3083,8 @@ * * @return The required space. */ - protected AxisSpace calculateRangeAxisSpace(Graphics2D g2, - Rectangle2D plotArea, - AxisSpace space) { + protected AxisSpace calculateRangeAxisSpace(Graphics2D g2, + Rectangle2D plotArea, AxisSpace space) { if (space == null) { space = new AxisSpace(); @@ -3146,6 +3146,7 @@ * @param info collects chart drawing information (<code>null</code> * permitted). */ + @Override public void draw(Graphics2D g2, Rectangle2D area, Point2D anchor, PlotState parentState, PlotRenderingInfo info) { @@ -3265,7 +3266,9 @@ Graphics2D savedG2 = g2; BufferedImage dataImage = null; - if (this.shadowGenerator != null) { + boolean suppressShadow = Boolean.TRUE.equals(g2.getRenderingHint( + JFreeChart.KEY_SUPPRESS_SHADOW_GENERATION)); + if (this.shadowGenerator != null && !suppressShadow) { dataImage = new BufferedImage((int) dataArea.getWidth(), (int)dataArea.getHeight(), BufferedImage.TYPE_INT_ARGB); g2 = dataImage.createGraphics(); @@ -3409,7 +3412,7 @@ } drawAnnotations(g2, dataArea, info); - if (this.shadowGenerator != null) { + if (this.shadowGenerator != null && !suppressShadow) { BufferedImage shadowImage = this.shadowGenerator.createDropShadow(dataImage); g2 = savedG2; @@ -3433,6 +3436,7 @@ * @param g2 the graphics device. * @param area the area. */ + @Override public void drawBackground(Graphics2D g2, Rectangle2D area) { fillBackground(g2, area, this.orientation); drawQuadrants(g2, area); @@ -4309,6 +4313,7 @@ * @param y the y-coordinate, where the click occurred, in Java2D space. * @param info object containing information about the plot dimensions. */ + @Override public void handleClick(int x, int y, PlotRenderingInfo info) { Rectangle2D dataArea = info.getDataArea(); @@ -4438,6 +4443,7 @@ * * @return The range. */ + @Override public Range getDataRange(ValueAxis axis) { Range result = null; @@ -4546,6 +4552,7 @@ * * @since 1.0.14 */ + @Override public void annotationChanged(AnnotationChangeEvent event) { if (getParent() != null) { getParent().annotationChanged(event); @@ -4563,6 +4570,7 @@ * * @param event information about the event (not used here). */ + @Override public void datasetChanged(DatasetChangeEvent event) { configureDomainAxes(); configureRangeAxes(); @@ -4581,6 +4589,7 @@ * * @param event the event. */ + @Override public void rendererChanged(RendererChangeEvent event) { // if the event was caused by a change to series visibility, then // the axis ranges might need updating... @@ -4984,6 +4993,7 @@ * * @since 1.0.13 */ + @Override public boolean isDomainPannable() { return this.domainPannable; } @@ -5008,6 +5018,7 @@ * * @since 1.0.13 */ + @Override public boolean isRangePannable() { return this.rangePannable; } @@ -5033,6 +5044,7 @@ * * @since 1.0.13 */ + @Override public void panDomainAxes(double percent, PlotRenderingInfo info, Point2D source) { if (!isDomainPannable()) { @@ -5087,6 +5099,7 @@ * * @see #zoomRangeAxes(double, PlotRenderingInfo, Point2D) */ + @Override public void zoomDomainAxes(double factor, PlotRenderingInfo info, Point2D source) { // delegate to other method @@ -5105,6 +5118,7 @@ * * @since 1.0.7 */ + @Override public void zoomDomainAxes(double factor, PlotRenderingInfo info, Point2D source, boolean useAnchor) { @@ -5144,6 +5158,7 @@ * * @see #zoomRangeAxes(double, double, PlotRenderingInfo, Point2D) */ + @Override public void zoomDomainAxes(double lowerPercent, double upperPercent, PlotRenderingInfo info, Point2D source) { for (int i = 0; i < this.domainAxes.size(); i++) { @@ -5163,6 +5178,7 @@ * * @see #zoomDomainAxes(double, PlotRenderingInfo, Point2D, boolean) */ + @Override public void zoomRangeAxes(double factor, PlotRenderingInfo info, Point2D source) { // delegate to other method @@ -5182,6 +5198,7 @@ * * @since 1.0.7 */ + @Override public void zoomRangeAxes(double factor, PlotRenderingInfo info, Point2D source, boolean useAnchor) { @@ -5217,6 +5234,7 @@ * * @see #zoomDomainAxes(double, double, PlotRenderingInfo, Point2D) */ + @Override public void zoomRangeAxes(double lowerPercent, double upperPercent, PlotRenderingInfo info, Point2D source) { for (int i = 0; i < this.rangeAxes.size(); i++) { @@ -5235,6 +5253,7 @@ * * @see #isRangeZoomable() */ + @Override public boolean isDomainZoomable() { return true; } @@ -5247,6 +5266,7 @@ * * @see #isDomainZoomable() */ + @Override public boolean isRangeZoomable() { return true; } @@ -5298,6 +5318,7 @@ * * @return The legend items. */ + @Override public LegendItemCollection getLegendItems() { if (this.fixedLegendItems != null) { return this.fixedLegendItems; @@ -5336,6 +5357,7 @@ * * @return <code>true</code> or <code>false</code>. */ + @Override public boolean equals(Object obj) { if (obj == this) { return true; @@ -5551,6 +5573,7 @@ * @throws CloneNotSupportedException this can occur if some component of * the plot cannot be cloned. */ + @Override public Object clone() throws CloneNotSupportedException { XYPlot clone = (XYPlot) super.clone(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mu...@us...> - 2013-11-21 15:41:11
|
Revision: 2973 http://sourceforge.net/p/jfreechart/code/2973 Author: mungady Date: 2013-11-21 15:41:08 +0000 (Thu, 21 Nov 2013) Log Message: ----------- Added @Override tags. Modified Paths: -------------- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartRenderingInfo.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartTransferable.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ClipPath.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LegendItem.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LegendItemCollection.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LegendRenderingOrder.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/MouseWheelHandler.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/PaintMap.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/PolarChartPanel.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/StandardChartTheme.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/StrokeMap.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartRenderingInfo.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartRenderingInfo.java 2013-11-21 11:57:19 UTC (rev 2972) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartRenderingInfo.java 2013-11-21 15:41:08 UTC (rev 2973) @@ -27,7 +27,7 @@ * ----------------------- * ChartRenderingInfo.java * ----------------------- - * (C) Copyright 2002-2008, by Object Refinery Limited. + * (C) Copyright 2002-2013, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -187,6 +187,7 @@ * * @return A boolean. */ + @Override public boolean equals(Object obj) { if (obj == this) { return true; @@ -214,6 +215,7 @@ * * @throws CloneNotSupportedException if the object cannot be cloned. */ + @Override public Object clone() throws CloneNotSupportedException { ChartRenderingInfo clone = (ChartRenderingInfo) super.clone(); if (this.chartArea != null) { Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartTransferable.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartTransferable.java 2013-11-21 11:57:19 UTC (rev 2972) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartTransferable.java 2013-11-21 15:41:08 UTC (rev 2973) @@ -24,10 +24,10 @@ * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. * Other names may be trademarks of their respective owners.] * - * ------------------- - * ChartSelection.java - * ------------------- - * (C) Copyright 2009, by Object Refinery Limited. + * ---------------------- + * ChartTransferable.java + * ---------------------- + * (C) Copyright 2009-2013, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -172,6 +172,7 @@ * * @return The data flavors supported. */ + @Override public DataFlavor[] getTransferDataFlavors() { return new DataFlavor[] {this.imageFlavor}; } @@ -183,6 +184,7 @@ * * @return A boolean. */ + @Override public boolean isDataFlavorSupported(DataFlavor flavor) { return this.imageFlavor.equals(flavor); } @@ -197,6 +199,7 @@ * @throws java.awt.datatransfer.UnsupportedFlavorException * @throws java.io.IOException */ + @Override public Object getTransferData(DataFlavor flavor) throws UnsupportedFlavorException, IOException { Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ClipPath.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ClipPath.java 2013-11-21 11:57:19 UTC (rev 2972) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ClipPath.java 2013-11-21 15:41:08 UTC (rev 2973) @@ -27,7 +27,7 @@ * ------------- * ClipPath.java * ------------- - * (C) Copyright 2003-2008, by David M. O'Donnell and Contributors. + * (C) Copyright 2003-2013, by David M. O'Donnell and Contributors. * * Original Author: David M. O'Donnell; * Contributor(s): David Gilbert (for Object Refinery Limited); @@ -429,6 +429,7 @@ * * @throws CloneNotSupportedException if cloning is not supported. */ + @Override public Object clone() throws CloneNotSupportedException { ClipPath clone = (ClipPath) super.clone(); clone.xValue = (double[]) this.xValue.clone(); Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LegendItem.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LegendItem.java 2013-11-21 11:57:19 UTC (rev 2972) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LegendItem.java 2013-11-21 15:41:08 UTC (rev 2973) @@ -1002,6 +1002,7 @@ * * @return A boolean. */ + @Override public boolean equals(Object obj) { if (obj == this) { return true; @@ -1083,6 +1084,7 @@ * * @since 1.0.10 */ + @Override public Object clone() throws CloneNotSupportedException { LegendItem clone = (LegendItem) super.clone(); if (this.seriesKey instanceof PublicCloneable) { Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LegendItemCollection.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LegendItemCollection.java 2013-11-21 11:57:19 UTC (rev 2972) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LegendItemCollection.java 2013-11-21 15:41:08 UTC (rev 2973) @@ -27,7 +27,7 @@ * ------------------------- * LegendItemCollection.java * ------------------------- - * (C) Copyright 2002-2009, by Object Refinery Limited. + * (C) Copyright 2002-2013, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -124,6 +124,7 @@ * * @return A boolean. */ + @Override public boolean equals(Object obj) { if (obj == this) { return true; @@ -146,6 +147,7 @@ * @throws CloneNotSupportedException if an item in the collection is not * cloneable. */ + @Override public Object clone() throws CloneNotSupportedException { LegendItemCollection clone = (LegendItemCollection) super.clone(); clone.items = (List) ObjectUtilities.deepClone(this.items); Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LegendRenderingOrder.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LegendRenderingOrder.java 2013-11-21 11:57:19 UTC (rev 2972) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LegendRenderingOrder.java 2013-11-21 15:41:08 UTC (rev 2973) @@ -27,10 +27,10 @@ * ------------------------- * LegendRenderingOrder.java * ------------------------- - * (C) Copyright 2004-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2004-2013, by Object Refinery Limited and Contributors. * * Original Author: Angel; - * Contributor(s): -; + * Contributor(s): David Gilbert (for Object Refinery Limited); * * Changes * ------- @@ -76,6 +76,7 @@ * * @return The string. */ + @Override public String toString() { return this.name; } @@ -88,6 +89,7 @@ * * @return A boolean. */ + @Override public boolean equals(Object obj) { if (this == obj) { return true; Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/MouseWheelHandler.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/MouseWheelHandler.java 2013-11-21 11:57:19 UTC (rev 2972) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/MouseWheelHandler.java 2013-11-21 15:41:08 UTC (rev 2973) @@ -27,7 +27,7 @@ * ---------------------- * MouseWheelHandler.java * ---------------------- - * (C) Copyright 2009 by Object Refinery Limited and Contributors. + * (C) Copyright 2009-2013 by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): Ulrich Voigt - patch 2686040; @@ -109,6 +109,7 @@ * * @param e the event. */ + @Override public void mouseWheelMoved(MouseWheelEvent e) { JFreeChart chart = this.chartPanel.getChart(); if (chart == null) { Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/PaintMap.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/PaintMap.java 2013-11-21 11:57:19 UTC (rev 2972) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/PaintMap.java 2013-11-21 15:41:08 UTC (rev 2973) @@ -140,6 +140,7 @@ * * @return A boolean. */ + @Override public boolean equals(Object obj) { if (obj == this) { return true; @@ -171,6 +172,7 @@ * * @throws CloneNotSupportedException if any key is not cloneable. */ + @Override public Object clone() throws CloneNotSupportedException { // TODO: I think we need to make sure the keys are actually cloned, // whereas the paint instances are always immutable so they're OK Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/PolarChartPanel.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/PolarChartPanel.java 2013-11-21 11:57:19 UTC (rev 2972) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/PolarChartPanel.java 2013-11-21 15:41:08 UTC (rev 2973) @@ -27,7 +27,7 @@ * -------------------- * PolarChartPanel.java * -------------------- - * (C) Copyright 2004-2008, by Solution Engineering, Inc. and Contributors. + * (C) Copyright 2004-2013, by Solution Engineering, Inc. and Contributors. * * Original Author: Daniel Bridenbecker, Solution Engineering, Inc.; * Contributor(s): David Gilbert (for Object Refinery Limited); @@ -124,6 +124,7 @@ * * @param chart The chart. */ + @Override public void setChart(JFreeChart chart) { checkChart(chart); super.setChart(chart); @@ -139,10 +140,9 @@ * * @return The popup menu. */ - protected JPopupMenu createPopupMenu(boolean properties, - boolean save, - boolean print, - boolean zoom) { + @Override + protected JPopupMenu createPopupMenu(boolean properties, boolean save, + boolean print, boolean zoom) { JPopupMenu result = super.createPopupMenu(properties, save, print, zoom); int zoomInIndex = getPopupMenuItem(result, @@ -197,6 +197,7 @@ * * @param event the event. */ + @Override public void actionPerformed(ActionEvent event) { String command = event.getActionCommand(); Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/StandardChartTheme.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/StandardChartTheme.java 2013-11-21 11:57:19 UTC (rev 2972) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/StandardChartTheme.java 2013-11-21 15:41:08 UTC (rev 2973) @@ -303,6 +303,7 @@ */ public static ChartTheme createLegacyTheme() { StandardChartTheme theme = new StandardChartTheme("Legacy") { + @Override public void apply(JFreeChart chart) { // do nothing at all } @@ -1097,6 +1098,7 @@ * * @param chart the chart (<code>null</code> not permitted). */ + @Override public void apply(JFreeChart chart) { ParamChecks.nullNotPermitted(chart, "chart"); TextTitle title = chart.getTitle(); @@ -1650,6 +1652,7 @@ * * @return A boolean. */ + @Override public boolean equals(Object obj) { if (obj == this) { return true; @@ -1770,6 +1773,7 @@ * * @throws CloneNotSupportedException if the theme cannot be cloned. */ + @Override public Object clone() throws CloneNotSupportedException { return super.clone(); } Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/StrokeMap.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/StrokeMap.java 2013-11-21 11:57:19 UTC (rev 2972) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/StrokeMap.java 2013-11-21 15:41:08 UTC (rev 2973) @@ -135,6 +135,7 @@ * * @return A boolean. */ + @Override public boolean equals(Object obj) { if (obj == this) { return true; @@ -166,6 +167,7 @@ * * @throws CloneNotSupportedException if any key is not cloneable. */ + @Override public Object clone() throws CloneNotSupportedException { // TODO: I think we need to make sure the keys are actually cloned, // whereas the stroke instances are always immutable so they're OK This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mu...@us...> - 2013-11-27 03:25:41
|
Revision: 3069 http://sourceforge.net/p/jfreechart/code/3069 Author: mungady Date: 2013-11-27 03:25:39 +0000 (Wed, 27 Nov 2013) Log Message: ----------- 2013-11-27 David Gilbert <dav...@ob...> * org/jfree/chart/ChartPanel.java (createPopupMenu): Localise 'Save as' menu items, * org/jfree/chart/LocalisationBundle.properties: Add new items. Modified Paths: -------------- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartPanel.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LocalizationBundle.properties 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 2013-11-27 03:15:11 UTC (rev 3068) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartPanel.java 2013-11-27 03:25:39 UTC (rev 3069) @@ -3101,21 +3101,25 @@ if (separator) { result.addSeparator(); } - JMenu saveSubMenu = new JMenu("Save as"); - JMenuItem pngItem = new JMenuItem("PNG..."); + JMenu saveSubMenu = new JMenu(localizationResources.getString( + "Save_as")); + JMenuItem pngItem = new JMenuItem(localizationResources.getString( + "PNG...")); pngItem.setActionCommand("SAVE_AS_PNG"); pngItem.addActionListener(this); saveSubMenu.add(pngItem); if (createSVGGraphics2D(10, 10) != null) { - JMenuItem svgItem = new JMenuItem("SVG..."); + JMenuItem svgItem = new JMenuItem(localizationResources.getString( + "SVG...")); svgItem.setActionCommand("SAVE_AS_SVG"); svgItem.addActionListener(this); saveSubMenu.add(svgItem); } if (isOrsonPDFAvailable()) { - JMenuItem pdfItem = new JMenuItem("PDF..."); + JMenuItem pdfItem = new JMenuItem( + localizationResources.getString("PDF...")); pdfItem.setActionCommand("SAVE_AS_PDF"); pdfItem.addActionListener(this); saveSubMenu.add(pdfItem); Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LocalizationBundle.properties =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LocalizationBundle.properties 2013-11-27 03:15:11 UTC (rev 3068) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LocalizationBundle.properties 2013-11-27 03:25:39 UTC (rev 3069) @@ -3,6 +3,7 @@ # Changes (from 31-Aug-2003) # -------------------------- # 31-Aug-2003 : Initial version (AL); +# 27-Nov-2013 : Added PNG..., PDF..., Save_as and SVG... (DG) # Auto_Range=Auto Range @@ -12,12 +13,16 @@ Copy=Copy Domain_Axis=Domain Axis FILE_EXISTS_CONFIRM_OVERWRITE=The file already exists, are you sure you want to overwrite it? +PNG...=PNG... PNG_Image_Files=PNG Image Files +PDF...=PDF... PDF_Files=PDF Files Print...=Print... Properties...=Properties... Range_Axis=Range Axis +Save_as=Save as Save_as...=Save as... +SVG...=SVG... SVG_Files=SVG Files Zoom_In=Zoom In Zoom_Out=Zoom Out This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mu...@us...> - 2014-03-18 19:53:19
|
Revision: 3117 http://sourceforge.net/p/jfreechart/code/3117 Author: mungady Date: 2014-03-18 19:53:15 +0000 (Tue, 18 Mar 2014) Log Message: ----------- 2013-03-18 David Gilbert <dav...@ob...> * org/jfree/chart/utils/AttrStringUtils.java (getTextBounds): New method, (deriveTextBoundsAnchorOffsets): Workaround for top anchor, * org/jfree/chart/axis/LogAxis.java (baseSymbol): New field, (baseFormatter): New field, (LogAxis(String)): Instantiate new tick unit source, (getBaseSymbol): New method, (setBaseSymbol): New method, (getBaseFormatter): New method, (setBaseFormatter): New method, (calculateValueNoINF): New private method, (refreshTicksHorizontal): Reimplement using attributed strings, (refreshTicksVertical): Likewise, (selectHorizontalAutoTickUnit): Reimplemented, (selectVerticalAutoTickUnit): Likewise, (createTickLabel): New method, (estimateMaximumTickLabelWidth): Updated for attributed strings, (resizeRange): New method override, (resizeRange2): Likewise, (equals): Updated for new fields, * org/jfree/chart/axis/LogTick.java: New file, * org/jfree/chart/axis/NumberTickUnitSource.java: New file, * org/jfree/chart/axis/ValueAxis.java (drawTickMarksAndLabels): Updated to draw attributed string labels, (findMaximumTickLabelHeight): Updated to handle LogTick, (findMaximumTickLabelWidth): Likewise. Modified Paths: -------------- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/LogAxis.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/ValueAxis.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/util/AttrStringUtils.java Added Paths: ----------- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/LogTick.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/NumberTickUnitSource.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/LogAxis.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/LogAxis.java 2014-03-18 19:49:00 UTC (rev 3116) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/LogAxis.java 2014-03-18 19:53:15 UTC (rev 3117) @@ -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 @@ * ------------ * LogAxis.java * ------------ - * (C) Copyright 2006-2013, by Object Refinery Limited and Contributors. + * (C) Copyright 2006-2014, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): Andrew Mickish (patch 1868745); @@ -57,32 +57,38 @@ * 28-Oct-2011 : Fixed endless loop for 0 TickUnit, # 3429707 (MH); * 02-Jul-2013 : Use ParamChecks (DG); * 01-Aug-2013 : Added attributedLabel override to support superscripts, - * subscripts and more (DG); */ + * subscripts and more (DG); + * 18-Mar-2014 : Add support for super-scripted tick labels (DG); + * + */ package org.jfree.chart.axis; import java.awt.Font; -import java.awt.FontMetrics; import java.awt.Graphics2D; import java.awt.font.FontRenderContext; import java.awt.font.LineMetrics; +import java.awt.font.TextAttribute; import java.awt.geom.Rectangle2D; +import java.text.AttributedString; import java.text.DecimalFormat; +import java.text.Format; import java.text.NumberFormat; import java.util.ArrayList; import java.util.List; import java.util.Locale; -import org.jfree.chart.event.AxisChangeEvent; import org.jfree.chart.plot.Plot; import org.jfree.chart.plot.PlotRenderingInfo; import org.jfree.chart.plot.ValueAxisPlot; +import org.jfree.chart.util.AttrStringUtils; import org.jfree.chart.util.LogFormat; import org.jfree.chart.util.ParamChecks; import org.jfree.data.Range; import org.jfree.ui.RectangleEdge; import org.jfree.ui.RectangleInsets; import org.jfree.ui.TextAnchor; +import org.jfree.util.ObjectUtilities; /** * A numerical axis that uses a logarithmic scale. The class is an @@ -98,6 +104,18 @@ /** The logarithm of the base value - cached for performance. */ private double baseLog = Math.log(10.0); + /** + * The base symbol to display (if <code>null</code> then the numerical + * value of the base is displayed). + */ + private String baseSymbol = null; + + /** + * The formatter to use for the base value when the base is displayed + * as a numerical value. + */ + private Format baseFormatter = new DecimalFormat("0"); + /** The smallest value permitted on the axis. */ private double smallestValue = 1E-100; @@ -120,13 +138,14 @@ * @param label the axis label (<code>null</code> permitted). */ public LogAxis(String label) { - super(label, createLogTickUnits(Locale.getDefault())); + super(label, new NumberTickUnitSource()); setDefaultAutoRange(new Range(0.01, 1.0)); - this.tickUnit = new NumberTickUnit(1.0, new DecimalFormat("0.#"), 9); + this.tickUnit = new NumberTickUnit(1.0, new DecimalFormat("0.#"), 10); } /** - * Returns the base for the logarithm calculation. + * Returns the base for the logarithm calculation. The default value is + * <code>10.0</code>. * * @return The base for the logarithm calculation. * @@ -137,8 +156,8 @@ } /** - * Sets the base for the logarithm calculation and sends an - * {@link AxisChangeEvent} to all registered listeners. + * Sets the base for the logarithm calculation and sends a change event to + * all registered listeners. * * @param base the base value (must be > 1.0). * @@ -154,6 +173,60 @@ } /** + * Returns the symbol used to represent the base of the logarithmic scale + * for the axis. If this is <code>null</code> (the default) then the + * numerical value of the base is displayed. + * + * @return The base symbol (possibly <code>null</code>). + * + * @since 1.0.18 + */ + public String getBaseSymbol() { + return this.baseSymbol; + } + + /** + * Sets the symbol used to represent the base value of the logarithmic + * scale and sends a change event to all registered listeners. + * + * @param symbol the symbol (<code>null</code> permitted). + * + * @since 1.0.18 + */ + public void setBaseSymbol(String symbol) { + this.baseSymbol = symbol; + fireChangeEvent(); + } + + /** + * Returns the formatter used to format the base value of the logarithmic + * scale when it is displayed numerically. The default value is + * <code>new DecimalFormat("0")</code>. + * + * @return The base formatter (never <code>null</code>). + * + * @since 1.0.18 + */ + public Format getBaseFormatter() { + return this.baseFormatter; + } + + /** + * Sets the formatter used to format the base value of the logarithmic + * scale when it is displayed numerically and sends a change event to all + * registered listeners. + * + * @param formatter the formatter (<code>null</code> not permitted). + * + * @since 1.0.18 + */ + public void setBaseFormatter(Format formatter) { + ParamChecks.nullNotPermitted(formatter, "formatter"); + this.baseFormatter = formatter; + fireChangeEvent(); + } + + /** * Returns the smallest value represented by the axis. * * @return The smallest value represented by the axis. @@ -165,8 +238,8 @@ } /** - * Sets the smallest value represented by the axis and sends an - * {@link AxisChangeEvent} to all registered listeners. + * Sets the smallest value represented by the axis and sends a change event + * to all registered listeners. * * @param value the value. * @@ -222,7 +295,6 @@ */ public void setTickUnit(NumberTickUnit unit, boolean notify, boolean turnOffAutoSelect) { - ParamChecks.nullNotPermitted(unit, "unit"); this.tickUnit = unit; if (turnOffAutoSelect) { @@ -231,12 +303,11 @@ if (notify) { fireChangeEvent(); } - } /** - * Returns the number format override. If this is non-null, then it will - * be used to format the numbers on the axis. + * Returns the number format override. If this is non-<code>null</code>, + * then it will be used to format the numbers on the axis. * * @return The number formatter (possibly <code>null</code>). * @@ -247,7 +318,8 @@ } /** - * Sets the number format override. If this is non-null, then it will be + * Sets the number format override and sends a change event to all + * registered listeners. If this is non-<code>null</code>, then it will be * used to format the numbers on the axis. * * @param formatter the number formatter (<code>null</code> permitted). @@ -286,14 +358,28 @@ public double calculateValue(double log) { return Math.pow(this.base, log); } + + private double calculateValueNoINF(double log) { + double result = calculateValue(log); + if (Double.isInfinite(result)) { + result = Double.MAX_VALUE; + } + if (result <= 0.0) { + result = Double.MIN_VALUE; + } + return result; + } /** * Converts a Java2D coordinate to an axis value, assuming that the - * axis covers the specified <code>edge</code> of the <code>area</code>. + * axis is aligned to the specified <code>edge</code> of the + * <code>area</code>. * * @param java2DValue the Java2D coordinate. - * @param area the area. - * @param edge the edge that the axis belongs to. + * @param area the area for plotting data (<code>null</code> not + * permitted). + * @param edge the edge that the axis is aligned to (<code>null</code> not + * permitted). * * @return A value along the axis scale. */ @@ -310,8 +396,7 @@ if (RectangleEdge.isTopOrBottom(edge)) { min = area.getX(); max = area.getMaxX(); - } - else if (RectangleEdge.isLeftOrRight(edge)) { + } else if (RectangleEdge.isLeftOrRight(edge)) { min = area.getMaxY(); max = area.getY(); } @@ -319,8 +404,7 @@ if (isInverted()) { log = axisMax - (java2DValue - min) / (max - min) * (axisMax - axisMin); - } - else { + } else { log = axisMin + (java2DValue - min) / (max - min) * (axisMax - axisMin); } @@ -333,8 +417,8 @@ * specified <code>edge</code>. * * @param value the data value. - * @param area the area. - * @param edge the edge. + * @param area the area (<code>null</code> not permitted). + * @param edge the edge (<code>null</code> not permitted). * * @return The Java2D coordinate corresponding to <code>value</code>. */ @@ -352,16 +436,14 @@ if (RectangleEdge.isTopOrBottom(edge)) { min = area.getX(); max = area.getMaxX(); - } - else if (RectangleEdge.isLeftOrRight(edge)) { + } else if (RectangleEdge.isLeftOrRight(edge)) { max = area.getMinY(); min = area.getMaxY(); } if (isInverted()) { return max - ((value - axisMin) / (axisMax - axisMin)) * (max - min); - } - else { + } else { return min + ((value - axisMin) / (axisMax - axisMin)) * (max - min); } @@ -421,10 +503,9 @@ double logRange = logUpper - logLower; logUpper = logUpper + getUpperMargin() * logRange; logLower = logLower - getLowerMargin() * logRange; - upper = calculateValue(logUpper); - lower = calculateValue(logLower); + upper = calculateValueNoINF(logUpper); + lower = calculateValueNoINF(logLower); } - setRange(new Range(lower, upper), false, false); } @@ -481,7 +562,6 @@ * @param edge the location of the axis. * * @return A list of ticks. - * */ @Override public List refreshTicks(Graphics2D g2, AxisState state, @@ -495,13 +575,13 @@ } return result; } - + /** * Returns a list of ticks for an axis at the top or bottom of the chart. * - * @param g2 the graphics device. - * @param dataArea the data area. - * @param edge the edge. + * @param g2 the graphics device (<code>null</code> not permitted). + * @param dataArea the data area (<code>null</code> not permitted). + * @param edge the edge (<code>null</code> not permitted). * * @return A list of ticks. */ @@ -524,16 +604,19 @@ selectAutoTickUnit(g2, dataArea, edge); } int minorTickCount = this.tickUnit.getMinorTickCount(); - double start = Math.floor(calculateLog(getLowerBound())); - double end = Math.ceil(calculateLog(getUpperBound())); + double unit = getTickUnit().getSize(); + double index = Math.ceil(calculateLog(getRange().getLowerBound()) + / unit); + double start = index * unit; + double end = calculateLog(getUpperBound()); double current = start; boolean hasTicks = (this.tickUnit.getSize() > 0.0) && !Double.isInfinite(start); while (hasTicks && current <= end) { - double v = calculateValue(current); + double v = calculateValueNoINF(current); if (range.contains(v)) { - ticks.add(new NumberTick(TickType.MAJOR, v, createTickLabel(v), - textAnchor, TextAnchor.CENTER, 0.0)); + ticks.add(new LogTick(TickType.MAJOR, v, createTickLabel(v), + textAnchor)); } // add minor ticks (for gridlines) double next = Math.pow(this.base, current @@ -541,8 +624,8 @@ for (int i = 1; i < minorTickCount; i++) { double minorV = v + i * ((next - v) / minorTickCount); if (range.contains(minorV)) { - ticks.add(new NumberTick(TickType.MINOR, minorV, "", - textAnchor, TextAnchor.CENTER, 0.0)); + ticks.add(new LogTick(TickType.MINOR, minorV, null, + textAnchor)); } } current = current + this.tickUnit.getSize(); @@ -553,9 +636,10 @@ /** * Returns a list of ticks for an axis at the left or right of the chart. * - * @param g2 the graphics device. - * @param dataArea the data area. - * @param edge the edge. + * @param g2 the graphics device (<code>null</code> not permitted). + * @param dataArea the data area (<code>null</code> not permitted). + * @param edge the edge that the axis is aligned to (<code>null</code> + * not permitted). * * @return A list of ticks. */ @@ -578,16 +662,19 @@ selectAutoTickUnit(g2, dataArea, edge); } int minorTickCount = this.tickUnit.getMinorTickCount(); - double start = Math.floor(calculateLog(getLowerBound())); - double end = Math.ceil(calculateLog(getUpperBound())); + double unit = getTickUnit().getSize(); + double index = Math.ceil(calculateLog(getRange().getLowerBound()) + / unit); + double start = index * unit; + double end = calculateLog(getUpperBound()); double current = start; boolean hasTicks = (this.tickUnit.getSize() > 0.0) && !Double.isInfinite(start); while (hasTicks && current <= end) { - double v = calculateValue(current); + double v = calculateValueNoINF(current); if (range.contains(v)) { - ticks.add(new NumberTick(TickType.MAJOR, v, createTickLabel(v), - textAnchor, TextAnchor.CENTER, 0.0)); + ticks.add(new LogTick(TickType.MAJOR, v, createTickLabel(v), + textAnchor)); } // add minor ticks (for gridlines) double next = Math.pow(this.base, current @@ -595,8 +682,8 @@ for (int i = 1; i < minorTickCount; i++) { double minorV = v + i * ((next - v) / minorTickCount); if (range.contains(minorV)) { - ticks.add(new NumberTick(TickType.MINOR, minorV, "", - textAnchor, TextAnchor.CENTER, 0.0)); + ticks.add(new LogTick(TickType.MINOR, minorV, null, + textAnchor)); } } current = current + this.tickUnit.getSize(); @@ -609,22 +696,21 @@ * display as many ticks as possible (selected from an array of 'standard' * tick units) without the labels overlapping. * - * @param g2 the graphics device. - * @param dataArea the area defined by the axes. - * @param edge the axis location. + * @param g2 the graphics device (<code>null</code> not permitted). + * @param dataArea the area defined by the axes (<code>null</code> not + * permitted). + * @param edge the axis location (<code>null</code> not permitted). * * @since 1.0.7 */ protected void selectAutoTickUnit(Graphics2D g2, Rectangle2D dataArea, RectangleEdge edge) { - if (RectangleEdge.isTopOrBottom(edge)) { selectHorizontalAutoTickUnit(g2, dataArea, edge); } else if (RectangleEdge.isLeftOrRight(edge)) { selectVerticalAutoTickUnit(g2, dataArea, edge); } - } /** @@ -638,33 +724,42 @@ * * @since 1.0.7 */ - protected void selectHorizontalAutoTickUnit(Graphics2D g2, - Rectangle2D dataArea, RectangleEdge edge) { + protected void selectHorizontalAutoTickUnit(Graphics2D g2, + Rectangle2D dataArea, RectangleEdge edge) { - double tickLabelWidth = estimateMaximumTickLabelWidth(g2, - getTickUnit()); - - // start with the current tick unit... + // select a tick unit that is the next one bigger than the current + // (log) range divided by 50 + Range range = getRange(); + double logAxisMin = calculateLog(range.getLowerBound()); + double logAxisMax = calculateLog(range.getUpperBound()); + double size = (logAxisMax - logAxisMin) / 50; TickUnitSource tickUnits = getStandardTickUnits(); - TickUnit unit1 = tickUnits.getCeilingTickUnit(getTickUnit()); - double unit1Width = exponentLengthToJava2D(unit1.getSize(), dataArea, - edge); - - // then extrapolate... - double guess = (tickLabelWidth / unit1Width) * unit1.getSize(); - - NumberTickUnit unit2 = (NumberTickUnit) - tickUnits.getCeilingTickUnit(guess); - double unit2Width = exponentLengthToJava2D(unit2.getSize(), dataArea, - edge); - - tickLabelWidth = estimateMaximumTickLabelWidth(g2, unit2); - if (tickLabelWidth > unit2Width) { - unit2 = (NumberTickUnit) tickUnits.getLargerTickUnit(unit2); - } - - setTickUnit(unit2, false, false); - + TickUnit candidate = tickUnits.getCeilingTickUnit(size); + TickUnit prevCandidate = candidate; + boolean found = false; + while (!found) { + // while the tick labels overlap and there are more tick sizes available, + // choose the next bigger label + this.tickUnit = (NumberTickUnit) candidate; + double tickLabelWidth = estimateMaximumTickLabelWidth(g2, + candidate); + // what is the available space for one unit? + double candidateWidth = exponentLengthToJava2D(candidate.getSize(), + dataArea, edge); + if (tickLabelWidth < candidateWidth) { + found = true; + } else if (Double.isNaN(candidateWidth)) { + candidate = prevCandidate; + found = true; + } else { + prevCandidate = candidate; + candidate = tickUnits.getLargerTickUnit(prevCandidate); + if (candidate.equals(prevCandidate)) { + found = true; // there are no more candidates + } + } + } + setTickUnit((NumberTickUnit) candidate, false, false); } /** @@ -681,8 +776,8 @@ */ public double exponentLengthToJava2D(double length, Rectangle2D area, RectangleEdge edge) { - double one = valueToJava2D(calculateValue(1.0), area, edge); - double l = valueToJava2D(calculateValue(length + 1.0), area, edge); + double one = valueToJava2D(calculateValueNoINF(1.0), area, edge); + double l = valueToJava2D(calculateValueNoINF(length + 1.0), area, edge); return Math.abs(l - one); } @@ -699,30 +794,69 @@ */ protected void selectVerticalAutoTickUnit(Graphics2D g2, Rectangle2D dataArea, RectangleEdge edge) { - - double tickLabelHeight = estimateMaximumTickLabelHeight(g2); - - // start with the current tick unit... + // select a tick unit that is the next one bigger than the current + // (log) range divided by 50 + Range range = getRange(); + double logAxisMin = calculateLog(range.getLowerBound()); + double logAxisMax = calculateLog(range.getUpperBound()); + double size = (logAxisMax - logAxisMin) / 50; TickUnitSource tickUnits = getStandardTickUnits(); - TickUnit unit1 = tickUnits.getCeilingTickUnit(getTickUnit()); - double unitHeight = exponentLengthToJava2D(unit1.getSize(), dataArea, - edge); + TickUnit candidate = tickUnits.getCeilingTickUnit(size); + TickUnit prevCandidate = candidate; + boolean found = false; + while (!found) { + // while the tick labels overlap and there are more tick sizes available, + // choose the next bigger label + this.tickUnit = (NumberTickUnit) candidate; + double tickLabelHeight = estimateMaximumTickLabelHeight(g2); + // what is the available space for one unit? + double candidateHeight = exponentLengthToJava2D(candidate.getSize(), + dataArea, edge); + if (tickLabelHeight < candidateHeight) { + found = true; + } else if (Double.isNaN(candidateHeight)) { + candidate = prevCandidate; + found = true; + } else { + prevCandidate = candidate; + candidate = tickUnits.getLargerTickUnit(prevCandidate); + if (candidate.equals(prevCandidate)) { + found = true; // there are no more candidates + } + } + } + setTickUnit((NumberTickUnit) candidate, false, false); + } - // then extrapolate... - double guess = (tickLabelHeight / unitHeight) * unit1.getSize(); - - NumberTickUnit unit2 = (NumberTickUnit) - tickUnits.getCeilingTickUnit(guess); - double unit2Height = exponentLengthToJava2D(unit2.getSize(), dataArea, - edge); - - tickLabelHeight = estimateMaximumTickLabelHeight(g2); - if (tickLabelHeight > unit2Height) { - unit2 = (NumberTickUnit) tickUnits.getLargerTickUnit(unit2); + /** + * Creates a tick label for the specified value based on the current + * tick unit (used for formatting the exponent). + * + * @param value the value. + * + * @return The label. + * + * @since 1.0.18 + */ + protected AttributedString createTickLabel(double value) { + if (this.numberFormatOverride != null) { + return new AttributedString( + this.numberFormatOverride.format(value)); + } else { + String baseStr = this.baseSymbol; + if (baseStr == null) { + baseStr = this.baseFormatter.format(this.base); + } + double logy = calculateLog(value); + String exponentStr = getTickUnit().valueToString(logy); + AttributedString as = new AttributedString(baseStr + exponentStr); + as.addAttributes(getTickLabelFont().getAttributes(), 0, (baseStr + + exponentStr).length()); + as.addAttribute(TextAttribute.SUPERSCRIPT, + TextAttribute.SUPERSCRIPT_SUPER, baseStr.length(), + baseStr.length() + exponentStr.length()); + return as; } - - setTickUnit(unit2, false, false); - } /** @@ -735,7 +869,6 @@ * @since 1.0.7 */ protected double estimateMaximumTickLabelHeight(Graphics2D g2) { - RectangleInsets tickLabelInsets = getTickLabelInsets(); double result = tickLabelInsets.getTop() + tickLabelInsets.getBottom(); @@ -743,7 +876,6 @@ FontRenderContext frc = g2.getFontRenderContext(); result += tickLabelFont.getLineMetrics("123", frc).getHeight(); return result; - } /** @@ -776,27 +908,16 @@ } else { // look at lower and upper bounds... - FontMetrics fm = g2.getFontMetrics(getTickLabelFont()); Range range = getRange(); double lower = range.getLowerBound(); double upper = range.getUpperBound(); - String lowerStr, upperStr; - NumberFormat formatter = getNumberFormatOverride(); - if (formatter != null) { - lowerStr = formatter.format(lower); - upperStr = formatter.format(upper); - } - else { - lowerStr = unit.valueToString(lower); - upperStr = unit.valueToString(upper); - } - double w1 = fm.stringWidth(lowerStr); - double w2 = fm.stringWidth(upperStr); + AttributedString lowerStr = createTickLabel(lower); + AttributedString upperStr = createTickLabel(upper); + double w1 = AttrStringUtils.getTextBounds(lowerStr, g2).getWidth(); + double w2 = AttrStringUtils.getTextBounds(upperStr, g2).getWidth(); result += Math.max(w1, w2); } - return result; - } /** @@ -817,12 +938,14 @@ if (isInverted()) { double logA = log1 + length * (1 - upperPercent); double logB = log1 + length * (1 - lowerPercent); - adjusted = new Range(calculateValue(logA), calculateValue(logB)); + adjusted = new Range(calculateValueNoINF(logA), + calculateValueNoINF(logB)); } else { double logA = log1 + length * lowerPercent; double logB = log1 + length * upperPercent; - adjusted = new Range(calculateValue(logA), calculateValue(logB)); + adjusted = new Range(calculateValueNoINF(logA), + calculateValueNoINF(logB)); } setRange(adjusted); } @@ -845,25 +968,69 @@ double adj = length * percent; log1 = log1 + adj; log2 = log2 + adj; - setRange(calculateValue(log1), calculateValue(log2)); + setRange(calculateValueNoINF(log1), calculateValueNoINF(log2)); } - + /** - * Creates a tick label for the specified value. Note that this method - * was 'private' prior to version 1.0.10. + * Increases or decreases the axis range by the specified percentage about + * the central value and sends an {@link AxisChangeEvent} to all registered + * listeners. + * <P> + * To double the length of the axis range, use 200% (2.0). + * To halve the length of the axis range, use 50% (0.5). * - * @param value the value. + * @param percent the resize factor. * - * @return The label. - * - * @since 1.0.10 + * @see #resizeRange(double, double) */ - protected String createTickLabel(double value) { - if (this.numberFormatOverride != null) { - return this.numberFormatOverride.format(value); + @Override + public void resizeRange(double percent) { + Range range = getRange(); + double logMin = calculateLog(range.getLowerBound()); + double logMax = calculateLog(range.getUpperBound()); + double centralValue = calculateValueNoINF((logMin + logMax) / 2.0); + resizeRange(percent, centralValue); + } + + @Override + public void resizeRange(double percent, double anchorValue) { + resizeRange2(percent, anchorValue); + } + + /** + * Resizes the axis length to the specified percentage of the current + * range and sends a change event to all registered listeners. If + * <code>percent</code> is greater than 1.0 (100 percent) then the axis + * range is increased (which has the effect of zooming out), while if the + * <code>percent</code> is less than 1.0 the axis range is decreased + * (which has the effect of zooming in). The resize occurs around an + * anchor value (which may not be in the center of the axis). This is used + * to support mouse wheel zooming around an arbitrary point on the plot. + * <br><br> + * This method is overridden to perform the percentage calculations on the + * log values (which are linear for this axis). + * + * @param percent the percentage (must be greater than zero). + * @param anchorValue the anchor value. + */ + @Override + public void resizeRange2(double percent, double anchorValue) { + if (percent > 0.0) { + double logAnchorValue = calculateLog(anchorValue); + Range range = getRange(); + double logAxisMin = calculateLog(range.getLowerBound()); + double logAxisMax = calculateLog(range.getUpperBound()); + + double left = percent * (logAnchorValue - logAxisMin); + double right = percent * (logAxisMax - logAnchorValue); + + double upperBound = calculateValueNoINF(logAnchorValue + right); + Range adjusted = new Range(calculateValueNoINF( + logAnchorValue - left), upperBound); + setRange(adjusted); } else { - return this.tickUnit.valueToString(value); + setAutoRange(true); } } @@ -886,9 +1053,19 @@ if (this.base != that.base) { return false; } + if (!ObjectUtilities.equal(this.baseSymbol, that.baseSymbol)) { + return false; + } + if (!this.baseFormatter.equals(that.baseFormatter)) { + return false; + } if (this.smallestValue != that.smallestValue) { return false; } + if (!ObjectUtilities.equal(this.numberFormatOverride, + that.numberFormatOverride)) { + return false; + } return super.equals(obj); } @@ -920,6 +1097,10 @@ * @return A collection of tick units for integer values. * * @since 1.0.7 + * + * @deprecated This method is no longer used internally and will be removed + * from a future version. If you need this method, copy the source + * code into your project. */ public static TickUnitSource createLogTickUnits(Locale locale) { TickUnits units = new TickUnits(); @@ -940,5 +1121,4 @@ units.add(new NumberTickUnit(10, numberFormat)); return units; } - } Added: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/LogTick.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/LogTick.java (rev 0) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/LogTick.java 2014-03-18 19:53:15 UTC (rev 3117) @@ -0,0 +1,78 @@ +/* =========================================================== + * JFreeChart : a free chart library for the Java(tm) platform + * =========================================================== + * + * (C) Copyright 2000-2014, by Object Refinery Limited and Contributors. + * + * Project Info: http://www.jfree.org/jfreechart/index.html + * + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or + * (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * 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. + * + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] + * + * ------------ + * LogTick.java + * ------------ + * (C) Copyright 2014, by Object Refinery Limited and Contributors. + * + * Original Author: David Gilbert (for Object Refinery Limited); + * Contributor(s): -; + * + * Changes + * ------- + * 18-Mar-2014 : Version 1 (DG); + * + */ + +package org.jfree.chart.axis; + +import java.text.AttributedString; +import org.jfree.ui.TextAnchor; + +/** + * A tick from a {@link LogAxis}. + */ +public class LogTick extends ValueTick { + + /** The attributed string for the tick label. */ + AttributedString attributedLabel; + + /** + * Creates a new instance. + * + * @param type the type (major or minor tick, <code>null</code> not + * permitted). + * @param value the value. + * @param label the label (<code>null</code> permitted). + * @param textAnchor the text anchor. + */ + public LogTick(TickType type, double value, AttributedString label, + TextAnchor textAnchor) { + super(type, value, null, textAnchor, textAnchor, 0.0); + this.attributedLabel = label; + } + + /** + * Returns the attributed string for the tick label, or <code>null</code> + * if there is no label. + * + * @return The attributed string or <code>null</code>. + */ + public AttributedString getAttributedLabel() { + return this.attributedLabel; + } +} Added: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/NumberTickUnitSource.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/NumberTickUnitSource.java (rev 0) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/NumberTickUnitSource.java 2014-03-18 19:53:15 UTC (rev 3117) @@ -0,0 +1,159 @@ +/* =========================================================== + * JFreeChart : a free chart library for the Java(tm) platform + * =========================================================== + * + * (C) Copyright 2000-2014, by Object Refinery Limited and Contributors. + * + * Project Info: http://www.jfree.org/jfreechart/index.html + * + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or + * (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * 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. + * + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] + * + * ------------------------- + * NumberTickUnitSource.java + * ------------------------- + * (C) Copyright 2014, by Object Refinery Limited. + * + * Original Author: David Gilbert (for Object Refinery Limited); + * Contributor(s): -; + * + * Changes + * ------- + * 18-Mar-2014 : Version 1 (DG); + * + */ + +package org.jfree.chart.axis; + +import java.io.Serializable; +import java.text.DecimalFormat; +import java.text.NumberFormat; + +/** + * A tick unit source implementation that returns NumberTickUnit instances + * that are multiples of 1 or 5 times some power of 10. + * + * @since 1.0.18 + */ +public class NumberTickUnitSource implements TickUnitSource, Serializable { + + private int power = 0; + + private int factor = 1; + + /** + * Creates a new instance. + */ + public NumberTickUnitSource() { + this.power = 0; + this.factor = 1; + } + + @Override + public TickUnit getLargerTickUnit(TickUnit unit) { + TickUnit t = getCeilingTickUnit(unit); + if (t.equals(unit)) { + next(); + t = new NumberTickUnit(getTickSize(), getTickLabelFormat(), + getMinorTickCount()); + } + return t; + } + + @Override + public TickUnit getCeilingTickUnit(TickUnit unit) { + return getCeilingTickUnit(unit.getSize()); + } + + @Override + public TickUnit getCeilingTickUnit(double size) { + this.power = (int) Math.ceil(Math.log10(size)); + this.factor = 1; + return new NumberTickUnit(getTickSize(), getTickLabelFormat(), + getMinorTickCount()); + } + + private boolean next() { + if (factor == 1) { + factor = 5; + return true; + } + if (factor == 5) { + power++; + factor = 1; + return true; + } + throw new IllegalStateException("We should never get here."); + } + + private boolean previous() { + if (factor == 1) { + factor = 5; + power--; + return true; + } + if (factor == 5) { + factor = 1; + return true; + } + throw new IllegalStateException("We should never get here."); + } + + private double getTickSize() { + return this.factor * Math.pow(10.0, this.power); + } + + private DecimalFormat dfNeg4 = new DecimalFormat("0.0000"); + private DecimalFormat dfNeg3 = new DecimalFormat("0.000"); + private DecimalFormat dfNeg2 = new DecimalFormat("0.00"); + private DecimalFormat dfNeg1 = new DecimalFormat("0.0"); + private DecimalFormat df0 = new DecimalFormat("#,##0"); + + private NumberFormat getTickLabelFormat() { + if (power == -4) { + return dfNeg4; + } + if (power == -3) { + return dfNeg3; + } + if (power == -2) { + return dfNeg2; + } + if (power == -1) { + return dfNeg1; + } + if (power >= 0 && power <= 6) { + return df0; + } + return new DecimalFormat("0.#E0"); + } + + private int getMinorTickCount() { + if (factor == 1) { + return 10; + } else if (factor == 5) { + return 5; + } + return 0; + } + + @Override + public boolean equals(Object obj) { + return (obj instanceof NumberTickUnitSource); + } +} Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/ValueAxis.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/ValueAxis.java 2014-03-18 19:49:00 UTC (rev 3116) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/ValueAxis.java 2014-03-18 19:53:15 UTC (rev 3117) @@ -107,7 +107,7 @@ * 30-Mar-2009 : Added pan(double) method (DG); * 03-Sep-2012 : Fix reserveSpace() method, bug 3555275 (DG); * 02-Jul-2013 : Use ParamChecks (DG); - * 10-Mar-2014 : Added setRange() check for issue #1121 (DG); + * 18-Mar-2014 : Updates to support attributed tick labels for LogAxis (DG); * */ @@ -131,6 +131,7 @@ import org.jfree.chart.event.AxisChangeEvent; import org.jfree.chart.plot.Plot; +import org.jfree.chart.util.AttrStringUtils; import org.jfree.chart.util.ParamChecks; import org.jfree.data.Range; import org.jfree.io.SerialUtilities; @@ -669,11 +670,12 @@ /** * Draws the axis line, tick marks and tick mark labels. * - * @param g2 the graphics device. + * @param g2 the graphics device (<code>null</code> not permitted). * @param cursor the cursor. - * @param plotArea the plot area. - * @param dataArea the data area. - * @param edge the edge that the axis is aligned with. + * @param plotArea the plot area (<code>null</code> not permitted). + * @param dataArea the data area (<code>null</code> not permitted). + * @param edge the edge that the axis is aligned with (<code>null</code> + * not permitted). * * @return The width or height used to draw the axis. */ @@ -682,11 +684,9 @@ RectangleEdge edge) { AxisState state = new AxisState(cursor); - if (isAxisLineVisible()) { drawAxisLine(g2, cursor, dataArea, edge); } - List ticks = refreshTicks(g2, state, dataArea, edge); state.setTicks(ticks); g2.setFont(getTickLabelFont()); @@ -697,9 +697,24 @@ g2.setPaint(getTickLabelPaint()); float[] anchorPoint = calculateAnchorPoint(tick, cursor, dataArea, edge); - TextUtilities.drawRotatedString(tick.getText(), g2, - anchorPoint[0], anchorPoint[1], tick.getTextAnchor(), - tick.getAngle(), tick.getRotationAnchor()); + if (tick instanceof LogTick) { + LogTick lt = (LogTick) tick; + if (lt.getAttributedLabel() == null) { + continue; + } + AttrStringUtils.drawRotatedString(lt.getAttributedLabel(), + g2, anchorPoint[0], anchorPoint[1], + tick.getTextAnchor(), tick.getAngle(), + tick.getRotationAnchor()); + } else { + if (tick.getText() == null) { + continue; + } + TextUtilities.drawRotatedString(tick.getText(), g2, + anchorPoint[0], anchorPoint[1], + tick.getTextAnchor(), tick.getAngle(), + tick.getRotationAnchor()); + } } if ((isTickMarksVisible() && tick.getTickType().equals( @@ -844,22 +859,31 @@ RectangleInsets insets = getTickLabelInsets(); Font font = getTickLabelFont(); + g2.setFont(font); double maxHeight = 0.0; if (vertical) { FontMetrics fm = g2.getFontMetrics(font); Iterator iterator = ticks.iterator(); while (iterator.hasNext()) { Tick tick = (Tick) iterator.next(); - Rectangle2D labelBounds = TextUtilities.getTextBounds( - tick.getText(), g2, fm); - if (labelBounds.getWidth() + insets.getTop() - + insets.getBottom() > maxHeight) { + Rectangle2D labelBounds = null; + if (tick instanceof LogTick) { + LogTick lt = (LogTick) tick; + if (lt.getAttributedLabel() != null) { + labelBounds = AttrStringUtils.getTextBounds( + lt.getAttributedLabel(), g2); + } + } else if (tick.getText() != null) { + labelBounds = TextUtilities.getTextBounds( + tick.getText(), g2, fm); + } + if (labelBounds != null && labelBounds.getWidth() + + insets.getTop() + insets.getBottom() > maxHeight) { maxHeight = labelBounds.getWidth() + insets.getTop() + insets.getBottom(); } } - } - else { + } else { LineMetrics metrics = font.getLineMetrics("ABCxyz", g2.getFontRenderContext()); maxHeight = metrics.getHeight() @@ -891,16 +915,25 @@ Iterator iterator = ticks.iterator(); while (iterator.hasNext()) { Tick tick = (Tick) iterator.next(); - Rectangle2D labelBounds = TextUtilities.getTextBounds( - tick.getText(), g2, fm); - if (labelBounds.getWidth() + insets.getLeft() + Rectangle2D labelBounds = null; + if (tick instanceof LogTick) { + LogTick lt = (LogTick) tick; + if (lt.getAttributedLabel() != null) { + labelBounds = AttrStringUtils.getTextBounds( + lt.getAttributedLabel(), g2); + } + } else if (tick.getText() != null) { + labelBounds = TextUtilities.getTextBounds(tick.getText(), + g2, fm); + } + if (labelBounds != null + && labelBounds.getWidth() + insets.getLeft() + insets.getRight() > maxWidth) { maxWidth = labelBounds.getWidth() + insets.getLeft() + insets.getRight(); } } - } - else { + } else { LineMetrics metrics = font.getLineMetrics("ABCxyz", g2.getFontRenderContext()); maxWidth = metrics.getHeight() Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/util/AttrStringUtils.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/util/AttrStringUtils.java 2014-03-18 19:49:00 UTC (rev 3116) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/util/AttrStringUtils.java 2014-03-18 19:53:15 UTC (rev 3117) @@ -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 @@ * -------------------- * AttrStringUtils.java * -------------------- - * (C) Copyright 2013 by Object Refinery Limited and Contributors. + * (C) Copyright 2013, 2014, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -35,7 +35,8 @@ * Changes: * -------- * 01-Aug-2013 : Version 1, backported from JFreeChart-FSE (DG); - * + * 18-Mar-2014 : Added getTextBounds() method (DG); + * */ package org.jfree.chart.util; @@ -59,6 +60,23 @@ } /** + * Returns the bounds for the attributed string. + * + * @param text the attributed string (<code>null</code> not permitted). + * @param g2 the graphics target (<code>null</code> not permitted). + * + * @return The bounds (never <code>null</code>). + * + * @since 1.0.18 + */ + public static Rectangle2D getTextBounds(AttributedString text, + Graphics2D g2) { + TextLayout tl = new TextLayout(text.getIterator(), + g2.getFontRenderContext()); + return tl.getBounds(); + } + + /** * Draws the attributed string at <code>(x, y)</code>, rotated by the * specified angle about <code>(x, y)</code>. * @@ -179,7 +197,8 @@ } if (isTop(anchor)) { - yAdj = -descent - leading + (float) bounds.getHeight(); + //yAdj = -descent - leading + (float) bounds.getHeight(); + yAdj = (float) bounds.getHeight(); } else if (isHalfAscent(anchor)) { yAdj = halfAscent; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mu...@us...> - 2014-04-08 14:31:49
|
Revision: 3121 http://sourceforge.net/p/jfreechart/code/3121 Author: mungady Date: 2014-04-08 14:31:46 +0000 (Tue, 08 Apr 2014) Log Message: ----------- 2013-04-07 David Gilbert <dav...@ob...> * org/jfree/chart/labels/StandardPieSectionLabelGenerator.java (attributedLabels): Change from ObjectList to Map, (StandardPieSectionLabelGenerator): Modify initialisation of storage, (setAttributedLabel): Storage changed to map, (equals): Simplification, (clone): Clone the attributed labels, * org/jfree/chart/StrokeMap.java (clone): Clone the storage, * org/jfree/chart/PaintMap.java (clone): Likewise, * org/jfree/chart/plot/PiePlot.java (clone): Clone required fields. Modified Paths: -------------- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/PaintMap.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/StrokeMap.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardPieSectionLabelGenerator.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PiePlot.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/PaintMap.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/PaintMap.java 2014-04-08 14:31:12 UTC (rev 3120) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/PaintMap.java 2014-04-08 14:31:46 UTC (rev 3121) @@ -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 @@ * ------------- * PaintMap.java * ------------- - * (C) Copyright 2006-2013, by Object Refinery Limited. + * (C) Copyright 2006-2014, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -174,9 +174,12 @@ */ @Override public Object clone() throws CloneNotSupportedException { + PaintMap clone = (PaintMap) super.clone(); + clone.store = new HashMap(); + clone.store.putAll(this.store); // TODO: I think we need to make sure the keys are actually cloned, // whereas the paint instances are always immutable so they're OK - return super.clone(); + return clone; } /** Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/StrokeMap.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/StrokeMap.java 2014-04-08 14:31:12 UTC (rev 3120) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/StrokeMap.java 2014-04-08 14:31:46 UTC (rev 3121) @@ -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 @@ * -------------- * StrokeMap.java * -------------- - * (C) Copyright 2006-2013, by Object Refinery Limited. + * (C) Copyright 2006-2014, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -169,9 +169,12 @@ */ @Override public Object clone() throws CloneNotSupportedException { + StrokeMap clone = (StrokeMap) super.clone(); + clone.store = new TreeMap(); + clone.store.putAll(this.store); // TODO: I think we need to make sure the keys are actually cloned, // whereas the stroke instances are always immutable so they're OK - return super.clone(); + return clone; } /** Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardPieSectionLabelGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardPieSectionLabelGenerator.java 2014-04-08 14:31:12 UTC (rev 3120) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardPieSectionLabelGenerator.java 2014-04-08 14:31:46 UTC (rev 3121) @@ -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 @@ * ------------------------------------- * StandardPieSectionLabelGenerator.java * ------------------------------------- - * (C) Copyright 2004-2008, by Object Refinery Limited. + * (C) Copyright 2004-2014, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -41,6 +41,7 @@ * 10-Jan-2007 : Include attributedLabels in equals() test (DG); * 10-Jul-2007 : Added constructors with locale parameter (DG); * 23-Apr-2008 : Implemented PublicCloneable (DG); + * 07-Apr-2014 : Fix cloning issue (DG); * */ @@ -52,10 +53,11 @@ import java.io.Serializable; import java.text.AttributedString; import java.text.NumberFormat; +import java.util.HashMap; import java.util.Locale; +import java.util.Map; import org.jfree.data.general.PieDataset; -import org.jfree.util.ObjectList; import org.jfree.util.PublicCloneable; /** @@ -79,9 +81,10 @@ public static final String DEFAULT_SECTION_LABEL_FORMAT = "{0}"; /** - * An optional list of attributed labels (instances of AttributedString). + * An optional map between item indices (Integer) and attributed labels + * (instances of AttributedString). */ - private ObjectList attributedLabels; + private Map attributedLabels; /** * Creates a new section label generator using @@ -141,7 +144,7 @@ public StandardPieSectionLabelGenerator(String labelFormat, NumberFormat numberFormat, NumberFormat percentFormat) { super(labelFormat, numberFormat, percentFormat); - this.attributedLabels = new ObjectList(); + this.attributedLabels = new HashMap(); } /** @@ -163,7 +166,7 @@ * @param label the label (<code>null</code> permitted). */ public void setAttributedLabel(int section, AttributedString label) { - this.attributedLabels.set(section, label); + this.attributedLabels.put(section, label); } /** @@ -208,7 +211,7 @@ */ @Override public AttributedString generateAttributedSectionLabel(PieDataset dataset, - Comparable key) { + Comparable key) { return getAttributedLabel(dataset.getIndex(key)); } @@ -232,10 +235,7 @@ if (!this.attributedLabels.equals(that.attributedLabels)) { return false; } - if (!super.equals(obj)) { - return false; - } - return true; + return super.equals(obj); } /** @@ -247,7 +247,11 @@ */ @Override public Object clone() throws CloneNotSupportedException { - return super.clone(); + StandardPieSectionLabelGenerator clone + = (StandardPieSectionLabelGenerator) super.clone(); + clone.attributedLabels = new HashMap(); + clone.attributedLabels.putAll(this.attributedLabels); + return clone; } } Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PiePlot.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PiePlot.java 2014-04-08 14:31:12 UTC (rev 3120) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PiePlot.java 2014-04-08 14:31:46 UTC (rev 3121) @@ -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 @@ * ------------ * PiePlot.java * ------------ - * (C) Copyright 2000-2013, by Andrzej Porebski and Contributors. + * (C) Copyright 2000-2014, by Andrzej Porebski and Contributors. * * Original Author: Andrzej Porebski; * Contributor(s): David Gilbert (for Object Refinery Limited); @@ -3473,6 +3473,17 @@ @Override public Object clone() throws CloneNotSupportedException { PiePlot clone = (PiePlot) super.clone(); + clone.sectionPaintMap = (PaintMap) this.sectionPaintMap.clone(); + clone.sectionOutlinePaintMap + = (PaintMap) this.sectionOutlinePaintMap.clone(); + clone.sectionOutlineStrokeMap + = (StrokeMap) this.sectionOutlineStrokeMap.clone(); + clone.explodePercentages + = new TreeMap<Comparable<?>, Number>(this.explodePercentages); + if (this.labelGenerator != null) { + clone.labelGenerator = (PieSectionLabelGenerator) + ObjectUtilities.clone(this.labelGenerator); + } if (clone.dataset != null) { clone.dataset.addChangeListener(clone); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mu...@us...> - 2014-04-09 09:23:28
|
Revision: 3123 http://sourceforge.net/p/jfreechart/code/3123 Author: mungady Date: 2014-04-09 09:23:25 +0000 (Wed, 09 Apr 2014) Log Message: ----------- 2013-04-09 David Gilbert <dav...@ob...> * org/jfree/chart/renderer/AbstractRenderer.java (itemLabelFontMap): Change to Map, (positiveItemLabelPositionMap): Likewise, (negativeItemLabelPositionMap): Likewise, (legendTextFontMap): Likewise, (AbstractRenderer): Update field instantiation, (getSeriesItemLabelFont): Update for field change, (setSeriesItemLabelFont): Likewise, (getSeriesPositiveItemLabelPosition): Likewise, (setSeriesPositiveItemLabelPosition): Likewise, (getSeriesNegativeItemLabelPosition): Likewise, (setSeriesNegativeItemLabelPosition): Likewise, (getLegendTextFont): Likewise, (setLegendTextFont): Likewise, (equals): Update for field changes, (clone): Likewise, * org/jfree/chart/renderer/xy/AbstractXYItemRenderer.java (itemLabelGeneratorMap): Change to Map, (toolTipGeneratorMap): Likewise, (AbstractXYItemRenderer): Update field instantiation, (getItemLabelGenerator): Update for field change, (getSeriesItemLabelGenerator): Likewise, (setSeriesItemLabelGenerator): Likewise, (getToolTipGenerator): Likewise, (getSeriesToolTipGenerator): Likewise, (setSeriesToolTipGenerator): Likewise, (clone): Update for field changes, (equals): Likewise, * org/jfree/chart/renderer/AbstractCategoryItemRenderer.java (itemLabelGeneratorMap): Change to Map, (toolTipGeneratorMap): Likewise, (itemURLGeneratorMap): Likewise, (AbstractCategoryItemRenderer): Update for field changes, (getSeriesItemLabelGenerator): Likewise, (setSeriesItemLabelGenerator): Likewise, (getSeriesToolTipGenerator): Likewise, (setSeriesToolTipGenerator): Likewise, (getSeriesItemURLGenerator): Likewise, (setSeriesItemURLGenerator): Likewise, (equals): Update for field changes, (clone): Likewise, * org/jfree/chart/util/CloneUtils.java: New file, * org/jfree/chart/plot/XYPlot.java (domainAxes): Change to Map, (domainAxisLocations): Likewise, (rangeAxes): Likewise, (rangeAxisLocations): Likewise, (datasets): Likewise, (renderers): Likewise, (XYPlot): Update for field changes, (setDomainAxis): Likewise, (setDomainAxisLocation): Likewise, (setRangeAxis): Likewise, (setRangeAxisLocation): Likewise, (setDataset): Likewise, (setRenderer): Likewise, (getIndexOf(XYItemRenderer)): Likewise, (getDomainAxisIndex): Likewise, (findDomainAxisIndex): New private method, (getRangeAxisIndex): Update for field changes, (findRangeAxisIndex): New private method, (clone): Updated for field changes, * org/jfree/chart/plot/CategoryPlot.java (domainAxes): Change to Map, (domainAxisLocations): Likewise, (rangeAxes): Likewise, (rangeAxisLocations): Likewise, (datasets): Likewise, (renderers): Likewise, (CategoryPlot): Updated for field changes, (setDomainAxis): Likewise, (getDomainAxisIndex): Likewise, (setDomainAxisLocation): Likewise, (setRangeAxis): Likewise, (getRangeAxisIndex): Likewise, (findRangeAxisIndex): New private method, (setRangeAxisLocation): Update for field changes, (setDataset): Likewise, (setRenderer): Likewise, (getIndexOf(CategoryItemRenderer)): Likewise, (getDataRange): Likewise, (datasetsMappedToDomainAxis): Likewise, (getCategoriesForAxis): Likewise, (clone): Likewise. Modified Paths: -------------- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/CategoryPlot.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/XYPlot.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/AbstractRenderer.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/AbstractCategoryItemRenderer.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/AbstractXYItemRenderer.java Added Paths: ----------- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/util/CloneUtils.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-04-09 08:52:25 UTC (rev 3122) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/CategoryPlot.java 2014-04-09 09:23:25 UTC (rev 3123) @@ -181,6 +181,7 @@ * 02-Jul-2013 : Use ParamChecks (DG); * 12-Sep-2013 : Check for KEY_SUPPRESS_SHADOW_GENERATION rendering hint (DG); * 10-Mar-2014 : Updated Javadocs for issue #1123 (DG); + * 09-Apr-2014 : Remove use of ObjectList (DG); * */ @@ -212,6 +213,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.ResourceBundle; import java.util.Set; import java.util.TreeMap; @@ -238,6 +240,7 @@ import org.jfree.chart.renderer.category.AbstractCategoryItemRenderer; import org.jfree.chart.renderer.category.CategoryItemRenderer; import org.jfree.chart.renderer.category.CategoryItemRendererState; +import org.jfree.chart.util.CloneUtils; import org.jfree.chart.util.ParamChecks; import org.jfree.chart.util.ResourceBundleWrapper; import org.jfree.chart.util.ShadowGenerator; @@ -250,7 +253,6 @@ import org.jfree.ui.Layer; import org.jfree.ui.RectangleEdge; import org.jfree.ui.RectangleInsets; -import org.jfree.util.ObjectList; import org.jfree.util.ObjectUtilities; import org.jfree.util.PaintUtilities; import org.jfree.util.PublicCloneable; @@ -326,10 +328,10 @@ private RectangleInsets axisOffset; /** Storage for the domain axes. */ - private ObjectList domainAxes; + private Map<Integer, CategoryAxis> domainAxes; /** Storage for the domain axis locations. */ - private ObjectList domainAxisLocations; + private Map<Integer, AxisLocation> domainAxisLocations; /** * A flag that controls whether or not the shared domain axis is drawn @@ -338,13 +340,13 @@ private boolean drawSharedDomainAxis; /** Storage for the range axes. */ - private ObjectList rangeAxes; + private Map<Integer, ValueAxis> rangeAxes; /** Storage for the range axis locations. */ - private ObjectList rangeAxisLocations; + private Map<Integer, AxisLocation> rangeAxisLocations; /** Storage for the datasets. */ - private ObjectList datasets; + private Map<Integer, CategoryDataset> datasets; /** Storage for keys that map datasets to domain axes. */ private TreeMap datasetToDomainAxesMap; @@ -353,7 +355,7 @@ private TreeMap datasetToRangeAxesMap; /** Storage for the renderers. */ - private ObjectList renderers; + private Map<Integer, CategoryItemRenderer> renderers; /** The dataset rendering order. */ private DatasetRenderingOrder renderingOrder @@ -574,53 +576,50 @@ * @param renderer the item renderer (<code>null</code> permitted). * */ - public CategoryPlot(CategoryDataset dataset, - CategoryAxis domainAxis, - ValueAxis rangeAxis, - CategoryItemRenderer renderer) { + public CategoryPlot(CategoryDataset dataset, CategoryAxis domainAxis, + ValueAxis rangeAxis, CategoryItemRenderer renderer) { super(); this.orientation = PlotOrientation.VERTICAL; // allocate storage for dataset, axes and renderers - this.domainAxes = new ObjectList(); - this.domainAxisLocations = new ObjectList(); - this.rangeAxes = new ObjectList(); - this.rangeAxisLocations = new ObjectList(); + this.domainAxes = new HashMap<Integer, CategoryAxis>(); + this.domainAxisLocations = new HashMap<Integer, AxisLocation>(); + this.rangeAxes = new HashMap<Integer, ValueAxis>(); + this.rangeAxisLocations = new HashMap<Integer, AxisLocation>(); this.datasetToDomainAxesMap = new TreeMap(); this.datasetToRangeAxesMap = new TreeMap(); - this.renderers = new ObjectList(); + this.renderers = new HashMap<Integer, CategoryItemRenderer>(); - this.datasets = new ObjectList(); - this.datasets.set(0, dataset); + this.datasets = new HashMap<Integer, CategoryDataset>(); + this.datasets.put(0, dataset); if (dataset != null) { dataset.addChangeListener(this); } this.axisOffset = RectangleInsets.ZERO_INSETS; + this.domainAxisLocations.put(0, AxisLocation.BOTTOM_OR_LEFT); + this.rangeAxisLocations.put(0, AxisLocation.TOP_OR_LEFT); - setDomainAxisLocation(AxisLocation.BOTTOM_OR_LEFT, false); - setRangeAxisLocation(AxisLocation.TOP_OR_LEFT, false); - - this.renderers.set(0, renderer); + this.renderers.put(0, renderer); if (renderer != null) { renderer.setPlot(this); renderer.addChangeListener(this); } - this.domainAxes.set(0, domainAxis); - this.mapDatasetToDomainAxis(0, 0); + this.domainAxes.put(0, domainAxis); + mapDatasetToDomainAxis(0, 0); if (domainAxis != null) { domainAxis.setPlot(this); domainAxis.addChangeListener(this); } this.drawSharedDomainAxis = false; - this.rangeAxes.set(0, rangeAxis); - this.mapDatasetToRangeAxis(0, 0); + this.rangeAxes.put(0, rangeAxis); + mapDatasetToRangeAxis(0, 0); if (rangeAxis != null) { rangeAxis.setPlot(this); rangeAxis.addChangeListener(this); @@ -807,7 +806,7 @@ if (axis != null) { axis.setPlot(this); } - this.domainAxes.set(index, axis); + this.domainAxes.put(index, axis); if (axis != null) { axis.configure(); axis.addChangeListener(this); @@ -847,7 +846,12 @@ */ public int getDomainAxisIndex(CategoryAxis axis) { ParamChecks.nullNotPermitted(axis, "axis"); - return this.domainAxes.indexOf(axis); + for (Entry<Integer, CategoryAxis> entry : this.domainAxes.entrySet()) { + if (entry.getValue() == axis) { + return entry.getKey(); + } + } + return -1; } /** @@ -941,7 +945,7 @@ throw new IllegalArgumentException( "Null 'location' for index 0 not permitted."); } - this.domainAxisLocations.set(index, location); + this.domainAxisLocations.put(index, location); if (notify) { fireChangeEvent(); } @@ -1082,7 +1086,7 @@ if (axis != null) { axis.setPlot(this); } - this.rangeAxes.set(index, axis); + this.rangeAxes.put(index, axis); if (axis != null) { axis.configure(); axis.addChangeListener(this); @@ -1122,7 +1126,7 @@ */ public int getRangeAxisIndex(ValueAxis axis) { ParamChecks.nullNotPermitted(axis, "axis"); - int result = this.rangeAxes.indexOf(axis); + int result = findRangeAxisIndex(axis); if (result < 0) { // try the parent plot Plot parent = getParent(); if (parent instanceof CategoryPlot) { @@ -1133,6 +1137,15 @@ return result; } + private int findRangeAxisIndex(ValueAxis axis) { + for (Entry<Integer, ValueAxis> entry : this.rangeAxes.entrySet()) { + if (entry.getValue() == axis) { + return entry.getKey(); + } + } + return -1; + } + /** * Returns the range axis location. * @@ -1215,12 +1228,12 @@ * @see #setDomainAxisLocation(int, AxisLocation, boolean) */ public void setRangeAxisLocation(int index, AxisLocation location, - boolean notify) { + boolean notify) { if (index == 0 && location == null) { throw new IllegalArgumentException( "Null 'location' for index 0 not permitted."); } - this.rangeAxisLocations.set(index, location); + this.rangeAxisLocations.put(index, location); if (notify) { fireChangeEvent(); } @@ -1335,20 +1348,17 @@ * @see #getDataset(int) */ public void setDataset(int index, CategoryDataset dataset) { - CategoryDataset existing = (CategoryDataset) this.datasets.get(index); if (existing != null) { existing.removeChangeListener(this); } - this.datasets.set(index, dataset); + this.datasets.put(index, dataset); if (dataset != null) { dataset.addChangeListener(this); } - // send a dataset change event to self... DatasetChangeEvent event = new DatasetChangeEvent(this, dataset); datasetChanged(event); - } /** @@ -1642,25 +1652,18 @@ * @see #getRenderer(int) */ public void setRenderer(int index, CategoryItemRenderer renderer, - boolean notify) { - - // stop listening to the existing renderer... - CategoryItemRenderer existing - = (CategoryItemRenderer) this.renderers.get(index); + boolean notify) { + CategoryItemRenderer existing = this.renderers.get(index); if (existing != null) { existing.removeChangeListener(this); } - - // register the new renderer... - this.renderers.set(index, renderer); + this.renderers.put(index, renderer); if (renderer != null) { renderer.setPlot(this); renderer.addChangeListener(this); } - configureDomainAxes(); configureRangeAxes(); - if (notify) { fireChangeEvent(); } @@ -1707,7 +1710,13 @@ * @return The renderer index. */ public int getIndexOf(CategoryItemRenderer renderer) { - return this.renderers.indexOf(renderer); + for (Entry<Integer, CategoryItemRenderer> entry + : this.renderers.entrySet()) { + if (entry.getValue() == renderer) { + return entry.getKey(); + } + } + return -1; } /** @@ -4257,11 +4266,9 @@ */ @Override public Range getDataRange(ValueAxis axis) { - Range result = null; - List mappedDatasets = new ArrayList(); - - int rangeIndex = this.rangeAxes.indexOf(axis); + List<CategoryDataset> mappedDatasets = new ArrayList<CategoryDataset>(); + int rangeIndex = findRangeAxisIndex(axis); if (rangeIndex >= 0) { mappedDatasets.addAll(datasetsMappedToRangeAxis(rangeIndex)); } @@ -4271,16 +4278,13 @@ // iterate through the datasets that map to the axis and get the union // of the ranges. - Iterator iterator = mappedDatasets.iterator(); - while (iterator.hasNext()) { - CategoryDataset d = (CategoryDataset) iterator.next(); + for (CategoryDataset d : mappedDatasets) { CategoryItemRenderer r = getRendererForDataset(d); if (r != null) { result = Range.combine(result, r.findRangeBounds(d)); } } return result; - } /** @@ -4293,21 +4297,20 @@ * * @since 1.0.3 */ - private List datasetsMappedToDomainAxis(int axisIndex) { + private List<CategoryDataset> datasetsMappedToDomainAxis(int axisIndex) { Integer key = new Integer(axisIndex); - List result = new ArrayList(); + List<CategoryDataset> result = new ArrayList<CategoryDataset>(); for (int i = 0; i < this.datasets.size(); i++) { List mappedAxes = (List) this.datasetToDomainAxesMap.get( new Integer(i)); - CategoryDataset dataset = (CategoryDataset) this.datasets.get(i); + CategoryDataset dataset = this.datasets.get(i); if (mappedAxes == null) { if (key.equals(ZERO)) { if (dataset != null) { result.add(dataset); } } - } - else { + } else { if (mappedAxes.contains(key)) { if (dataset != null) { result.add(dataset); @@ -4480,11 +4483,8 @@ */ public List getCategoriesForAxis(CategoryAxis axis) { List result = new ArrayList(); - int axisIndex = this.domainAxes.indexOf(axis); - List datasets = datasetsMappedToDomainAxis(axisIndex); - Iterator iterator = datasets.iterator(); - while (iterator.hasNext()) { - CategoryDataset dataset = (CategoryDataset) iterator.next(); + int axisIndex = getDomainAxisIndex(axis); + for (CategoryDataset dataset : datasetsMappedToDomainAxis(axisIndex)) { // add the unique categories from this dataset for (int i = 0; i < dataset.getColumnCount(); i++) { Comparable category = dataset.getColumnKey(i); @@ -4994,33 +4994,30 @@ */ @Override public Object clone() throws CloneNotSupportedException { - CategoryPlot clone = (CategoryPlot) super.clone(); - - clone.domainAxes = new ObjectList(); - for (int i = 0; i < this.domainAxes.size(); i++) { - CategoryAxis xAxis = (CategoryAxis) this.domainAxes.get(i); - if (xAxis != null) { - CategoryAxis clonedAxis = (CategoryAxis) xAxis.clone(); - clone.setDomainAxis(i, clonedAxis); + clone.domainAxes = CloneUtils.cloneMapValues(this.domainAxes); + for (CategoryAxis axis : clone.domainAxes.values()) { + if (axis != null) { + axis.setPlot(clone); + axis.addChangeListener(clone); } } - clone.domainAxisLocations - = (ObjectList) this.domainAxisLocations.clone(); - - clone.rangeAxes = new ObjectList(); - for (int i = 0; i < this.rangeAxes.size(); i++) { - ValueAxis yAxis = (ValueAxis) this.rangeAxes.get(i); - if (yAxis != null) { - ValueAxis clonedAxis = (ValueAxis) yAxis.clone(); - clone.setRangeAxis(i, clonedAxis); + clone.rangeAxes = CloneUtils.cloneMapValues(this.rangeAxes); + for (ValueAxis axis : clone.rangeAxes.values()) { + if (axis != null) { + axis.setPlot(clone); + axis.addChangeListener(clone); } } - clone.rangeAxisLocations = (ObjectList) this.rangeAxisLocations.clone(); - clone.datasets = (ObjectList) this.datasets.clone(); - for (int i = 0; i < clone.datasets.size(); i++) { - CategoryDataset dataset = clone.getDataset(i); + // AxisLocation is immutable, so we can just copy the maps + clone.domainAxisLocations = new HashMap<Integer, AxisLocation>( + this.domainAxisLocations); + clone.rangeAxisLocations = new HashMap<Integer, AxisLocation>( + this.rangeAxisLocations); + + clone.datasets = new HashMap<Integer, CategoryDataset>(this.datasets); + for (CategoryDataset dataset : clone.datasets.values()) { if (dataset != null) { dataset.addChangeListener(clone); } @@ -5030,16 +5027,11 @@ clone.datasetToRangeAxesMap = new TreeMap(); clone.datasetToRangeAxesMap.putAll(this.datasetToRangeAxesMap); - clone.renderers = (ObjectList) this.renderers.clone(); - for (int i = 0; i < this.renderers.size(); i++) { - CategoryItemRenderer renderer2 = (CategoryItemRenderer) - this.renderers.get(i); - if (renderer2 instanceof PublicCloneable) { - PublicCloneable pc = (PublicCloneable) renderer2; - CategoryItemRenderer rc = (CategoryItemRenderer) pc.clone(); - clone.renderers.set(i, rc); - rc.setPlot(clone); - rc.addChangeListener(clone); + clone.renderers = CloneUtils.cloneMapValues(this.renderers); + for (CategoryItemRenderer renderer : clone.renderers.values()) { + if (renderer != null) { + renderer.setPlot(clone); + renderer.addChangeListener(clone); } } if (this.fixedDomainAxisSpace != null) { @@ -5065,7 +5057,6 @@ = (LegendItemCollection) this.fixedLegendItems.clone(); } return clone; - } /** 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-04-09 08:52:25 UTC (rev 3122) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/XYPlot.java 2014-04-09 09:23:25 UTC (rev 3123) @@ -286,6 +286,7 @@ import org.jfree.chart.renderer.xy.AbstractXYItemRenderer; import org.jfree.chart.renderer.xy.XYItemRenderer; import org.jfree.chart.renderer.xy.XYItemRendererState; +import org.jfree.chart.util.CloneUtils; import org.jfree.chart.util.ParamChecks; import org.jfree.chart.util.ResourceBundleWrapper; import org.jfree.chart.util.ShadowGenerator; @@ -298,7 +299,6 @@ import org.jfree.ui.Layer; import org.jfree.ui.RectangleEdge; import org.jfree.ui.RectangleInsets; -import org.jfree.util.ObjectList; import org.jfree.util.ObjectUtilities; import org.jfree.util.PaintUtilities; import org.jfree.util.PublicCloneable; @@ -350,22 +350,22 @@ private RectangleInsets axisOffset; /** The domain axis / axes (used for the x-values). */ - private ObjectList domainAxes; + private Map<Integer, ValueAxis> domainAxes; /** The domain axis locations. */ - private ObjectList domainAxisLocations; + private Map<Integer, AxisLocation> domainAxisLocations; /** The range axis (used for the y-values). */ - private ObjectList rangeAxes; + private Map<Integer, ValueAxis> rangeAxes; /** The range axis location. */ - private ObjectList rangeAxisLocations; + private Map<Integer, AxisLocation> rangeAxisLocations; /** Storage for the datasets. */ - private ObjectList datasets; + private Map<Integer, XYDataset> datasets; /** Storage for the renderers. */ - private ObjectList renderers; + private Map<Integer, XYItemRenderer> renderers; /** * Storage for the mapping between datasets/renderers and domain axes. The @@ -623,62 +623,58 @@ * @param rangeAxis the range axis (<code>null</code> permitted). * @param renderer the renderer (<code>null</code> permitted). */ - public XYPlot(XYDataset dataset, - ValueAxis domainAxis, - ValueAxis rangeAxis, - XYItemRenderer renderer) { - + public XYPlot(XYDataset dataset, ValueAxis domainAxis, ValueAxis rangeAxis, + XYItemRenderer renderer) { super(); - this.orientation = PlotOrientation.VERTICAL; this.weight = 1; // only relevant when this is a subplot this.axisOffset = RectangleInsets.ZERO_INSETS; // allocate storage for datasets, axes and renderers (all optional) - this.domainAxes = new ObjectList(); - this.domainAxisLocations = new ObjectList(); + this.domainAxes = new HashMap<Integer, ValueAxis>(); + this.domainAxisLocations = new HashMap<Integer, AxisLocation>(); this.foregroundDomainMarkers = new HashMap(); this.backgroundDomainMarkers = new HashMap(); - this.rangeAxes = new ObjectList(); - this.rangeAxisLocations = new ObjectList(); + this.rangeAxes = new HashMap<Integer, ValueAxis>(); + this.rangeAxisLocations = new HashMap<Integer, AxisLocation>(); this.foregroundRangeMarkers = new HashMap(); this.backgroundRangeMarkers = new HashMap(); - this.datasets = new ObjectList(); - this.renderers = new ObjectList(); + this.datasets = new HashMap<Integer, XYDataset>(); + this.renderers = new HashMap<Integer, XYItemRenderer>(); this.datasetToDomainAxesMap = new TreeMap(); this.datasetToRangeAxesMap = new TreeMap(); this.annotations = new java.util.ArrayList(); - this.datasets.set(0, dataset); + this.datasets.put(0, dataset); if (dataset != null) { dataset.addChangeListener(this); } - this.renderers.set(0, renderer); + this.renderers.put(0, renderer); if (renderer != null) { renderer.setPlot(this); renderer.addChangeListener(this); } - this.domainAxes.set(0, domainAxis); - this.mapDatasetToDomainAxis(0, 0); + this.domainAxes.put(0, domainAxis); + mapDatasetToDomainAxis(0, 0); if (domainAxis != null) { domainAxis.setPlot(this); domainAxis.addChangeListener(this); } - this.domainAxisLocations.set(0, AxisLocation.BOTTOM_OR_LEFT); + this.domainAxisLocations.put(0, AxisLocation.BOTTOM_OR_LEFT); - this.rangeAxes.set(0, rangeAxis); - this.mapDatasetToRangeAxis(0, 0); + this.rangeAxes.put(0, rangeAxis); + mapDatasetToRangeAxis(0, 0); if (rangeAxis != null) { rangeAxis.setPlot(this); rangeAxis.addChangeListener(this); } - this.rangeAxisLocations.set(0, AxisLocation.BOTTOM_OR_LEFT); + this.rangeAxisLocations.put(0, AxisLocation.BOTTOM_OR_LEFT); configureDomainAxes(); configureRangeAxes(); @@ -865,7 +861,7 @@ if (axis != null) { axis.setPlot(this); } - this.domainAxes.set(index, axis); + this.domainAxes.put(index, axis); if (axis != null) { axis.configure(); axis.addChangeListener(this); @@ -1035,12 +1031,11 @@ */ public void setDomainAxisLocation(int index, AxisLocation location, boolean notify) { - if (index == 0 && location == null) { throw new IllegalArgumentException( "Null 'location' for index 0 not permitted."); } - this.domainAxisLocations.set(index, location); + this.domainAxisLocations.put(index, location); if (notify) { fireChangeEvent(); } @@ -1084,24 +1079,20 @@ * @see #setRangeAxis(int, ValueAxis) */ public void setRangeAxis(ValueAxis axis) { - if (axis != null) { axis.setPlot(this); } - // plot is likely registered as a listener with the existing axis... ValueAxis existing = getRangeAxis(); if (existing != null) { existing.removeChangeListener(this); } - - this.rangeAxes.set(0, axis); + this.rangeAxes.put(0, axis); if (axis != null) { axis.configure(); axis.addChangeListener(this); } fireChangeEvent(); - } /** @@ -1210,7 +1201,7 @@ if (axis != null) { axis.setPlot(this); } - this.rangeAxes.set(index, axis); + this.rangeAxes.put(index, axis); if (axis != null) { axis.configure(); axis.addChangeListener(this); @@ -1329,12 +1320,11 @@ */ public void setRangeAxisLocation(int index, AxisLocation location, boolean notify) { - if (index == 0 && location == null) { throw new IllegalArgumentException( "Null 'location' for index 0 not permitted."); } - this.rangeAxisLocations.set(index, location); + this.rangeAxisLocations.put(index, location); if (notify) { fireChangeEvent(); } @@ -1410,7 +1400,7 @@ if (existing != null) { existing.removeChangeListener(this); } - this.datasets.set(index, dataset); + this.datasets.put(index, dataset); if (dataset != null) { dataset.addChangeListener(this); } @@ -1632,13 +1622,13 @@ * * @see #getRenderer(int) */ - public void setRenderer(int index, XYItemRenderer renderer, - boolean notify) { + public void setRenderer(int index, XYItemRenderer renderer, + boolean notify) { XYItemRenderer existing = getRenderer(index); if (existing != null) { existing.removeChangeListener(this); } - this.renderers.set(index, renderer); + this.renderers.put(index, renderer); if (renderer != null) { renderer.setPlot(this); renderer.addChangeListener(this); @@ -1726,7 +1716,13 @@ * @return The renderer index. */ public int getIndexOf(XYItemRenderer renderer) { - return this.renderers.indexOf(renderer); + for (Map.Entry<Integer, XYItemRenderer> entry + : this.renderers.entrySet()) { + if (entry.getValue() == renderer) { + return entry.getKey(); + } + } + return -1; } /** @@ -4409,7 +4405,7 @@ * @see #getRangeAxisIndex(ValueAxis) */ public int getDomainAxisIndex(ValueAxis axis) { - int result = this.domainAxes.indexOf(axis); + int result = findDomainAxisIndex(axis); if (result < 0) { // try the parent plot Plot parent = getParent(); @@ -4420,6 +4416,15 @@ } return result; } + + private int findDomainAxisIndex(ValueAxis axis) { + for (Map.Entry<Integer, ValueAxis> entry : this.domainAxes.entrySet()) { + if (entry.getValue() == axis) { + return entry.getKey(); + } + } + return -1; + } /** * Returns the index of the given range axis. @@ -4431,7 +4436,7 @@ * @see #getDomainAxisIndex(ValueAxis) */ public int getRangeAxisIndex(ValueAxis axis) { - int result = this.rangeAxes.indexOf(axis); + int result = findRangeAxisIndex(axis); if (result < 0) { // try the parent plot Plot parent = getParent(); @@ -4443,6 +4448,15 @@ return result; } + private int findRangeAxisIndex(ValueAxis axis) { + for (Map.Entry<Integer, ValueAxis> entry : this.rangeAxes.entrySet()) { + if (entry.getValue() == axis) { + return entry.getKey(); + } + } + return -1; + } + /** * Returns the range for the specified axis. * @@ -5583,40 +5597,31 @@ */ @Override public Object clone() throws CloneNotSupportedException { - XYPlot clone = (XYPlot) super.clone(); - clone.domainAxes = (ObjectList) ObjectUtilities.clone(this.domainAxes); - for (int i = 0; i < this.domainAxes.size(); i++) { - ValueAxis axis = (ValueAxis) this.domainAxes.get(i); + clone.domainAxes = CloneUtils.cloneMapValues(this.domainAxes); + for (ValueAxis axis : clone.domainAxes.values()) { if (axis != null) { - ValueAxis clonedAxis = (ValueAxis) axis.clone(); - clone.domainAxes.set(i, clonedAxis); - clonedAxis.setPlot(clone); - clonedAxis.addChangeListener(clone); + axis.setPlot(clone); + axis.addChangeListener(clone); } } - clone.domainAxisLocations = (ObjectList) - this.domainAxisLocations.clone(); - - clone.rangeAxes = (ObjectList) ObjectUtilities.clone(this.rangeAxes); - for (int i = 0; i < this.rangeAxes.size(); i++) { - ValueAxis axis = (ValueAxis) this.rangeAxes.get(i); + clone.rangeAxes = CloneUtils.cloneMapValues(this.rangeAxes); + for (ValueAxis axis : clone.rangeAxes.values()) { if (axis != null) { - ValueAxis clonedAxis = (ValueAxis) axis.clone(); - clone.rangeAxes.set(i, clonedAxis); - clonedAxis.setPlot(clone); - clonedAxis.addChangeListener(clone); + axis.setPlot(clone); + axis.addChangeListener(clone); } } - clone.rangeAxisLocations = (ObjectList) ObjectUtilities.clone( + clone.domainAxisLocations = new HashMap<Integer, AxisLocation>( + this.domainAxisLocations); + clone.rangeAxisLocations = new HashMap<Integer, AxisLocation>( this.rangeAxisLocations); // the datasets are not cloned, but listeners need to be added... - clone.datasets = (ObjectList) ObjectUtilities.clone(this.datasets); - for (int i = 0; i < clone.datasets.size(); ++i) { - XYDataset d = getDataset(i); - if (d != null) { - d.addChangeListener(clone); + clone.datasets = new HashMap<Integer, XYDataset>(this.datasets); + for (XYDataset dataset : clone.datasets.values()) { + if (dataset != null) { + dataset.addChangeListener(clone); } } @@ -5625,15 +5630,11 @@ clone.datasetToRangeAxesMap = new TreeMap(); clone.datasetToRangeAxesMap.putAll(this.datasetToRangeAxesMap); - clone.renderers = (ObjectList) ObjectUtilities.clone(this.renderers); - for (int i = 0; i < this.renderers.size(); i++) { - XYItemRenderer renderer2 = (XYItemRenderer) this.renderers.get(i); - if (renderer2 instanceof PublicCloneable) { - PublicCloneable pc = (PublicCloneable) renderer2; - XYItemRenderer rc = (XYItemRenderer) pc.clone(); - clone.renderers.set(i, rc); - rc.setPlot(clone); - rc.addChangeListener(clone); + clone.renderers = CloneUtils.cloneMapValues(this.renderers); + for (XYItemRenderer renderer : clone.renderers.values()) { + if (renderer != null) { + renderer.setPlot(clone); + renderer.addChangeListener(clone); } } clone.foregroundDomainMarkers = (Map) ObjectUtilities.clone( Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/AbstractRenderer.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/AbstractRenderer.java 2014-04-09 08:52:25 UTC (rev 3122) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/AbstractRenderer.java 2014-04-09 09:23:25 UTC (rev 3123) @@ -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 @@ * --------------------- * AbstractRenderer.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): Nicolas Brodu; @@ -91,6 +91,7 @@ * a line (DG); * 05-Jul-2012 : No need for BooleanUtilities now that min JDK = 1.4.2 (DG); * 03-Jul-2013 : Use ParamChecks (DG); + * 09-Apr-2014 : Remove use of ObjectList (DG); * */ @@ -110,7 +111,9 @@ import java.io.Serializable; import java.util.Arrays; import java.util.EventListener; +import java.util.HashMap; import java.util.List; +import java.util.Map; import javax.swing.event.EventListenerList; @@ -122,11 +125,11 @@ import org.jfree.chart.plot.DrawingSupplier; import org.jfree.chart.plot.PlotOrientation; import org.jfree.chart.title.LegendTitle; +import org.jfree.chart.util.CloneUtils; import org.jfree.chart.util.ParamChecks; import org.jfree.io.SerialUtilities; import org.jfree.ui.TextAnchor; import org.jfree.util.BooleanList; -import org.jfree.util.ObjectList; import org.jfree.util.ObjectUtilities; import org.jfree.util.PaintList; import org.jfree.util.PaintUtilities; @@ -277,7 +280,7 @@ private Boolean baseItemLabelsVisible; /** The item label font list (one font per series). */ - private ObjectList itemLabelFontList; + private Map<Integer, Font> itemLabelFontMap; /** The base item label font. */ private Font baseItemLabelFont; @@ -289,13 +292,13 @@ private transient Paint baseItemLabelPaint; /** The positive item label position (per series). */ - private ObjectList positiveItemLabelPositionList; + private Map<Integer, ItemLabelPosition> positiveItemLabelPositionMap; /** The fallback positive item label position. */ private ItemLabelPosition basePositiveItemLabelPosition; /** The negative item label position (per series). */ - private ObjectList negativeItemLabelPositionList; + private Map<Integer, ItemLabelPosition> negativeItemLabelPositionMap; /** The fallback negative item label position. */ private ItemLabelPosition baseNegativeItemLabelPosition; @@ -343,7 +346,7 @@ * * @since 1.0.11 */ - private ObjectList legendTextFont; + private Map<Integer, Font> legendTextFontMap; /** * The base legend font. @@ -389,7 +392,6 @@ * Default constructor. */ public AbstractRenderer() { - this.seriesVisible = null; this.seriesVisibleList = new BooleanList(); this.baseSeriesVisible = true; @@ -433,7 +435,7 @@ this.baseItemLabelsVisible = Boolean.FALSE; this.itemLabelFont = null; - this.itemLabelFontList = new ObjectList(); + this.itemLabelFontMap = new HashMap<Integer, Font>(); this.baseItemLabelFont = new Font("SansSerif", Font.PLAIN, 10); this.itemLabelPaint = null; @@ -441,12 +443,14 @@ this.baseItemLabelPaint = Color.black; this.positiveItemLabelPosition = null; - this.positiveItemLabelPositionList = new ObjectList(); + this.positiveItemLabelPositionMap + = new HashMap<Integer, ItemLabelPosition>(); this.basePositiveItemLabelPosition = new ItemLabelPosition( ItemLabelAnchor.OUTSIDE12, TextAnchor.BOTTOM_CENTER); this.negativeItemLabelPosition = null; - this.negativeItemLabelPositionList = new ObjectList(); + this.negativeItemLabelPositionMap + = new HashMap<Integer, ItemLabelPosition>(); this.baseNegativeItemLabelPosition = new ItemLabelPosition( ItemLabelAnchor.OUTSIDE6, TextAnchor.TOP_CENTER); @@ -461,14 +465,13 @@ this.treatLegendShapeAsLine = false; - this.legendTextFont = new ObjectList(); + this.legendTextFontMap = new HashMap<Integer, Font>(); this.baseLegendTextFont = null; this.legendTextPaint = new PaintList(); this.baseLegendTextPaint = null; this.listenerList = new EventListenerList(); - } /** @@ -1896,7 +1899,7 @@ * @see #setSeriesItemLabelFont(int, Font) */ public Font getSeriesItemLabelFont(int series) { - return (Font) this.itemLabelFontList.get(series); + return this.itemLabelFontMap.get(series); } /** @@ -1924,7 +1927,7 @@ * @see #getSeriesItemLabelFont(int) */ public void setSeriesItemLabelFont(int series, Font font, boolean notify) { - this.itemLabelFontList.set(series, font); + this.itemLabelFontMap.put(series, font); if (notify) { fireChangeEvent(); } @@ -2106,20 +2109,17 @@ * @see #setSeriesPositiveItemLabelPosition(int, ItemLabelPosition) */ public ItemLabelPosition getSeriesPositiveItemLabelPosition(int series) { - // return the override, if there is one... if (this.positiveItemLabelPosition != null) { return this.positiveItemLabelPosition; } - // otherwise look up the position table ItemLabelPosition position = (ItemLabelPosition) - this.positiveItemLabelPositionList.get(series); + this.positiveItemLabelPositionMap.get(series); if (position == null) { position = this.basePositiveItemLabelPosition; } return position; - } /** @@ -2148,9 +2148,8 @@ * @see #getSeriesPositiveItemLabelPosition(int) */ public void setSeriesPositiveItemLabelPosition(int series, - ItemLabelPosition position, - boolean notify) { - this.positiveItemLabelPositionList.set(series, position); + ItemLabelPosition position, boolean notify) { + this.positiveItemLabelPositionMap.put(series, position); if (notify) { fireChangeEvent(); } @@ -2225,20 +2224,17 @@ * @see #setSeriesNegativeItemLabelPosition(int, ItemLabelPosition) */ public ItemLabelPosition getSeriesNegativeItemLabelPosition(int series) { - // return the override, if there is one... if (this.negativeItemLabelPosition != null) { return this.negativeItemLabelPosition; } - // otherwise look up the position list - ItemLabelPosition position = (ItemLabelPosition) - this.negativeItemLabelPositionList.get(series); + ItemLabelPosition position + = this.negativeItemLabelPositionMap.get(series); if (position == null) { position = this.baseNegativeItemLabelPosition; } return position; - } /** @@ -2267,9 +2263,8 @@ * @see #getSeriesNegativeItemLabelPosition(int) */ public void setSeriesNegativeItemLabelPosition(int series, - ItemLabelPosition position, - boolean notify) { - this.negativeItemLabelPositionList.set(series, position); + ItemLabelPosition position, boolean notify) { + this.negativeItemLabelPositionMap.put(series, position); if (notify) { fireChangeEvent(); } @@ -2606,7 +2601,7 @@ * @since 1.0.11 */ public Font getLegendTextFont(int series) { - return (Font) this.legendTextFont.get(series); + return this.legendTextFontMap.get(series); } /** @@ -2619,7 +2614,7 @@ * @since 1.0.11 */ public void setLegendTextFont(int series, Font font) { - this.legendTextFont.set(series, font); + this.legendTextFontMap.put(series, font); fireChangeEvent(); } @@ -3061,8 +3056,8 @@ if (!ObjectUtilities.equal(this.itemLabelFont, that.itemLabelFont)) { return false; } - if (!ObjectUtilities.equal(this.itemLabelFontList, - that.itemLabelFontList)) { + if (!ObjectUtilities.equal(this.itemLabelFontMap, + that.itemLabelFontMap)) { return false; } if (!ObjectUtilities.equal(this.baseItemLabelFont, @@ -3086,8 +3081,8 @@ that.positiveItemLabelPosition)) { return false; } - if (!ObjectUtilities.equal(this.positiveItemLabelPositionList, - that.positiveItemLabelPositionList)) { + if (!ObjectUtilities.equal(this.positiveItemLabelPositionMap, + that.positiveItemLabelPositionMap)) { return false; } if (!ObjectUtilities.equal(this.basePositiveItemLabelPosition, @@ -3099,8 +3094,8 @@ that.negativeItemLabelPosition)) { return false; } - if (!ObjectUtilities.equal(this.negativeItemLabelPositionList, - that.negativeItemLabelPositionList)) { + if (!ObjectUtilities.equal(this.negativeItemLabelPositionMap, + that.negativeItemLabelPositionMap)) { return false; } if (!ObjectUtilities.equal(this.baseNegativeItemLabelPosition, @@ -3128,7 +3123,8 @@ that.baseLegendShape)) { return false; } - if (!ObjectUtilities.equal(this.legendTextFont, that.legendTextFont)) { + if (!ObjectUtilities.equal(this.legendTextFontMap, + that.legendTextFontMap)) { return false; } if (!ObjectUtilities.equal(this.baseLegendTextFont, @@ -3254,9 +3250,9 @@ // 'basePaint' : immutable, no need to clone reference // 'itemLabelFont' : immutable, no need to clone reference - if (this.itemLabelFontList != null) { - clone.itemLabelFontList - = (ObjectList) this.itemLabelFontList.clone(); + if (this.itemLabelFontMap != null) { + clone.itemLabelFontMap + = CloneUtils.cloneMapValues(this.itemLabelFontMap); } // 'baseItemLabelFont' : immutable, no need to clone reference @@ -3268,16 +3264,16 @@ // 'baseItemLabelPaint' : immutable, no need to clone reference // 'postiveItemLabelAnchor' : immutable, no need to clone reference - if (this.positiveItemLabelPositionList != null) { - clone.positiveItemLabelPositionList - = (ObjectList) this.positiveItemLabelPositionList.clone(); + if (this.positiveItemLabelPositionMap != null) { + clone.positiveItemLabelPositionMap = CloneUtils.cloneMapValues( + this.positiveItemLabelPositionMap); } // 'baseItemLabelAnchor' : immutable, no need to clone reference // 'negativeItemLabelAnchor' : immutable, no need to clone reference - if (this.negativeItemLabelPositionList != null) { - clone.negativeItemLabelPositionList - = (ObjectList) this.negativeItemLabelPositionList.clone(); + if (this.negativeItemLabelPositionMap != null) { + clone.negativeItemLabelPositionMap = CloneUtils.cloneMapValues( + this.negativeItemLabelPositionMap); } // 'baseNegativeItemLabelAnchor' : immutable, no need to clone reference @@ -3289,8 +3285,9 @@ if (this.legendShapeList != null) { clone.legendShapeList = (ShapeList) this.legendShapeList.clone(); } - if (this.legendTextFont != null) { - clone.legendTextFont = (ObjectList) this.legendTextFont.clone(); + if (this.legendTextFontMap != null) { + clone.legendTextFontMap = CloneUtils.cloneMapValues( + this.legendTextFontMap); } if (this.legendTextPaint != null) { clone.legendTextPaint = (PaintList) this.legendTextPaint.clone(); Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/AbstractCategoryItemRenderer.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/AbstractCategoryItemRenderer.java 2014-04-09 08:52:25 UTC (rev 3122) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/AbstractCategoryItemRenderer.java 2014-04-09 09:23:25 UTC (rev 3123) @@ -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 @@ * --------------------------------- * AbstractCategoryItemRenderer.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): Richard Atkinson; @@ -104,6 +104,7 @@ * 01-Apr-2009 : Added new addEntity() method (DG); * 09-Feb-2010 : Fixed bug 2947660 (DG); * 02-Jul-2013 : Use ParamChecks (DG); + * 08-Apr-2014 : Remove use of ObjectList (DG); * */ @@ -124,7 +125,9 @@ import java.io.Serializable; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; import org.jfree.chart.LegendItem; import org.jfree.chart.LegendItemCollection; import org.jfree.chart.axis.CategoryAxis; @@ -148,6 +151,7 @@ import org.jfree.chart.plot.ValueMarker; import org.jfree.chart.renderer.AbstractRenderer; import org.jfree.chart.urls.CategoryURLGenerator; +import org.jfree.chart.util.CloneUtils; import org.jfree.chart.util.ParamChecks; import org.jfree.data.Range; import org.jfree.data.category.CategoryDataset; @@ -158,7 +162,6 @@ import org.jfree.ui.RectangleAnchor; import org.jfree.ui.RectangleEdge; import org.jfree.ui.RectangleInsets; -import org.jfree.util.ObjectList; import org.jfree.util.ObjectUtilities; import org.jfree.util.PublicCloneable; import org.jfree.util.SortOrder; @@ -180,19 +183,19 @@ private CategoryPlot plot; /** A list of item label generators (one per series). */ - private ObjectList itemLabelGeneratorList; + private Map<Integer, CategoryItemLabelGenerator> itemLabelGeneratorMap; /** The base item label generator. */ private CategoryItemLabelGenerator baseItemLabelGenerator; /** A list of tool tip generators (one per series). */ - private ObjectList toolTipGeneratorList; + private Map<Integer, CategoryToolTipGenerator> toolTipGeneratorMap; /** The base tool tip generator. */ private CategoryToolTipGenerator baseToolTipGenerator; /** A list of item label generators (one per series). */ - private ObjectList itemURLGeneratorList; + private Map<Integer, CategoryURLGenerator> itemURLGeneratorMap; /** The base item label generator. */ private CategoryURLGenerator baseItemURLGenerator; @@ -221,11 +224,13 @@ */ protected AbstractCategoryItemRenderer() { this.itemLabelGenerator = null; - this.itemLabelGeneratorList = new ObjectList(); + this.itemLabelGeneratorMap + = new HashMap<Integer, CategoryItemLabelGenerator>(); this.toolTipGenerator = null; - this.toolTipGeneratorList = new ObjectList(); + this.toolTipGeneratorMap + = new HashMap<Integer, CategoryToolTipGenerator>(); this.itemURLGenerator = null; - this.itemURLGeneratorList = new ObjectList(); + this.itemURLGeneratorMap = new HashMap<Integer, CategoryURLGenerator>(); this.legendItemLabelGenerator = new StandardCategorySeriesLabelGenerator(); } @@ -308,13 +313,12 @@ } // otherwise look up the generator table - CategoryItemLabelGenerator generator = (CategoryItemLabelGenerator) - this.itemLabelGeneratorList.get(series); + CategoryItemLabelGenerator generator = this.itemLabelGeneratorMap.get( + series); if (generator == null) { generator = this.baseItemLabelGenerator; } return generator; - } /** @@ -329,7 +333,7 @@ @Override public void setSeriesItemLabelGenerator(int series, CategoryItemLabelGenerator generator) { - this.itemLabelGeneratorList.set(series, generator); + this.itemLabelGeneratorMap.put(series, generator); fireChangeEvent(); } @@ -402,7 +406,7 @@ */ @Override public CategoryToolTipGenerator getSeriesToolTipGenerator(int series) { - return (CategoryToolTipGenerator) this.toolTipGeneratorList.get(series); + return this.toolTipGeneratorMap.get(series); } /** @@ -417,7 +421,7 @@ @Override public void setSeriesToolTipGenerator(int series, CategoryToolTipGenerator generator) { - this.toolTipGeneratorList.set(series, generator); + this.toolTipGeneratorMap.put(series, generator); fireChangeEvent(); } @@ -475,20 +479,16 @@ */ @Override public CategoryURLGenerator getSeriesItemURLGenerator(int series) { - // return the generator for ALL series, if there is one... if (this.itemURLGenerator != null) { return this.itemURLGenerator; } - // otherwise look up the generator table - CategoryURLGenerator generator - = (CategoryURLGenerator) this.itemURLGeneratorList.get(series); + CategoryURLGenerator generator = this.itemURLGeneratorMap.get(series); if (generator == null) { generator = this.baseItemURLGenerator; } return generator; - } /** @@ -503,7 +503,7 @@ @Override public void setSeriesItemURLGenerator(int series, CategoryURLGenerator generator) { - this.itemURLGeneratorList.set(series, generator); + this.itemURLGeneratorMap.put(series, generator); fireChangeEvent(); } @@ -1238,7 +1238,6 @@ */ @Override public boolean equals(Object obj) { - if (obj == this) { return true; } @@ -1251,8 +1250,8 @@ that.itemLabelGenerator)) { return false; } - if (!ObjectUtilities.equal(this.itemLabelGeneratorList, - that.itemLabelGeneratorList)) { + if (!ObjectUtilities.equal(this.itemLabelGeneratorMap, + that.itemLabelGeneratorMap)) { return false; } if (!ObjectUtilities.equal(this.baseItemLabelGenerator, @@ -1263,8 +1262,8 @@ that.toolTipGenerator)) { return false; } - if (!ObjectUtilities.equal(this.toolTipGeneratorList, - that.toolTipGeneratorList)) { + if (!ObjectUtilities.equal(this.toolTipGeneratorMap, + that.toolTipGeneratorMap)) { return false; } if (!ObjectUtilities.equal(this.baseToolTipGenerator, @@ -1275,8 +1274,8 @@ that.itemURLGenerator)) { return false; } - if (!ObjectUtilities.equal(this.itemURLGeneratorList, - that.itemURLGeneratorList)) { + if (!ObjectUtilities.equal(this.itemURLGeneratorMap, + that.itemURLGeneratorMap)) { return false; } if (!ObjectUtilities.equal(this.baseItemURLGenerator, @@ -1416,7 +1415,6 @@ */ @Override public Object clone() throws CloneNotSupportedException { - AbstractCategoryItemRenderer clone = (AbstractCategoryItemRenderer) super.clone(); @@ -1432,9 +1430,9 @@ } } - if (this.itemLabelGeneratorList != null) { - clone.itemLabelGeneratorList - = (ObjectList) this.itemLabelGeneratorList.clone(); + if (this.itemLabelGeneratorMap != null) { + clone.itemLabelGeneratorMap = CloneUtils.cloneMapValues( + this.itemLabelGeneratorMap); } if (this.baseItemLabelGenerator != null) { @@ -1461,9 +1459,9 @@ } } - if (this.toolTipGeneratorList != null) { - clone.toolTipGeneratorList - = (ObjectList) this.toolTipGeneratorList.clone(); + if (this.toolTipGeneratorMap != null) { + clone.toolTipGeneratorMap = CloneUtils.cloneMapValues( + this.toolTipGeneratorMap); } if (this.baseToolTipGenerator != null) { @@ -1490,9 +1488,9 @@ } } - if (this.itemURLGeneratorList != null) { - clone.itemURLGeneratorList - = (ObjectList) this.itemURLGeneratorList.clone(); + if (this.itemURLGeneratorMap != null) { + clone.itemURLGeneratorMap = CloneUtils.cloneMapValues( + this.itemURLGeneratorMap); } if (this.baseItemURLGenerator != null) { Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/AbstractXYItemRenderer.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/AbstractXYItemRenderer.java 2014-04-09 08:52:25 UTC (rev 3122) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/AbstractXYItemRenderer.java 2014-04-09 09:23:25 UTC (rev 3123) @@ -120,6 +120,7 @@ * 06-Oct-2011 : Add utility methods to work with 1.4 API in GeneralPath (MK) * 03-Jul-2013 : Use ParamChecks (DG); * 11-Jan-2014 : Fix error in fillDomainGridBand method (DG); + * 07-Apr-2014 : Don't use ObjectList anymore (DG); * */ @@ -141,8 +142,10 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.Collection; +import java.util.HashMap; import java.util.Iterator; import java.util.List; +import java.util.Map; import org.jfree.chart.LegendItem; import org.jfree.chart.LegendItemCollection; @@ -170,6 +173,7 @@ import org.jfree.chart.plot.XYPlot; import org.jfree.chart.renderer.AbstractRenderer; import org.jfree.chart.urls.XYURLGenerator; +import org.jfree.chart.util.CloneUtils; import org.jfree.chart.util.ParamChecks; import org.jfree.data.Range; import org.jfree.data.general.DatasetUtilities; @@ -180,7 +184,6 @@ import org.jfree.ui.LengthAdjustmentType; import org.jfree.ui.RectangleAnchor; import org.jfree.ui.RectangleInsets; -import org.jfree.util.ObjectList; import org.jfree.util.ObjectUtilities; import org.jfree.util.PublicCloneable; @@ -199,13 +202,13 @@ private XYPlot plot; /** A list of item label generators (one per series). */ - private ObjectList itemLabelGeneratorList; + private Map<Integer, XYItemLabelGenerator> itemLabelGeneratorMap; /** The base item label generator. */ private XYItemLabelGenerator baseItemLabelGenerator; /** A list of tool tip generators (one per series). */ - private ObjectList toolTipGeneratorList; + private Map<Integer, XYToolTipGenerator> toolTipGeneratorMap; /** The base tool tip generator. */ private XYToolTipGenerator baseToolTipGenerator; @@ -241,9 +244,10 @@ protected AbstractXYItemRenderer() { super(); this.itemLabelGenerator = null; - this.itemLabelGeneratorList = new ObjectList(); + this.itemLabelGeneratorMap + = new HashMap<Integer, XYItemLabelGenerator>(); this.toolTipGenerator = null; - this.toolTipGeneratorList = new ObjectList(); + this.toolTipGeneratorMap = new HashMap<Integer, XYToolTipGenerator>(); this.urlGenerator = null; this.backgroundAnnotations = new java.util.ArrayList(); this.foregroundAnnotations = new java.util.ArrayList(); @@ -328,7 +332,7 @@ // otherwise look up the generator table XYItemLabelGenerator generator - = (XYItemLabelGenerator) this.itemLabelGeneratorList.get(series); + = (XYItemLabelGenerator) this.itemLabelGeneratorMap.get(series); if (generator == null) { generator = this.baseItemLabelGenerator; } @@ -344,7 +348,7 @@ */ @Override public XYItemLabelGenerator getSeriesItemLabelGenerator(int series) { - return (XYItemLabelGenerator) this.itemLabelGeneratorList.get(series); + return this.itemLabelGeneratorMap.get(series); } /** @@ -356,8 +360,8 @@ */ @Override public void setSeriesItemLabelGenerator(int series, - XYItemLabelGenerator generator) { - this.itemLabelGeneratorList.set(series, generator); + XYItemLabelGenerator generator) { + this.itemLabelGeneratorMap.put(series, generator); fireChangeEvent(); } @@ -404,7 +408,7 @@ // otherwise look up the generator table XYToolTipGenerator generator - ... [truncated message content] |
From: <mu...@us...> - 2014-06-27 10:43:42
|
Revision: 3134 http://sourceforge.net/p/jfreechart/code/3134 Author: mungady Date: 2014-06-27 10:43:29 +0000 (Fri, 27 Jun 2014) Log Message: ----------- 2014-06-27 David Gilbert <dav...@ob...> * org/jfree/chart/fx/ChartCanvas.java: New file, * org/jfree/chart/fx/ChartViewer.java: Likewise, * org/jfree/chart/fx/ChartViewerSkin.java: Likewise, * org/jfree/chart/fx/FXGraphics2D.java: Likewise, * org/jfree/chart/fx/chart-viewer.css: Likewise, * org/jfree/chart/fx/demo/BarChartFXDemo1.java: Likewise, * org/jfree/chart/fx/demo/PieChartFXDemo1.java: Likewise, * org/jfree/chart/fx/demo/TimeSeriesChartFXDemo1.java: Likewise, * org/jfree/chart/fx/interaction/AbstractMouseHandlerFX.java: Likewise, * org/jfree/chart/fx/interaction/AnchorHandlerFX.java: Likewise, * org/jfree/chart/fx/interaction/ChartMouseEventFX.java: Likewise, * org/jfree/chart/fx/interaction/ChartMouseListenerFX.java: Likewise, * org/jfree/chart/fx/interaction/DispatchHandlerFX.java: Likewise, * org/jfree/chart/fx/interaction/MouseHandlerFX.java: Likewise, * org/jfree/chart/fx/interaction/PanHandlerFX.java: Likewise, * org/jfree/chart/fx/interaction/ScrollHandlerFX.java: Likewise, * org/jfree/chart/fx/interaction/TooltipHandlerFX.java: Likewise, * org/jfree/chart/fx/interaction/ZoomHandlerFX.java: Likewise, * org/jfree/chart/utils/ExportUtils.java: Likewise. Added Paths: ----------- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/fx/ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/fx/ChartCanvas.java 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/FXGraphics2D.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/fx/chart-viewer.css branches/jfreechart-1.0.x-branch/source/org/jfree/chart/fx/demo/ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/fx/demo/BarChartFXDemo1.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/fx/demo/PieChartFXDemo1.java 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/package-info.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/fx/interaction/ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/fx/interaction/AbstractMouseHandlerFX.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/fx/interaction/AnchorHandlerFX.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/fx/interaction/ChartMouseEventFX.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/fx/interaction/ChartMouseListenerFX.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/fx/interaction/DispatchHandlerFX.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/fx/interaction/MouseHandlerFX.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/fx/interaction/PanHandlerFX.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/fx/interaction/ScrollHandlerFX.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/fx/interaction/TooltipHandlerFX.java 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/package-info.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/fx/package-info.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/util/ExportUtils.java Added: 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 (rev 0) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/fx/ChartCanvas.java 2014-06-27 10:43:29 UTC (rev 3134) @@ -0,0 +1,555 @@ +/* =========================================================== + * JFreeChart : a free chart library for the Java(tm) platform + * =========================================================== + * + * (C) Copyright 2000-2014, by Object Refinery Limited and Contributors. + * + * Project Info: http://www.jfree.org/jfreechart/index.html + * + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or + * (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * 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. + * + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] + * + * ---------------- + * ChartCanvas.java + * ---------------- + * (C) Copyright 2014, by Object Refinery Limited and Contributors. + * + * Original Author: David Gilbert (for Object Refinery Limited); + * Contributor(s): -; + * + * Changes: + * -------- + * 25-Jun-2014 : Version 1 (DG); + * + */ + +package org.jfree.chart.fx; + +import java.awt.Graphics2D; +import java.awt.Rectangle; +import java.awt.geom.Point2D; +import java.awt.geom.Rectangle2D; +import java.util.ArrayList; +import java.util.List; +import javafx.scene.canvas.Canvas; +import javafx.scene.control.Tooltip; +import javafx.scene.input.MouseEvent; +import javafx.scene.input.ScrollEvent; +import org.jfree.chart.ChartMouseEvent; +import org.jfree.chart.ChartRenderingInfo; +import org.jfree.chart.JFreeChart; +import org.jfree.chart.entity.ChartEntity; +import org.jfree.chart.event.ChartChangeEvent; +import org.jfree.chart.event.ChartChangeListener; +import org.jfree.chart.fx.interaction.AnchorHandlerFX; +import org.jfree.chart.fx.interaction.DispatchHandlerFX; +import org.jfree.chart.fx.interaction.ChartMouseEventFX; +import org.jfree.chart.fx.interaction.ChartMouseListenerFX; +import org.jfree.chart.fx.interaction.TooltipHandlerFX; +import org.jfree.chart.fx.interaction.ScrollHandlerFX; +import org.jfree.chart.fx.interaction.PanHandlerFX; +import org.jfree.chart.fx.interaction.MouseHandlerFX; +import org.jfree.chart.plot.PlotRenderingInfo; +import org.jfree.chart.util.ParamChecks; + +/** + * A canvas for displaying a {@link JFreeChart} in JavaFX. You can use the + * canvas directly to display charts, but usually the {@link ChartViewer} + * class (which embeds a canvas) is a better option. + * <p> + * The canvas installs several default mouse handlers, if you don't like the + * behaviour provided by these you can retrieve the handler by ID and + * disable or remove it (the IDs are "tooltip", "scroll", "anchor", "pan" and + * "dispatch"). + * + * <p>THE API FOR THIS CLASS IS SUBJECT TO CHANGE IN FUTURE RELEASES. This is + * so that we can incorporate feedback on the (new) JavaFX support in + * JFreeChart.</p> + * + * @since 1.0.18 + */ +public class ChartCanvas extends Canvas implements ChartChangeListener { + + /** The chart being displayed in the canvas (never null). */ + private JFreeChart chart; + + /** + * The graphics drawing context (will be an instance of FXGraphics2D). + */ + private Graphics2D g2; + + /** + * The anchor point (can be null) is usually updated to reflect the most + * recent mouse click and is used during chart rendering to update + * crosshairs belonging to the chart. + */ + private Point2D anchor; + + /** The chart rendering info from the most recent drawing of the chart. */ + private ChartRenderingInfo info; + + /** The tooltip object for the canvas (can be null). */ + private Tooltip tooltip; + + /** + * A flag that controls whether or not tooltips will be generated from the + * chart as the mouse pointer moves over it. + */ + private boolean tooltipEnabled; + + /** Storage for registered chart mouse listeners. */ + private transient List<ChartMouseListenerFX> chartMouseListeners; + + /** The current live handler (can be null). */ + private MouseHandlerFX liveHandler; + + /** + * The list of available live mouse handlers (can be empty but not null). + */ + private List<MouseHandlerFX> availableMouseHandlers; + + /** The auxiliary mouse handlers (can be empty but not null). */ + private List<MouseHandlerFX> auxiliaryMouseHandlers; + + /** + * Creates a new canvas to display the supplied chart in JavaFX. + * + * @param chart the chart ({@code null} not permitted). + */ + public ChartCanvas(JFreeChart chart) { + ParamChecks.nullNotPermitted(chart, "chart"); + this.chart = chart; + this.chart.addChangeListener(this); + this.tooltip = null; + this.tooltipEnabled = true; + this.chartMouseListeners = new ArrayList<ChartMouseListenerFX>(); + + widthProperty().addListener(evt -> draw()); + heightProperty().addListener(evt -> draw()); + this.g2 = new FXGraphics2D(getGraphicsContext2D()); + this.liveHandler = null; + this.availableMouseHandlers = new ArrayList<MouseHandlerFX>(); + + this.availableMouseHandlers.add(new PanHandlerFX("pan", true, false, + false, false)); + + this.auxiliaryMouseHandlers = new ArrayList<MouseHandlerFX>(); + this.auxiliaryMouseHandlers.add(new TooltipHandlerFX("tooltip")); + this.auxiliaryMouseHandlers.add(new ScrollHandlerFX("scroll")); + this.auxiliaryMouseHandlers.add(new AnchorHandlerFX("anchor")); + this.auxiliaryMouseHandlers.add(new DispatchHandlerFX("dispatch")); + + setOnMouseMoved((MouseEvent e) -> { handleMouseMoved(e); }); + setOnMouseClicked((MouseEvent e) -> { handleMouseClicked(e); }); + setOnMousePressed((MouseEvent e) -> { handleMousePressed(e); }); + setOnMouseDragged((MouseEvent e) -> { handleMouseDragged(e); }); + setOnMouseReleased((MouseEvent e) -> { handleMouseReleased(e); }); + setOnScroll((ScrollEvent event) -> { handleScroll(event); }); + } + + /** + * Returns the chart that is being displayed by this node. + * + * @return The chart (never {@code null}). + */ + public JFreeChart getChart() { + return this.chart; + } + + /** + * Sets the chart to be displayed by this node. + * + * @param chart the chart ({@code null} not permitted). + */ + public void setChart(JFreeChart chart) { + ParamChecks.nullNotPermitted(chart, "chart"); + this.chart.removeChangeListener(this); + this.chart = chart; + this.chart.addChangeListener(this); + draw(); + } + + /** + * Returns the rendering info from the most recent drawing of the chart. + * + * @return The rendering info (possibly {@code null}). + */ + public ChartRenderingInfo getRenderingInfo() { + return this.info; + } + + /** + * Returns the flag that controls whether or not tooltips are enabled. + * The default value is {@code true}. The {@link ToolTipHandlerFX} + * class will only update the tooltip if this flag is set to + * {@code true}. + * + * @return The flag. + */ + public boolean isTooltipEnabled() { + return this.tooltipEnabled; + } + + /** + * Sets the flag that controls whether or not tooltips are enabled. + * + * @param tooltipEnabled the new flag value. + */ + public void setTooltipEnabled(boolean tooltipEnabled) { + this.tooltipEnabled = tooltipEnabled; + } + + /** + * Set the anchor point and forces a redraw of the chart (the anchor point + * is used to determine the position of the crosshairs on the chart, if + * they are visible). + * + * @param anchor the anchor ({@code null} permitted). + */ + public void setAnchor(Point2D anchor) { + this.anchor = anchor; + this.chart.setNotify(true); // force a redraw + } + + /** + * Registers a listener to receive {@link ChartMouseEvent} notifications. + * + * @param listener the listener ({@code null} not permitted). + */ + public void addChartMouseListener(ChartMouseListenerFX listener) { + ParamChecks.nullNotPermitted(listener, "listener"); + this.chartMouseListeners.add(listener); + } + + /** + * Removes a listener from the list of objects listening for chart mouse + * events. + * + * @param listener the listener. + */ + public void removeChartMouseListener(ChartMouseListenerFX listener) { + this.chartMouseListeners.remove(listener); + } + + /** + * Returns the mouse handler with the specified ID, or {@code null} if + * there is no handler with that ID. This method will look for handlers + * in both the regular and auxiliary handler lists. + * + * @param id the ID ({@code null} not permitted). + * + * @return The handler with the specified ID + */ + public MouseHandlerFX getMouseHandler(String id) { + for (MouseHandlerFX h: this.availableMouseHandlers) { + if (h.getID().equals(id)) { + return h; + } + } + for (MouseHandlerFX h: this.auxiliaryMouseHandlers) { + if (h.getID().equals(id)) { + return h; + } + } + return null; + } + + /** + * Adds a mouse handler to the list of available handlers (handlers that + * are candidates to take the position of live handler). The handler must + * have an ID that uniquely identifies it amongst the handlers registered + * with this canvas. + * + * @param handler the handler ({@code null} not permitted). + */ + public void addMouseHandler(MouseHandlerFX handler) { + if (!this.hasUniqueID(handler)) { + throw new IllegalArgumentException( + "There is already a handler with that ID (" + + handler.getID() + ")."); + } + this.availableMouseHandlers.add(handler); + } + + /** + * Removes a handler from the list of available handlers. + * + * @param handler the handler ({@code null} not permitted). + */ + public void removeMouseHandler(MouseHandlerFX handler) { + this.availableMouseHandlers.remove(handler); + } + + /** + * Validates that the specified handler has an ID that uniquely identifies + * it amongst the existing handlers for this canvas. + * + * @param handler the handler ({@code null} not permitted). + * + * @return A boolean. + */ + private boolean hasUniqueID(MouseHandlerFX handler) { + for (MouseHandlerFX h: this.availableMouseHandlers) { + if (handler.getID().equals(h.getID())) { + return false; + } + } + for (MouseHandlerFX h: this.auxiliaryMouseHandlers) { + if (handler.getID().equals(h.getID())) { + return false; + } + } + return true; + } + + /** + * Clears the current live handler. This method is intended for use by the + * handlers themselves, you should not call it directly. + */ + public void clearLiveHandler() { + this.liveHandler = null; + } + + /** + * Draws the content of the canvas and updates the + * {@code renderingInfo} attribute with the latest rendering + * information. + */ + public final void draw() { + getGraphicsContext2D().save(); + double width = getWidth(); + double height = getHeight(); + if (width > 0 && height > 0) { + this.info = new ChartRenderingInfo(); + this.chart.draw(this.g2, new Rectangle((int) width, (int) height), + this.anchor, this.info); + } + getGraphicsContext2D().restore(); + this.anchor = null; + } + + /** + * Returns the data area (the area inside the axes) for the plot or subplot. + * + * @param point the selection point (for subplot selection). + * + * @return The data area. + */ + public Rectangle2D findDataArea(Point2D point) { + PlotRenderingInfo plotInfo = this.info.getPlotInfo(); + Rectangle2D result; + if (plotInfo.getSubplotCount() == 0) { + result = plotInfo.getDataArea(); + } + else { + int subplotIndex = plotInfo.getSubplotIndex(point); + if (subplotIndex == -1) { + return null; + } + result = plotInfo.getSubplotInfo(subplotIndex).getDataArea(); + } + return result; + } + + /** + * Return {@code true} to indicate the canvas is resizable. + * + * @return {@code true}. + */ + @Override + public boolean isResizable() { + return true; + } + + /** + * Sets the tooltip text, with the (x, y) location being used for the + * anchor. If the text is {@code null}, no tooltip will be displayed. + * This method is intended for calling by the {@link TooltipHandlerFX} + * class, you won't normally call it directly. + * + * @param text the text ({@code null} permitted). + * @param x the x-coordinate of the mouse pointer. + * @param y the y-coordinate of the mouse pointer. + */ + public void setTooltip(String text, double x, double y) { + if (text != null) { + if (this.tooltip == null) { + this.tooltip = new Tooltip(text); + Tooltip.install(this, this.tooltip); + } else { + this.tooltip.setText(text); + this.tooltip.setAnchorX(x); + this.tooltip.setAnchorY(y); + } + } else { + Tooltip.uninstall(this, this.tooltip); + this.tooltip = null; + } + } + + /** + * Handles a mouse pressed event by (1) selecting a live handler if one + * is not already selected, (2) passing the event to the live handler if + * there is one, and (3) passing the event to all enabled auxiliary + * handlers. + * + * @param e the mouse event. + */ + private void handleMousePressed(MouseEvent e) { + if (this.liveHandler == null) { + for (MouseHandlerFX handler: this.availableMouseHandlers) { + if (handler.isEnabled() && handler.hasMatchingModifiers(e)) { + this.liveHandler = handler; + } + } + } + + if (this.liveHandler != null) { + this.liveHandler.handleMousePressed(this, e); + } + + // pass on the event to the auxiliary handlers + for (MouseHandlerFX handler: this.auxiliaryMouseHandlers) { + if (handler.isEnabled()) { + handler.handleMousePressed(this, e); + } + } + } + + /** + * Handles a mouse moved event by passing it on to the registered handlers. + * + * @param e the mouse event. + */ + private void handleMouseMoved(MouseEvent e) { + if (this.liveHandler != null && this.liveHandler.isEnabled()) { + this.liveHandler.handleMouseMoved(this, e); + } + + for (MouseHandlerFX handler: this.auxiliaryMouseHandlers) { + if (handler.isEnabled()) { + handler.handleMouseMoved(this, e); + } + } + } + + /** + * Handles a mouse dragged event by passing it on to the registered + * handlers. + * + * @param e the mouse event. + */ + private void handleMouseDragged(MouseEvent e) { + if (this.liveHandler != null && this.liveHandler.isEnabled()) { + this.liveHandler.handleMouseDragged(this, e); + } + + // pass on the event to the auxiliary handlers + for (MouseHandlerFX handler: this.auxiliaryMouseHandlers) { + if (handler.isEnabled()) { + handler.handleMouseDragged(this, e); + } + } + } + + /** + * Handles a mouse released event by passing it on to the registered + * handlers. + * + * @param e the mouse event. + */ + private void handleMouseReleased(MouseEvent e) { + if (this.liveHandler != null && this.liveHandler.isEnabled()) { + this.liveHandler.handleMouseReleased(this, e); + } + + // pass on the event to the auxiliary handlers + for (MouseHandlerFX handler: this.auxiliaryMouseHandlers) { + if (handler.isEnabled()) { + handler.handleMouseReleased(this, e); + } + } + } + + /** + * Handles a mouse released event by passing it on to the registered + * handlers. + * + * @param e the mouse event. + */ + private void handleMouseClicked(MouseEvent e) { + if (this.liveHandler != null && this.liveHandler.isEnabled()) { + this.liveHandler.handleMouseClicked(this, e); + } + + // pass on the event to the auxiliary handlers + for (MouseHandlerFX handler: this.auxiliaryMouseHandlers) { + if (handler.isEnabled()) { + handler.handleMouseClicked(this, e); + } + } + } + + /** + * Handles a scroll event by passing it on to the registered handlers. + * + * @param e the scroll event. + */ + protected void handleScroll(ScrollEvent e) { + if (this.liveHandler != null && this.liveHandler.isEnabled()) { + this.liveHandler.handleScroll(this, e); + } + for (MouseHandlerFX handler: this.auxiliaryMouseHandlers) { + if (handler.isEnabled()) { + handler.handleScroll(this, e); + } + } + } + + /** + * Receives a notification from the chart that it has been changed and + * responds by redrawing the chart entirely. + * + * @param event event information. + */ + @Override + public void chartChanged(ChartChangeEvent event) { + draw(); + } + + public void dispatchMouseMovedEvent(Point2D point, MouseEvent e) { + double x = point.getX(); + double y = point.getY(); + ChartEntity entity = this.info.getEntityCollection().getEntity(x, y); + ChartMouseEventFX event = new ChartMouseEventFX(this.chart, e, entity); + for (ChartMouseListenerFX listener : this.chartMouseListeners) { + listener.chartMouseMoved(event); + } + } + + public void dispatchMouseClickedEvent(Point2D point, MouseEvent e) { + double x = point.getX(); + double y = point.getY(); + ChartEntity entity = this.info.getEntityCollection().getEntity(x, y); + ChartMouseEventFX event = new ChartMouseEventFX(this.chart, e, entity); + for (ChartMouseListenerFX listener : this.chartMouseListeners) { + listener.chartMouseClicked(event); + } + } +} + Added: 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 (rev 0) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/fx/ChartViewer.java 2014-06-27 10:43:29 UTC (rev 3134) @@ -0,0 +1,338 @@ +/* =========================================================== + * JFreeChart : a free chart library for the Java(tm) platform + * =========================================================== + * + * (C) Copyright 2000-2014, by Object Refinery Limited and Contributors. + * + * Project Info: http://www.jfree.org/jfreechart/index.html + * + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or + * (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * 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. + * + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] + * + * ---------------- + * ChartViewer.java + * ---------------- + * (C) Copyright 2014, by Object Refinery Limited and Contributors. + * + * Original Author: David Gilbert (for Object Refinery Limited); + * Contributor(s): -; + * + * Changes: + * -------- + * 27-Jun-2014 : Version 1 (DG); + * + */ + +package org.jfree.chart.fx; + +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import javafx.event.ActionEvent; +import javafx.scene.control.ContextMenu; +import javafx.scene.control.Control; +import javafx.scene.control.Menu; +import javafx.scene.control.MenuItem; +import javafx.scene.control.Skinnable; +import javafx.stage.FileChooser; +import javafx.stage.WindowEvent; +import org.jfree.chart.ChartMouseEvent; +import org.jfree.chart.JFreeChart; +import org.jfree.chart.fx.interaction.ChartMouseEventFX; +import org.jfree.chart.fx.interaction.ChartMouseListenerFX; +import org.jfree.chart.util.ExportUtils; +import org.jfree.chart.util.ParamChecks; + +/** + * A control for displaying a {@link JFreeChart} in JavaFX (embeds a + * {@link ChartCanvas}, adds drag zooming and provides a popup menu for export + * to PNG/JPG/SVG and PDF formats). Many behaviours(tooltips, zooming etc) are + * provided directly by the canvas. + * + * <p>THE API FOR THIS CLASS IS SUBJECT TO CHANGE IN FUTURE RELEASES. This is + * so that we can incorporate feedback on the (new) JavaFX support in + * JFreeChart.</p> + * + * @since 1.0.18 + */ +public class ChartViewer extends Control implements Skinnable, + ChartMouseListenerFX { + + /** The chart to display. */ + private JFreeChart chart; + + /** The context menu that will be attached to the canvas. */ + private ContextMenu contextMenu; + + /** Does the viewer show tooltips from the chart? */ + private boolean tooltipEnabled; + + /** Storage for registered chart mouse listeners. */ + private transient List<ChartMouseListenerFX> chartMouseListeners; + + /** + * Creates a new viewer to display the supplied chart in JavaFX. + * + * @param chart the chart ({@code null} not permitted). + */ + public ChartViewer(JFreeChart chart) { + this(chart, true); + } + + /** + * Creates a new viewer instance. + * + * @param chart the chart ({@code null} not permitted). + * @param contextMenuEnabled enable the context menu? + */ + public ChartViewer(JFreeChart chart, boolean contextMenuEnabled) { + ParamChecks.nullNotPermitted(chart, "chart"); + this.chart = chart; + getStyleClass().add("chart-control"); + this.contextMenu = createContextMenu(); + this.contextMenu.setOnShowing((WindowEvent event) -> { + ChartViewer.this.setTooltipEnabled(false); + }); + this.contextMenu.setOnHiding((WindowEvent event) -> { + ChartViewer.this.setTooltipEnabled(true); + }); + setContextMenu(this.contextMenu); + this.tooltipEnabled = true; + this.chartMouseListeners = new ArrayList<ChartMouseListenerFX>(); + } + + @Override + protected String getUserAgentStylesheet() { + return ChartViewer.class.getResource("chart-viewer.css") + .toExternalForm(); + } + + /** + * Returns the chart that is being displayed by this node. + * + * @return The chart (never {@code null}). + */ + public JFreeChart getChart() { + return this.chart; + } + + /** + * Sets the chart to be displayed by this node. + * + * @param chart the chart ({@code null} not permitted). + */ + public void setChart(JFreeChart chart) { + ParamChecks.nullNotPermitted(chart, "chart"); + this.chart = chart; + ChartViewerSkin skin = (ChartViewerSkin) getSkin(); + skin.setChart(chart); + } + + /** + * Returns the flag that controls whether or not tooltips are displayed + * for the chart. + * + * @return A boolean. + */ + public boolean isTooltipEnabled() { + return this.tooltipEnabled; + } + + /** + * Sets the flag that controls whether or not the chart tooltips are shown + * by this viewer. + * + * @param enabled the new flag value. + */ + public void setTooltipEnabled(boolean enabled) { + this.tooltipEnabled = enabled; + ChartViewerSkin skin = (ChartViewerSkin) getSkin(); + if (skin != null) { + skin.setTooltipEnabled(enabled); + } + } + + /** + * Hides the zoom rectangle. The work is delegated to the control's + * current skin. + */ + public void hideZoomRectangle() { + ChartViewerSkin skin = (ChartViewerSkin) getSkin(); + skin.setZoomRectangleVisible(false); + } + + /** + * Sets the size and location of the zoom rectangle and makes it visible + * if it wasn't already visible. The work is delegated to the control's + * current skin. + * + * @param x the x-location. + * @param y the y-location. + * @param w the width. + * @param h the height. + */ + public void showZoomRectangle(double x, double y, double w, double h) { + ChartViewerSkin skin = (ChartViewerSkin) getSkin(); + skin.showZoomRectangle(x, y, w, h); + } + + /** + * Registers a listener to receive {@link ChartMouseEvent} notifications + * from this viewer. + * + * @param listener the listener ({@code null} not permitted). + */ + public void addChartMouseListener(ChartMouseListenerFX listener) { + ParamChecks.nullNotPermitted(listener, "listener"); + this.chartMouseListeners.add(listener); + } + + /** + * Removes a listener from the list of objects listening for chart mouse + * events. + * + * @param listener the listener. + */ + public void removeChartMouseListener(ChartMouseListenerFX listener) { + ParamChecks.nullNotPermitted(listener, "listener"); + this.chartMouseListeners.remove(listener); + } + + /** + * Creates the context menu. + * + * @return The context menu. + */ + private ContextMenu createContextMenu() { + final ContextMenu menu = new ContextMenu(); + + Menu export = new Menu("Export As"); + + MenuItem pngItem = new MenuItem("PNG..."); + pngItem.setOnAction((ActionEvent e) -> { handleExportToPNG(); }); + export.getItems().add(pngItem); + + MenuItem jpegItem = new MenuItem("JPEG..."); + jpegItem.setOnAction((ActionEvent e) -> { handleExportToJPEG(); }); + export.getItems().add(jpegItem); + + if (ExportUtils.isOrsonPDFAvailable()) { + MenuItem pdfItem = new MenuItem("PDF..."); + pdfItem.setOnAction((ActionEvent e) -> { + handleExportToPDF(); + }); + export.getItems().add(pdfItem); + } + if (ExportUtils.isJFreeSVGAvailable()) { + MenuItem svgItem = new MenuItem("SVG..."); + svgItem.setOnAction((ActionEvent e) -> { + handleExportToSVG(); + }); + export.getItems().add(svgItem); + } + menu.getItems().add(export); + return menu; + } + + /** + * A handler for the export to PDF option in the context menu. + */ + private void handleExportToPDF() { + FileChooser fileChooser = new FileChooser(); + fileChooser.setSelectedExtensionFilter(new FileChooser.ExtensionFilter( + "Portable Document Format (PDF)", "pdf")); + fileChooser.setTitle("Export to PDF"); + File file = fileChooser.showSaveDialog(this.getScene().getWindow()); + if (file != null) { + ExportUtils.writeAsPDF(this.chart, (int) getWidth(), + (int) getHeight(), file); + } + } + + /** + * A handler for the export to SVG option in the context menu. + */ + private void handleExportToSVG() { + FileChooser fileChooser = new FileChooser(); + fileChooser.setTitle("Export to SVG"); + fileChooser.setSelectedExtensionFilter(new FileChooser.ExtensionFilter( + "Scalable Vector Graphics (SVG)", "svg")); + File file = fileChooser.showSaveDialog(this.getScene().getWindow()); + if (file != null) { + ExportUtils.writeAsSVG(this.chart, (int) getWidth(), + (int) getHeight(), file); + } + } + + /** + * A handler for the export to PNG option in the context menu. + */ + private void handleExportToPNG() { + FileChooser fileChooser = new FileChooser(); + fileChooser.setTitle("Export to PNG"); + fileChooser.setSelectedExtensionFilter(new FileChooser.ExtensionFilter( + "Portable Network Graphics (PNG)", "png")); + File file = fileChooser.showSaveDialog(this.getScene().getWindow()); + if (file != null) { + try { + ExportUtils.writeAsPNG(this.chart, (int) getWidth(), + (int) getHeight(), file); + } catch (IOException ex) { + // FIXME: show a dialog with the error + } + } + } + + /** + * A handler for the export to JPEG option in the context menu. + */ + private void handleExportToJPEG() { + FileChooser fileChooser = new FileChooser(); + fileChooser.setTitle("Export to JPEG"); + fileChooser.setSelectedExtensionFilter(new FileChooser.ExtensionFilter( + "JPEG", "jpg")); + File file = fileChooser.showSaveDialog(this.getScene().getWindow()); + if (file != null) { + try { + ExportUtils.writeAsJPEG(this.chart, (int) getWidth(), + (int) getHeight(), file); + } catch (IOException ex) { + // FIXME: show a dialog with the error + } + } + } + + @Override + public void chartMouseClicked(ChartMouseEventFX event) { + // relay the event from the canvas to our registered listeners + for (ChartMouseListenerFX listener: this.chartMouseListeners) { + listener.chartMouseClicked(event); + } + } + + @Override + public void chartMouseMoved(ChartMouseEventFX event) { + // relay the event from the canvas to our registered listeners + for (ChartMouseListenerFX listener: this.chartMouseListeners) { + listener.chartMouseMoved(event); + } + } + +} + Added: 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 (rev 0) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/fx/ChartViewerSkin.java 2014-06-27 10:43:29 UTC (rev 3134) @@ -0,0 +1,192 @@ +/* =========================================================== + * JFreeChart : a free chart library for the Java(tm) platform + * =========================================================== + * + * (C) Copyright 2000-2014, by Object Refinery Limited and Contributors. + * + * Project Info: http://www.jfree.org/jfreechart/index.html + * + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or + * (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * 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. + * + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] + * + * -------------------- + * ChartViewerSkin.java + * -------------------- + * (C) Copyright 2014, by Object Refinery Limited and Contributors. + * + * Original Author: David Gilbert (for Object Refinery Limited); + * Contributor(s): -; + * + * Changes: + * -------- + * 20-Jun-2014 : Version 1 (DG); + */ + + +package org.jfree.chart.fx; + +import org.jfree.chart.fx.interaction.ZoomHandlerFX; +import javafx.scene.control.SkinBase; +import javafx.scene.layout.BorderPane; +import javafx.scene.layout.StackPane; +import javafx.scene.paint.Color; +import javafx.scene.paint.Paint; +import javafx.scene.shape.Rectangle; +import org.jfree.chart.ChartMouseEvent; +import org.jfree.chart.JFreeChart; +import org.jfree.chart.fx.interaction.ChartMouseListenerFX; +import org.jfree.chart.util.ParamChecks; + +/** + * A default skin for the {@link ChartViewer} control. + * + * <p>THE API FOR THIS CLASS IS SUBJECT TO CHANGE IN FUTURE RELEASES. This is + * so that we can incorporate feedback on the (new) JavaFX support in + * JFreeChart.</p> + * + * @since 1.0.18 + */ +public class ChartViewerSkin extends SkinBase<ChartViewer> { + + /** The chart canvas. */ + private ChartCanvas canvas; + + /** + * The zoom rectangle is used to display the zooming region when + * doing a drag-zoom with the mouse. Most of the time this rectangle + * is not visible. + */ + private Rectangle zoomRectangle; + + /** + * Creates a new instance. + * + * @param control the control ({@code null} not permitted). + */ + public ChartViewerSkin(ChartViewer control) { + super(control); + getChildren().add(createNode(control)); + this.zoomRectangle = new Rectangle(0, 0, new Color(0, 0, 1, 0.25)); + this.zoomRectangle.setManaged(false); + this.zoomRectangle.setVisible(false); + getChildren().add(this.zoomRectangle); + } + + /** + * Sets the chart displayed by this control. + * + * @param chart the chart ({@code null} not permitted). + */ + public void setChart(JFreeChart chart) { + this.canvas.setChart(chart); + } + + public void setTooltipEnabled(boolean enabled) { + this.canvas.setTooltipEnabled(enabled); + } + + /** + * Returns the current fill paint for the zoom rectangle. + * + * @return The fill paint. + */ + public Paint getZoomFillPaint() { + return this.zoomRectangle.getFill(); + } + + /** + * Sets the fill paint for the zoom rectangle. + * + * @param paint the new paint. + */ + public void setZoomFillPaint(Paint paint) { + this.zoomRectangle.setFill(paint); + } + + /** + * Registers a listener to receive {@link ChartMouseEvent} notifications + * from the chart viewer. + * + * @param listener the listener ({@code null} not permitted). + */ + public void addChartMouseListener(ChartMouseListenerFX listener) { + ParamChecks.nullNotPermitted(listener, "listener"); + this.canvas.addChartMouseListener(listener); + } + + /** + * Removes a listener from the list of objects listening for chart mouse + * events. + * + * @param listener the listener. + */ + public void removeChartMouseListener(ChartMouseListenerFX listener) { + this.canvas.removeChartMouseListener(listener); + } + + /** + * Sets the visibility of the zoom rectangle. + * + * @param visible + */ + public void setZoomRectangleVisible(boolean visible) { + this.zoomRectangle.setVisible(visible); + } + + /** + * Sets the location and size of the zoom rectangle and makes it visible + * if it is not already visible. + * + * @param x the x-coordinate. + * @param y the y-coordinate. + * @param w the width. + * @param h the height. + */ + public void showZoomRectangle(double x, double y, double w, double h) { + this.zoomRectangle.setX(x); + this.zoomRectangle.setY(y); + this.zoomRectangle.setWidth(w); + this.zoomRectangle.setHeight(h); + this.zoomRectangle.setVisible(true); + } + + /** + * Creates the node representing this control. + * + * @return The node. + */ + private BorderPane createNode(ChartViewer control) { + BorderPane borderPane = new BorderPane(); + borderPane.setPrefSize(800, 500); + StackPane sp = new StackPane(); + sp.setMinSize(10, 10); + sp.setPrefSize(600, 400); + this.canvas = new ChartCanvas(getSkinnable().getChart()); + this.canvas.setTooltipEnabled(control.isTooltipEnabled()); + this.canvas.addChartMouseListener(control); + this.canvas.widthProperty().bind(sp.widthProperty()); + this.canvas.heightProperty().bind(sp.heightProperty()); + + this.canvas.addMouseHandler(new ZoomHandlerFX("zoom", control)); + sp.getChildren().add(this.canvas); + + borderPane.setCenter(sp); + return borderPane; + } + +} Added: 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 (rev 0) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/fx/FXGraphics2D.java 2014-06-27 10:43:29 UTC (rev 3134) @@ -0,0 +1,1777 @@ +/* =========================================================== + * JFreeChart : a free chart library for the Java(tm) platform + * =========================================================== + * + * (C) Copyright 2000-2014, by Object Refinery Limited and Contributors. + * + * Project Info: http://www.jfree.org/jfreechart/index.html + * + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or + * (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * 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. + * + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] + * + * ----------------- + * FXGraphics2D.java + * ----------------- + * (C) Copyright 2014, by Object Refinery Limited and Contributors. + * + * Original Author: David Gilbert (for Object Refinery Limited); + * Contributor(s): -; + + * Changes: + * -------- + * 20-Jun-2014 : Version 1 (DG); + */ + + +package org.jfree.chart.fx; + +import java.awt.AlphaComposite; +import java.awt.BasicStroke; +import java.awt.Color; +import java.awt.Composite; +import java.awt.Font; +import java.awt.FontMetrics; +import java.awt.GradientPaint; +import java.awt.Graphics; +import java.awt.Graphics2D; +import java.awt.GraphicsConfiguration; +import java.awt.Image; +import java.awt.LinearGradientPaint; +import java.awt.MultipleGradientPaint; +import java.awt.Paint; +import java.awt.RadialGradientPaint; +import java.awt.Rectangle; +import java.awt.RenderingHints; +import java.awt.Shape; +import java.awt.Stroke; +import java.awt.font.FontRenderContext; +import java.awt.font.GlyphVector; +import java.awt.font.TextLayout; +import java.awt.geom.AffineTransform; +import java.awt.geom.Arc2D; +import java.awt.geom.Area; +import java.awt.geom.Ellipse2D; +import java.awt.geom.GeneralPath; +import java.awt.geom.Line2D; +import java.awt.geom.NoninvertibleTransformException; +import java.awt.geom.Path2D; +import java.awt.geom.PathIterator; +import java.awt.geom.Point2D; +import java.awt.geom.Rectangle2D; +import java.awt.geom.RoundRectangle2D; +import java.awt.image.BufferedImage; +import java.awt.image.BufferedImageOp; +import java.awt.image.ColorModel; +import java.awt.image.ImageObserver; +import java.awt.image.RenderedImage; +import java.awt.image.WritableRaster; +import java.awt.image.renderable.RenderableImage; +import java.text.AttributedCharacterIterator; +import java.util.Hashtable; +import java.util.Map; +import java.util.Set; +import javafx.embed.swing.SwingFXUtils; +import javafx.scene.canvas.Canvas; +import javafx.scene.canvas.GraphicsContext; +import javafx.scene.paint.CycleMethod; +import javafx.scene.paint.LinearGradient; +import javafx.scene.paint.RadialGradient; +import javafx.scene.paint.Stop; +import javafx.scene.shape.ArcType; +import javafx.scene.shape.StrokeLineCap; +import javafx.scene.shape.StrokeLineJoin; +import javafx.scene.text.FontPosture; +import javafx.scene.text.FontWeight; + +/** + * A {@link Graphics2D} implementation that writes to a JavaFX {@link Canvas}. + * This class is copied directly from the FXGraphics2D project, we keep a local + * copy to avoid having a dependency to manage. + * + * @since 1.0.18 + */ +public class FXGraphics2D extends Graphics2D { + + private final GraphicsContext gc; + + private boolean clippingDisabled = false; + + /** Rendering hints (all ignored). */ + private final RenderingHints hints; + + private Shape clip; + + private Paint paint = Color.BLACK; + + private Color awtColor = Color.BLACK; + + private Composite composite = AlphaComposite.getInstance( + AlphaComposite.SRC_OVER, 1.0f); + + private Stroke stroke = new BasicStroke(1.0f); + + /** + * The width of the stroke to use when the user supplies a + * BasicStroke with a width of 0.0 (in this case the Java specification + * says "If width is set to 0.0f, the stroke is rendered as the thinnest + * possible line for the target device and the antialias hint setting.") + */ + private double zeroStrokeWidth; + + private Font font = new Font("SansSerif", Font.PLAIN, 12); + + private AffineTransform transform = new AffineTransform(); + + /** 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. + */ + private Line2D line; + + /** + * An instance that is lazily instantiated in fillRect and then + * subsequently reused to avoid creating a lot of garbage. + */ + Rectangle2D rect; + + /** + * An instance that is lazily instantiated in draw/fillRoundRect and then + * subsequently reused to avoid creating a lot of garbage. + */ + private RoundRectangle2D roundRect; + + /** + * An instance that is lazily instantiated in draw/fillOval and then + * subsequently reused to avoid creating a lot of garbage. + */ + private Ellipse2D oval; + + /** + * An instance that is lazily instantiated in draw/fillArc and then + * subsequently reused to avoid creating a lot of garbage. + */ + private Arc2D arc; + + /** A hidden image used for font metrics. */ + private final BufferedImage fmImage = new BufferedImage(10, 10, + BufferedImage.TYPE_INT_RGB); + + /** + * Throws an {@code IllegalArgumentException} if {@code arg} is + * {@code null}. + * + * @param arg the argument to check. + * @param name the name of the + */ + private static void nullNotPermitted(Object arg, String name) { + if (arg == null) { + throw new IllegalArgumentException("Null '" + name + "' argument."); + } + } + + /** + * Creates a new instance that will render to the specified JavaFX + * {@code GraphicsContext}. + * + * @param gc the graphics context ({@code null} not permitted). + */ + public FXGraphics2D(GraphicsContext gc) { + nullNotPermitted(gc, "gc"); + this.gc = gc; + this.zeroStrokeWidth = 0.5; + this.hints = new RenderingHints(RenderingHints.KEY_ANTIALIASING, + RenderingHints.VALUE_ANTIALIAS_DEFAULT); + } + + /** + * Returns the width to use for the stroke when the AWT stroke + * specified has a zero width (the default value is {@code 0.5}). + * <p>In the Java specification for {@code BasicStroke} it states "If width + * is set to 0.0f, the stroke is rendered as the thinnest possible + * line for the target device and the antialias hint setting." We don't + * have a means to implement that accurately since we must specify a fixed + * width to the JavaFX canvas - this attribute is the width that is + * used.</p> + * + * @return The width. + */ + public double getZeroStrokeWidth() { + return this.zeroStrokeWidth; + } + + /** + * Sets the width to use for the stroke when the current AWT stroke + * has a width of {@code 0.0}. + * + * @param width the new width (must be 0 or greater). + */ + public void setZeroStrokeWidth(double width) { + if (width < 0.0) { + throw new IllegalArgumentException("Width cannot be negative."); + } + this.zeroStrokeWidth = width; + } + + /** + * 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"> + * https://javafx-jira.kenai.com/browse/RT-36891</a> for details (requires + * an account). + * + * @return A boolean. + * + * @see #setClippingDisabled(boolean) + */ + public boolean isClippingDisabled() { + return this.clippingDisabled; + } + + /** + * Sets the flag that controls whether or not clipping is disabled. + * + * @param disabled the new flag value. + * + * @see #isClippingDisabled() + */ + public void setClippingDisabled(boolean disabled) { + this.clippingDisabled = disabled; + } + + /** + * This method is not implemented yet. + * @return {@code null}. + */ + @Override + public GraphicsConfiguration getDeviceConfiguration() { + // FIXME + return null; + } + + /** + * Creates a new graphics object that is a copy of this graphics object. + * + * @return A new graphics object. + */ + @Override + public Graphics create() { + FXGraphics2D copy = new FXGraphics2D(this.gc); + copy.setRenderingHints(getRenderingHints()); + copy.setClip(getClip()); + copy.setPaint(getPaint()); + copy.setColor(getColor()); + copy.setComposite(getComposite()); + copy.setStroke(getStroke()); + copy.setFont(getFont()); + copy.setTransform(getTransform()); + copy.setBackground(getBackground()); + return copy; + } + + /** + * Returns the paint used to draw or fill shapes (or text). The default + * value is {@link Color#BLACK}. + * + * @return The paint (never {@code null}). + * + * @see #setPaint(java.awt.Paint) + */ + @Override + public Paint getPaint() { + return this.paint; + } + + /** + * Sets the paint used to draw or fill shapes (or text). If + * {@code paint} is an instance of {@code Color}, this method will + * also update the current color attribute (see {@link #getColor()}). If + * you pass {@code null} to this method, it does nothing (in + * accordance with the JDK specification). + * <br><br> + * Note that this implementation will map {@link Color}, + * {@link GradientPaint}, {@link LinearGradientPaint} and + * {@link RadialGradientPaint}, other paint implementations are not + * handled. + * + * @param paint the paint ({@code null} is permitted but ignored). + * + * @see #getPaint() + */ + @Override + public void setPaint(Paint paint) { + if (paint == null) { + return; + } + this.paint = paint; + if (paint instanceof Color) { + setColor((Color) paint); + } else if (paint instanceof GradientPaint) { + GradientPaint gp = (GradientPaint) paint; + Stop[] stops = new Stop[] { new Stop(0, + awtColorToJavaFX(gp.getColor1())), + new Stop(1, awtColorToJavaFX(gp.getColor2())) }; + Point2D p1 = gp.getPoint1(); + Point2D p2 = gp.getPoint2(); + LinearGradient lg = new LinearGradient(p1.getX(), p1.getY(), + p2.getX(), p2.getY(), false, CycleMethod.NO_CYCLE, stops); + this.gc.setStroke(lg); + this.gc.setFill(lg); + } else if (paint instanceof MultipleGradientPaint) { + MultipleGradientPaint mgp = (MultipleGradientPaint) paint; + Color[] colors = mgp.getColors(); + float[] fractions = mgp.getFractions(); + Stop[] stops = new Stop[colors.length]; + for (int i = 0; i < colors.length; i++) { + stops[i] = new Stop(fractions[i], awtColorToJavaFX(colors[i])); + } + + if (paint instanceof RadialGradientPaint) { + RadialGradientPaint rgp = (RadialGradientPaint) paint; + Point2D center = rgp.getCenterPoint(); + Point2D focus = rgp.getFocusPoint(); + double focusDistance = focus.distance(center); + double focusAngle = 0.0; + if (!focus.equals(center)) { + focusAngle = Math.atan2(focus.getY() - center.getY(), + focus.getX() - center.getX()); + } + double radius = rgp.getRadius(); + RadialGradient rg = new RadialGradient( + focusAngle * Math.PI / 180, focusDistance, + center.getX(), center.getY(), radius, false, + CycleMethod.NO_CYCLE, stops); + this.gc.setStroke(rg); + this.gc.setFill(rg); + } else if (paint instanceof LinearGradientPaint) { + LinearGradientPaint lgp = (LinearGradientPaint) paint; + Point2D start = lgp.getStartPoint(); + Point2D end = lgp.getEndPoint(); + LinearGradient lg = new LinearGradient(start.getX(), + start.getY(), end.getX(), end.getY(), false, + CycleMethod.NO_CYCLE, stops); + this.gc.setStroke(lg); + this.gc.setFill(lg); + } + } else { + // this is a paint we don't recognise + } + } + + /** + * 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>). + * + * @see #getPaint() + */ + @Override + public Color getColor() { + return this.awtColor; + } + + /** + * Sets the foreground color. This method exists for backwards + * compatibility in AWT, you should use the + * {@link #setPaint(java.awt.Paint)} method. + * + * @param c the color (<code>null</code> permitted but ignored). + * + * @see #setPaint(java.awt.Paint) + */ + @Override + public void setColor(Color c) { + if (c == null) { + return; + } + this.awtColor = c; + this.paint = c; + javafx.scene.paint.Color fxcolor = awtColorToJavaFX(c); + this.gc.setFill(fxcolor); + this.gc.setStroke(fxcolor); + } + + /** + * Returns a JavaFX color that is equivalent to the specified AWT color. + * + * @param c the color (<code>null</code> not permitted). + * + * @return A JavaFX color. + */ + private javafx.scene.paint.Color awtColorToJavaFX(Color c) { + return javafx.scene.paint.Color.rgb(c.getRed(), c.getGreen(), + c.getBlue(), c.getAlpha() / 255.0); + } + + /** + * Returns the background color (the default value is {@link Color#BLACK}). + * This attribute is used by the {@link #clearRect(int, int, int, int)} + * method. + * + * @return The background color (possibly {@code null}). + * + * @see #setBackground(java.awt.Color) + */ + @Override + public Color getBackground() { + return this.background; + } + + /** + * Sets the background color. This attribute is used by the + * {@link #clearRect(int, int, int, int)} method. The reference + * implementation allows {@code null} for the background color so + * we allow that too (but for that case, the {@link #clearRect(int, int, int, int)} + * method will do nothing). + * + * @param color the color ({@code null} permitted). + * + * @see #getBackground() + */ + @Override + public void setBackground(Color color) { + this.background = color; + } + + /** + * Returns the current composite. + * + * @return The current composite (never {@code null}). + * + * @see #setComposite(java.awt.Composite) + */ + @Override + public Composite getComposite() { + return this.composite; + } + + /** + * Sets the composite (only {@code AlphaComposite} is handled). + * + * @param comp the composite ({@code null} not permitted). + * + * @see #getComposite() + */ + @Override + public void setComposite(Composite comp) { + nullNotPermitted(comp, "comp"); + this.composite = comp; + } + + /** + * Returns the current stroke (this attribute is used when drawing shapes). + * + * @return The current stroke (never {@code null}). + * + * @see #setStroke(java.awt.Stroke) + */ + @Override + public Stroke getStroke() { + return this.stroke; + } + + /** + * Sets the stroke that will be used to draw shapes. + * + * @param s the stroke ({@code null} not permitted). + * + * @see #getStroke() + */ + @Override + public void setStroke(Stroke s) { + nullNotPermitted(s, "s"); + ... [truncated message content] |
From: <mu...@us...> - 2014-07-01 15:35:09
|
Revision: 3229 http://sourceforge.net/p/jfreechart/code/3229 Author: mungady Date: 2014-07-01 15:35:02 +0000 (Tue, 01 Jul 2014) Log Message: ----------- Fixed Javadoc warnings. Modified Paths: -------------- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/LogarithmicAxis.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/LayeredBarRenderer.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/LineAndShapeRenderer.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/LineRenderer3D.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/LogarithmicAxis.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/LogarithmicAxis.java 2014-07-01 15:34:24 UTC (rev 3228) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/LogarithmicAxis.java 2014-07-01 15:35:02 UTC (rev 3229) @@ -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 @@ * -------------------- * LogarithmicAxis.java * -------------------- - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2014, by Object Refinery Limited and Contributors. * * Original Author: Michael Duffy / Eric Thomas; * Contributor(s): David Gilbert (for Object Refinery Limited); @@ -124,8 +124,8 @@ protected boolean allowNegativesFlag = false; /** - * Flag set true make axis throw exception if any values are - * <= 0 and 'allowNegativesFlag' is false. + * Flag set true make axis throw exception if any values are <= 0 and + * 'allowNegativesFlag' is false. */ protected boolean strictValuesFlag = true; Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/LayeredBarRenderer.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/LayeredBarRenderer.java 2014-07-01 15:34:24 UTC (rev 3228) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/LayeredBarRenderer.java 2014-07-01 15:35:02 UTC (rev 3229) @@ -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 @@ * ----------------------- * LayeredBarRenderer.java * ----------------------- - * (C) Copyright 2003-2009, by Arnaud Lelievre and Contributors. + * (C) Copyright 2003-2014, by Arnaud Lelievre and Contributors. * * Original Author: Arnaud Lelievre (for Garden); * Contributor(s): David Gilbert (for Object Refinery Limited); @@ -78,7 +78,7 @@ * Demo Collection: * <br><br> * <img src="../../../../../images/LayeredBarRendererSample.png" - * alt="LayeredBarRendererSample.png" /> + * alt="LayeredBarRendererSample.png"> */ public class LayeredBarRenderer extends BarRenderer implements Serializable { Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/LineAndShapeRenderer.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/LineAndShapeRenderer.java 2014-07-01 15:34:24 UTC (rev 3228) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/LineAndShapeRenderer.java 2014-07-01 15:35:02 UTC (rev 3229) @@ -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 @@ * ------------------------- * LineAndShapeRenderer.java * ------------------------- - * (C) Copyright 2001-2009, by Object Refinery Limited and Contributors. + * (C) Copyright 2001-2014, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): Mark Watson (www.markwatson.com); @@ -123,7 +123,7 @@ * program included in the JFreeChart Demo Collection: * <br><br> * <img src="../../../../../images/LineAndShapeRendererSample.png" - * alt="LineAndShapeRendererSample.png" /> + * alt="LineAndShapeRendererSample.png"> */ public class LineAndShapeRenderer extends AbstractCategoryItemRenderer implements Cloneable, PublicCloneable, Serializable { @@ -798,7 +798,7 @@ * (expressed as a percentage of the overall category width), and sends * a {@link RendererChangeEvent} to all registered listeners. * - * @param margin the margin (0.0 <= margin < 1.0). + * @param margin the margin (0.0 <= margin < 1.0). * * @see #getItemMargin() * @see #getUseSeriesOffset() Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/LineRenderer3D.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/LineRenderer3D.java 2014-07-01 15:34:24 UTC (rev 3228) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/LineRenderer3D.java 2014-07-01 15:35:02 UTC (rev 3229) @@ -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 @@ * ------------------- * LineRenderer3D.java * ------------------- - * (C) Copyright 2004-2013, by Tobias Selb and Contributors. + * (C) Copyright 2004-2014, by Tobias Selb and Contributors. * * Original Author: Tobias Selb (http://www.uepselon.com); * Contributor(s): David Gilbert (for Object Refinery Limited); @@ -94,7 +94,7 @@ * Demo Collection: * <br><br> * <img src="../../../../../images/LineRenderer3DSample.png" - * alt="LineRenderer3DSample.png" /> + * alt="LineRenderer3DSample.png"> */ public class LineRenderer3D extends LineAndShapeRenderer implements Effect3D, Serializable { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mu...@us...> - 2014-07-29 09:50:38
|
Revision: 3273 http://sourceforge.net/p/jfreechart/code/3273 Author: mungady Date: 2014-07-29 09:50:28 +0000 (Tue, 29 Jul 2014) Log Message: ----------- 2014-07-29 David Gilbert <dav...@ob...> * org/jfree/chart/axis/Axis.java (drawAxisLine): Add rendering hint, * org/jfree/chart/axis/CategoryAxis.java (drawTickMarks): Add rendering hint, * org/jfree/chart/axis/ValueAxis.java (drawAxisLine): Add rendering hint, (drawTickMarksAndLabels): Likewise, * org/jfree/chart/block/LineBorder.java (draw): Add rendering hint, * org/jfree/chart/plot/FastScatterPlot.java (drawDomainGridlines): Add rendering hint, (drawRangeGridlines): Likewise, * org/jfree/chart/plot/Plot.java (drawOutline): Add rendering hint, * org/jfree/chart/plot/XYPlot.java (drawDomainCrosshair): Add rendering hint, (drawRangeCrosshair): Likewise, * org/jfree/chart/renderer/category/AbstractCategoryItemRenderer.java (drawRangeLine): Add rendering hint, * org/jfree/chart/renderer/xy/AbstractXYItemRenderer.java (drawDomainLine): Add rendering hint, (drawRangeLine): Likewise. Modified Paths: -------------- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/Axis.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/CategoryAxis.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/ValueAxis.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/block/LineBorder.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/FastScatterPlot.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/Plot.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/XYPlot.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/AbstractCategoryItemRenderer.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/AbstractXYItemRenderer.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/Axis.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/Axis.java 2014-07-29 09:38:54 UTC (rev 3272) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/Axis.java 2014-07-29 09:50:28 UTC (rev 3273) @@ -85,6 +85,8 @@ * 02-Jul-2013 : Use ParamChecks (DG); * 01-Aug-2013 : Added attributedLabel override to support superscripts, * subscripts and more (DG); + * 29-Jul-2014 : Add hint to normalise stroke for axis line (DG); + * */ package org.jfree.chart.axis; @@ -95,6 +97,7 @@ import java.awt.FontMetrics; import java.awt.Graphics2D; import java.awt.Paint; +import java.awt.RenderingHints; import java.awt.Shape; import java.awt.Stroke; import java.awt.font.TextLayout; @@ -1528,28 +1531,25 @@ */ protected void drawAxisLine(Graphics2D g2, double cursor, Rectangle2D dataArea, RectangleEdge edge) { - Line2D axisLine = null; + double x = dataArea.getX(); + double y = dataArea.getY(); if (edge == RectangleEdge.TOP) { - axisLine = new Line2D.Double(dataArea.getX(), cursor, - dataArea.getMaxX(), cursor); + axisLine = new Line2D.Double(x, cursor, dataArea.getMaxX(), cursor); + } else if (edge == RectangleEdge.BOTTOM) { + axisLine = new Line2D.Double(x, cursor, dataArea.getMaxX(), cursor); + } else if (edge == RectangleEdge.LEFT) { + axisLine = new Line2D.Double(cursor, y, cursor, dataArea.getMaxY()); + } else if (edge == RectangleEdge.RIGHT) { + axisLine = new Line2D.Double(cursor, y, cursor, dataArea.getMaxY()); } - else if (edge == RectangleEdge.BOTTOM) { - axisLine = new Line2D.Double(dataArea.getX(), cursor, - dataArea.getMaxX(), cursor); - } - else if (edge == RectangleEdge.LEFT) { - axisLine = new Line2D.Double(cursor, dataArea.getY(), cursor, - dataArea.getMaxY()); - } - else if (edge == RectangleEdge.RIGHT) { - axisLine = new Line2D.Double(cursor, dataArea.getY(), cursor, - dataArea.getMaxY()); - } g2.setPaint(this.axisLinePaint); g2.setStroke(this.axisLineStroke); + Object saved = g2.getRenderingHint(RenderingHints.KEY_STROKE_CONTROL); + g2.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, + RenderingHints.VALUE_STROKE_NORMALIZE); g2.draw(axisLine); - + g2.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, saved); } /** Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/CategoryAxis.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/CategoryAxis.java 2014-07-29 09:38:54 UTC (rev 3272) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/CategoryAxis.java 2014-07-29 09:50:28 UTC (rev 3273) @@ -97,6 +97,8 @@ * 25-Jul-2013 : Added support for URLs on category labels (DG); * 01-Aug-2013 : Added attributedLabel override to support superscripts, * subscripts and more (DG); + * 29-Jul-2014 : Add hint to normalise stroke for tick marks (DG); + * */ package org.jfree.chart.axis; @@ -104,6 +106,7 @@ import java.awt.Font; import java.awt.Graphics2D; import java.awt.Paint; +import java.awt.RenderingHints; import java.awt.Shape; import java.awt.geom.Line2D; import java.awt.geom.Point2D; @@ -1187,7 +1190,7 @@ * Draws the tick marks. * * @param g2 the graphics target. - * @param cursor the cursor position (an offset when drawing multiple axes) + * @param cursor the cursor position (an offset when drawing multiple axes) * @param dataArea the area for plotting the data. * @param edge the location of the axis. * @param state the axis state. @@ -1208,6 +1211,9 @@ List categories = plot.getCategoriesForAxis(this); g2.setPaint(getTickMarkPaint()); g2.setStroke(getTickMarkStroke()); + Object saved = g2.getRenderingHint(RenderingHints.KEY_STROKE_CONTROL); + g2.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, + RenderingHints.VALUE_STROKE_NORMALIZE); if (edge.equals(RectangleEdge.TOP)) { Iterator iterator = categories.iterator(); while (iterator.hasNext()) { @@ -1219,8 +1225,7 @@ g2.draw(line); } state.cursorUp(ol); - } - else if (edge.equals(RectangleEdge.BOTTOM)) { + } else if (edge.equals(RectangleEdge.BOTTOM)) { Iterator iterator = categories.iterator(); while (iterator.hasNext()) { Comparable key = (Comparable) iterator.next(); @@ -1231,8 +1236,7 @@ g2.draw(line); } state.cursorDown(ol); - } - else if (edge.equals(RectangleEdge.LEFT)) { + } else if (edge.equals(RectangleEdge.LEFT)) { Iterator iterator = categories.iterator(); while (iterator.hasNext()) { Comparable key = (Comparable) iterator.next(); @@ -1243,8 +1247,7 @@ g2.draw(line); } state.cursorLeft(ol); - } - else if (edge.equals(RectangleEdge.RIGHT)) { + } else if (edge.equals(RectangleEdge.RIGHT)) { Iterator iterator = categories.iterator(); while (iterator.hasNext()) { Comparable key = (Comparable) iterator.next(); @@ -1256,6 +1259,7 @@ } state.cursorRight(ol); } + g2.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, saved); } /** Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/ValueAxis.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/ValueAxis.java 2014-07-29 09:38:54 UTC (rev 3272) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/ValueAxis.java 2014-07-29 09:50:28 UTC (rev 3273) @@ -108,6 +108,7 @@ * 03-Sep-2012 : Fix reserveSpace() method, bug 3555275 (DG); * 02-Jul-2013 : Use ParamChecks (DG); * 18-Mar-2014 : Updates to support attributed tick labels for LogAxis (DG); + * 29-Jul-2014 : Add hints to normalise axis line and tick marks (DG); * */ @@ -117,6 +118,7 @@ import java.awt.FontMetrics; import java.awt.Graphics2D; import java.awt.Polygon; +import java.awt.RenderingHints; import java.awt.Shape; import java.awt.font.LineMetrics; import java.awt.geom.AffineTransform; @@ -536,7 +538,7 @@ /** * Draws an axis line at the current cursor position and edge. * - * @param g2 the graphics device. + * @param g2 the graphics device ({@code null} not permitted). * @param cursor the cursor position. * @param dataArea the data area. * @param edge the edge. @@ -545,25 +547,27 @@ protected void drawAxisLine(Graphics2D g2, double cursor, Rectangle2D dataArea, RectangleEdge edge) { Line2D axisLine = null; + double c = cursor; if (edge == RectangleEdge.TOP) { - axisLine = new Line2D.Double(dataArea.getX(), cursor, - dataArea.getMaxX(), cursor); - } - else if (edge == RectangleEdge.BOTTOM) { - axisLine = new Line2D.Double(dataArea.getX(), cursor, - dataArea.getMaxX(), cursor); - } - else if (edge == RectangleEdge.LEFT) { - axisLine = new Line2D.Double(cursor, dataArea.getY(), cursor, + axisLine = new Line2D.Double(dataArea.getX(), c, dataArea.getMaxX(), + c); + } else if (edge == RectangleEdge.BOTTOM) { + axisLine = new Line2D.Double(dataArea.getX(), c, dataArea.getMaxX(), + c); + } else if (edge == RectangleEdge.LEFT) { + axisLine = new Line2D.Double(c, dataArea.getY(), c, dataArea.getMaxY()); - } - else if (edge == RectangleEdge.RIGHT) { - axisLine = new Line2D.Double(cursor, dataArea.getY(), cursor, + } else if (edge == RectangleEdge.RIGHT) { + axisLine = new Line2D.Double(c, dataArea.getY(), c, dataArea.getMaxY()); } g2.setPaint(getAxisLinePaint()); g2.setStroke(getAxisLineStroke()); + Object saved = g2.getRenderingHint(RenderingHints.KEY_STROKE_CONTROL); + g2.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, + RenderingHints.VALUE_STROKE_NORMALIZE); g2.draw(axisLine); + g2.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, saved); boolean drawUpOrRight = false; boolean drawDownOrLeft = false; @@ -578,8 +582,7 @@ if (this.negativeArrowVisible) { if (this.inverted) { drawUpOrRight = true; - } - else { + } else { drawDownOrLeft = true; } } @@ -591,8 +594,7 @@ x = dataArea.getMaxX(); y = cursor; arrow = this.rightArrow; - } - else if (edge == RectangleEdge.LEFT + } else if (edge == RectangleEdge.LEFT || edge == RectangleEdge.RIGHT) { x = cursor; y = dataArea.getMinY(); @@ -615,8 +617,7 @@ x = dataArea.getMinX(); y = cursor; arrow = this.leftArrow; - } - else if (edge == RectangleEdge.LEFT + } else if (edge == RectangleEdge.LEFT || edge == RectangleEdge.RIGHT) { x = cursor; y = dataArea.getMaxY(); @@ -690,6 +691,9 @@ List ticks = refreshTicks(g2, state, dataArea, edge); state.setTicks(ticks); g2.setFont(getTickLabelFont()); + Object saved = g2.getRenderingHint(RenderingHints.KEY_STROKE_CONTROL); + g2.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, + RenderingHints.VALUE_STROKE_NORMALIZE); Iterator iterator = ticks.iterator(); while (iterator.hasNext()) { ValueTick tick = (ValueTick) iterator.next(); @@ -749,7 +753,8 @@ g2.draw(mark); } } - + g2.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, saved); + // need to work out the space used by the tick labels... // so we can update the cursor... double used = 0.0; @@ -758,18 +763,15 @@ used += findMaximumTickLabelWidth(ticks, g2, plotArea, isVerticalTickLabels()); state.cursorLeft(used); - } - else if (edge == RectangleEdge.RIGHT) { + } else if (edge == RectangleEdge.RIGHT) { used = findMaximumTickLabelWidth(ticks, g2, plotArea, isVerticalTickLabels()); state.cursorRight(used); - } - else if (edge == RectangleEdge.TOP) { + } else if (edge == RectangleEdge.TOP) { used = findMaximumTickLabelHeight(ticks, g2, plotArea, isVerticalTickLabels()); state.cursorUp(used); - } - else if (edge == RectangleEdge.BOTTOM) { + } else if (edge == RectangleEdge.BOTTOM) { used = findMaximumTickLabelHeight(ticks, g2, plotArea, isVerticalTickLabels()); state.cursorDown(used); Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/block/LineBorder.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/block/LineBorder.java 2014-07-29 09:38:54 UTC (rev 3272) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/block/LineBorder.java 2014-07-29 09:50:28 UTC (rev 3273) @@ -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 @@ * --------------- * LineBorder.java * --------------- - * (C) Copyright 2007-2013, by Christo Zietsman and Contributors. + * (C) Copyright 2007-2014, by Christo Zietsman and Contributors. * * Original Author: Christo Zietsman; * Contributor(s): David Gilbert (for Object Refinery Limited); @@ -38,6 +38,7 @@ * modifications by DG (DG); * 13-Jun-2007 : Don't draw if area doesn't have positive dimensions (DG); * 02-Jul-2013 : Use ParamChecks (DG); + * 29-Jul-2014 : Add rendering hint to normalise stroke for border (DG); * */ @@ -47,6 +48,7 @@ import java.awt.Color; import java.awt.Graphics2D; import java.awt.Paint; +import java.awt.RenderingHints; import java.awt.Stroke; import java.awt.geom.Line2D; import java.awt.geom.Rectangle2D; @@ -91,9 +93,9 @@ /** * Creates a new border with the specified color. * - * @param paint the color (<code>null</code> not permitted). - * @param stroke the border stroke (<code>null</code> not permitted). - * @param insets the insets (<code>null</code> not permitted). + * @param paint the color ({@code null} not permitted). + * @param stroke the border stroke ({@code null} not permitted). + * @param insets the insets ({@code null} not permitted). */ public LineBorder(Paint paint, Stroke stroke, RectangleInsets insets) { ParamChecks.nullNotPermitted(paint, "paint"); @@ -107,7 +109,7 @@ /** * Returns the paint. * - * @return The paint (never <code>null</code>). + * @return The paint (never {@code null}). */ public Paint getPaint() { return this.paint; @@ -116,7 +118,7 @@ /** * Returns the insets. * - * @return The insets (never <code>null</code>). + * @return The insets (never {@code null}). */ @Override public RectangleInsets getInsets() { @@ -126,7 +128,7 @@ /** * Returns the stroke. * - * @return The stroke (never <code>null</code>). + * @return The stroke (never {@code null}). */ public Stroke getStroke() { return this.stroke; @@ -158,6 +160,9 @@ double y1 = y + t / 2.0; g2.setPaint(getPaint()); g2.setStroke(getStroke()); + Object saved = g2.getRenderingHint(RenderingHints.KEY_STROKE_CONTROL); + g2.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, + RenderingHints.VALUE_STROKE_NORMALIZE); Line2D line = new Line2D.Double(); if (t > 0.0) { line.setLine(x0, y1, x1, y1); @@ -175,12 +180,13 @@ line.setLine(x1, y0, x1, y1); g2.draw(line); } + g2.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, saved); } /** * Tests this border for equality with an arbitrary instance. * - * @param obj the object (<code>null</code> permitted). + * @param obj the object ({@code null} permitted). * * @return A boolean. */ 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-29 09:38:54 UTC (rev 3272) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/FastScatterPlot.java 2014-07-29 09:50:28 UTC (rev 3273) @@ -62,6 +62,7 @@ * 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); + * 29-Jul-2014 : Add rendering hint to normalise stroke for gridlines (DG); * */ @@ -73,6 +74,7 @@ import java.awt.Composite; import java.awt.Graphics2D; import java.awt.Paint; +import java.awt.RenderingHints; import java.awt.Shape; import java.awt.Stroke; import java.awt.geom.Line2D; @@ -580,10 +582,6 @@ */ public void render(Graphics2D g2, Rectangle2D dataArea, PlotRenderingInfo info, CrosshairState crosshairState) { - - - //long start = System.currentTimeMillis(); - //System.out.println("Start: " + start); g2.setPaint(this.paint); // if the axes use a linear scale, you can uncomment the code below and @@ -613,10 +611,6 @@ g2.fillRect(transX, transY, 1, 1); } } - //long finish = System.currentTimeMillis(); - //System.out.println("Finish: " + finish); - //System.out.println("Time: " + (finish - start)); - } /** @@ -627,22 +621,25 @@ * @param ticks the ticks. */ protected void drawDomainGridlines(Graphics2D g2, Rectangle2D dataArea, - List ticks) { - - // draw the domain grid lines, if the flag says they're visible... - if (isDomainGridlinesVisible()) { - Iterator iterator = ticks.iterator(); - while (iterator.hasNext()) { - ValueTick tick = (ValueTick) iterator.next(); - double v = this.domainAxis.valueToJava2D(tick.getValue(), - dataArea, RectangleEdge.BOTTOM); - Line2D line = new Line2D.Double(v, dataArea.getMinY(), v, - dataArea.getMaxY()); - g2.setPaint(getDomainGridlinePaint()); - g2.setStroke(getDomainGridlineStroke()); - g2.draw(line); - } + List ticks) { + if (!isDomainGridlinesVisible()) { + return; } + Object saved = g2.getRenderingHint(RenderingHints.KEY_STROKE_CONTROL); + g2.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, + RenderingHints.VALUE_STROKE_NORMALIZE); + Iterator iterator = ticks.iterator(); + while (iterator.hasNext()) { + ValueTick tick = (ValueTick) iterator.next(); + double v = this.domainAxis.valueToJava2D(tick.getValue(), + dataArea, RectangleEdge.BOTTOM); + Line2D line = new Line2D.Double(v, dataArea.getMinY(), v, + dataArea.getMaxY()); + g2.setPaint(getDomainGridlinePaint()); + g2.setStroke(getDomainGridlineStroke()); + g2.draw(line); + } + g2.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, saved); } /** @@ -653,23 +650,27 @@ * @param ticks the ticks. */ protected void drawRangeGridlines(Graphics2D g2, Rectangle2D dataArea, - List ticks) { + List ticks) { - // draw the range grid lines, if the flag says they're visible... - if (isRangeGridlinesVisible()) { - Iterator iterator = ticks.iterator(); - while (iterator.hasNext()) { - ValueTick tick = (ValueTick) iterator.next(); - double v = this.rangeAxis.valueToJava2D(tick.getValue(), - dataArea, RectangleEdge.LEFT); - Line2D line = new Line2D.Double(dataArea.getMinX(), v, - dataArea.getMaxX(), v); - g2.setPaint(getRangeGridlinePaint()); - g2.setStroke(getRangeGridlineStroke()); - g2.draw(line); - } + if (!isRangeGridlinesVisible()) { + return; } + Object saved = g2.getRenderingHint(RenderingHints.KEY_STROKE_CONTROL); + g2.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, + RenderingHints.VALUE_STROKE_NORMALIZE); + Iterator iterator = ticks.iterator(); + while (iterator.hasNext()) { + ValueTick tick = (ValueTick) iterator.next(); + double v = this.rangeAxis.valueToJava2D(tick.getValue(), + dataArea, RectangleEdge.LEFT); + Line2D line = new Line2D.Double(dataArea.getMinX(), v, + dataArea.getMaxX(), v); + g2.setPaint(getRangeGridlinePaint()); + g2.setStroke(getRangeGridlineStroke()); + g2.draw(line); + } + g2.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, saved); } /** Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/Plot.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/Plot.java 2014-07-29 09:38:54 UTC (rev 3272) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/Plot.java 2014-07-29 09:50:28 UTC (rev 3273) @@ -129,6 +129,7 @@ * PK) (DG); * 13-Jul-2009 : Plot background image should be clipped if necessary (DG); * 02-Jul-2013 : Use ParamChecks (DG); + * 29-Jul-2014 : Add hint to normalise stroke for plot border (DG); * */ @@ -143,6 +144,7 @@ import java.awt.Graphics2D; import java.awt.Image; import java.awt.Paint; +import java.awt.RenderingHints; import java.awt.Shape; import java.awt.Stroke; import java.awt.geom.Ellipse2D; @@ -1122,7 +1124,10 @@ if ((this.outlineStroke != null) && (this.outlinePaint != null)) { g2.setStroke(this.outlineStroke); g2.setPaint(this.outlinePaint); + Object saved = g2.getRenderingHint(RenderingHints.KEY_STROKE_CONTROL); + g2.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, RenderingHints.VALUE_STROKE_NORMALIZE); g2.draw(area); + g2.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, saved); } } 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-29 09:38:54 UTC (rev 3272) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/XYPlot.java 2014-07-29 09:50:28 UTC (rev 3273) @@ -229,7 +229,8 @@ * 18-Oct-2011 : Fix tooltip offset with shadow renderer (DG); * 12-Sep-2013 : Check for KEY_SUPPRESS_SHADOW_GENERATION rendering hint (DG); * 10-Mar-2014 : Updated Javadocs for issue #1123 (DG); - * + * 29-Jul-2014 : Add hints to normalise stroke for crosshairs (DG); + * */ package org.jfree.chart.plot; @@ -241,6 +242,7 @@ import java.awt.Graphics2D; import java.awt.Paint; import java.awt.Rectangle; +import java.awt.RenderingHints; import java.awt.Shape; import java.awt.Stroke; import java.awt.geom.Line2D; @@ -4164,25 +4166,28 @@ PlotOrientation orientation, double value, ValueAxis axis, Stroke stroke, Paint paint) { - if (axis.getRange().contains(value)) { - Line2D line; - if (orientation == PlotOrientation.VERTICAL) { - double xx = axis.valueToJava2D(value, dataArea, - RectangleEdge.BOTTOM); - line = new Line2D.Double(xx, dataArea.getMinY(), xx, - dataArea.getMaxY()); - } - else { - double yy = axis.valueToJava2D(value, dataArea, - RectangleEdge.LEFT); - line = new Line2D.Double(dataArea.getMinX(), yy, - dataArea.getMaxX(), yy); - } - g2.setStroke(stroke); - g2.setPaint(paint); - g2.draw(line); + if (!axis.getRange().contains(value)) { + return; } - + Line2D line; + if (orientation == PlotOrientation.VERTICAL) { + double xx = axis.valueToJava2D(value, dataArea, + RectangleEdge.BOTTOM); + line = new Line2D.Double(xx, dataArea.getMinY(), xx, + dataArea.getMaxY()); + } else { + double yy = axis.valueToJava2D(value, dataArea, + RectangleEdge.LEFT); + line = new Line2D.Double(dataArea.getMinX(), yy, + dataArea.getMaxX(), yy); + } + Object saved = g2.getRenderingHint(RenderingHints.KEY_STROKE_CONTROL); + g2.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, + RenderingHints.VALUE_STROKE_NORMALIZE); + g2.setStroke(stroke); + g2.setPaint(paint); + g2.draw(line); + g2.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, saved); } /** @@ -4230,25 +4235,27 @@ PlotOrientation orientation, double value, ValueAxis axis, Stroke stroke, Paint paint) { - if (axis.getRange().contains(value)) { - Line2D line; - if (orientation == PlotOrientation.HORIZONTAL) { - double xx = axis.valueToJava2D(value, dataArea, - RectangleEdge.BOTTOM); - line = new Line2D.Double(xx, dataArea.getMinY(), xx, - dataArea.getMaxY()); - } - else { - double yy = axis.valueToJava2D(value, dataArea, - RectangleEdge.LEFT); - line = new Line2D.Double(dataArea.getMinX(), yy, - dataArea.getMaxX(), yy); - } - g2.setStroke(stroke); - g2.setPaint(paint); - g2.draw(line); + if (!axis.getRange().contains(value)) { + return; } - + Object saved = g2.getRenderingHint(RenderingHints.KEY_STROKE_CONTROL); + g2.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, + RenderingHints.VALUE_STROKE_NORMALIZE); + Line2D line; + if (orientation == PlotOrientation.HORIZONTAL) { + double xx = axis.valueToJava2D(value, dataArea, + RectangleEdge.BOTTOM); + line = new Line2D.Double(xx, dataArea.getMinY(), xx, + dataArea.getMaxY()); + } else { + double yy = axis.valueToJava2D(value, dataArea, RectangleEdge.LEFT); + line = new Line2D.Double(dataArea.getMinX(), yy, + dataArea.getMaxX(), yy); + } + g2.setStroke(stroke); + g2.setPaint(paint); + g2.draw(line); + g2.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, saved); } /** Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/AbstractCategoryItemRenderer.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/AbstractCategoryItemRenderer.java 2014-07-29 09:38:54 UTC (rev 3272) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/AbstractCategoryItemRenderer.java 2014-07-29 09:50:28 UTC (rev 3273) @@ -105,18 +105,19 @@ * 09-Feb-2010 : Fixed bug 2947660 (DG); * 02-Jul-2013 : Use ParamChecks (DG); * 08-Apr-2014 : Remove use of ObjectList (DG); + * 29-Jul-2014 : Add rendering hints to normalise range lines (DG); * */ package org.jfree.chart.renderer.category; import java.awt.AlphaComposite; -import java.awt.Color; import java.awt.Composite; import java.awt.Font; import java.awt.GradientPaint; import java.awt.Graphics2D; import java.awt.Paint; +import java.awt.RenderingHints; import java.awt.Shape; import java.awt.Stroke; import java.awt.geom.Ellipse2D; @@ -844,16 +845,18 @@ if (orientation == PlotOrientation.HORIZONTAL) { line = new Line2D.Double(v, dataArea.getMinY(), v, dataArea.getMaxY()); - } - else if (orientation == PlotOrientation.VERTICAL) { + } else if (orientation == PlotOrientation.VERTICAL) { line = new Line2D.Double(dataArea.getMinX(), v, dataArea.getMaxX(), v); } g2.setPaint(paint); g2.setStroke(stroke); + Object saved = g2.getRenderingHint(RenderingHints.KEY_STROKE_CONTROL); + g2.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, + RenderingHints.VALUE_STROKE_NORMALIZE); g2.draw(line); - + g2.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, saved); } /** Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/AbstractXYItemRenderer.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/AbstractXYItemRenderer.java 2014-07-29 09:38:54 UTC (rev 3272) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/AbstractXYItemRenderer.java 2014-07-29 09:50:28 UTC (rev 3273) @@ -121,6 +121,7 @@ * 03-Jul-2013 : Use ParamChecks (DG); * 11-Jan-2014 : Fix error in fillDomainGridBand method (DG); * 07-Apr-2014 : Don't use ObjectList anymore (DG); + * 29-Jul-2014 : Add rendering hint to normalise domain and range lines (DG); * */ @@ -132,6 +133,7 @@ import java.awt.GradientPaint; import java.awt.Graphics2D; import java.awt.Paint; +import java.awt.RenderingHints; import java.awt.Shape; import java.awt.Stroke; import java.awt.geom.Ellipse2D; @@ -1014,21 +1016,23 @@ PlotOrientation orientation = plot.getOrientation(); Line2D line = null; - double v = axis.valueToJava2D(value, dataArea, + double v = axis.valueToJava2D(value, dataArea, plot.getDomainAxisEdge()); - if (orientation == PlotOrientation.HORIZONTAL) { + if (orientation.isHorizontal()) { line = new Line2D.Double(dataArea.getMinX(), v, dataArea.getMaxX(), v); - } - else if (orientation == PlotOrientation.VERTICAL) { + } else if (orientation.isVertical()) { line = new Line2D.Double(v, dataArea.getMinY(), v, dataArea.getMaxY()); } g2.setPaint(paint); g2.setStroke(stroke); + Object saved = g2.getRenderingHint(RenderingHints.KEY_STROKE_CONTROL); + g2.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, + RenderingHints.VALUE_STROKE_NORMALIZE); g2.draw(line); - + g2.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, saved); } /** @@ -1054,20 +1058,22 @@ PlotOrientation orientation = plot.getOrientation(); Line2D line = null; - double v = axis.valueToJava2D(value, dataArea, plot.getRangeAxisEdge()); + double v = axis.valueToJava2D(value, dataArea, plot.getRangeAxisEdge()); if (orientation == PlotOrientation.HORIZONTAL) { line = new Line2D.Double(v, dataArea.getMinY(), v, dataArea.getMaxY()); - } - else if (orientation == PlotOrientation.VERTICAL) { + } else if (orientation == PlotOrientation.VERTICAL) { line = new Line2D.Double(dataArea.getMinX(), v, dataArea.getMaxX(), v); } g2.setPaint(paint); g2.setStroke(stroke); + Object saved = g2.getRenderingHint(RenderingHints.KEY_STROKE_CONTROL); + g2.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, + RenderingHints.VALUE_STROKE_NORMALIZE); g2.draw(line); - + g2.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, saved); } /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |