svn commit: r1598383 - in /sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature: DefaultOperation.java FeatureFormat.java

[desruisseaux]

Author: desruisseaux
Date: Thu May 29 19:42:51 2014
New Revision: 1598383

URL: http://svn.apache.org/r1598383
Log:
DefaultOperation now implements Operation.
This complete the implementation of GeoAPI interfaces derived from ISO 19109.
The next step will be to implement GeoAPI interfaces for feature instances (as 
opposed to feature types).

Modified:
    
sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultOperation.java
    
sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java

Modified: 
sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultOperation.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultOperation.java?rev=1598383&r1=1598382&r2=1598383&view=diff
==============================================================================
--- 
sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultOperation.java
 [UTF-8] (original)
+++ 
sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultOperation.java
 [UTF-8] Thu May 29 19:42:51 2014
@@ -27,8 +27,7 @@ import org.apache.sis.util.Debug;
 // Branch-dependent imports
 import java.util.Objects;
 import org.opengis.feature.IdentifiedType;
-import org.opengis.feature.PropertyType;
-import org.opengis.feature.AttributeType;
+import org.opengis.feature.Operation;
 
 
 /**
@@ -51,7 +50,7 @@ import org.opengis.feature.AttributeType
  * @version 0.5
  * @module
  */
-public class DefaultOperation extends AbstractIdentifiedType implements 
PropertyType {
+public class DefaultOperation extends AbstractIdentifiedType implements 
Operation {
     /**
      * For cross-version compatibility.
      */
@@ -89,6 +88,7 @@ public class DefaultOperation extends Ab
      *
      * @return Description of the input parameters.
      */
+    @Override
     public ParameterDescriptorGroup getParameters() {
         return parameters;
     }
@@ -98,6 +98,7 @@ public class DefaultOperation extends Ab
      *
      * @return The type of the result, or {@code null} if none.
      */
+    @Override
     public IdentifiedType getResult() {
         return result;
     }

Modified: 
sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java?rev=1598383&r1=1598382&r2=1598383&view=diff
==============================================================================
--- 
sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java
 [UTF-8] (original)
+++ 
sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java
 [UTF-8] Thu May 29 19:42:51 2014
@@ -38,6 +38,7 @@ import org.opengis.feature.PropertyType;
 import org.opengis.feature.AttributeType;
 import org.opengis.feature.FeatureType;
 import org.opengis.feature.FeatureAssociationRole;
+import org.opengis.feature.Operation;
 
 
 /**
@@ -229,8 +230,8 @@ header: for (int i=0; ; i++) {
                 maximumOccurs = pt.getMaximumOccurs();
                 valueType     = toString(pt.getValueType().getName());
                 valueClass    = AbstractFeature.class;
-            } else if (propertyType instanceof DefaultOperation) {
-                final IdentifiedType resultType = ((DefaultOperation) 
propertyType).getResult();
+            } else if (propertyType instanceof Operation) {
+                final IdentifiedType resultType = ((Operation) 
propertyType).getResult();
                 valueType   = toString(resultType.getName());
                 valueClass  = null;
                 minimumOccurs = -1;