sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject [sis] 01/02: Remove unnecessary "throws ProjectionException" in Spherical private classes.
Date Tue, 30 Apr 2019 14:11:38 GMT
This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 9d03001b9ab858d2d8ebf98f4d6d0e499cd0b7bf
Author: Martin Desruisseaux <martin.desruisseaux@geomatys.com>
AuthorDate: Tue Apr 30 14:25:30 2019 +0200

    Remove unnecessary "throws ProjectionException" in Spherical private classes.
---
 .../apache/sis/referencing/operation/projection/AlbersEqualArea.java | 3 +--
 .../sis/referencing/operation/projection/CylindricalEqualArea.java   | 5 ++---
 .../sis/referencing/operation/projection/LambertConicConformal.java  | 3 +--
 .../org/apache/sis/referencing/operation/projection/Mercator.java    | 3 +--
 .../sis/referencing/operation/projection/ObliqueStereographic.java   | 3 +--
 .../sis/referencing/operation/projection/PolarStereographic.java     | 3 +--
 .../org/apache/sis/referencing/operation/projection/Polyconic.java   | 4 ++--
 .../org/apache/sis/referencing/operation/projection/Sinusoidal.java  | 2 +-
 .../sis/referencing/operation/projection/TransverseMercator.java     | 1 -
 9 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/AlbersEqualArea.java
b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/AlbersEqualArea.java
index c7de81a..e31c363 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/AlbersEqualArea.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/AlbersEqualArea.java
@@ -310,7 +310,7 @@ public class AlbersEqualArea extends EqualAreaProjection {
         @Override
         public Matrix transform(final double[] srcPts, final int srcOff,
                                 final double[] dstPts, final int dstOff,
-                                final boolean derivate) throws ProjectionException
+                                final boolean derivate)
         {
             final double θ = srcPts[srcOff];                // θ = n⋅λ
             final double φ = srcPts[srcOff+1];
@@ -336,7 +336,6 @@ public class AlbersEqualArea extends EqualAreaProjection {
         @Override
         protected void inverseTransform(final double[] srcPts, final int srcOff,
                                         final double[] dstPts, final int dstOff)
-                throws ProjectionException
         {
             final double x = srcPts[srcOff];
             final double y = srcPts[srcOff + 1];
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/CylindricalEqualArea.java
b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/CylindricalEqualArea.java
index 7fda325..d9275af 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/CylindricalEqualArea.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/CylindricalEqualArea.java
@@ -284,7 +284,7 @@ public class CylindricalEqualArea extends EqualAreaProjection {
      * @since   0.8
      * @module
      */
-    static final class Spherical extends CylindricalEqualArea {
+    private static final class Spherical extends CylindricalEqualArea {
         /**
          * For cross-version compatibility.
          */
@@ -306,7 +306,7 @@ public class CylindricalEqualArea extends EqualAreaProjection {
         @Override
         public Matrix transform(final double[] srcPts, final int srcOff,
                                 final double[] dstPts, final int dstOff,
-                                final boolean derivate) throws ProjectionException
+                                final boolean derivate)
         {
             final double φ = srcPts[srcOff+1];
             if (dstPts != null) {
@@ -345,7 +345,6 @@ public class CylindricalEqualArea extends EqualAreaProjection {
         @Override
         protected void inverseTransform(final double[] srcPts, final int srcOff,
                                         final double[] dstPts, final int dstOff)
-                throws ProjectionException
         {
             final double y = srcPts[srcOff+1];                      // Must be before writing
x.
             dstPts[dstOff  ] = srcPts[srcOff];                      // Must be before writing
y.
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/LambertConicConformal.java
b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/LambertConicConformal.java
index 8796382..230e979 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/LambertConicConformal.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/LambertConicConformal.java
@@ -513,7 +513,7 @@ public class LambertConicConformal extends ConformalProjection {
         @Override
         public Matrix transform(final double[] srcPts, final int srcOff,
                                 final double[] dstPts, final int dstOff,
-                                final boolean derivate) throws ProjectionException
+                                final boolean derivate)
         {
             final double θ    = srcPts[srcOff  ];       // θ = λ⋅n
             final double φ    = srcPts[srcOff+1];       // Sign may be reversed
@@ -553,7 +553,6 @@ public class LambertConicConformal extends ConformalProjection {
         @Override
         protected void inverseTransform(final double[] srcPts, final int srcOff,
                                         final double[] dstPts, final int dstOff)
-                throws ProjectionException
         {
             double x = srcPts[srcOff  ];
             double y = srcPts[srcOff+1];
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/Mercator.java
b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/Mercator.java
index 3a98b54..df709b8 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/Mercator.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/Mercator.java
@@ -476,7 +476,7 @@ public class Mercator extends ConformalProjection {
         @Override
         public Matrix transform(final double[] srcPts, final int srcOff,
                                 final double[] dstPts, final int dstOff,
-                                final boolean derivate) throws ProjectionException
+                                final boolean derivate)
         {
             final double φ = srcPts[srcOff+1];
             if (dstPts != null) {
@@ -546,7 +546,6 @@ public class Mercator extends ConformalProjection {
         @Override
         protected void inverseTransform(final double[] srcPts, final int srcOff,
                                         final double[] dstPts, final int dstOff)
-                throws ProjectionException
         {
             final double y = srcPts[srcOff+1];                      // Must be before writing
x.
             dstPts[dstOff  ] = srcPts[srcOff];                      // Must be before writing
y.
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ObliqueStereographic.java
b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ObliqueStereographic.java
index 54382ed..f6da1fa 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ObliqueStereographic.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ObliqueStereographic.java
@@ -402,7 +402,7 @@ public class ObliqueStereographic extends NormalizedProjection {
         @Override
         public Matrix transform(final double[] srcPts, final int srcOff,
                                 final double[] dstPts, final int dstOff,
-                                final boolean derivate) throws ProjectionException
+                                final boolean derivate)
         {
             final double λ = srcPts[srcOff  ];
             final double φ = srcPts[srcOff+1];
@@ -440,7 +440,6 @@ public class ObliqueStereographic extends NormalizedProjection {
         @Override
         protected void inverseTransform(final double[] srcPts, final int srcOff,
                                         final double[] dstPts, final int dstOff)
-                throws ProjectionException
         {
             final double x = srcPts[srcOff  ];
             final double y = srcPts[srcOff+1];
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/PolarStereographic.java
b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/PolarStereographic.java
index eeb987e..9b80d13 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/PolarStereographic.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/PolarStereographic.java
@@ -370,7 +370,7 @@ public class PolarStereographic extends ConformalProjection {
         @Override
         public Matrix transform(final double[] srcPts, final int srcOff,
                                 final double[] dstPts, final int dstOff,
-                                final boolean derivate) throws ProjectionException
+                                final boolean derivate)
         {
             final double θ    = srcPts[srcOff  ];       // θ = λ - λ₀
             final double φ    = srcPts[srcOff+1];
@@ -397,7 +397,6 @@ public class PolarStereographic extends ConformalProjection {
         @Override
         protected void inverseTransform(final double[] srcPts, final int srcOff,
                                         final double[] dstPts, final int dstOff)
-                throws ProjectionException
         {
             double x = srcPts[srcOff  ];
             double y = srcPts[srcOff+1];
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/Polyconic.java
b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/Polyconic.java
index cb08253..2d597f1 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/Polyconic.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/Polyconic.java
@@ -281,7 +281,7 @@ public class Polyconic extends MeridianArcBased {
      * @since   1.0
      * @module
      */
-    static final class Spherical extends Polyconic {
+    private static final class Spherical extends Polyconic {
         /**
          * For cross-version compatibility.
          */
@@ -302,7 +302,7 @@ public class Polyconic extends MeridianArcBased {
         @Override
         public Matrix transform(final double[] srcPts, final int srcOff,
                                 final double[] dstPts, final int dstOff,
-                                final boolean derivate) throws ProjectionException
+                                final boolean derivate)
         {
             final double λ    = srcPts[srcOff  ];
             final double φ    = srcPts[srcOff+1];
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/Sinusoidal.java
b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/Sinusoidal.java
index 6180442..545851f 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/Sinusoidal.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/Sinusoidal.java
@@ -188,7 +188,7 @@ public class Sinusoidal extends MeridianArcBased {
         @Override
         public Matrix transform(final double[] srcPts, final int srcOff,
                                 final double[] dstPts, final int dstOff,
-                                final boolean derivate) throws ProjectionException
+                                final boolean derivate)
         {
             final double λ    = srcPts[srcOff  ];
             final double φ    = srcPts[srcOff+1];
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/TransverseMercator.java
b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/TransverseMercator.java
index 669b1d3..a3067b3 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/TransverseMercator.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/TransverseMercator.java
@@ -689,7 +689,6 @@ public class TransverseMercator extends NormalizedProjection {
         @Override
         protected void inverseTransform(final double[] srcPts, final int srcOff,
                                         final double[] dstPts, final int dstOff)
-                throws ProjectionException
         {
             final double x = srcPts[srcOff  ];
             final double y = srcPts[srcOff+1];


Mime
View raw message