sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1634464 - in /sis/trunk/core/sis-metadata/src: main/java/org/apache/sis/metadata/iso/distribution/ main/java/org/apache/sis/metadata/iso/extent/ test/resources/org/apache/sis/metadata/iso/
Date Mon, 27 Oct 2014 07:47:48 GMT
Author: desruisseaux
Date: Mon Oct 27 07:47:47 2014
New Revision: 1634464

URL: http://svn.apache.org/r1634464
Log:
Missing @UML annotations.

Modified:
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultFormat.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultSpatialTemporalExtent.java
    sis/trunk/core/sis-metadata/src/test/resources/org/apache/sis/metadata/iso/api-changes.properties

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultFormat.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultFormat.java?rev=1634464&r1=1634463&r2=1634464&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultFormat.java
[UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultFormat.java
[UTF-8] Mon Oct 27 07:47:47 2014
@@ -32,6 +32,7 @@ import org.apache.sis.metadata.iso.citat
 import org.apache.sis.metadata.iso.ISOMetadata;
 import org.apache.sis.util.iso.Types;
 
+import static org.opengis.annotation.Obligation.OPTIONAL;
 import static org.opengis.annotation.Obligation.MANDATORY;
 import static org.opengis.annotation.Specification.ISO_19115;
 
@@ -358,6 +359,7 @@ public class DefaultFormat extends ISOMe
      * @since 0.5
      */
 /// @XmlElement(name = "medium")
+    @UML(identifier="medium", obligation=OPTIONAL, specification=ISO_19115)
     public Collection<Medium> getMedia() {
         return media = nonNullCollection(media, Medium.class);
     }

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultSpatialTemporalExtent.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultSpatialTemporalExtent.java?rev=1634464&r1=1634463&r2=1634464&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultSpatialTemporalExtent.java
[UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultSpatialTemporalExtent.java
[UTF-8] Mon Oct 27 07:47:47 2014
@@ -20,6 +20,7 @@ import java.util.Collection;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
+import org.opengis.annotation.UML;
 import org.opengis.geometry.Envelope;
 import org.opengis.metadata.extent.TemporalExtent;
 import org.opengis.metadata.extent.VerticalExtent;
@@ -29,6 +30,9 @@ import org.opengis.metadata.extent.Spati
 import org.opengis.referencing.operation.TransformException;
 import org.apache.sis.internal.metadata.ReferencingServices;
 
+import static org.opengis.annotation.Obligation.OPTIONAL;
+import static org.opengis.annotation.Specification.ISO_19115;
+
 
 /**
  * Extent with respect to date/time and spatial boundaries.
@@ -165,6 +169,7 @@ public class DefaultSpatialTemporalExten
      * @since 0.5
      */
     @XmlElement(name = "verticalExtent")
+    @UML(identifier="verticalExtent", obligation=OPTIONAL, specification=ISO_19115)
     public VerticalExtent getVerticalExtent() {
         return verticalExtent;
     }

Modified: sis/trunk/core/sis-metadata/src/test/resources/org/apache/sis/metadata/iso/api-changes.properties
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/test/resources/org/apache/sis/metadata/iso/api-changes.properties?rev=1634464&r1=1634463&r2=1634464&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/test/resources/org/apache/sis/metadata/iso/api-changes.properties
[ISO-8859-1] (original)
+++ sis/trunk/core/sis-metadata/src/test/resources/org/apache/sis/metadata/iso/api-changes.properties
[ISO-8859-1] Mon Oct 27 07:47:47 2014
@@ -1,7 +1,13 @@
 #
 # Methods added or deprecated by the API upgrade from ISO 19115:2003 to 19115:2014.
-# Those changes are not present in GeoAPI 3.0.0, so we apply them as a patch on top
-# of the GeoAPI interfaces.
+# Those changes are not present in GeoAPI 3.0.0 interfaces, so we declare them with
+# @Deprecated and @UML annotations in Apache SIS implementation.
+#
+# This properties file is automatically generated by a comparison between the GeoAPI
+# 3.0 and 3.1 JAR files, with minor manual editions.  This file is used for checking
+# annotation validity in Apache SIS implementation. This file should be empty in SIS
+# branches implementing latest GeoAPI snapshots, and may be non-empty on the trunk
+# when the changes are not yet incorporated in a standard release.
 #
 org.opengis.metadata.citation.Citation=-getCollectiveTitle +getGraphics:graphic +getOnlineResources:onlineResource
 org.opengis.metadata.citation.Contact=-getAddress +getAddresses:address +getContactType:contactType
-getOnlineResource +getOnlineResources:onlineResource -getPhone +getPhones:phone
@@ -20,9 +26,9 @@ org.opengis.metadata.distribution.Medium
 org.opengis.metadata.distribution.StandardOrderProcess=+getOrderOptionType:orderOptionType
+getOrderOptions:orderOptions
 org.opengis.metadata.ExtendedElementInformation=-getDomainCode +getRationale:rationale -getRationales
-getShortName
 org.opengis.metadata.extent.SpatialTemporalExtent=+getVerticalExtent:verticalExtent
-org.opengis.metadata.identification.AggregateInformation=-getAggregateDataSetIdentifier -getAggregateDataSetName
+org.opengis.metadata.identification.AggregateInformation=-getAggregateDataSetIdentifier -getAggregateDataSetName
+getMetadataReference:metadataReference +getName:name
 org.opengis.metadata.identification.BrowseGraphic=+getImageConstraints:imageContraints +getLinkages:linkage
-org.opengis.metadata.identification.Identification=+getAdditionalDocumentations:additionalDocumentation
~getAggregationInfo +getAssociatedResources:associatedResource +getExtents:extent +getProcessingLevel:processingLevel
+getSpatialRepresentationTypes:spatialRepresentationType +getSpatialResolutions:spatialResolution
+getTemporalResolutions:temporalResolution +getTopicCategories:topicCategory
+org.opengis.metadata.identification.Identification=+getAdditionalDocumentations:additionalDocumentation
~-getAggregationInfo ~+getAssociatedResources:associatedResource +getExtents:extent +getProcessingLevel:processingLevel
+getSpatialRepresentationTypes:spatialRepresentationType +getSpatialResolutions:spatialResolution
~+getTemporalResolutions:temporalResolution +getTopicCategories:topicCategory
 org.opengis.metadata.identification.Keywords=+getKeywordClass:keywordClass
 org.opengis.metadata.identification.Resolution=+getAngularDistance:angularDistance +getLevelOfDetail:levelOfDetail
+getVertical:vertical
 org.opengis.metadata.identification.ServiceIdentification=+getAccessProperties:accessProperties
+getContainsChain:containsChain +getContainsOperations:containsOperations +getCoupledResources:coupledResource
+getCouplingType:couplingType +getOperatedDatasets:operatedDataset +getOperatesOn:operatesOn
+getProfiles:profile +getServiceStandards:serviceStandard +getServiceType:serviceType +getServiceTypeVersions:serviceTypeVersion
@@ -33,5 +39,5 @@ org.opengis.metadata.lineage.ProcessStep
 org.opengis.metadata.lineage.Source=-getScaleDenominator +getScope:scope -getSourceExtents
+getSourceMetadata:sourceMetadata +getSourceSpatialResolution:sourceSpatialResolution
 org.opengis.metadata.maintenance.MaintenanceInformation=-getDateOfNextUpdate +getMaintenanceDates:maintenanceDate
+getMaintenanceScopes:maintenanceScope -getUpdateScopeDescriptions -getUpdateScopes
 org.opengis.metadata.Metadata=+getAlternativeMetadataReferences:alternativeMetadataReference
-getCharacterSet +getCharacterSets:characterSet -getDataSetUri -getDateStamp +getDates:dateInfo
-getFileIdentifier -getHierarchyLevelNames -getHierarchyLevels -getLanguage +getLanguages:defaultLocale+otherLocale
-getLocales +getMetadataIdentifier:metadataIdentifier +getMetadataLinkages:metadataLinkage
+getMetadataProfiles:metadataProfile +getMetadataScopes:metadataScope -getMetadataStandardName
-getMetadataStandardVersion +getMetadataStandards:metadataStandard -getParentIdentifier +getParentMetadata:parentMetadata
+getResourceLineages:resourceLineage
-org.opengis.metadata.quality.Scope=-getExtent
+org.opengis.metadata.quality.Scope=-getExtent +getExtents:extent
 org.opengis.metadata.spatial.Dimension=+getDimensionDescription:dimensionDescription +getDimensionTitle:dimensionTitle



Mime
View raw message