[Git][java-team/libjcommon-java][upstream] 2 commits: New upstream version 1.0.24

[Christian Bayle (@bayle)]

Christian Bayle pushed to branch upstream at Debian Java Maintainers / libjcommon-java


Commits:
c255c17a by Christian Bayle at 2025-02-22T18:48:19+01:00
New upstream version 1.0.24
- - - - -
d9eef27a by Christian Bayle at 2025-02-22T19:15:27+01:00
New upstream version 1.0.24+ds
- - - - -


13 changed files:

- + .gitignore
- README.md
- ant/build.properties
- ant/build.xml
- pom.xml
- src/main/java/org/jfree/text/TextUtilities.java
- src/main/java/org/jfree/ui/LocalizationBundle_es.properties
- src/main/java/org/jfree/ui/RectangleAnchor.java
- src/main/java/org/jfree/ui/about/gpl-2.0.txt
- src/main/java/org/jfree/ui/about/lgpl-2.1.txt
- src/main/java/org/jfree/util/PaintUtilities.java
- src/test/java/org/jfree/ui/RectangleAnchorTest.java
- src/test/java/org/jfree/util/PaintUtilitiesTest.java


Changes:

=====================================
.gitignore
=====================================
@@ -0,0 +1,14 @@
+*.class
+
+# Package Files #
+*.jar
+*.war
+*.ear
+
+# Eclipse files #
+/.classpath
+/.project
+/.settings
+
+# Build directory #
+/target


=====================================
README.md
=====================================
@@ -1,9 +1,9 @@
-THE JCOMMON CLASS LIBRARY: Version 1.0.23
+THE JCOMMON CLASS LIBRARY: Version 1.0.24
 =========================================
 
-24 July 2014
+18 February 2017
 
-(C)opyright, 2000-2014, by Object Refinery Limited and Contributors.
+(C)opyright, 2000-2017, by Object Refinery Limited and Contributors.
 
 -----------------
 1.  INTRODUCTION
@@ -43,47 +43,51 @@ and Hari.
 ---------------
 Changes in each version are listed here:
 
+1.0.24: (17-Feb-2017) Fix for `RectangleAnchor` class, add handling for gradient
+                      paint in `PaintUtilities`, fix for bug in 
+                      `drawRotatedString()` method.
+
 1.0.23: (24-Jul-2014) Reorganised directories to align to Maven standard.
                       Updated pom file.  Fixed Javadoc warnings for JDK 8.
 
-1.0.22: (28-Feb-2014) Fix for endless loop in TextUtilities.createTextBlock().
+1.0.22: (28-Feb-2014) Fix for endless loop in `TextUtilities.createTextBlock()`.
 
-1.0.21: (24-Oct-2013) Modified drawRotatedString() to call drawAlignedString()
+1.0.21: (24-Oct-2013) Modified `drawRotatedString()` to call `drawAlignedString()`
                       when the rotation angle is 0.0.  This provides benefits
                       downstream for JFreeChart, JFreeSVG and OrsonPDF.
 
-1.0.20: (01-Sep-2013) Fixed TextFragment.draw() to respect TextAnchor argument.
+1.0.20: (01-Sep-2013) Fixed `TextFragment.draw()` to respect `TextAnchor` argument.
 
 1.0.19: (30-Aug-2013) Updated Licences.java so that complete licence text is 
                       loaded on demand only (bug #1118).
 
-1.0.18: (23-Sep-2012) Fixed PaintList.equals() bug, fixed line break issue in
-                      TextUtilities;
+1.0.18: (23-Sep-2012) Fixed `PaintList.equals()` bug, fixed line break issue in
+                      `TextUtilities`;
 
-1.0.17: (17-Oct-2011) Updated SerialUtilities to support serialisation of
-                      Composite instances;
+1.0.17: (17-Oct-2011) Updated `SerialUtilities` to support serialisation of
+                      `Composite` instances;
 
 1.0.16: (17-Apr-2009) New release in conjunction with JFreeChart 1.0.13;
 
-1.0.15: (19-Dec-2008) New ResourceBundleWrapper class to enable applets to
+1.0.15: (19-Dec-2008) New `ResourceBundleWrapper` class to enable applets to
                       bypass codeBase lookup.  Updated Maven specs.
 
-1.0.14: (10-Sep-2008) Workaround added to PngEncoder, bug fix in ShapeList.
+1.0.14: (10-Sep-2008) Workaround added to `PngEncoder`, bug fix in `ShapeList`.
 
-1.0.13: (05-Jun-2008) Bug fixes for TextBox and ShapeUtilities.
+1.0.13: (05-Jun-2008) Bug fixes for `TextBox` and `ShapeUtilities`.
 
 1.0.12: (02-Nov-2007) Made the resource-loading and classloader selection more
         robust in cases where the jars were distributed over several
         classloaders.
 
-1.0.11: (19-Oct-2007) BugFix in the KeyedComboBoxModel causing
+1.0.11: (19-Oct-2007) BugFix in the `KeyedComboBoxModel` causing
         NullPointerExceptions on MacOS-X; Make sure that all resource-streams
         that get opened also get safely closed in case of errors.
 
-1.0.10: (21-May-2007) BugFix in the PackageSorter, Window positioning is now
+1.0.10: (21-May-2007) BugFix in the `PackageSorter`, Window positioning is now
         multi-screen aware.
 
-1.0.9 : (23-Mar-2007) Serialization fix in TextFragment.
+1.0.9 : (23-Mar-2007) Serialization fix in `TextFragment`.
 
 1.0.8 : (11-Dec-2006) Minor bugfixes in the synchronization of the Booting code
         and the FastStack.


=====================================
ant/build.properties
=====================================
@@ -2,7 +2,7 @@
 #
 #  Global settings ...
 jcommon.name=jcommon
-jcommon.version=1.0.23
+jcommon.version=1.0.24
 
 #
 # This defines the compiler settings. Optimizing would remove


=====================================
ant/build.xml
=====================================
@@ -11,10 +11,6 @@
 <!-- A "../javadoc" directory will be created for the Javadoc -->
 <!-- HTML pages. -->
 
-<!-- The script should work for the distribution and also the CVS -->
-<!-- repository (which is shared with the JFreeChart project in a -->
-<!-- slightly messy way). -->
-
 <project name="jcommon" default="all" basedir="..">
 
   <!-- Initialisation. -->


=====================================
pom.xml
=====================================
@@ -10,16 +10,9 @@
 
     <artifactId>jcommon</artifactId>
     <groupId>org.jfree</groupId>
-    <version>1.0.23</version>
+    <version>1.0.24</version>
     <packaging>jar</packaging>
 
-    <!-- this is required to host it on Sonatype's OSSRH -->
-    <parent>
-        <groupId>org.sonatype.oss</groupId>
-        <artifactId>oss-parent</artifactId>
-        <version>9</version>
-    </parent>
-
     <organization>
         <name>JFree.org</name>
         <url>http://www.jfree.org/</url>
@@ -34,33 +27,21 @@
 
     <url>http://www.jfree.org/jcommon/</url>
     <issueManagement>
-        <url>http://sourceforge.net/tracker/?group_id=15494</url>
+        <url>https://github.com/jfree/jcommon/issues</url>
+        <system>GitHub Issues</system>
     </issueManagement>
     <scm>
-        <connection>scm:cvs:pserver:anonymous at cvs.sourceforge.net:/cvsroot/jfreechart:jcommon</connection>
-        <url>http://cvs.sourceforge.net/viewcvs.py/jfreechart/jcommon</url>
+        <connection>scm:git:git:https://github.com/jfree/jcommon.git</connection>
+        <url>https://github.com/jfree/jcommon</url>
     </scm>
 
-    <mailingLists>
-        <mailingList>
-            <name>JFreeChart Developer List</name>
-            <subscribe>
-        jfreechart-dev-request at lists.sourceforge.net?subject=subscribe
-            </subscribe>
-            <unsubscribe>
-        jfreechart-dev-request at lists.sourceforge.net?subject=unsubscribe
-            </unsubscribe>
-            <archive>
-        http://sourceforge.net/mailarchive/forum.php?forum=jfreechart-dev
-            </archive>
-        </mailingList>
-    </mailingLists>
-
     <developers>
-    <!--
-    For an up to date list of developers and contributors have a look at
-    the project info implementations.
-    -->
+      <developer>
+        <name>David Gilbert</name>
+        <email>dave at jfree.org</email>
+        <organization>Object Refinery Limited</organization>
+        <organizationUrl>http://www.object-refinery.com</organizationUrl>
+      </developer>
     </developers>
     <licenses>
         <license>
@@ -157,7 +138,7 @@
             <plugin>
               <groupId>org.sonatype.plugins</groupId>
               <artifactId>nexus-staging-maven-plugin</artifactId>
-              <version>1.6.2</version>
+              <version>1.6.7</version>
               <extensions>true</extensions>
               <configuration>
                 <serverId>ossrh</serverId>


=====================================
src/main/java/org/jfree/text/TextUtilities.java
=====================================
@@ -501,7 +501,7 @@ public class TextUtilities {
             return;
         }
         if (angle == 0.0) {
-            drawAlignedString(text, g2, textY, textY, TextAnchor.BASELINE_LEFT);
+            drawAlignedString(text, g2, textX, textY, TextAnchor.BASELINE_LEFT);
             return;
         }
         


=====================================
src/main/java/org/jfree/ui/LocalizationBundle_es.properties
=====================================
@@ -2,15 +2,15 @@
 # 
 # Changes (from 31-Aug-2003)
 # --------------------------
-# 14-Oct-2004 : Initial version: Leopoldo Federico P�rtile (Grupo de Procesamiento Digital de Im�genes)
-#					   Universidad Tecnol�gica Nacional - Facultad Regional Resistencia, Argentina
+# 14-Oct-2004 : Initial version: Leopoldo Federico Prtile (Grupo de Procesamiento Digital de Imgenes)
+#					   Universidad Tecnolgica Nacional - Facultad Regional Resistencia, Argentina
 
 Attributes=Atributos:
 B=Inf:
 Bold=Negrita
 Bottom=Inferior
 Font=Fuente:
-Insets=M�rgenes:
+Insets=Mrgenes:
 Italic=Cursiva
 L=Izq: 
 Left=Izquierda


=====================================
src/main/java/org/jfree/ui/RectangleAnchor.java
=====================================
@@ -2,7 +2,7 @@
  * JCommon : a free general purpose class library for the Java(tm) platform
  * ========================================================================
  *
- * (C) Copyright 2000-2005, by Object Refinery Limited and Contributors.
+ * (C) Copyright 2000-2015, by Object Refinery Limited and Contributors.
  * 
  * Project Info:  http://www.jfree.org/jcommon/index.html
  *
@@ -27,20 +27,19 @@
  * --------------------
  * RectangleAnchor.java
  * --------------------
- * (C) Copyright 2003-2005, by Object Refinery Limited.
+ * (C) Copyright 2003-2015, by Object Refinery Limited.
  *
  * Original Author:  David Gilbert (for Object Refinery Limited);
  * Contributor(s):   -;
  *
- * $Id: RectangleAnchor.java,v 1.6 2005/10/18 13:18:34 mungady Exp $
- *
  * Changes:
  * --------
  * 31-Oct-2003 (DG);
  * 01-Apr-2004 : Changed java.awt.geom.Dimension2D to org.jfree.ui.Size2D 
  *               because of JDK bug 4976448 which persists on JDK 1.3.1 (DG);
  * 21-Jan-2005 : Changed return type of coordinates() method (DG);
- * 
+ * 17-Feb-2015 : Fixes for createRectangle() (DG);
+ *
  */
 
 package org.jfree.ui;
@@ -52,8 +51,6 @@ import java.io.Serializable;
 
 /**
  * Used to indicate an anchor point for a rectangle.
- *
- * @author David Gilbert
  */
 public final class RectangleAnchor implements Serializable {
 
@@ -104,7 +101,7 @@ public final class RectangleAnchor implements Serializable {
      *
      * @param name  the name.
      */
-    private RectangleAnchor(final String name) {
+    private RectangleAnchor(String name) {
         this.name = name;
     }
 
@@ -194,66 +191,41 @@ public final class RectangleAnchor implements Serializable {
     
     /**
      * Creates a new rectangle with the specified dimensions that is aligned to
-     * the given anchor point <code>(anchorX, anchorY)</code>.
+     * the given anchor point {@code (anchorX, anchorY)}.
      * 
-     * @param dimensions  the dimensions (<code>null</code> not permitted).
+     * @param dimensions  the dimensions ({@code null} not permitted).
      * @param anchorX  the x-anchor.
      * @param anchorY  the y-anchor.
-     * @param anchor  the anchor (<code>null</code> not permitted).
+     * @param anchor  the anchor ({@code null} not permitted).
      * 
      * @return A rectangle.
      */
-    public static Rectangle2D createRectangle(final Size2D dimensions,
-                                              final double anchorX,
-                                              final double anchorY,
-                                              final RectangleAnchor anchor) {
+    public static Rectangle2D createRectangle(Size2D dimensions, 
+            double anchorX, double anchorY, RectangleAnchor anchor) {
         Rectangle2D result = null;
         final double w = dimensions.getWidth();
         final double h = dimensions.getHeight();
         if (anchor == RectangleAnchor.CENTER) {
-            result = new Rectangle2D.Double(
-                anchorX - w / 2.0, anchorY - h / 2.0, w, h
-            );
-        }
-        else if (anchor == RectangleAnchor.TOP) {
-            result = new Rectangle2D.Double(
-                anchorX - w / 2.0, anchorY - h / 2.0, w, h
-            );
-        }
-        else if (anchor == RectangleAnchor.BOTTOM) {
-            result = new Rectangle2D.Double(
-                anchorX - w / 2.0, anchorY - h / 2.0, w, h
-            );
-        }
-        else if (anchor == RectangleAnchor.LEFT) {
-            result = new Rectangle2D.Double(
-                anchorX, anchorY - h / 2.0, w, h
-            );
-        }
-        else if (anchor == RectangleAnchor.RIGHT) {
-            result = new Rectangle2D.Double(
-                anchorX - w, anchorY - h / 2.0, w, h
-            );
-        }
-        else if (anchor == RectangleAnchor.TOP_LEFT) {
-            result = new Rectangle2D.Double(
-                anchorX - w / 2.0, anchorY - h / 2.0, w, h
-            );
-        }
-        else if (anchor == RectangleAnchor.TOP_RIGHT) {
-            result = new Rectangle2D.Double(
-                anchorX - w / 2.0, anchorY - h / 2.0, w, h
-            );
-        }
-        else if (anchor == RectangleAnchor.BOTTOM_LEFT) {
-            result = new Rectangle2D.Double(
-                anchorX - w / 2.0, anchorY - h / 2.0, w, h
-            );
-        }
-        else if (anchor == RectangleAnchor.BOTTOM_RIGHT) {
-            result = new Rectangle2D.Double(
-                anchorX - w / 2.0, anchorY - h / 2.0, w, h
-            );
+            result = new Rectangle2D.Double(anchorX - w / 2.0, 
+                    anchorY - h / 2.0, w, h);
+        } else if (anchor == RectangleAnchor.TOP) {
+            result = new Rectangle2D.Double(anchorX - w / 2.0, anchorY, w, h);
+        } else if (anchor == RectangleAnchor.BOTTOM) {
+            result = new Rectangle2D.Double(anchorX - w / 2.0, anchorY - h, 
+                    w, h);
+        } else if (anchor == RectangleAnchor.LEFT) {
+            result = new Rectangle2D.Double(anchorX, anchorY - h / 2.0, w, h);
+        } else if (anchor == RectangleAnchor.RIGHT) {
+            result = new Rectangle2D.Double(anchorX - w, anchorY - h / 2.0, 
+                    w, h);
+        } else if (anchor == RectangleAnchor.TOP_LEFT) {
+            result = new Rectangle2D.Double(anchorX, anchorY, w, h);
+        } else if (anchor == RectangleAnchor.TOP_RIGHT) {
+            result = new Rectangle2D.Double(anchorX - w, anchorY, w, h);
+        } else if (anchor == RectangleAnchor.BOTTOM_LEFT) {
+            result = new Rectangle2D.Double(anchorX, anchorY - h, w, h);
+        } else if (anchor == RectangleAnchor.BOTTOM_RIGHT) {
+            result = new Rectangle2D.Double(anchorX - w, anchorY - h, w, h);
         }
         return result;
     }


=====================================
src/main/java/org/jfree/ui/about/gpl-2.0.txt
=====================================
@@ -1,339 +1,339 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-                            NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program 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 General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.


=====================================
src/main/java/org/jfree/ui/about/lgpl-2.1.txt
=====================================
@@ -1,502 +1,502 @@
-GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-                            NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    JCommon class library (used by JFreeChart 1.0.x)
-    Copyright (C) 2013  David Gilbert
-
-    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
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  {signature of Ty Coon}, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
+GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    JCommon class library (used by JFreeChart 1.0.x)
+    Copyright (C) 2013  David Gilbert
+
+    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
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  {signature of Ty Coon}, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!


=====================================
src/main/java/org/jfree/util/PaintUtilities.java
=====================================
@@ -2,7 +2,7 @@
  * JCommon : a free general purpose class library for the Java(tm) platform
  * ========================================================================
  *
- * (C) Copyright 2000-2005, by Object Refinery Limited and Contributors.
+ * (C) Copyright 2000-2017, by Object Refinery Limited and Contributors.
  * 
  * Project Info:  http://www.jfree.org/jcommon/index.html
  *
@@ -27,18 +27,17 @@
  * -------------------
  * PaintUtilities.java
  * -------------------
- * (C) Copyright 2003-2005, by Object Refinery Limited.
+ * (C) Copyright 2003-2016, by Object Refinery Limited.
  *
  * Original Author:  David Gilbert (for Object Refinery Limited);
  * Contributor(s):   -;
  *
- * $Id: PaintUtilities.java,v 1.10 2007/11/02 17:50:37 taqua Exp $
- *
  * Changes
  * -------
  * 13-Nov-2003 : Version 1 (DG);
  * 04-Oct-2004 : Renamed PaintUtils --> PaintUtilities (DG);
  * 23-Feb-2005 : Rewrote equal() method with less indenting required (DG);
+ * 16-Jan-2016 : Update equal() test (DG);
  *
  */
 
@@ -46,14 +45,15 @@ package org.jfree.util;
 
 import java.awt.Color;
 import java.awt.GradientPaint;
+import java.awt.LinearGradientPaint;
 import java.awt.Paint;
+import java.awt.RadialGradientPaint;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
+import java.util.Arrays;
 
 /**
- * Utility code that relates to <code>Paint</code> objects.
- *
- * @author David Gilbert
+ * Utility code that relates to {@code Paint} objects.
  */
 public class PaintUtilities {
 
@@ -64,17 +64,22 @@ public class PaintUtilities {
     }
 
     /**
-     * Returns <code>true</code> if the two <code>Paint</code> objects are equal 
-     * OR both <code>null</code>.  This method handles
-     * <code>GradientPaint</code> as a special case.
+     * Returns {@code true} if the two {@code Paint} objects are equal 
+     * OR both {@code null}.  This method handles
+     * {@code GradientPaint}, {@code LinearGradientPaint} and 
+     * {@code RadialGradientPaint} as a special cases, since those classes do
+     * not override the {@code equals()} method.
      *
-     * @param p1  paint 1 (<code>null</code> permitted).
-     * @param p2  paint 2 (<code>null</code> permitted).
+     * @param p1  paint 1 ({@code null} permitted).
+     * @param p2  paint 2 ({@code null} permitted).
      *
      * @return A boolean.
      */
-    public static boolean equal(final Paint p1, final Paint p2) {
-
+    public static boolean equal(Paint p1, Paint p2) {
+        if (p1 == p2) {
+            return true;
+        }
+            
         // handle cases where either or both arguments are null
         if (p1 == null) {
             return (p2 == null);   
@@ -82,24 +87,43 @@ public class PaintUtilities {
         if (p2 == null) {
             return false;   
         }
-        
-        boolean result = false;
+
         // handle GradientPaint as a special case...
         if (p1 instanceof GradientPaint && p2 instanceof GradientPaint) {
-            final GradientPaint gp1 = (GradientPaint) p1;
-            final GradientPaint gp2 = (GradientPaint) p2;
-            result = gp1.getColor1().equals(gp2.getColor1()) 
-                && gp1.getColor2().equals(gp2.getColor2())
-                && gp1.getPoint1().equals(gp2.getPoint1())    
-                && gp1.getPoint2().equals(gp2.getPoint2())
-                && gp1.isCyclic() == gp2.isCyclic()
-                && gp1.getTransparency() == gp1.getTransparency(); 
-        }
-        else {
-            result = p1.equals(p2);
+            GradientPaint gp1 = (GradientPaint) p1;
+            GradientPaint gp2 = (GradientPaint) p2;
+            return gp1.getColor1().equals(gp2.getColor1()) 
+                    && gp1.getColor2().equals(gp2.getColor2())
+                    && gp1.getPoint1().equals(gp2.getPoint1())    
+                    && gp1.getPoint2().equals(gp2.getPoint2())
+                    && gp1.isCyclic() == gp2.isCyclic()
+                    && gp1.getTransparency() == gp1.getTransparency(); 
+        } else if (p1 instanceof LinearGradientPaint 
+                && p2 instanceof LinearGradientPaint) {
+            LinearGradientPaint lgp1 = (LinearGradientPaint) p1;
+            LinearGradientPaint lgp2 = (LinearGradientPaint) p2;
+            return lgp1.getStartPoint().equals(lgp2.getStartPoint())
+                    && lgp1.getEndPoint().equals(lgp2.getEndPoint()) 
+                    && Arrays.equals(lgp1.getFractions(), lgp2.getFractions())
+                    && Arrays.equals(lgp1.getColors(), lgp2.getColors())
+                    && lgp1.getCycleMethod() == lgp2.getCycleMethod()
+                    && lgp1.getColorSpace() == lgp2.getColorSpace()
+                    && lgp1.getTransform().equals(lgp2.getTransform());
+        } else if (p1 instanceof RadialGradientPaint 
+                && p2 instanceof RadialGradientPaint) {
+            RadialGradientPaint rgp1 = (RadialGradientPaint) p1;
+            RadialGradientPaint rgp2 = (RadialGradientPaint) p2;
+            return rgp1.getCenterPoint().equals(rgp2.getCenterPoint())
+                    && rgp1.getRadius() == rgp2.getRadius() 
+                    && rgp1.getFocusPoint().equals(rgp2.getFocusPoint())
+                    && Arrays.equals(rgp1.getFractions(), rgp2.getFractions())
+                    && Arrays.equals(rgp1.getColors(), rgp2.getColors())
+                    && rgp1.getCycleMethod() == rgp2.getCycleMethod()
+                    && rgp1.getColorSpace() == rgp2.getColorSpace()
+                    && rgp1.getTransform().equals(rgp2.getTransform());
+        } else {
+            return p1.equals(p2);
         }
-        return result;
-
     }
 
     /**
@@ -110,41 +134,39 @@ public class PaintUtilities {
      * @param c the color.
      * @return the string for this color.
      */
-    public static String colorToString (final Color c)
-    {
-      try {
-          final Field[] fields = Color.class.getFields();
-          for (int i = 0; i < fields.length; i++) {
-              final Field f = fields[i];
-              if (Modifier.isPublic(f.getModifiers())
-                  && Modifier.isFinal(f.getModifiers())
-                  && Modifier.isStatic(f.getModifiers())) {
-                  final String name = f.getName();
-                  final Object oColor = f.get(null);
-                  if (oColor instanceof Color) {
-                      if (c.equals(oColor)) {
-                          return name;
-                      }
-                  }
-              }
-          }
-      }
-      catch (Exception e) {
-          //
-      }
+    public static String colorToString (final Color c) {
+        try {
+            final Field[] fields = Color.class.getFields();
+            for (int i = 0; i < fields.length; i++) {
+                final Field f = fields[i];
+                if (Modifier.isPublic(f.getModifiers())
+                        && Modifier.isFinal(f.getModifiers())
+                        && Modifier.isStatic(f.getModifiers())) {
+                    final String name = f.getName();
+                    final Object oColor = f.get(null);
+                    if (oColor instanceof Color) {
+                        if (c.equals(oColor)) {
+                            return name;
+                        }
+                    }
+                }
+            }
+        } catch (Exception e) {
+            //
+        }
 
-      // no defined constant color, so this must be a user defined color
-      final String color = Integer.toHexString(c.getRGB() & 0x00ffffff);
-      final StringBuffer retval = new StringBuffer(7);
-      retval.append("#");
+        // no defined constant color, so this must be a user defined color
+        final String color = Integer.toHexString(c.getRGB() & 0x00ffffff);
+        final StringBuffer retval = new StringBuffer(7);
+        retval.append("#");
 
-      final int fillUp = 6 - color.length();
-      for (int i = 0; i < fillUp; i++) {
-          retval.append("0");
-      }
+        final int fillUp = 6 - color.length();
+        for (int i = 0; i < fillUp; i++) {
+            retval.append("0");
+        }
 
-      retval.append(color);
-      return retval.toString();
+        retval.append(color);
+        return retval.toString();
     }
 
     /**
@@ -153,28 +175,24 @@ public class PaintUtilities {
      * @param value the string, either a name or a hex-string.
      * @return the color.
      */
-    public static Color stringToColor (final String value)
-    {
-      if (value == null) {
-          return Color.black;
-      }
-      try {
-          // get color by hex or octal value
-          return Color.decode(value);
-      }
-      catch (NumberFormatException nfe) {
-          // if we can't decode lets try to get it by name
-          try {
-              // try to get a color by name using reflection
-              final Field f = Color.class.getField(value);
-
-              return (Color) f.get(null);
-          }
-          catch (Exception ce) {
-              Log.info("No such Color : " + value);
-              // if we can't get any color return black
-              return Color.black;
-          }
-      }
+    public static Color stringToColor(String value) {
+        if (value == null) {
+            return Color.black;
+        }
+        try {
+            // get color by hex or octal value
+            return Color.decode(value);
+        } catch (NumberFormatException nfe) {
+            // if we can't decode lets try to get it by name
+            try {
+                // try to get a color by name using reflection
+                final Field f = Color.class.getField(value);
+                return (Color) f.get(null);
+            } catch (Exception ce) {
+                Log.info("No such Color : " + value);
+                // if we can't get any color return black
+                return Color.black;
+            }
+        }
     }
 }


=====================================
src/test/java/org/jfree/ui/RectangleAnchorTest.java
=====================================
@@ -2,7 +2,7 @@
  * JCommon : a free general purpose class library for the Java(tm) platform
  * ========================================================================
  *
- * (C) Copyright 2000-2014, by Object Refinery Limited and Contributors.
+ * (C) Copyright 2000-2015, by Object Refinery Limited and Contributors.
  * 
  * Project Info:  http://www.jfree.org/jcommon/index.html
  *
@@ -27,21 +27,21 @@
  * ------------------------
  * RectangleAnchorTest.java
  * ------------------------
- * (C) Copyright 2004-2014, by Object Refinery Limited and Contributors.
+ * (C) Copyright 2004-2015, by Object Refinery Limited and Contributors.
  *
  * Original Author:  David Gilbert (for Object Refinery Limited);
  * Contributor(s):   -;
  *
- * $Id: RectangleAnchorTest.java,v 1.3 2007/11/02 17:50:37 taqua Exp $
- *
  * Changes
  * -------
  * 08-Jan-2004 : Version 1 (DG);
+ * 17-Feb-2015 : Add tests (DG);
  *
  */
 
 package org.jfree.ui;
 
+import java.awt.geom.Rectangle2D;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.ObjectInput;
@@ -72,10 +72,35 @@ public class RectangleAnchorTest extends TestCase {
      *
      * @param name  the name of the tests.
      */
-    public RectangleAnchorTest(final String name) {
+    public RectangleAnchorTest(String name) {
         super(name);
     }
 
+    /**
+     * Tests for the createRectangle() method.
+     */
+    public void testCreateRectangle() {
+        Size2D s = new Size2D(3.0, 8.0);
+        assertEquals(new Rectangle2D.Double(-0.5, -2.0, 3.0, 8.0), 
+                RectangleAnchor.createRectangle(s, 1.0, 2.0, RectangleAnchor.CENTER));
+        assertEquals(new Rectangle2D.Double(1.0, -2.0, 3.0, 8.0), 
+                RectangleAnchor.createRectangle(s, 1.0, 2.0, RectangleAnchor.LEFT));
+        assertEquals(new Rectangle2D.Double(-2.0, -2.0, 3.0, 8.0), 
+                RectangleAnchor.createRectangle(s, 1.0, 2.0, RectangleAnchor.RIGHT));
+        assertEquals(new Rectangle2D.Double(-0.5, 2.0, 3.0, 8.0), 
+                RectangleAnchor.createRectangle(s, 1.0, 2.0, RectangleAnchor.TOP));
+        assertEquals(new Rectangle2D.Double(1.0, 2.0, 3.0, 8.0), 
+                RectangleAnchor.createRectangle(s, 1.0, 2.0, RectangleAnchor.TOP_LEFT));
+        assertEquals(new Rectangle2D.Double(-2.0, 2.0, 3.0, 8.0), 
+                RectangleAnchor.createRectangle(s, 1.0, 2.0, RectangleAnchor.TOP_RIGHT));
+        assertEquals(new Rectangle2D.Double(-0.5, -6.0, 3.0, 8.0), 
+                RectangleAnchor.createRectangle(s, 1.0, 2.0, RectangleAnchor.BOTTOM));
+        assertEquals(new Rectangle2D.Double(1.0, -6.0, 3.0, 8.0), 
+                RectangleAnchor.createRectangle(s, 1.0, 2.0, RectangleAnchor.BOTTOM_LEFT));
+        assertEquals(new Rectangle2D.Double(-2.0, -6.0, 3.0, 8.0), 
+                RectangleAnchor.createRectangle(s, 1.0, 2.0, RectangleAnchor.BOTTOM_RIGHT));
+    }
+    
     /**
      * Tests the equals() method.
      */
@@ -87,25 +112,22 @@ public class RectangleAnchorTest extends TestCase {
      * Serialize an instance, restore it, and check for identity.
      */
     public void testSerialization() {
-
-        final RectangleAnchor a1 = RectangleAnchor.RIGHT;
+        RectangleAnchor a1 = RectangleAnchor.RIGHT;
         RectangleAnchor a2 = null;
-
         try {
-            final ByteArrayOutputStream buffer = new ByteArrayOutputStream();
-            final ObjectOutput out = new ObjectOutputStream(buffer);
+            ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+            ObjectOutput out = new ObjectOutputStream(buffer);
             out.writeObject(a1);
             out.close();
 
-            final ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(buffer.toByteArray()));
+            ObjectInput in = new ObjectInputStream(new ByteArrayInputStream(buffer.toByteArray()));
             a2 = (RectangleAnchor) in.readObject();
             in.close();
         }
         catch (Exception e) {
-            System.out.println(e.toString());
+            System.err.println(e.toString());
         }
         assertTrue(a1 == a2); 
-
     }
 
 }


=====================================
src/test/java/org/jfree/util/PaintUtilitiesTest.java
=====================================
@@ -2,7 +2,7 @@
  * JCommon : a free general purpose class library for the Java(tm) platform
  * ========================================================================
  *
- * (C) Copyright 2000-2014, by Object Refinery Limited and Contributors.
+ * (C) Copyright 2000-2016, by Object Refinery Limited and Contributors.
  * 
  * Project Info:  http://www.jfree.org/jcommon/index.html
  *
@@ -27,7 +27,7 @@
  * ------------------------
  * PaintUtilitiesTest.java
  * ------------------------
- * (C) Copyright 2005-2014, by Object Refinery Limited.
+ * (C) Copyright 2005-2016, by Object Refinery Limited.
  *
  * Original Author:  David Gilbert (for Object Refinery Limited);
  * Contributor(s):   -;
@@ -37,6 +37,7 @@
  * Changes
  * -------
  * 23-Feb-2005 : Version 1 (DG);
+ * 16-Jan-2016 : Backport updates to equals() method (DG);
  *
  */
 
@@ -44,7 +45,12 @@ package org.jfree.util;
 
 import java.awt.Color;
 import java.awt.GradientPaint;
+import java.awt.LinearGradientPaint;
+import java.awt.MultipleGradientPaint;
 import java.awt.Paint;
+import java.awt.RadialGradientPaint;
+import java.awt.geom.AffineTransform;
+import java.awt.geom.Point2D;
 
 import junit.framework.Test;
 import junit.framework.TestCase;
@@ -81,15 +87,12 @@ public class PaintUtilitiesTest  extends TestCase {
         Paint p2 = Color.blue;
         Paint p3 = new Color(1, 2, 3, 4);
         Paint p4 = new Color(1, 2, 3, 4);
-        Paint p5 = new GradientPaint(
-            1.0f, 2.0f, Color.red, 3.0f, 4.0f, Color.yellow
-        );
-        Paint p6 = new GradientPaint(
-            1.0f, 2.0f, Color.red, 3.0f, 4.0f, Color.yellow
-        );
-        Paint p7 = new GradientPaint(
-            1.0f, 2.0f, Color.red, 3.0f, 4.0f, Color.blue
-        );
+        Paint p5 = new GradientPaint(1.0f, 2.0f, Color.red, 3.0f, 4.0f, 
+                Color.yellow);
+        Paint p6 = new GradientPaint(1.0f, 2.0f, Color.red, 3.0f, 4.0f, 
+                Color.yellow);
+        Paint p7 = new GradientPaint(1.0f, 2.0f, Color.red, 3.0f, 4.0f, 
+                Color.blue);
         assertTrue(PaintUtilities.equal(null, null));
         assertFalse(PaintUtilities.equal(p1, null));
         assertFalse(PaintUtilities.equal(null, p1));
@@ -99,5 +102,174 @@ public class PaintUtilitiesTest  extends TestCase {
         assertTrue(PaintUtilities.equal(p5, p6));
         assertFalse(PaintUtilities.equal(p5, p7));
     }
+    
+    public void testLinearGradientPaint() {
+        Point2D start1 = new Point2D.Float(0, 0);
+        Point2D end1 = new Point2D.Float(50, 50);
+        float[] dist1 = {0.0f, 0.2f, 1.0f};
+        Color[] colors1 = {Color.RED, Color.WHITE, Color.BLUE};
+        LinearGradientPaint p1 = new LinearGradientPaint(start1, end1, dist1, 
+                colors1);    
+
+        Point2D start2 = new Point2D.Float(0, 0);
+        Point2D end2 = new Point2D.Float(50, 50);
+        float[] dist2 = {0.0f, 0.2f, 1.0f};
+        Color[] colors2 = {Color.RED, Color.WHITE, Color.BLUE};
+        LinearGradientPaint p2 = new LinearGradientPaint(start2, end2, dist2, 
+                colors2);
+        assertTrue(PaintUtilities.equal(p1, p2));
+        assertFalse(PaintUtilities.equal(p1, Color.RED));
+        assertFalse(PaintUtilities.equal(p1, null));
+        assertFalse(PaintUtilities.equal(null, p1));
+        
+        // check ColorSpaceType
+        p1 = new LinearGradientPaint(start1, end1, dist1, colors1, 
+                MultipleGradientPaint.CycleMethod.NO_CYCLE, 
+                MultipleGradientPaint.ColorSpaceType.LINEAR_RGB, 
+                new AffineTransform());
+        p2 = new LinearGradientPaint(start1, end1, dist1, colors1, 
+                MultipleGradientPaint.CycleMethod.NO_CYCLE, 
+                MultipleGradientPaint.ColorSpaceType.SRGB, 
+                new AffineTransform());
+        assertFalse(PaintUtilities.equal(p1, p2));
+        p2 = new LinearGradientPaint(start1, end1, dist1, colors1, 
+                MultipleGradientPaint.CycleMethod.NO_CYCLE, 
+                MultipleGradientPaint.ColorSpaceType.LINEAR_RGB, 
+                new AffineTransform());
+        assertTrue(PaintUtilities.equal(p1, p2));
+
+        // check transform
+        p1 = new LinearGradientPaint(start1, end1, dist1, colors1, 
+                MultipleGradientPaint.CycleMethod.NO_CYCLE, 
+                MultipleGradientPaint.ColorSpaceType.LINEAR_RGB, 
+                AffineTransform.getTranslateInstance(1.0, 2.0));
+        assertFalse(PaintUtilities.equal(p1, p2));
+        p2 = new LinearGradientPaint(start1, end1, dist1, colors1, 
+                MultipleGradientPaint.CycleMethod.NO_CYCLE, 
+                MultipleGradientPaint.ColorSpaceType.LINEAR_RGB, 
+                AffineTransform.getTranslateInstance(1.0, 2.0));
+        assertTrue(PaintUtilities.equal(p1, p2));
+    }
+    
+    public void testRadialGradientPaint() {
+        RadialGradientPaint p1 = new RadialGradientPaint(1.0f, 2.0f, 3.0f, 
+                new float[] {0.0f, 0.4f, 1.0f}, 
+                new Color[] {Color.RED, Color.GREEN, Color.BLUE});
+        RadialGradientPaint p2 = new RadialGradientPaint(1.0f, 2.0f, 3.0f, 
+                new float[] {0.0f, 0.4f, 1.0f}, 
+                new Color[] {Color.RED, Color.GREEN, Color.BLUE});
+        assertTrue(PaintUtilities.equal(p1, p2));
+        assertFalse(PaintUtilities.equal(p1, Color.RED));
+        assertFalse(PaintUtilities.equal(p1, null));
+        assertFalse(PaintUtilities.equal(null, p1));
+
+        p1 = new RadialGradientPaint(1.1f, 2.0f, 3.0f, 
+                new float[] {0.0f, 0.4f, 1.0f}, 
+                new Color[] {Color.RED, Color.GREEN, Color.BLUE});
+        assertFalse(PaintUtilities.equal(p1, p2));
+        p2 = new RadialGradientPaint(1.1f, 2.0f, 3.0f, 
+                new float[] {0.0f, 0.4f, 1.0f}, 
+                new Color[] {Color.RED, Color.GREEN, Color.BLUE});
+        assertTrue(PaintUtilities.equal(p1, p2));
+
+        p1 = new RadialGradientPaint(1.1f, 2.2f, 3.0f, 
+                new float[] {0.0f, 0.4f, 1.0f}, 
+                new Color[] {Color.RED, Color.GREEN, Color.BLUE});
+        assertFalse(PaintUtilities.equal(p1, p2));
+        p2 = new RadialGradientPaint(1.1f, 2.2f, 3.0f, 
+                new float[] {0.0f, 0.4f, 1.0f}, 
+                new Color[] {Color.RED, Color.GREEN, Color.BLUE});
+        assertTrue(PaintUtilities.equal(p1, p2));
+
+        p1 = new RadialGradientPaint(1.1f, 2.2f, 3.3f, 
+                new float[] {0.0f, 0.4f, 1.0f}, 
+                new Color[] {Color.RED, Color.GREEN, Color.BLUE});
+        assertFalse(PaintUtilities.equal(p1, p2));
+        p2 = new RadialGradientPaint(1.1f, 2.2f, 3.3f, 
+                new float[] {0.0f, 0.4f, 1.0f}, 
+                new Color[] {Color.RED, Color.GREEN, Color.BLUE});
+        assertTrue(PaintUtilities.equal(p1, p2));
+
+        p1 = new RadialGradientPaint(1.1f, 2.2f, 3.3f, 
+                new float[] {0.0f, 0.6f, 1.0f}, 
+                new Color[] {Color.RED, Color.GREEN, Color.BLUE});
+        assertFalse(PaintUtilities.equal(p1, p2));
+        p2 = new RadialGradientPaint(1.1f, 2.2f, 3.3f, 
+                new float[] {0.0f, 0.6f, 1.0f}, 
+                new Color[] {Color.RED, Color.GREEN, Color.BLUE});
+        assertTrue(PaintUtilities.equal(p1, p2));
+    
+        p1 = new RadialGradientPaint(1.1f, 2.2f, 3.3f, 
+                new float[] {0.0f, 0.6f, 1.0f}, 
+                new Color[] {Color.RED, Color.YELLOW, Color.BLUE});
+        assertFalse(PaintUtilities.equal(p1, p2));
+        p2 = new RadialGradientPaint(1.1f, 2.2f, 3.3f, 
+                new float[] {0.0f, 0.6f, 1.0f}, 
+                new Color[] {Color.RED, Color.YELLOW, Color.BLUE});
+        assertTrue(PaintUtilities.equal(p1, p2));
+        
+        p1 = new RadialGradientPaint(1.1f, 2.2f, 3.3f,
+                new float[] {0.0f, 0.6f, 1.0f}, 
+                new Color[] {Color.RED, Color.YELLOW, Color.BLUE}, 
+                MultipleGradientPaint.CycleMethod.REPEAT);
+        assertFalse(PaintUtilities.equal(p1, p2));
+        p2 = new RadialGradientPaint(1.1f, 2.2f, 3.3f,
+                new float[] {0.0f, 0.6f, 1.0f}, 
+                new Color[] {Color.RED, Color.YELLOW, Color.BLUE},
+                MultipleGradientPaint.CycleMethod.REPEAT);
+        assertTrue(PaintUtilities.equal(p1, p2));
+        
+        p1 = new RadialGradientPaint(1.1f, 2.2f, 3.3f, 4.4f, 5.5f,
+                new float[] {0.0f, 0.6f, 1.0f}, 
+                new Color[] {Color.RED, Color.YELLOW, Color.BLUE}, 
+                MultipleGradientPaint.CycleMethod.REPEAT);
+        assertFalse(PaintUtilities.equal(p1, p2));
+        p2 = new RadialGradientPaint(1.1f, 2.2f, 3.3f, 4.4f, 5.5f,
+                new float[] {0.0f, 0.6f, 1.0f}, 
+                new Color[] {Color.RED, Color.YELLOW, Color.BLUE},
+                MultipleGradientPaint.CycleMethod.REPEAT);
+        assertTrue(PaintUtilities.equal(p1, p2));
+
+        // check ColorSpaceType
+        Point2D center = new Point2D.Float(1.1f, 2.2f);
+        float radius = 3.3f;
+        Point2D focus = new Point2D.Float(4.4f, 5.5f);
+        p1 = new RadialGradientPaint(center, radius, focus,
+                new float[] {0.0f, 0.6f, 1.0f}, 
+                new Color[] {Color.RED, Color.YELLOW, Color.BLUE}, 
+                MultipleGradientPaint.CycleMethod.REPEAT,
+                MultipleGradientPaint.ColorSpaceType.SRGB, 
+                new AffineTransform());
+        p2 = new RadialGradientPaint(center, radius, focus,
+                new float[] {0.0f, 0.6f, 1.0f}, 
+                new Color[] {Color.RED, Color.YELLOW, Color.BLUE}, 
+                MultipleGradientPaint.CycleMethod.REPEAT,
+                MultipleGradientPaint.ColorSpaceType.LINEAR_RGB,
+                new AffineTransform());
+        assertFalse(PaintUtilities.equal(p1, p2));
+        p2 = new RadialGradientPaint(center, radius, focus,
+                new float[] {0.0f, 0.6f, 1.0f}, 
+                new Color[] {Color.RED, Color.YELLOW, Color.BLUE}, 
+                MultipleGradientPaint.CycleMethod.REPEAT,
+                MultipleGradientPaint.ColorSpaceType.SRGB,
+                new AffineTransform());        
+        assertTrue(PaintUtilities.equal(p1, p2));
+
+        // check transform
+        p1 = new RadialGradientPaint(center, radius, focus,
+                new float[] {0.0f, 0.6f, 1.0f}, 
+                new Color[] {Color.RED, Color.YELLOW, Color.BLUE}, 
+                MultipleGradientPaint.CycleMethod.REPEAT,
+                MultipleGradientPaint.ColorSpaceType.SRGB, 
+                AffineTransform.getTranslateInstance(1.0, 2.0));
+        assertFalse(PaintUtilities.equal(p1, p2));
+        p2 = new RadialGradientPaint(center, radius, focus,
+                new float[] {0.0f, 0.6f, 1.0f}, 
+                new Color[] {Color.RED, Color.YELLOW, Color.BLUE}, 
+                MultipleGradientPaint.CycleMethod.REPEAT,
+                MultipleGradientPaint.ColorSpaceType.SRGB, 
+                AffineTransform.getTranslateInstance(1.0, 2.0));
+        assertTrue(PaintUtilities.equal(p1, p2));
+    }
 
 }



View it on GitLab: https://salsa.debian.org/java-team/libjcommon-java/-/compare/23419455323130c2f333661e3eea270f08d6dfb7...d9eef27abf2a8723774c4866e497f5368192252e

-- 
View it on GitLab: https://salsa.debian.org/java-team/libjcommon-java/-/compare/23419455323130c2f333661e3eea270f08d6dfb7...d9eef27abf2a8723774c4866e497f5368192252e
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20250222/244820b1/attachment.htm>