sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1820246 - in /sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso: ./ content/ lineage/ quality/
Date Fri, 05 Jan 2018 02:48:43 GMT
Author: desruisseaux
Date: Fri Jan  5 02:48:43 2018
New Revision: 1820246

URL: http://svn.apache.org/viewvc?rev=1820246&view=rev
Log:
Adaptation of commit f03b113f2e90a12e19697f7a51256cd9604dfaaa from Image Matter.
The change from GMI to MDS namespace has been skipped; we keep GMI namespace, pending ISO
19115-4.

The project at this revision can be built but is known to have test failures.
Tests will pass only after we completed the port of all ISO 19115-3 work.

Modified:
    sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java
    sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultRangeElementDescription.java
    sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/package-info.java
    sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultAlgorithm.java
    sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultNominalResolution.java
    sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessing.java
    sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultCoverageResult.java
    sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultUsability.java

Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java?rev=1820246&r1=1820245&r2=1820246&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java
[UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java
[UTF-8] Fri Jan  5 02:48:43 2018
@@ -616,6 +616,7 @@ public class ImmutableIdentifier extends
     /**
      * Empty constructor for JAXB.
      */
+    @SuppressWarnings("unused")
     private ImmutableIdentifier() {
         code        = null;
         codeSpace   = null;

Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultRangeElementDescription.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultRangeElementDescription.java?rev=1820246&r1=1820245&r2=1820246&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultRangeElementDescription.java
[UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultRangeElementDescription.java
[UTF-8] Fri Jan  5 02:48:43 2018
@@ -48,16 +48,16 @@ import org.apache.sis.xml.Namespaces;
  *
  * @author  Cédric Briançon (Geomatys)
  * @author  Martin Desruisseaux (Geomatys)
- * @version 0.3
+ * @version 1.0
  * @since   0.3
  * @module
  */
 @SuppressWarnings("CloneableClassWithoutClone")                 // ModifiableMetadata needs
shallow clones.
 @TitleProperty(name = "name")
-@XmlType(name = "MI_RangeElementDescription_Type", propOrder = {
+@XmlType(name = "MI_RangeElementDescription_Type", namespace = Namespaces.GMI, propOrder
= {
     "name",
-    "definition"/*,
-    "rangeElements"*/ // TODO: not yet supported.
+    "definition",
+    "rangeElements"
 })
 @XmlRootElement(name = "MI_RangeElementDescription", namespace = Namespaces.GMI)
 public class DefaultRangeElementDescription extends ISOMetadata implements RangeElementDescription
{
@@ -136,7 +136,7 @@ public class DefaultRangeElementDescript
      * @return designation associated with a set of range elements, or {@code null}.
      */
     @Override
-    @XmlElement(name = "name", namespace = Namespaces.GMI, required = true)
+    @XmlElement(name = "name", required = true)
     public InternationalString getName() {
         return name;
     }
@@ -157,7 +157,7 @@ public class DefaultRangeElementDescript
      * @return description of a set of specific range elements, or {@code null}.
      */
     @Override
-    @XmlElement(name = "definition", namespace = Namespaces.GMI, required = true)
+    @XmlElement(name = "definition", required = true)
     public InternationalString getDefinition() {
         return definition;
     }
@@ -181,7 +181,7 @@ public class DefaultRangeElementDescript
      * @todo implements {@link Record} in order to use the annotation.
      */
     @Override
-    //@XmlElement(name = "rangeElement", namespace = Namespaces.GMI, required = true)
+    @XmlElement(name = "rangeElement", required = true)
     public Collection<Record> getRangeElements() {
         return rangeElements = nonNullCollection(rangeElements, Record.class);
     }

Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/package-info.java?rev=1820246&r1=1820245&r2=1820246&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/package-info.java
[UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/package-info.java
[UTF-8] Fri Jan  5 02:48:43 2018
@@ -115,6 +115,7 @@
     @XmlJavaTypeAdapter(InternationalStringAdapter.class),
     @XmlJavaTypeAdapter(GO_GenericName.class),
     @XmlJavaTypeAdapter(GO_RecordType.class),
+    @XmlJavaTypeAdapter(GO_Record.class),
     @XmlJavaTypeAdapter(GO_Boolean.class), @XmlJavaTypeAdapter(type=boolean.class, value=GO_Boolean.class),
     @XmlJavaTypeAdapter(GO_Integer.class), @XmlJavaTypeAdapter(type=int.class,     value=GO_Integer.class),
     @XmlJavaTypeAdapter(GO_Real.class),    @XmlJavaTypeAdapter(type=double.class,  value=GO_Real.class)

Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultAlgorithm.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultAlgorithm.java?rev=1820246&r1=1820245&r2=1820246&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultAlgorithm.java
[UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultAlgorithm.java
[UTF-8] Fri Jan  5 02:48:43 2018
@@ -48,12 +48,12 @@ import org.apache.sis.xml.Namespaces;
  * @author  Cédric Briançon (Geomatys)
  * @author  Guilhem Legal (Geomatys)
  * @author  Martin Desruisseaux (Geomatys)
- * @version 0.3
+ * @version 1.0
  * @since   0.3
  * @module
  */
 @SuppressWarnings("CloneableClassWithoutClone")                 // ModifiableMetadata needs
shallow clones.
-@XmlType(name = "LE_Algorithm_Type", propOrder = {
+@XmlType(name = "LE_Algorithm_Type", namespace = Namespaces.GMI, propOrder = {
     "citation",
     "description"
 })
@@ -128,7 +128,7 @@ public class DefaultAlgorithm extends IS
      * @return algorithm and version or date, or {@code null}.
      */
     @Override
-    @XmlElement(name = "citation", namespace = Namespaces.GMI, required = true)
+    @XmlElement(name = "citation", required = true)
     public Citation getCitation() {
         return citation;
     }
@@ -149,7 +149,7 @@ public class DefaultAlgorithm extends IS
      * @return algorithm used to generate the data, or {@code null}.
      */
     @Override
-    @XmlElement(name = "description", namespace = Namespaces.GMI, required = true)
+    @XmlElement(name = "description", required = true)
     public InternationalString getDescription() {
         return description;
     }

Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultNominalResolution.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultNominalResolution.java?rev=1820246&r1=1820245&r2=1820246&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultNominalResolution.java
[UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultNominalResolution.java
[UTF-8] Fri Jan  5 02:48:43 2018
@@ -51,7 +51,7 @@ import static org.apache.sis.internal.me
  * @module
  */
 @SuppressWarnings("CloneableClassWithoutClone")                 // ModifiableMetadata needs
shallow clones.
-@XmlType(name = "LE_NominalResolution_Type", propOrder = {
+@XmlType(name = "LE_NominalResolution_Type", namespace = Namespaces.GMI, propOrder = {
     "scanningResolution",
     "groundResolution"
 })
@@ -137,7 +137,7 @@ public class DefaultNominalResolution ex
      */
     @Override
     @ValueRange(minimum=0, isMinIncluded=false)
-    @XmlElement(name = "scanningResolution", namespace = Namespaces.GMI, required = true)
+    @XmlElement(name = "scanningResolution", required = true)
     public Double getScanningResolution() {
         return scanningResolution;
     }
@@ -164,7 +164,7 @@ public class DefaultNominalResolution ex
      */
     @Override
     @ValueRange(minimum=0, isMinIncluded=false)
-    @XmlElement(name = "groundResolution", namespace = Namespaces.GMI, required = true)
+    @XmlElement(name = "groundResolution", required = true)
     public Double getGroundResolution() {
         return groundResolution;
     }

Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessing.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessing.java?rev=1820246&r1=1820245&r2=1820246&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessing.java
[UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessing.java
[UTF-8] Fri Jan  5 02:48:43 2018
@@ -50,12 +50,12 @@ import org.apache.sis.internal.jaxb.NonM
  * @author  Cédric Briançon (Geomatys)
  * @author  Guilhem Legal (Geomatys)
  * @author  Martin Desruisseaux (Geomatys)
- * @version 0.3
+ * @version 1.0
  * @since   0.3
  * @module
  */
 @SuppressWarnings("CloneableClassWithoutClone")                 // ModifiableMetadata needs
shallow clones.
-@XmlType(name = "LE_Processing_Type", propOrder = {
+@XmlType(name = "LE_Processing_Type", namespace = Namespaces.GMI, propOrder = {
     "identifier",
     "softwareReferences",
     "procedureDescription",
@@ -154,7 +154,7 @@ public class DefaultProcessing extends I
      * @return identifier of the processing package that produced the data, or {@code null}.
      */
     @Override
-    @XmlElement(name = "identifier", namespace = Namespaces.GMI, required = true)
+    @XmlElement(name = "identifier", required = true)
     public Identifier getIdentifier() {
         return NonMarshalledAuthority.getMarshallable(identifiers);
     }
@@ -176,7 +176,7 @@ public class DefaultProcessing extends I
      * @return document describing processing software.
      */
     @Override
-    @XmlElement(name = "softwareReference", namespace = Namespaces.GMI)
+    @XmlElement(name = "softwareReference")
     public Collection<Citation> getSoftwareReferences() {
         return softwareReferences = nonNullCollection(softwareReferences, Citation.class);
     }
@@ -196,7 +196,7 @@ public class DefaultProcessing extends I
      * @return processing procedures, or {@code null}.
      */
     @Override
-    @XmlElement(name = "procedureDescription", namespace = Namespaces.GMI)
+    @XmlElement(name = "procedureDescription")
     public InternationalString getProcedureDescription() {
         return procedureDescription;
     }
@@ -217,7 +217,7 @@ public class DefaultProcessing extends I
      * @return documentation describing the processing.
      */
     @Override
-    @XmlElement(name = "documentation", namespace = Namespaces.GMI)
+    @XmlElement(name = "documentation")
     public Collection<Citation> getDocumentations() {
         return documentations = nonNullCollection(documentations, Citation.class);
     }
@@ -237,7 +237,7 @@ public class DefaultProcessing extends I
      * @return parameters to control the processing operations, or {@code null}.
      */
     @Override
-    @XmlElement(name = "runTimeParameters", namespace = Namespaces.GMI)
+    @XmlElement(name = "runTimeParameters")
     public InternationalString getRunTimeParameters() {
         return runTimeParameters;
     }
@@ -259,7 +259,7 @@ public class DefaultProcessing extends I
      * @return methodology by which geographic information was derived from the instrument
readings.
      */
     @Override
-    @XmlElement(name = "algorithm", namespace = Namespaces.GMI)
+    @XmlElement(name = "algorithm")
     public Collection<Algorithm> getAlgorithms() {
         return algorithms = nonNullCollection(algorithms, Algorithm.class);
     }

Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultCoverageResult.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultCoverageResult.java?rev=1820246&r1=1820245&r2=1820246&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultCoverageResult.java
[UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultCoverageResult.java
[UTF-8] Fri Jan  5 02:48:43 2018
@@ -60,7 +60,7 @@ import org.apache.sis.xml.Namespaces;
  * @module
  */
 @SuppressWarnings("CloneableClassWithoutClone")                 // ModifiableMetadata needs
shallow clones.
-@XmlType(name = "QE_CoverageResult_Type", propOrder = {
+@XmlType(name = "QE_CoverageResult_Type", namespace = Namespaces.GMI, propOrder = {
     "spatialRepresentationType",
     "resultSpatialRepresentation",
     "resultContentDescription",
@@ -157,7 +157,7 @@ public class DefaultCoverageResult exten
      * @return spatial representation of the coverage result, or {@code null}.
      */
     @Override
-    @XmlElement(name = "spatialRepresentationType", namespace = Namespaces.GMI, required
= true)
+    @XmlElement(name = "spatialRepresentationType", required = true)
     public SpatialRepresentationType getSpatialRepresentationType() {
         return spatialRepresentationType;
     }
@@ -178,7 +178,7 @@ public class DefaultCoverageResult exten
      * @return digital representation of data quality measures composing the coverage result,
or {@code null}.
      */
     @Override
-    @XmlElement(name = "resultSpatialRepresentation", namespace = Namespaces.GMI, required
= true)
+    @XmlElement(name = "resultSpatialRepresentation", required = true)
     public SpatialRepresentation getResultSpatialRepresentation() {
         return resultSpatialRepresentation;
     }
@@ -200,7 +200,7 @@ public class DefaultCoverageResult exten
      * @return description of the content of the result coverage, or {@code null}.
      */
     @Override
-    @XmlElement(name = "resultContentDescription", namespace = Namespaces.GMI, required =
true)
+    @XmlElement(name = "resultContentDescription", required = true)
     public CoverageDescription getResultContentDescription() {
         return resultContentDescription;
     }
@@ -222,7 +222,7 @@ public class DefaultCoverageResult exten
      * @return format of the result coverage data, or {@code null}.
      */
     @Override
-    @XmlElement(name = "resultFormat", namespace = Namespaces.GMI, required = true)
+    @XmlElement(name = "resultFormat", required = true)
     public Format getResultFormat() {
         return resultFormat;
     }

Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultUsability.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultUsability.java?rev=1820246&r1=1820245&r2=1820246&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultUsability.java
[UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultUsability.java
[UTF-8] Fri Jan  5 02:48:43 2018
@@ -45,7 +45,7 @@ import org.apache.sis.xml.Namespaces;
  * @module
  */
 @SuppressWarnings("CloneableClassWithoutClone")                 // ModifiableMetadata needs
shallow clones.
-@XmlType(name = "QE_Usability_Type")
+@XmlType(name = "QE_Usability_Type", namespace = Namespaces.GMI)
 @XmlRootElement(name = "QE_Usability", namespace = Namespaces.GMI)
 public class DefaultUsability extends AbstractElement implements Usability {
     /**



Mime
View raw message