Align with v1.5.x

Author: jfree

src/main/java/org/jfree/data/Range.java

@@ -21,7 +21,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
  * USA.
  *
- * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. 
+ * [Oracle and Java are registered trademarks of Oracle and/or its affiliates.
  * Other names may be trademarks of their respective owners.]
  *
  * ----------
@@ -34,7 +34,8 @@
  *                   Bill Kelemen;
  *                   Nicolas Brodu;
  *                   Sergei Ivanov;
- * 
+ *                   Tracy Hiltbrand (equals complies with EqualsVerifier);
+ *
  */
 
 package org.jfree.data;
@@ -145,8 +146,6 @@ public boolean intersects(double b0, double b1) {
      * @param range  another range ({@code null} not permitted).
      *
      * @return A boolean.
-     *
-     * @since 1.0.9
      */
     public boolean intersects(Range range) {
         return intersects(range.getLowerBound(), range.getUpperBound());
@@ -202,16 +201,14 @@ public static Range combine(Range range1, Range range2) {
     }
 
     /**
-     * Returns a new range that spans both {@code range1} and 
+     * Returns a new range that spans both {@code range1} and
      * {@code range2}.  This method has a special handling to ignore
      * Double.NaN values.
      *
      * @param range1  the first range ({@code null} permitted).
      * @param range2  the second range ({@code null} permitted).
      *
      * @return A new range (possibly {@code null}).
-     *
-     * @since 1.0.15
      */
     public static Range combineIgnoringNaN(Range range1, Range range2) {
         if (range1 == null) {
@@ -233,15 +230,15 @@ public static Range combineIgnoringNaN(Range range1, Range range2) {
         }
         return new Range(l, u);
     }
-    
+
     /**
-     * Returns the minimum value.  If either value is NaN, the other value is 
+     * Returns the minimum value.  If either value is NaN, the other value is
      * returned.  If both are NaN, NaN is returned.
-     * 
+     *
      * @param d1  value 1.
      * @param d2  value 2.
-     * 
-     * @return The minimum of the two values. 
+     *
+     * @return The minimum of the two values.
      */
     private static double min(double d1, double d2) {
         if (Double.isNaN(d1)) {
@@ -271,8 +268,6 @@ private static double max(double d1, double d2) {
      * @param value  the value that must be included.
      *
      * @return A range.
-     *
-     * @since 1.0.1
      */
     public static Range expandToInclude(Range range, double value) {
         if (range == null) {
@@ -378,8 +373,6 @@ else if (value < 0.0) {
      * @param factor the scaling factor (must be non-negative).
      *
      * @return A new range.
-     *
-     * @since 1.0.9
      */
     public static Range scale(Range base, double factor) {
         Args.nullNotPermitted(base, "base");
@@ -403,41 +396,36 @@ public boolean equals(Object obj) {
             return false;
         }
         Range range = (Range) obj;
-        if (!(this.lower == range.lower)) {
+        if (Double.doubleToLongBits(this.lower) !=
+            Double.doubleToLongBits(range.lower)) {
             return false;
         }
-        if (!(this.upper == range.upper)) {
+        if (Double.doubleToLongBits(this.upper) !=
+            Double.doubleToLongBits(range.upper)) {
             return false;
         }
         return true;
     }
 
     /**
-     * Returns {@code true} if both the lower and upper bounds are 
+     * Returns {@code true} if both the lower and upper bounds are
      * {@code Double.NaN}, and {@code false} otherwise.
-     * 
+     *
      * @return A boolean.
-     * 
-     * @since 1.0.18
      */
     public boolean isNaNRange() {
         return Double.isNaN(this.lower) && Double.isNaN(this.upper);
     }
-    
+
     /**
      * Returns a hash code.
      *
      * @return A hash code.
      */
     @Override
     public int hashCode() {
-        int result;
-        long temp;
-        temp = Double.doubleToLongBits(this.lower);
-        result = (int) (temp ^ (temp >>> 32));
-        temp = Double.doubleToLongBits(this.upper);
-        result = 29 * result + (int) (temp ^ (temp >>> 32));
-        return result;
+        int result = Double.hashCode(this.lower);
+        return 29 * result + Double.hashCode(this.upper);
     }
 
     /**