sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1677693 - in /sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation: AbstractCoordinateOperation.java AbstractSingleOperation.java DefaultConcatenatedOperation.java
Date Mon, 04 May 2015 21:46:39 GMT
Author: desruisseaux
Date: Mon May  4 21:46:38 2015
New Revision: 1677693

URL: http://svn.apache.org/r1677693
Log:
Referencing: move the restriction about non-null transform into the CoordinateOperation base
class.

Modified:
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractCoordinateOperation.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractSingleOperation.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultConcatenatedOperation.java

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractCoordinateOperation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractCoordinateOperation.java?rev=1677693&r1=1677692&r2=1677693&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractCoordinateOperation.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractCoordinateOperation.java
[UTF-8] Mon May  4 21:46:38 2015
@@ -294,6 +294,8 @@ public class AbstractCoordinateOperation
                                        final MathTransform             transform)
     {
         super(properties);
+        ArgumentChecks.ensureNonNull("transform", transform);
+
         this.sourceCRS        = sourceCRS;
         this.targetCRS        = targetCRS;
         this.interpolationCRS = interpolationCRS;

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractSingleOperation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractSingleOperation.java?rev=1677693&r1=1677692&r2=1677693&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractSingleOperation.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractSingleOperation.java
[UTF-8] Mon May  4 21:46:38 2015
@@ -96,8 +96,7 @@ class AbstractSingleOperation extends Ab
                                    final MathTransform             transform)
     {
         super(properties, sourceCRS, targetCRS, interpolationCRS, transform);
-        ArgumentChecks.ensureNonNull("method",    method);
-        ArgumentChecks.ensureNonNull("transform", transform);
+        ArgumentChecks.ensureNonNull("method", method);
         checkDimensions(method, transform, properties);
         this.method = method;
         /*

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultConcatenatedOperation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultConcatenatedOperation.java?rev=1677693&r1=1677692&r2=1677693&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultConcatenatedOperation.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultConcatenatedOperation.java
[UTF-8] Mon May  4 21:46:38 2015
@@ -145,7 +145,7 @@ public class DefaultConcatenatedOperatio
      * @param  factory       The math transform factory to use.
      * @param  wantTransform {@code true} if the concatenated math transform should be computed.
      *         This is set to {@code false} only when this method invokes itself recursively.
-     * @return The concatenated math transform.
+     * @return The concatenated math transform, or {@code null} if {@code wantTransform}
was {@code false}.
      * @throws FactoryException if the factory can not concatenate the math transforms.
      */
     private static MathTransform expand(final CoordinateOperation[] operations,



Mime
View raw message