sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1832816 - in /sis/branches/JDK8/core: sis-referencing/src/main/java/org/apache/sis/geometry/ sis-referencing/src/main/java/org/apache/sis/referencing/ sis-referencing/src/main/java/org/apache/sis/referencing/cs/ sis-referencing/src/main/ja...
Date Mon, 04 Jun 2018 10:51:00 GMT
Author: desruisseaux
Date: Mon Jun  4 10:51:00 2018
New Revision: 1832816

URL: http://svn.apache.org/viewvc?rev=1832816&view=rev
Log:
Remove Numerics.hashCode(long), replaced by Long.hashCode(long).

Modified:
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractDirectPosition.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractEnvelope.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/geometry/DirectPosition1D.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/geometry/DirectPosition2D.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DirectionAlongMeridian.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/TimeDependentBWP.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrix1.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrix2.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/NormalizedProjection.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ZonedGridSystem.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransform.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ExponentialTransform1D.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/LinearTransform1D.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/LogarithmicTransform1D.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/MolodenskyFormula.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/PowerTransform1D.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/DoubleDouble.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/Numerics.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/math/Line.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/math/Plane.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/measure/LinearConverter.java

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractDirectPosition.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractDirectPosition.java?rev=1832816&r1=1832815&r2=1832816&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractDirectPosition.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractDirectPosition.java
[UTF-8] Mon Jun  4 10:51:00 2018
@@ -40,7 +40,6 @@ import org.apache.sis.internal.referenci
 import org.apache.sis.io.wkt.FormattableObject;
 import org.apache.sis.io.wkt.Formatter;
 
-import static java.lang.Double.doubleToLongBits;
 import static org.apache.sis.util.StringBuilders.trimFractionalPart;
 import static org.apache.sis.util.ArgumentChecks.ensureDimensionMatches;
 
@@ -392,7 +391,7 @@ parse:  while (i < length) {
         final int dimension = getDimension();
         int code = 1;
         for (int i=0; i<dimension; i++) {
-            code = code*31 + Numerics.hashCode(doubleToLongBits(getOrdinate(i)));
+            code = code*31 + Double.hashCode(getOrdinate(i));
         }
         return code + Objects.hashCode(getCoordinateReferenceSystem());
     }

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractEnvelope.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractEnvelope.java?rev=1832816&r1=1832815&r2=1832816&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractEnvelope.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractEnvelope.java
[UTF-8] Mon Jun  4 10:51:00 2018
@@ -35,7 +35,6 @@ import org.opengis.referencing.crs.Coord
 import org.opengis.referencing.cs.CoordinateSystemAxis;
 import org.opengis.referencing.cs.CoordinateSystem;
 import org.opengis.referencing.cs.RangeMeaning;
-import org.apache.sis.internal.util.Numerics;
 import org.apache.sis.util.Emptiable;
 import org.apache.sis.util.Utilities;
 import org.apache.sis.util.ComparisonMode;
@@ -1113,7 +1112,7 @@ public abstract class AbstractEnvelope e
         boolean p = true;
         do {
             for (int i=0; i<dimension; i++) {
-                code = code*31 + Numerics.hashCode(doubleToLongBits(p ? getLower(i) : getUpper(i)));
+                code = code*31 + Double.hashCode(p ? getLower(i) : getUpper(i));
             }
         } while ((p = !p) == false);
         return code + Objects.hashCode(getCoordinateReferenceSystem());

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/geometry/DirectPosition1D.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/geometry/DirectPosition1D.java?rev=1832816&r1=1832815&r2=1832816&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/geometry/DirectPosition1D.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/geometry/DirectPosition1D.java
[UTF-8] Mon Jun  4 10:51:00 2018
@@ -26,7 +26,6 @@ import java.io.Serializable;
 import org.opengis.referencing.crs.CoordinateReferenceSystem;
 import org.opengis.geometry.DirectPosition;
 import org.opengis.geometry.MismatchedDimensionException;
-import org.apache.sis.internal.util.Numerics;
 import org.apache.sis.util.resources.Errors;
 
 import static org.apache.sis.util.ArgumentChecks.ensureDimensionMatches;
@@ -245,7 +244,7 @@ public class DirectPosition1D extends Ab
      */
     @Override
     public int hashCode() {
-        final int code = 31 + Numerics.hashCode(Double.doubleToLongBits(ordinate)) + Objects.hashCode(crs);
+        final int code = 31 + Double.hashCode(ordinate) + Objects.hashCode(crs);
         assert code == super.hashCode();
         return code;
     }

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/geometry/DirectPosition2D.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/geometry/DirectPosition2D.java?rev=1832816&r1=1832815&r2=1832816&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/geometry/DirectPosition2D.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/geometry/DirectPosition2D.java
[UTF-8] Mon Jun  4 10:51:00 2018
@@ -303,8 +303,8 @@ public class DirectPosition2D extends Po
      */
     @Override
     public int hashCode() {
-        int code =  31 + Numerics.hashCode(doubleToLongBits(x));
-        code = code*31 + Numerics.hashCode(doubleToLongBits(y));
+        int code =  31 + java.lang.Double.hashCode(x);
+        code = code*31 + java.lang.Double.hashCode(y);
         return code + Objects.hashCode(crs);
     }
 

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java?rev=1832816&r1=1832815&r2=1832816&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java
[UTF-8] Mon Jun  4 10:51:00 2018
@@ -44,7 +44,6 @@ import org.opengis.referencing.Identifie
 import org.apache.sis.internal.jaxb.Context;
 import org.apache.sis.internal.jaxb.UseLegacyMetadata;
 import org.apache.sis.internal.jaxb.referencing.Code;
-import org.apache.sis.internal.util.Numerics;
 import org.apache.sis.internal.util.UnmodifiableArrayList;
 import org.apache.sis.internal.metadata.NameToIdentifier;
 import org.apache.sis.internal.referencing.WKTUtilities;
@@ -792,13 +791,13 @@ public class AbstractIdentifiedObject ex
     public final int hashCode() {                       // No need to synchronize; ok if
invoked twice.
         int hash = hashCode;
         if (hash == 0) {
-            hash = Numerics.hashCode(computeHashCode());
+            hash = Long.hashCode(computeHashCode());
             if (hash == 0) {
                 hash = -1;
             }
             hashCode = hash;
         }
-        assert hash == -1 || hash == Numerics.hashCode(computeHashCode()) : hash;
+        assert hash == -1 || hash == Long.hashCode(computeHashCode()) : hash;
         return hash;
     }
 

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DirectionAlongMeridian.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DirectionAlongMeridian.java?rev=1832816&r1=1832815&r2=1832816&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DirectionAlongMeridian.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DirectionAlongMeridian.java
[UTF-8] Mon Jun  4 10:51:00 2018
@@ -248,7 +248,7 @@ final class DirectionAlongMeridian exten
      */
     @Override
     public int hashCode() {
-        return Numerics.hashCode(Double.doubleToLongBits(meridian) + baseDirection.hashCode());
+        return Double.hashCode(meridian) + baseDirection.hashCode();
     }
 
     /**

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/TimeDependentBWP.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/TimeDependentBWP.java?rev=1832816&r1=1832815&r2=1832816&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/TimeDependentBWP.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/TimeDependentBWP.java
[UTF-8] Mon Jun  4 10:51:00 2018
@@ -20,7 +20,6 @@ import java.util.Date;
 import org.opengis.metadata.extent.Extent;
 import org.opengis.referencing.datum.GeodeticDatum;
 import org.opengis.referencing.datum.PrimeMeridian;
-import org.apache.sis.internal.util.Numerics;
 import org.apache.sis.internal.util.DoubleDouble;
 
 import static org.apache.sis.util.ArgumentChecks.*;
@@ -294,6 +293,6 @@ public class TimeDependentBWP extends Bu
      */
     @Override
     public int hashCode() {
-        return super.hashCode() ^ Numerics.hashCode(timeReference);
+        return super.hashCode() ^ Long.hashCode(timeReference);
     }
 }

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrix1.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrix1.java?rev=1832816&r1=1832815&r2=1832816&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrix1.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrix1.java
[UTF-8] Mon Jun  4 10:51:00 2018
@@ -282,6 +282,6 @@ public final class Matrix1 extends Matri
      */
     @Override
     public int hashCode() {
-        return Numerics.hashCode(Double.doubleToLongBits(m00) ^ serialVersionUID);
+        return Long.hashCode(Double.doubleToLongBits(m00) ^ serialVersionUID);
     }
 }

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrix2.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrix2.java?rev=1832816&r1=1832815&r2=1832816&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrix2.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrix2.java
[UTF-8] Mon Jun  4 10:51:00 2018
@@ -309,7 +309,7 @@ public final class Matrix2 extends Matri
      */
     @Override
     public int hashCode() {
-        return Numerics.hashCode(serialVersionUID ^
+        return Long.hashCode(serialVersionUID ^
                 (((Double.doubleToLongBits(m00)  +
               31 * Double.doubleToLongBits(m01)) +
               31 * Double.doubleToLongBits(m10)) +

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/NormalizedProjection.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/NormalizedProjection.java?rev=1832816&r1=1832815&r2=1832816&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/NormalizedProjection.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/NormalizedProjection.java
[UTF-8] Mon Jun  4 10:51:00 2018
@@ -911,7 +911,7 @@ public abstract class NormalizedProjecti
                 c = c*31 + Double.doubleToLongBits(parameters[i]);
             }
         }
-        return super.computeHashCode() ^ Numerics.hashCode(c);
+        return super.computeHashCode() ^ Long.hashCode(c);
     }
 
     /**

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ZonedGridSystem.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ZonedGridSystem.java?rev=1832816&r1=1832815&r2=1832816&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ZonedGridSystem.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ZonedGridSystem.java
[UTF-8] Mon Jun  4 10:51:00 2018
@@ -255,7 +255,7 @@ public class ZonedGridSystem extends Abs
     @Override
     protected int computeHashCode() {
         final long c = Double.doubleToLongBits(initialLongitude) + 31*Double.doubleToLongBits(zoneWidth);
-        return (super.computeHashCode() ^ Numerics.hashCode(c)) + 37 * projection.hashCode();
+        return (super.computeHashCode() ^ Long.hashCode(c)) + 37 * projection.hashCode();
     }
 
     /**

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransform.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransform.java?rev=1832816&r1=1832815&r2=1832816&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransform.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransform.java
[UTF-8] Mon Jun  4 10:51:00 2018
@@ -748,7 +748,7 @@ next:   while (--numPts >= 0) {
      */
     @Override
     protected int computeHashCode() {
-        int code = super.computeHashCode() + Numerics.hashCode(Double.doubleToLongBits(axisRatio));
+        int code = super.computeHashCode() + Double.hashCode(axisRatio);
         if (withHeight) code += 37;
         return code;
     }

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ExponentialTransform1D.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ExponentialTransform1D.java?rev=1832816&r1=1832815&r2=1832816&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ExponentialTransform1D.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ExponentialTransform1D.java
[UTF-8] Mon Jun  4 10:51:00 2018
@@ -283,7 +283,7 @@ final class ExponentialTransform1D exten
      */
     @Override
     protected int computeHashCode() {
-        return Numerics.hashCode(Double.doubleToLongBits(base)
+        return Long.hashCode(Double.doubleToLongBits(base)
                 + 31 * Double.doubleToLongBits(scale)) ^ super.computeHashCode();
     }
 

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/LinearTransform1D.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/LinearTransform1D.java?rev=1832816&r1=1832815&r2=1832816&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/LinearTransform1D.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/LinearTransform1D.java
[UTF-8] Mon Jun  4 10:51:00 2018
@@ -28,7 +28,6 @@ import org.apache.sis.referencing.operat
 import org.apache.sis.referencing.operation.matrix.Matrix1;
 import org.apache.sis.referencing.operation.matrix.Matrix2;
 import org.apache.sis.internal.referencing.provider.Affine;
-import org.apache.sis.internal.util.Numerics;
 import org.apache.sis.util.ComparisonMode;
 /*
  * We really want to use doubleToRawLongBits, not doubleToLongBits, because the
@@ -350,7 +349,7 @@ class LinearTransform1D extends Abstract
      */
     @Override
     protected int computeHashCode() {
-        return Numerics.hashCode(doubleToRawLongBits(offset) + 31*doubleToRawLongBits(scale))
^ super.computeHashCode();
+        return Long.hashCode(doubleToRawLongBits(offset) + 31*doubleToRawLongBits(scale))
^ super.computeHashCode();
     }
 
     /**

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/LogarithmicTransform1D.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/LogarithmicTransform1D.java?rev=1832816&r1=1832815&r2=1832816&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/LogarithmicTransform1D.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/LogarithmicTransform1D.java
[UTF-8] Mon Jun  4 10:51:00 2018
@@ -406,7 +406,7 @@ class LogarithmicTransform1D extends Abs
         /** {@inheritDoc} */
         @Override
         protected int computeHashCode() {
-            return Numerics.hashCode(Double.doubleToLongBits(offset)) ^ super.computeHashCode();
+            return Double.hashCode(offset) ^ super.computeHashCode();
         }
 
         /** Compares the specified object with this math transform for equality. */

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/MolodenskyFormula.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/MolodenskyFormula.java?rev=1832816&r1=1832815&r2=1832816&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/MolodenskyFormula.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/MolodenskyFormula.java
[UTF-8] Mon Jun  4 10:51:00 2018
@@ -453,7 +453,7 @@ abstract class MolodenskyFormula extends
      */
     @Override
     protected int computeHashCode() {
-        int code = super.computeHashCode() + Numerics.hashCode(
+        int code = super.computeHashCode() + Long.hashCode(
                         Double.doubleToLongBits(Δa)
                 +       Double.doubleToLongBits(Δfmod)
                 + 31 * (Double.doubleToLongBits(tX)

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/PowerTransform1D.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/PowerTransform1D.java?rev=1832816&r1=1832815&r2=1832816&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/PowerTransform1D.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/PowerTransform1D.java
[UTF-8] Mon Jun  4 10:51:00 2018
@@ -194,7 +194,7 @@ final class PowerTransform1D extends Abs
      */
     @Override
     protected int computeHashCode() {
-        return super.computeHashCode() + Numerics.hashCode(Double.doubleToLongBits(power));
+        return super.computeHashCode() + Double.hashCode(power);
     }
 
     /**

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/DoubleDouble.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/DoubleDouble.java?rev=1832816&r1=1832815&r2=1832816&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/DoubleDouble.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/DoubleDouble.java
[UTF-8] Mon Jun  4 10:51:00 2018
@@ -1077,7 +1077,7 @@ public final class DoubleDouble extends
      */
     @Override
     public int hashCode() {
-        return Numerics.hashCode(Double.doubleToLongBits(value) ^ Double.doubleToLongBits(error));
+        return Long.hashCode(Double.doubleToLongBits(value) ^ Double.doubleToLongBits(error));
     }
 
     /**

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/Numerics.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/Numerics.java?rev=1832816&r1=1832815&r2=1832816&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/Numerics.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/Numerics.java
[UTF-8] Mon Jun  4 10:51:00 2018
@@ -308,16 +308,6 @@ public final class Numerics extends Stat
     }
 
     /**
-     * Returns a hash code value for the given long.
-     *
-     * @param  c  the value to hash.
-     * @return hash code value for the given long.
-     */
-    public static int hashCode(final long c) {
-        return ((int) c) ^ (int) (c >>> Integer.SIZE);
-    }
-
-    /**
      * Converts an unsigned {@code long} to a {@code float} value.
      *
      * @param  value  the unsigned {@code long} value.

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/math/Line.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/math/Line.java?rev=1832816&r1=1832815&r2=1832816&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/math/Line.java [UTF-8]
(original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/math/Line.java [UTF-8]
Mon Jun  4 10:51:00 2018
@@ -412,7 +412,7 @@ public class Line implements Cloneable,
      */
     @Override
     public int hashCode() {
-        return Numerics.hashCode(serialVersionUID ^ (doubleToLongBits(slope) + 31*doubleToLongBits(y0)));
+        return Long.hashCode(serialVersionUID ^ (doubleToLongBits(slope) + 31*doubleToLongBits(y0)));
     }
 
     /**

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/math/Plane.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/math/Plane.java?rev=1832816&r1=1832815&r2=1832816&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/math/Plane.java [UTF-8]
(original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/math/Plane.java [UTF-8]
Mon Jun  4 10:51:00 2018
@@ -590,7 +590,7 @@ public class Plane implements Cloneable,
      */
     @Override
     public int hashCode() {
-        return Numerics.hashCode(serialVersionUID
+        return Long.hashCode(serialVersionUID
                      ^ (Double.doubleToLongBits(z0)
                 + 31 * (Double.doubleToLongBits(sx)
                 + 31 * (Double.doubleToLongBits(sy)))));

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/measure/LinearConverter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/measure/LinearConverter.java?rev=1832816&r1=1832815&r2=1832816&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/measure/LinearConverter.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/measure/LinearConverter.java
[UTF-8] Mon Jun  4 10:51:00 2018
@@ -423,9 +423,9 @@ final class LinearConverter extends Abst
      */
     @Override
     public int hashCode() {
-        return Numerics.hashCode(Double.doubleToLongBits(scale)
-                         + 31 * (Double.doubleToLongBits(offset)
-                         + 37 *  Double.doubleToLongBits(divisor)));
+        return Long.hashCode(Double.doubleToLongBits(scale)
+                     + 31 * (Double.doubleToLongBits(offset)
+                     + 37 *  Double.doubleToLongBits(divisor)));
     }
 
     /**



Mime
View raw message