sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1804162 - in /sis/branches/JDK8/core/sis-metadata/src: main/java/org/apache/sis/internal/jaxb/metadata/ main/java/org/apache/sis/metadata/iso/ test/java/org/apache/sis/metadata/iso/
Date Fri, 04 Aug 2017 22:53:13 GMT
Author: desruisseaux
Date: Fri Aug  4 22:53:13 2017
New Revision: 1804162

URL: http://svn.apache.org/viewvc?rev=1804162&view=rev
Log:
Deprecated FeatureTypeList since it is not anymore part of ISO 19115 in 2014 revision.

Modified:
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_FeatureTypeList.java
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultFeatureTypeList.java
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/package-info.java
    sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_FeatureTypeList.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_FeatureTypeList.java?rev=1804162&r1=1804161&r2=1804162&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_FeatureTypeList.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_FeatureTypeList.java
[UTF-8] Fri Aug  4 22:53:13 2017
@@ -31,7 +31,10 @@ import org.apache.sis.internal.jaxb.gco.
  * @version 0.3
  * @since   0.3
  * @module
+ *
+ * @deprecated Not anymore part of ISO 19115.
  */
+@Deprecated
 public final class MD_FeatureTypeList extends PropertyType<MD_FeatureTypeList, FeatureTypeList>
{
     /**
      * Empty constructor for JAXB only.

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultFeatureTypeList.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultFeatureTypeList.java?rev=1804162&r1=1804161&r2=1804162&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultFeatureTypeList.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultFeatureTypeList.java
[UTF-8] Fri Aug  4 22:53:13 2017
@@ -45,7 +45,10 @@ import org.opengis.metadata.FeatureTypeL
  * @version 0.3
  * @since   0.3
  * @module
+ *
+ * @deprecated Not anymore part of ISO 19115.
  */
+@Deprecated                                     // TODO: after deletion, search "FeatureTypeList"
on the whole code base.
 @SuppressWarnings("CloneableClassWithoutClone")                 // ModifiableMetadata needs
shallow clones.
 @XmlType(propOrder = {
     "spatialObject",

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/package-info.java?rev=1804162&r1=1804161&r2=1804162&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/package-info.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/package-info.java
[UTF-8] Fri Aug  4 22:53:13 2017
@@ -39,7 +39,6 @@
  * {@code  ├─} {@linkplain org.apache.sis.metadata.iso.DefaultApplicationSchemaInformation
Application schema information}<br>
  * {@code  ├─} {@linkplain org.apache.sis.metadata.iso.DefaultMetadataExtensionInformation
Metadata extension information}<br>
  * {@code  ├─} {@linkplain org.apache.sis.metadata.iso.DefaultExtendedElementInformation
  Extended element information}<br>
- * {@code  ├─} {@linkplain org.apache.sis.metadata.iso.DefaultFeatureTypeList      
       Feature type list}<br>
  * {@code  └─} {@linkplain org.apache.sis.metadata.iso.DefaultIdentifier           
       Identifier}<br>
  * {@linkplain org.opengis.util.CodeList Code list}<br>
  * {@code  ├─} {@linkplain org.opengis.metadata.Datatype     Data type}<br>
@@ -53,7 +52,6 @@
  * {@code  │   └─}     {@linkplain org.apache.sis.metadata.iso.DefaultExtendedElementInformation
  Extended element information}<br>
  * {@code  │       ├─} {@linkplain org.opengis.metadata.Datatype          
                        Data type} «code list»<br>
  * {@code  │       └─} {@linkplain org.opengis.annotation.Obligation      
                        Obligation} «code list»<br>
- * {@code  ├─}         {@linkplain org.apache.sis.metadata.iso.DefaultFeatureTypeList
             Feature type list}<br>
  * {@code  └─}         {@linkplain org.apache.sis.metadata.iso.DefaultIdentifier   
               Identifier}<br>
  * </td></tr></table>
  *

Modified: sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java?rev=1804162&r1=1804161&r2=1804162&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java
[UTF-8] Fri Aug  4 22:53:13 2017
@@ -60,7 +60,6 @@ public final strictfp class AllMetadataT
             org.opengis.metadata.ApplicationSchemaInformation.class,
             org.opengis.metadata.Datatype.class,
             org.opengis.metadata.ExtendedElementInformation.class,
-            org.opengis.metadata.FeatureTypeList.class,
             org.opengis.metadata.Identifier.class,
             org.opengis.metadata.Metadata.class,
             org.opengis.metadata.MetadataExtensionInformation.class,
@@ -288,10 +287,6 @@ public final strictfp class AllMetadataT
     protected String getExpectedXmlTypeForElement(final Class<?> type, final Class<?>
impl) {
         final String rootName = type.getAnnotation(UML.class).identifier();
         switch (rootName) {
-            // We don't know yet what is the type of this one.
-            case "MD_FeatureTypeList": {
-                return null;
-            }
             // Following prefix was changed in ISO 19115 corrigendum,
             // but ISO 19139 still use the old prefix.
             case "SV_ServiceIdentification": {



Mime
View raw message