sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject [sis] 02/04: Merge branch 'geoapi-4.0' into geoapi-3.1 but without the change in Objective.getObjectiveOccurences() method name. The old name is kept on GeoAPI 3.1 branch for compatibility reason.
Date Wed, 01 May 2019 16:01:17 GMT
This is an automated email from the ASF dual-hosted git repository.

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

commit 9426368e13a5abcfb28fd91f44c991dbf3484219
Merge: 77720b8 59b5551
Author: Martin Desruisseaux <martin.desruisseaux@geomatys.com>
AuthorDate: Wed May 1 14:48:24 2019 +0200

    Merge branch 'geoapi-4.0' into geoapi-3.1 but without the change in Objective.getObjectiveOccurences()
method name.
    The old name is kept on GeoAPI 3.1 branch for compatibility reason.

 .../metadata/iso/acquisition/DefaultObjective.java | 54 ++++++++++++++++------
 .../distribution/DefaultStandardOrderProcess.java  | 42 +++++++++++++----
 2 files changed, 72 insertions(+), 24 deletions(-)

diff --cc core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultObjective.java
index 22c1e41,599614e..2e4ee54
--- 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
@@@ -134,14 -134,14 +134,14 @@@ public class DefaultObjective extends I
      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);
++            objectiveOccurrences = copyCollection(object.getObjectiveOccurences(), Event.class);
+             pass                 = copyCollection(object.getPass(), PlatformPass.class);
+             sensingInstruments   = copyCollection(object.getSensingInstruments(), Instrument.class);
          }
      }
  
@@@ -290,23 -290,23 +290,47 @@@
       * Returns the event or events associated with objective completion.
       *
       * @return events associated with objective completion.
++     *
++     * @since 1.0
       */
--    @Override
      @XmlElement(name = "objectiveOccurence", required = true)
+     public Collection<Event> getObjectiveOccurrences() {
+         return objectiveOccurrences = nonNullCollection(objectiveOccurrences, Event.class);
+     }
+ 
+     /**
++     * @deprecated Renamed {@link #getObjectiveOccurrences()}.
++     *
++     * @return events associated with objective completion.
++     */
++    @Override
++    @Deprecated
 +    public Collection<Event> getObjectiveOccurences() {
-         return objectiveOccurences = nonNullCollection(objectiveOccurences, Event.class);
++        return getObjectiveOccurrences();
 +    }
 +
 +    /**
       * Sets the event or events associated with objective completion.
       *
       * @param  newValues  the new objective occurrences values.
++     *
++     * @since 1.0
+      */
+     public void setObjectiveOccurrences(final Collection<? extends Event> newValues)
{
+         objectiveOccurrences = writeCollection(newValues, objectiveOccurrences, Event.class);
+     }
+ 
+     /**
++     * @deprecated Renamed {@link #setObjectiveOccurrences(Collection)}.
++     *
++     * @param  newValues  the new objective occurrences values.
 +     */
++    @Deprecated
 +    public void setObjectiveOccurences(final Collection<? extends Event> newValues)
{
-         objectiveOccurences = writeCollection(newValues, objectiveOccurences, Event.class);
++        setObjectiveOccurrences(newValues);
 +    }
 +
 +    /**
       * Returns the pass of the platform over the objective.
       *
       * @return pass of the platform.


Mime
View raw message