From: <mu...@us...> - 2008-09-02 12:18:41
|
Revision: 1462 http://jfreechart.svn.sourceforge.net/jfreechart/?rev=1462&view=rev Author: mungady Date: 2008-09-02 12:18:36 +0000 (Tue, 02 Sep 2008) Log Message: ----------- Fixed Eclipse warnings. Modified Paths: -------------- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/CustomCategoryURLGenerator.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/CustomXYURLGenerator.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/CustomCategoryURLGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/CustomCategoryURLGenerator.java 2008-09-02 12:18:15 UTC (rev 1461) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/CustomCategoryURLGenerator.java 2008-09-02 12:18:36 UTC (rev 1462) @@ -184,6 +184,8 @@ * generator. * * @return A clone. + * + * @throws CloneNotSupportedException if there is a problem with cloning. */ public Object clone() throws CloneNotSupportedException { CustomCategoryURLGenerator clone Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/CustomXYURLGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/CustomXYURLGenerator.java 2008-09-02 12:18:15 UTC (rev 1461) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/CustomXYURLGenerator.java 2008-09-02 12:18:36 UTC (rev 1462) @@ -196,6 +196,8 @@ * generator. * * @return A clone. + * + * @throws CloneNotSupportedException if there is a problem with cloning. */ public Object clone() throws CloneNotSupportedException { CustomXYURLGenerator clone = (CustomXYURLGenerator) super.clone(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mu...@us...> - 2008-09-04 20:11:42
|
Revision: 1528 http://jfreechart.svn.sourceforge.net/jfreechart/?rev=1528&view=rev Author: mungady Date: 2008-09-04 20:11:38 +0000 (Thu, 04 Sep 2008) Log Message: ----------- Whitespace. Modified Paths: -------------- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/CategoryURLGenerator.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/CustomPieURLGenerator.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/PieURLGenerator.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/StandardPieURLGenerator.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/StandardXYURLGenerator.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/StandardXYZURLGenerator.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/TimeSeriesURLGenerator.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/URLUtilities.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/XYURLGenerator.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/XYZURLGenerator.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/CategoryURLGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/CategoryURLGenerator.java 2008-09-04 20:11:01 UTC (rev 1527) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/CategoryURLGenerator.java 2008-09-04 20:11:38 UTC (rev 1528) @@ -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.] * * ------------------------- * CategoryURLGenerator.java * ------------------------- - * (C) Copyright 2002-2007, by Richard Atkinson and Contributors. + * (C) Copyright 2002-2008, by Richard Atkinson and Contributors. * * Original Author: Richard Atkinson; * Contributors: David Gilbert (for Object Refinery Limited); @@ -36,13 +36,13 @@ * -------- * 05-Aug-2002 : Version 1, contributed by Richard Atkinson; * 09-Oct-2002 : Fixed errors reported by Checkstyle (DG); - * 10-Apr-2003 : Replaced reference to CategoryDataset with + * 10-Apr-2003 : Replaced reference to CategoryDataset with * KeyedValues2DDataset (DG); - * 23-Apr-2003 : Switched around CategoryDataset and KeyedValues2DDataset + * 23-Apr-2003 : Switched around CategoryDataset and KeyedValues2DDataset * (again) (DG); * 13-Aug-2003 : Added clone() method (DG); - * 14-Jun-2004 : Removed clone() method - classes that implement the interface - * should implement the PublicCloneable interface instead, + * 14-Jun-2004 : Removed clone() method - classes that implement the interface + * should implement the PublicCloneable interface instead, * wherever possible (DG); * ------------- JFREECHART 1.0.x --------------------------------------------- * 02-Feb-2007 : Removed author tags from all over JFreeChart sources (DG); @@ -60,7 +60,7 @@ public interface CategoryURLGenerator { /** - * Returns a URL for one item in a dataset. As a guideline, the URL + * Returns a URL for one item in a dataset. As a guideline, the URL * should be valid within the context of an XHTML 1.0 document. Classes * that implement this interface are responsible for correctly escaping * any text that is derived from the dataset, as this may be user-specified @@ -72,7 +72,7 @@ * * @return A string containing the URL. */ - public String generateURL(CategoryDataset dataset, int series, + public String generateURL(CategoryDataset dataset, int series, int category); } Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/CustomPieURLGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/CustomPieURLGenerator.java 2008-09-04 20:11:01 UTC (rev 1527) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/CustomPieURLGenerator.java 2008-09-04 20:11:38 UTC (rev 1528) @@ -2,43 +2,44 @@ * JFreeChart : a free Java chart library * ====================================== * - * (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.] * * -------------------------- * CustomPieURLGenerator.java * -------------------------- - * (C) Copyright 2004-2007, by David Basten and Contributors. + * (C) Copyright 2004-2008, by David Basten and Contributors. * * Original Author: David Basten; * Contributors: -; * * Changes: * -------- - * 04-Feb-2004 : Version 1, contributed by David Basten based on + * 04-Feb-2004 : Version 1, contributed by David Basten based on * CustomXYURLGenerator by Richard Atkinson (added to main source * tree on 25-May-2004); * */ + package org.jfree.chart.urls; import java.io.Serializable; @@ -55,10 +56,8 @@ /** * A custom URL generator for pie charts. */ -public class CustomPieURLGenerator implements PieURLGenerator, - Cloneable, - PublicCloneable, - Serializable { +public class CustomPieURLGenerator implements PieURLGenerator, + Cloneable, PublicCloneable, Serializable { /** For serialization. */ private static final long serialVersionUID = 7100607670144900503L; @@ -83,33 +82,33 @@ * @param pieIndex the pie index. * * @return A string containing the generated URL. - * + * * @see #getURL(Comparable, int) */ - public String generateURL(PieDataset dataset, Comparable key, + public String generateURL(PieDataset dataset, Comparable key, int pieIndex) { return getURL(key, pieIndex); } /** * Returns the number of URL maps stored by the renderer. - * + * * @return The list count. - * + * * @see #addURLs(Map) */ public int getListCount() { return this.urls.size(); } - + /** - * Returns the number of URLs in a given map (specified by its position + * Returns the number of URLs in a given map (specified by its position * in the map list). - * + * * @param list the list index (zero based). - * + * * @return The URL count. - * + * * @see #getListCount() */ public int getURLCount(int list) { @@ -123,12 +122,12 @@ /** * Returns the URL for a section in the specified map. - * + * * @param key the key. * @param mapIndex the map index. - * + * * @return The URL. - */ + */ public String getURL(Comparable key, int mapIndex) { String result = null; if (mapIndex < getListCount()) { @@ -142,32 +141,32 @@ /** * Adds a map containing <code>(key, URL)</code> mappings where each - * <code>key</code> is an instance of <code>Comparable</code> - * (corresponding to the key for an item in a pie dataset) and each + * <code>key</code> is an instance of <code>Comparable</code> + * (corresponding to the key for an item in a pie dataset) and each * <code>URL</code> is a <code>String</code> representing a URL fragment. * <br><br> * The map is appended to an internal list...you can add multiple maps * if you are working with, say, a {@link MultiplePiePlot}. - * + * * @param urlMap the URLs (<code>null</code> permitted). */ public void addURLs(Map urlMap) { this.urls.add(urlMap); } - + /** * Tests if this object is equal to another. - * + * * @param o the other object. - * + * * @return A boolean. */ public boolean equals(Object o) { - + if (o == this) { return true; } - + if (o instanceof CustomPieURLGenerator) { CustomPieURLGenerator generator = (CustomPieURLGenerator) o; if (getListCount() != generator.getListCount()) { @@ -195,9 +194,9 @@ /** * Returns a clone of the generator. - * + * * @return A clone. - * + * * @throws CloneNotSupportedException if cloning is not supported. */ public Object clone() throws CloneNotSupportedException { Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/PieURLGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/PieURLGenerator.java 2008-09-04 20:11:01 UTC (rev 1527) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/PieURLGenerator.java 2008-09-04 20:11:38 UTC (rev 1528) @@ -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.] * * -------------------- * PieURLGenerator.java * -------------------- - * (C) Copyright 2002-2007, by Richard Atkinson and Contributors. + * (C) Copyright 2002-2008, by Richard Atkinson and Contributors. * * Original Author: Richard Atkinson; * Contributors: David Gilbert (for Object Refinery Limited); @@ -36,7 +36,7 @@ * -------- * 05-Aug-2002 : Version 1, contributed by Richard Atkinson; * 09-Oct-2002 : Fixed errors reported by Checkstyle (DG); - * 07-Mar-2003 : Modified to use KeyedValuesDataset and added pieIndex + * 07-Mar-2003 : Modified to use KeyedValuesDataset and added pieIndex * parameter (DG); * 24-Apr-2003 : Switched around PieDataset and KeyedValuesDataset (DG); * ------------- JFREECHART 1.0.x --------------------------------------------- @@ -50,27 +50,27 @@ import org.jfree.data.general.PieDataset; /** - * Interface for a URL generator for plots that use data from a + * Interface for a URL generator for plots that use data from a * {@link PieDataset}. Classes that implement this interface: * <ul> * <li>are responsible for correctly escaping any text that is derived from the * dataset, as this may be user-specified and could pose a security * risk;</li> - * <li>should be either (a) immutable, or (b) cloneable via the - * <code>PublicCloneable</code> interface (defined in the JCommon class - * library). This provides a mechanism for the referring plot to clone + * <li>should be either (a) immutable, or (b) cloneable via the + * <code>PublicCloneable</code> interface (defined in the JCommon class + * library). This provides a mechanism for the referring plot to clone * the generator if necessary.</li> * </ul> */ public interface PieURLGenerator { /** - * Generates a URL for one item in a {@link PieDataset}. As a guideline, + * Generates a URL for one item in a {@link PieDataset}. As a guideline, * the URL should be valid within the context of an XHTML 1.0 document. * * @param dataset the dataset (<code>null</code> not permitted). * @param key the item key (<code>null</code> not permitted). - * @param pieIndex the pie index (differentiates between pies in a + * @param pieIndex the pie index (differentiates between pies in a * 'multi' pie chart). * * @return A string containing the URL. Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/StandardPieURLGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/StandardPieURLGenerator.java 2008-09-04 20:11:01 UTC (rev 1527) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/StandardPieURLGenerator.java 2008-09-04 20:11:38 UTC (rev 1528) @@ -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.] * * ---------------------------- * StandardPieURLGenerator.java * ---------------------------- - * (C) Copyright 2002-2007, by Richard Atkinson and Contributors. + * (C) Copyright 2002-2008, by Richard Atkinson and Contributors. * * Original Author: Richard Atkinson; * Contributors: David Gilbert (for Object Refinery Limited); @@ -36,7 +36,7 @@ * -------- * 05-Aug-2002 : Version 1, contributed by Richard Atkinson; * 09-Oct-2002 : Fixed errors reported by Checkstyle (DG); - * 07-Mar-2003 : Modified to use KeyedValuesDataset and added pieIndex + * 07-Mar-2003 : Modified to use KeyedValuesDataset and added pieIndex * parameter (DG); * 21-Mar-2003 : Implemented Serializable (DG); * 24-Apr-2003 : Switched around PieDataset and KeyedValuesDataset (DG); @@ -47,7 +47,7 @@ * 17-Apr-2007 : Encode section key in generateURL() (DG); * */ - + package org.jfree.chart.urls; import java.io.Serializable; @@ -62,13 +62,13 @@ /** For serialization. */ private static final long serialVersionUID = 1626966402065883419L; - + /** The prefix. */ private String prefix = "index.html"; /** The category parameter name. */ private String categoryParameterName = "category"; - + /** The pie index parameter name. */ private String indexParameterName = "pieIndex"; @@ -92,10 +92,10 @@ * Creates a new generator. * * @param prefix the prefix (<code>null</code> not permitted). - * @param categoryParameterName the category parameter name + * @param categoryParameterName the category parameter name * (<code>null</code> not permitted). */ - public StandardPieURLGenerator(String prefix, + public StandardPieURLGenerator(String prefix, String categoryParameterName) { this(prefix, categoryParameterName, "pieIndex"); } @@ -104,13 +104,13 @@ * Creates a new generator. * * @param prefix the prefix (<code>null</code> not permitted). - * @param categoryParameterName the category parameter name + * @param categoryParameterName the category parameter name * (<code>null</code> not permitted). - * @param indexParameterName the index parameter name (<code>null</code> + * @param indexParameterName the index parameter name (<code>null</code> * permitted). */ - public StandardPieURLGenerator(String prefix, - String categoryParameterName, + public StandardPieURLGenerator(String prefix, + String categoryParameterName, String indexParameterName) { if (prefix == null) { throw new IllegalArgumentException("Null 'prefix' argument."); @@ -133,19 +133,19 @@ * * @return A string containing the generated URL. */ - public String generateURL(PieDataset dataset, Comparable key, + public String generateURL(PieDataset dataset, Comparable key, int pieIndex) { String url = this.prefix; if (url.indexOf("?") > -1) { - url += "&" + this.categoryParameterName + "=" + url += "&" + this.categoryParameterName + "=" + URLUtilities.encode(key.toString(), "UTF-8"); } else { - url += "?" + this.categoryParameterName + "=" + url += "?" + this.categoryParameterName + "=" + URLUtilities.encode(key.toString(), "UTF-8"); } if (this.indexParameterName != null) { - url += "&" + this.indexParameterName + "=" + url += "&" + this.indexParameterName + "=" + String.valueOf(pieIndex); } return url; @@ -172,7 +172,7 @@ if (!this.categoryParameterName.equals(that.categoryParameterName)) { return false; } - if (!ObjectUtilities.equal(this.indexParameterName, + if (!ObjectUtilities.equal(this.indexParameterName, that.indexParameterName)) { return false; } Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/StandardXYURLGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/StandardXYURLGenerator.java 2008-09-04 20:11:01 UTC (rev 1527) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/StandardXYURLGenerator.java 2008-09-04 20:11:38 UTC (rev 1528) @@ -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.] * * --------------------------- * StandardXYURLGenerator.java * --------------------------- - * (C) Copyright 2002-2007, by Richard Atkinson and Contributors. + * (C) Copyright 2002-2008, by Richard Atkinson and Contributors. * * Original Author: Richard Atkinson; * Contributors: David Gilbert (for Object Refinery Limited); @@ -35,7 +35,7 @@ * Changes: * -------- * 05-Aug-2002 : Version 1, contributed by Richard Atkinson; - * 29-Aug-2002 : New constructor and member variables to customise series and + * 29-Aug-2002 : New constructor and member variables to customise series and * item parameter names (RA); * 09-Oct-2002 : Fixed errors reported by Checkstyle (DG); * 23-Mar-2003 : Implemented Serializable (DG); @@ -57,19 +57,19 @@ * A URL generator. */ public class StandardXYURLGenerator implements XYURLGenerator, Serializable { - + /** For serialization. */ private static final long serialVersionUID = -1771624523496595382L; - + /** The default prefix. */ public static final String DEFAULT_PREFIX = "index.html"; - + /** The default series parameter. */ public static final String DEFAULT_SERIES_PARAMETER = "series"; - + /** The default item parameter. */ public static final String DEFAULT_ITEM_PARAMETER = "item"; - + /** Prefix to the URL */ private String prefix; @@ -89,8 +89,8 @@ } /** - * Creates a new generator with the specified prefix. This constructor - * is equivalent to calling + * Creates a new generator with the specified prefix. This constructor + * is equivalent to calling * <code>StandardXYURLGenerator(prefix, "series", "item");</code>. * * @param prefix the prefix to the URL (<code>null</code> not permitted). @@ -103,7 +103,7 @@ * Constructor that overrides all the defaults * * @param prefix the prefix to the URL (<code>null</code> not permitted). - * @param seriesParameterName the name of the series parameter to go in + * @param seriesParameterName the name of the series parameter to go in * each URL (<code>null</code> not permitted). * @param itemParameterName the name of the item parameter to go in each * URL (<code>null</code> not permitted). @@ -137,6 +137,7 @@ * @return The generated URL. */ public String generateURL(XYDataset dataset, int series, int item) { + // TODO: URLEncode? String url = this.prefix; boolean firstParameter = url.indexOf("?") == -1; url += firstParameter ? "?" : "&"; @@ -147,14 +148,14 @@ /** * Tests this generator 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; + return true; } if (!(obj instanceof StandardXYURLGenerator)) { return false; @@ -163,15 +164,15 @@ if (!ObjectUtilities.equal(that.prefix, this.prefix)) { return false; } - if (!ObjectUtilities.equal(that.seriesParameterName, + if (!ObjectUtilities.equal(that.seriesParameterName, this.seriesParameterName)) { return false; } - if (!ObjectUtilities.equal(that.itemParameterName, + if (!ObjectUtilities.equal(that.itemParameterName, this.itemParameterName)) { return false; } return true; } - + } Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/StandardXYZURLGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/StandardXYZURLGenerator.java 2008-09-04 20:11:01 UTC (rev 1527) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/StandardXYZURLGenerator.java 2008-09-04 20:11:38 UTC (rev 1528) @@ -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.] * * ---------------------------- * StandardXYZURLGenerator.java * ---------------------------- - * (C) Copyright 2003-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2003-2008, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributors: -; @@ -46,7 +46,7 @@ * A URL generator. */ public class StandardXYZURLGenerator extends StandardXYURLGenerator - implements XYZURLGenerator { + implements XYZURLGenerator { /** * Generates a URL for a particular item within a series. Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/TimeSeriesURLGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/TimeSeriesURLGenerator.java 2008-09-04 20:11:01 UTC (rev 1527) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/TimeSeriesURLGenerator.java 2008-09-04 20:11:38 UTC (rev 1528) @@ -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.] * * --------------------------- * TimeSeriesURLGenerator.java * --------------------------- - * (C) Copyright 2002-2007, by Richard Atkinson and Contributors. + * (C) Copyright 2002-2008, by Richard Atkinson and Contributors. * * Original Author: Richard Atkinson; * Contributors: David Gilbert (for Object Refinery Limited); @@ -37,15 +37,15 @@ * 29-Aug-2002 : Initial version (RA); * 09-Oct-2002 : Fixed errors reported by Checkstyle (DG); * 23-Mar-2003 : Implemented Serializable (DG); - * 15-Jul-2004 : Switched getX() with getXValue() and getY() with + * 15-Jul-2004 : Switched getX() with getXValue() and getY() with * getYValue() (DG); * 13-Jan-2005 : Modified for XHTML 1.0 compliance (DG); * ------------- JFREECHART 1.0.x --------------------------------------------- * 06-Jul-2006 : Swap call to dataset's getX() --> getXValue() (DG); - * 17-Apr-2007 : Added null argument checks to constructor, new accessor + * 17-Apr-2007 : Added null argument checks to constructor, new accessor * methods, added equals() override and used new URLUtilities * class to encode series key and date (DG); - * + * */ package org.jfree.chart.urls; @@ -62,11 +62,11 @@ public class TimeSeriesURLGenerator implements XYURLGenerator, Serializable { /** For serialization. */ - private static final long serialVersionUID = -9122773175671182445L; - + private static final long serialVersionUID = -9122773175671182445L; + /** A formatter for the date. */ private DateFormat dateFormat = DateFormat.getInstance(); - + /** Prefix to the URL */ private String prefix = "index.html"; @@ -86,12 +86,12 @@ /** * Construct TimeSeriesURLGenerator overriding defaults. * - * @param dateFormat a formatter for the date (<code>null</code> not + * @param dateFormat a formatter for the date (<code>null</code> not * permitted). * @param prefix the prefix of the URL (<code>null</code> not permitted). * @param seriesParameterName the name of the series parameter in the URL * (<code>null</code> not permitted). - * @param itemParameterName the name of the item parameter in the URL + * @param itemParameterName the name of the item parameter in the URL * (<code>null</code> not permitted). */ public TimeSeriesURLGenerator(DateFormat dateFormat, String prefix, @@ -111,7 +111,7 @@ throw new IllegalArgumentException( "Null 'itemParameterName' argument."); } - + this.dateFormat = (DateFormat) dateFormat.clone(); this.prefix = prefix; this.seriesParameterName = seriesParameterName; @@ -121,48 +121,48 @@ /** * Returns a clone of the date format assigned to this URL generator. - * + * * @return The date format (never <code>null</code>). - * + * * @since 1.0.6 */ public DateFormat getDateFormat() { return (DateFormat) this.dateFormat.clone(); } - + /** * Returns the prefix string. - * + * * @return The prefix string (never <code>null</code>). - * + * * @since 1.0.6 */ public String getPrefix() { return this.prefix; } - + /** * Returns the series parameter name. - * + * * @return The series parameter name (never <code>null</code>). - * + * * @since 1.0.6 */ public String getSeriesParameterName() { return this.seriesParameterName; } - + /** * Returns the item parameter name. - * + * * @return The item parameter name (never <code>null</code>). - * + * * @since 1.0.6 */ public String getItemParameterName() { return this.itemParameterName; } - + /** * Generates a URL for a particular item within a series. * @@ -186,7 +186,7 @@ long x = (long) dataset.getXValue(series, item); String xValue = this.dateFormat.format(new Date(x)); result += firstParameter ? "?" : "&"; - result += this.itemParameterName + "=" + URLUtilities.encode(xValue, + result += this.itemParameterName + "=" + URLUtilities.encode(xValue, "UTF-8"); return result; @@ -194,9 +194,9 @@ /** * Tests this generator for equality with an arbitrary object. - * + * * @param obj the object (<code>null</code> permitted). - * + * * @return A boolean. */ public boolean equals(Object obj) { Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/URLUtilities.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/URLUtilities.java 2008-09-04 20:11:01 UTC (rev 1527) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/URLUtilities.java 2008-09-04 20:11:38 UTC (rev 1528) @@ -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.] * * ----------------- * URLUtilities.java * ----------------- - * (C) Copyright 2007, by Object Refinery Limited. + * (C) Copyright 2007, 2008, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributors: -; @@ -35,7 +35,7 @@ * Changes: * -------- * 17-Apr-2007 : Version 1 (DG); - * + * */ package org.jfree.chart.urls; @@ -46,25 +46,25 @@ /** * General utility methods for URLs. - * + * * @since 1.0.6 */ public class URLUtilities { /** Constant used by {@link #encode(String, String)}. */ - private static final Class[] STRING_ARGS_2 = new Class[] {String.class, + private static final Class[] STRING_ARGS_2 = new Class[] {String.class, String.class}; - + /** * Calls <code>java.net.URLEncoder.encode(String, String)</code> via * reflection, if we are running on JRE 1.4 or later, otherwise reverts to * the deprecated <code>URLEncoder.encode(String)</code> method. - * + * * @param s the string to encode. * @param encoding the encoding. - * + * * @return The encoded string. - * + * * @since 1.0.6 */ public static String encode(String s, String encoding) { @@ -88,5 +88,5 @@ } return result; } - + } Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/XYURLGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/XYURLGenerator.java 2008-09-04 20:11:01 UTC (rev 1527) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/XYURLGenerator.java 2008-09-04 20:11:38 UTC (rev 1528) @@ -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.] * * ------------------- * XYURLGenerator.java * ------------------- - * (C) Copyright 2002-2007, by Richard Atkinson and Contributors. + * (C) Copyright 2002-2008, by Richard Atkinson and Contributors. * * Original Author: Richard Atkinson; * Contributors: David Gilbert (for Object Refinery Limited); @@ -48,22 +48,22 @@ import org.jfree.data.xy.XYDataset; /** - * Interface for a URL generator for plots that uses data from an - * {@link XYDataset}. Classes that implement this interface are responsible - * for correctly escaping any text that is derived from the dataset, as this + * Interface for a URL generator for plots that uses data from an + * {@link XYDataset}. Classes that implement this interface are responsible + * for correctly escaping any text that is derived from the dataset, as this * may be user-specified and could pose a security risk. */ public interface XYURLGenerator { /** - * Generates a URL for a particular item within a series. As a guideline, + * Generates a URL for a particular item within a series. As a guideline, * the URL should be valid within the context of an XHTML 1.0 document. * * @param dataset the dataset (<code>null</code> not permitted). * @param series the series index (zero-based). * @param item the item index (zero-based). * - * @return A string containing the generated URL (possibly + * @return A string containing the generated URL (possibly * <code>null</code>). */ public String generateURL(XYDataset dataset, int series, int item); Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/XYZURLGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/XYZURLGenerator.java 2008-09-04 20:11:01 UTC (rev 1527) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/XYZURLGenerator.java 2008-09-04 20:11:38 UTC (rev 1528) @@ -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.] * * -------------------- * XYZURLGenerator.java * -------------------- - * (C) Copyright 2003-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2003-2008, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributors: -; @@ -44,15 +44,15 @@ import org.jfree.data.xy.XYZDataset; /** - * Interface for a URL generator for plots that uses data from an - * {@link XYZDataset}. Classes that implement this interface are responsible - * for correctly escaping any text that is derived from the dataset, as this + * Interface for a URL generator for plots that uses data from an + * {@link XYZDataset}. Classes that implement this interface are responsible + * for correctly escaping any text that is derived from the dataset, as this * may be user-specified and could pose a security risk. */ public interface XYZURLGenerator extends XYURLGenerator { /** - * Generates a URL for a particular item within a series. As a guideline, + * Generates a URL for a particular item within a series. As a guideline, * the URL should be valid within the context of an XHTML 1.0 document. * * @param dataset the dataset (<code>null</code> not permitted). This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mu...@us...> - 2011-10-30 18:35:29
|
Revision: 2375 http://jfreechart.svn.sourceforge.net/jfreechart/?rev=2375&view=rev Author: mungady Date: 2011-10-30 18:35:23 +0000 (Sun, 30 Oct 2011) Log Message: ----------- Update headers for Oracle trademarks. Modified Paths: -------------- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/CategoryURLGenerator.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/CustomCategoryURLGenerator.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/CustomPieURLGenerator.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/CustomXYURLGenerator.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/PieURLGenerator.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/StandardCategoryURLGenerator.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/StandardPieURLGenerator.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/StandardXYURLGenerator.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/StandardXYZURLGenerator.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/TimeSeriesURLGenerator.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/URLUtilities.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/XYURLGenerator.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/XYZURLGenerator.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/CategoryURLGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/CategoryURLGenerator.java 2011-10-30 18:34:37 UTC (rev 2374) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/CategoryURLGenerator.java 2011-10-30 18:35:23 UTC (rev 2375) @@ -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.] * * ------------------------- * CategoryURLGenerator.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/CustomCategoryURLGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/CustomCategoryURLGenerator.java 2011-10-30 18:34:37 UTC (rev 2374) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/CustomCategoryURLGenerator.java 2011-10-30 18:35:23 UTC (rev 2375) @@ -2,7 +2,7 @@ * JFreeChart : a free Java chart library * ====================================== * - * (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.] * * ------------------------------- * CustomCategoryURLGenerator.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/CustomPieURLGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/CustomPieURLGenerator.java 2011-10-30 18:34:37 UTC (rev 2374) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/CustomPieURLGenerator.java 2011-10-30 18:35:23 UTC (rev 2375) @@ -2,7 +2,7 @@ * JFreeChart : a free Java chart library * ====================================== * - * (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.] * * -------------------------- * CustomPieURLGenerator.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/CustomXYURLGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/CustomXYURLGenerator.java 2011-10-30 18:34:37 UTC (rev 2374) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/CustomXYURLGenerator.java 2011-10-30 18:35:23 UTC (rev 2375) @@ -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.] * * ------------------------- * CustomXYURLGenerator.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/PieURLGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/PieURLGenerator.java 2011-10-30 18:34:37 UTC (rev 2374) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/PieURLGenerator.java 2011-10-30 18:35:23 UTC (rev 2375) @@ -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.] * * -------------------- * PieURLGenerator.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/StandardCategoryURLGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/StandardCategoryURLGenerator.java 2011-10-30 18:34:37 UTC (rev 2374) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/StandardCategoryURLGenerator.java 2011-10-30 18:35:23 UTC (rev 2375) @@ -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.] * * --------------------------------- * StandardCategoryURLGenerator.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/StandardPieURLGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/StandardPieURLGenerator.java 2011-10-30 18:34:37 UTC (rev 2374) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/StandardPieURLGenerator.java 2011-10-30 18:35:23 UTC (rev 2375) @@ -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.] * * ---------------------------- * StandardPieURLGenerator.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/StandardXYURLGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/StandardXYURLGenerator.java 2011-10-30 18:34:37 UTC (rev 2374) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/StandardXYURLGenerator.java 2011-10-30 18:35:23 UTC (rev 2375) @@ -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.] * * --------------------------- * StandardXYURLGenerator.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/StandardXYZURLGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/StandardXYZURLGenerator.java 2011-10-30 18:34:37 UTC (rev 2374) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/StandardXYZURLGenerator.java 2011-10-30 18:35:23 UTC (rev 2375) @@ -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.] * * ---------------------------- * StandardXYZURLGenerator.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/TimeSeriesURLGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/TimeSeriesURLGenerator.java 2011-10-30 18:34:37 UTC (rev 2374) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/TimeSeriesURLGenerator.java 2011-10-30 18:35:23 UTC (rev 2375) @@ -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.] * * --------------------------- * TimeSeriesURLGenerator.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/URLUtilities.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/URLUtilities.java 2011-10-30 18:34:37 UTC (rev 2374) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/URLUtilities.java 2011-10-30 18:35:23 UTC (rev 2375) @@ -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.] * * ----------------- * URLUtilities.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/XYURLGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/XYURLGenerator.java 2011-10-30 18:34:37 UTC (rev 2374) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/XYURLGenerator.java 2011-10-30 18:35:23 UTC (rev 2375) @@ -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.] * * ------------------- * XYURLGenerator.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/XYZURLGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/XYZURLGenerator.java 2011-10-30 18:34:37 UTC (rev 2374) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/XYZURLGenerator.java 2011-10-30 18:35:23 UTC (rev 2375) @@ -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.] * * -------------------- * XYZURLGenerator.java This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mu...@us...> - 2013-11-22 19:23:02
|
Revision: 3033 http://sourceforge.net/p/jfreechart/code/3033 Author: mungady Date: 2013-11-22 19:22:59 +0000 (Fri, 22 Nov 2013) Log Message: ----------- Fixed NB warnings. Modified Paths: -------------- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/CustomCategoryURLGenerator.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/CustomPieURLGenerator.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/CustomXYURLGenerator.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/StandardCategoryURLGenerator.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/StandardPieURLGenerator.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/StandardXYURLGenerator.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/StandardXYZURLGenerator.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/TimeSeriesURLGenerator.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/CustomCategoryURLGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/CustomCategoryURLGenerator.java 2013-11-22 19:22:46 UTC (rev 3032) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/CustomCategoryURLGenerator.java 2013-11-22 19:22:59 UTC (rev 3033) @@ -119,6 +119,7 @@ * * @return A string containing the URL (possibly <code>null</code>). */ + @Override public String generateURL(CategoryDataset dataset, int series, int item) { return getURL(series, item); } @@ -143,6 +144,7 @@ * * @return A boolean. */ + @Override public boolean equals(Object obj) { if (obj == this) { return true; @@ -187,6 +189,7 @@ * * @throws CloneNotSupportedException if there is a problem with cloning. */ + @Override public Object clone() throws CloneNotSupportedException { CustomCategoryURLGenerator clone = (CustomCategoryURLGenerator) super.clone(); Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/CustomPieURLGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/CustomPieURLGenerator.java 2013-11-22 19:22:46 UTC (rev 3032) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/CustomPieURLGenerator.java 2013-11-22 19:22:59 UTC (rev 3033) @@ -85,6 +85,7 @@ * * @see #getURL(Comparable, int) */ + @Override public String generateURL(PieDataset dataset, Comparable key, int pieIndex) { return getURL(key, pieIndex); @@ -161,6 +162,7 @@ * * @return A boolean. */ + @Override public boolean equals(Object o) { if (o == this) { @@ -199,6 +201,7 @@ * * @throws CloneNotSupportedException if cloning is not supported. */ + @Override public Object clone() throws CloneNotSupportedException { CustomPieURLGenerator urlGen = new CustomPieURLGenerator(); Map map; @@ -215,7 +218,6 @@ } urlGen.addURLs(newMap); - newMap = null; } return urlGen; Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/CustomXYURLGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/CustomXYURLGenerator.java 2013-11-22 19:22:46 UTC (rev 3032) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/CustomXYURLGenerator.java 2013-11-22 19:22:59 UTC (rev 3033) @@ -128,6 +128,7 @@ * * @return A string containing the URL (possibly <code>null</code>). */ + @Override public String generateURL(XYDataset dataset, int series, int item) { return getURL(series, item); } @@ -153,6 +154,7 @@ * * @return A boolean. */ + @Override public boolean equals(Object obj) { if (obj == this) { return true; @@ -199,6 +201,7 @@ * * @throws CloneNotSupportedException if there is a problem with cloning. */ + @Override public Object clone() throws CloneNotSupportedException { CustomXYURLGenerator clone = (CustomXYURLGenerator) super.clone(); clone.urlSeries = new java.util.ArrayList(this.urlSeries); Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/StandardCategoryURLGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/StandardCategoryURLGenerator.java 2013-11-22 19:22:46 UTC (rev 3032) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/StandardCategoryURLGenerator.java 2013-11-22 19:22:59 UTC (rev 3033) @@ -127,6 +127,7 @@ * * @return The generated URL. */ + @Override public String generateURL(CategoryDataset dataset, int series, int category) { String url = this.prefix; @@ -149,6 +150,7 @@ * @throws CloneNotSupportedException not thrown by this class, but * subclasses (if any) might. */ + @Override public Object clone() throws CloneNotSupportedException { // all attributes are immutable, so we can just return the super.clone() // FIXME: in fact, the generator itself is immutable, so cloning is @@ -163,6 +165,7 @@ * * @return A boolean. */ + @Override public boolean equals(Object obj) { if (obj == this) { return true; @@ -191,6 +194,7 @@ * * @return A hash code. */ + @Override public int hashCode() { int result; result = (this.prefix != null ? this.prefix.hashCode() : 0); Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/StandardPieURLGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/StandardPieURLGenerator.java 2013-11-22 19:22:46 UTC (rev 3032) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/StandardPieURLGenerator.java 2013-11-22 19:22:59 UTC (rev 3033) @@ -129,6 +129,7 @@ * * @return A string containing the generated URL. */ + @Override public String generateURL(PieDataset dataset, Comparable key, int pieIndex) { String url = this.prefix; @@ -154,6 +155,7 @@ * * @return A boolean. */ + @Override public boolean equals(Object obj) { if (obj == this) { return true; Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/StandardXYURLGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/StandardXYURLGenerator.java 2013-11-22 19:22:46 UTC (rev 3032) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/StandardXYURLGenerator.java 2013-11-22 19:22:59 UTC (rev 3033) @@ -129,6 +129,7 @@ * * @return The generated URL. */ + @Override public String generateURL(XYDataset dataset, int series, int item) { // TODO: URLEncode? String url = this.prefix; @@ -146,6 +147,7 @@ * * @return A boolean. */ + @Override public boolean equals(Object obj) { if (obj == this) { return true; Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/StandardXYZURLGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/StandardXYZURLGenerator.java 2013-11-22 19:22:46 UTC (rev 3032) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/StandardXYZURLGenerator.java 2013-11-22 19:22:59 UTC (rev 3033) @@ -57,6 +57,7 @@ * * @return A string containing the generated URL. */ + @Override public String generateURL(XYZDataset dataset, int series, int item) { return super.generateURL(dataset, series, item); } Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/TimeSeriesURLGenerator.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/TimeSeriesURLGenerator.java 2013-11-22 19:22:46 UTC (rev 3032) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/TimeSeriesURLGenerator.java 2013-11-22 19:22:59 UTC (rev 3033) @@ -162,6 +162,7 @@ * * @return The generated URL. */ + @Override public String generateURL(XYDataset dataset, int series, int item) { String result = this.prefix; boolean firstParameter = result.indexOf("?") == -1; @@ -189,6 +190,7 @@ * * @return A boolean. */ + @Override public boolean equals(Object obj) { if (obj == this) { return true; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |