sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject [sis] 01/04: Fix spelling error in method name, but not in XML annotation since the spelling exists in ISO specification. https://github.com/opengeospatial/geoapi/issues/43
Date Wed, 01 May 2019 15:51:35 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

commit 59b555174b480a02beb5a9db65c607f97b60a868
Author: Martin Desruisseaux <martin.desruisseaux@geomatys.com>
AuthorDate: Wed May 1 14:33:40 2019 +0200

    Fix spelling error in method name, but not in XML annotation since the spelling exists
in ISO specification.
    https://github.com/opengeospatial/geoapi/issues/43
---
 .../metadata/iso/acquisition/DefaultObjective.java | 32 +++++++++++-----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultObjective.java
b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultObjective.java
index 22c1e41..599614e 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultObjective.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultObjective.java
@@ -40,7 +40,7 @@ import org.apache.sis.internal.jaxb.NonMarshalledAuthority;
  * <div class="preformat">{@code MI_Objective}
  * {@code   ├─identifier…………………………} Code used to identify the objective.
  * {@code   │   └─code………………………………} Alphanumeric value
identifying an instance in the namespace.
- * {@code   └─objectiveOccurence……} Event or events associated with objective completion.
+ * {@code   └─objectiveOccurrence…} Event or events associated with objective completion.
  * {@code       ├─identifier………………} Event name or number.
  * {@code       │   └─code……………………} Alphanumeric value identifying
an instance in the namespace.
  * {@code       ├─trigger………………………} Initiator of the event.
@@ -69,7 +69,7 @@ import org.apache.sis.internal.jaxb.NonMarshalledAuthority;
     "types",
     "functions",
     "extents",
-    "objectiveOccurences",
+    "objectiveOccurrences",
     "pass",
     "sensingInstruments"
 })
@@ -78,7 +78,7 @@ public class DefaultObjective extends ISOMetadata implements Objective {
     /**
      * Serial number for inter-operability with different versions.
      */
-    private static final long serialVersionUID = 8273806197892815938L;
+    private static final long serialVersionUID = 3312985886806161441L;
 
     /**
      * Priority applied to the target.
@@ -104,7 +104,7 @@ public class DefaultObjective extends ISOMetadata implements Objective
{
     /**
      * Event or events associated with objective completion.
      */
-    private Collection<Event> objectiveOccurences;
+    private Collection<Event> objectiveOccurrences;
 
     /**
      * Pass of the platform over the objective.
@@ -134,14 +134,14 @@ public class DefaultObjective extends ISOMetadata implements Objective
{
     public DefaultObjective(final Objective object) {
         super(object);
         if (object != null) {
-            identifiers         = copyCollection(object.getIdentifiers(), Identifier.class);
-            priority            = object.getPriority();
-            types               = copyCollection(object.getTypes(), ObjectiveType.class);
-            functions           = copyCollection(object.getFunctions(), InternationalString.class);
-            extents             = copyCollection(object.getExtents(), Extent.class);
-            objectiveOccurences = copyCollection(object.getObjectiveOccurences(), Event.class);
-            pass                = copyCollection(object.getPass(), PlatformPass.class);
-            sensingInstruments  = copyCollection(object.getSensingInstruments(), Instrument.class);
+            identifiers          = copyCollection(object.getIdentifiers(), Identifier.class);
+            priority             = object.getPriority();
+            types                = copyCollection(object.getTypes(), ObjectiveType.class);
+            functions            = copyCollection(object.getFunctions(), InternationalString.class);
+            extents              = copyCollection(object.getExtents(), Extent.class);
+            objectiveOccurrences = copyCollection(object.getObjectiveOccurrences(), Event.class);
+            pass                 = copyCollection(object.getPass(), PlatformPass.class);
+            sensingInstruments   = copyCollection(object.getSensingInstruments(), Instrument.class);
         }
     }
 
@@ -293,8 +293,8 @@ public class DefaultObjective extends ISOMetadata implements Objective
{
      */
     @Override
     @XmlElement(name = "objectiveOccurence", required = true)
-    public Collection<Event> getObjectiveOccurences() {
-        return objectiveOccurences = nonNullCollection(objectiveOccurences, Event.class);
+    public Collection<Event> getObjectiveOccurrences() {
+        return objectiveOccurrences = nonNullCollection(objectiveOccurrences, Event.class);
     }
 
     /**
@@ -302,8 +302,8 @@ public class DefaultObjective extends ISOMetadata implements Objective
{
      *
      * @param  newValues  the new objective occurrences values.
      */
-    public void setObjectiveOccurences(final Collection<? extends Event> newValues)
{
-        objectiveOccurences = writeCollection(newValues, objectiveOccurences, Event.class);
+    public void setObjectiveOccurrences(final Collection<? extends Event> newValues)
{
+        objectiveOccurrences = writeCollection(newValues, objectiveOccurrences, Event.class);
     }
 
     /**


Mime
View raw message