sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject [sis] 04/04: Merge branch 'geoapi-4.0' into geoapi-3.1, but replacing method renaming by a comment about future evolution.
Date Wed, 01 May 2019 16:01:19 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 8164ff4a7c1cfce4c059c2f891b920c86745c873
Merge: f7fb545 bf56b15
Author: Martin Desruisseaux <martin.desruisseaux@geomatys.com>
AuthorDate: Wed May 1 18:00:45 2019 +0200

    Merge branch 'geoapi-4.0' into geoapi-3.1, but replacing method renaming by a comment
about future evolution.

 .../org/apache/sis/metadata/iso/spatial/DefaultGeorectified.java  | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --cc core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGeorectified.java
index e1ceea0,214b9c1..50149d7
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGeorectified.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGeorectified.java
@@@ -294,6 -294,6 +294,10 @@@ public class DefaultGeorectified extend
       * and the grid coordinate of the cell halfway between opposite ends of the grid in
the
       * spatial dimensions.
       *
++     * <div class="warning"><b>Upcoming API change</b><br>
++     * This method may be renamed {@code getCentrePoint()} in GeoAPI 4.0
++     * for compliance with ISO 19115:2014.</div>
++     *
       * @return the center point, or {@code null}.
       */
      @Override
@@@ -305,11 -305,11 +309,15 @@@
      /**
       * Sets the center point.
       *
++     * <div class="warning"><b>Upcoming API change</b><br>
++     * This method may be renamed {@code setCentrePoint(…)} in GeoAPI 4.0
++     * for compliance with ISO 19115:2014.</div>
++     *
       * @param  newValue  the new center point.
       */
 -    public void setCentrePoint(final Point newValue) {
 -        checkWritePermission(centrePoint);
 -        centrePoint = newValue;
 +    public void setCenterPoint(final Point newValue) {
 +        checkWritePermission(centerPoint);
 +        centerPoint = newValue;
      }
  
      /**


Mime
View raw message