sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject [sis] branch geoapi-4.0 updated: Fix missing "s" in "getOrderOptionsType()" for ISO 19115 compliance. https://github.com/opengeospatial/geoapi/issues/21
Date Wed, 01 May 2019 11:50:06 GMT
This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git


The following commit(s) were added to refs/heads/geoapi-4.0 by this push:
     new fceec82  Fix missing "s" in "getOrderOptionsType()" for ISO 19115 compliance. https://github.com/opengeospatial/geoapi/issues/21
fceec82 is described below

commit fceec8246dbb7bf2ad11038198739d251297114a
Author: Martin Desruisseaux <martin.desruisseaux@geomatys.com>
AuthorDate: Wed May 1 13:48:49 2019 +0200

    Fix missing "s" in "getOrderOptionsType()" for ISO 19115 compliance.
    https://github.com/opengeospatial/geoapi/issues/21
---
 .../distribution/DefaultStandardOrderProcess.java  | 42 +++++++++++++++++-----
 1 file changed, 33 insertions(+), 9 deletions(-)

diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultStandardOrderProcess.java
b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultStandardOrderProcess.java
index ca3ca7f..242800a 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultStandardOrderProcess.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultStandardOrderProcess.java
@@ -60,7 +60,7 @@ import static org.apache.sis.internal.metadata.MetadataUtilities.toMilliseconds;
     "plannedAvailableDateTime",
     "orderingInstructions",
     "turnaround",
-    "orderOptionType",              // New in ISO 19115-3
+    "orderOptionsType",             // New in ISO 19115-3
     "orderOptions"                  // New in ISO 19115-3
 })
 @XmlRootElement(name = "MD_StandardOrderProcess")
@@ -68,7 +68,7 @@ public class DefaultStandardOrderProcess extends ISOMetadata implements
Standard
     /**
      * Serial number for inter-operability with different versions.
      */
-    private static final long serialVersionUID = 6107884863471045743L;
+    private static final long serialVersionUID = 1948951192071039775L;
 
     /**
      * Fees and terms for retrieving the resource.
@@ -100,7 +100,7 @@ public class DefaultStandardOrderProcess extends ISOMetadata implements
Standard
     /**
      * Description of the order options record.
      */
-    private RecordType orderOptionType;
+    private RecordType orderOptionsType;
 
     /**
      * Request/purchase choices.
@@ -129,7 +129,7 @@ public class DefaultStandardOrderProcess extends ISOMetadata implements
Standard
             plannedAvailableDateTime = toMilliseconds(object.getPlannedAvailableDateTime());
             orderingInstructions     = object.getOrderingInstructions();
             turnaround               = object.getTurnaround();
-            orderOptionType          = object.getOrderOptionType();
+            orderOptionsType         = object.getOrderOptionsType();
             orderOptions             = object.getOrderOptions();
         }
     }
@@ -291,27 +291,51 @@ public class DefaultStandardOrderProcess extends ISOMetadata implements
Standard
      *
      * @return description of the order options record, or {@code null} if none.
      *
-     * @since 0.5
+     * @since 1.0
      *
      * @see org.apache.sis.util.iso.DefaultRecord#getRecordType()
      */
     @Override
     @XmlElement(name = "orderOptionsType")
     @XmlJavaTypeAdapter(GO_RecordType.Since2014.class)
+    public RecordType getOrderOptionsType() {
+        return orderOptionsType;
+    }
+
+    /**
+     * @deprecated Renamed {@link #getOrderOptionsType()} for ISO 19115 conformance.
+     *
+     * @return description of the order options record, or {@code null} if none.
+     *
+     * @since 0.5
+     */
+    @Deprecated
     public RecordType getOrderOptionType() {
-        return orderOptionType;
+        return getOrderOptionsType();
     }
 
     /**
      * Sets the description of the {@linkplain #getOrderOptions() order options} record.
      *
-     * @param newValue New description of the order options record.
+     * @param  newValue  new description of the order options record.
+     *
+     * @since 1.0
+     */
+    public void setOrderOptionsType(final RecordType newValue) {
+        checkWritePermission(orderOptionsType);
+        orderOptionsType = newValue;
+    }
+
+    /**
+     * @deprecated Renamed {@link #setOrderOptionsType(RecordType)} for ISO 19115 conformance.
+     *
+     * @param  newValue  new description of the order options record.
      *
      * @since 0.5
      */
+    @Deprecated
     public void setOrderOptionType(final RecordType newValue) {
-        checkWritePermission(orderOptionType);
-        orderOptionType = newValue;
+        setOrderOptionsType(newValue);
     }
 
     /**


Mime
View raw message