svn commit: r1697308 - /sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultPassThroughOperation.java

[desruisseaux]

Author: desruisseaux
Date: Mon Aug 24 03:24:11 2015
New Revision: 1697308

URL: http://svn.apache.org/r1697308
Log:
Upgrade from ISO 19111:2003 to ISO 19111:2007.

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

Modified: 
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultPassThroughOperation.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultPassThroughOperation.java?rev=1697308&r1=1697307&r2=1697308&view=diff
==============================================================================
--- 
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultPassThroughOperation.java
 [UTF-8] (original)
+++ 
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultPassThroughOperation.java
 [UTF-8] Mon Aug 24 03:24:11 2015
@@ -17,10 +17,8 @@
 package org.apache.sis.referencing.operation;
 
 import java.util.Map;
-import org.opengis.parameter.ParameterValueGroup;
 import org.opengis.referencing.operation.MathTransform;
-import org.opengis.referencing.operation.OperationMethod;
-import org.opengis.referencing.operation.SingleOperation;
+import org.opengis.referencing.operation.CoordinateOperation;
 import org.opengis.referencing.operation.PassThroughOperation;
 import org.opengis.referencing.crs.CoordinateReferenceSystem;
 import org.apache.sis.referencing.operation.transform.PassThroughTransform;
@@ -51,7 +49,7 @@ public class DefaultPassThroughOperation
     /**
      * The operation to apply on the subset of a coordinate tuple.
      */
-    private final SingleOperation operation;
+    private final CoordinateOperation operation;
 
     /**
      * Constructs a single operation from a set of properties.
@@ -89,7 +87,7 @@ public class DefaultPassThroughOperation
     public DefaultPassThroughOperation(final Map<String,?>            
properties,
                                        final CoordinateReferenceSystem 
sourceCRS,
                                        final CoordinateReferenceSystem 
targetCRS,
-                                       final SingleOperation           
operation,
+                                       final CoordinateOperation       
operation,
                                        final int firstAffectedOrdinate,
                                        final int numTrailingOrdinates)
     {
@@ -149,28 +147,6 @@ public class DefaultPassThroughOperation
     }
 
     /**
-     * @deprecated May be removed in GeoAPI 4.0 since it does not apply to 
pass-through operations.
-     *
-     * @return {@code null}.
-     */
-    @Override
-    @Deprecated
-    public OperationMethod getMethod() {
-        return null;
-    }
-
-    /**
-     * @deprecated May be removed in GeoAPI 4.0 since it does not apply to 
pass-through operations.
-     *
-     * @return {@code null}.
-     */
-    @Override
-    @Deprecated
-    public ParameterValueGroup getParameterValues() {
-        return null;
-    }
-
-    /**
      * Returns the operation to apply on the subset of a coordinate tuple.
      *
      * @return The operation to apply on the subset of a coordinate tuple.
@@ -178,7 +154,7 @@ public class DefaultPassThroughOperation
      * @see PassThroughTransform#getSubTransform()
      */
     @Override
-    public SingleOperation getOperation() {
+    public CoordinateOperation getOperation() {
         return operation;
     }