sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject [sis] 03/04: Merge branch 'geoapi-4.0' into geoapi-3.1, taking only the renaming in annotations. Renaming of methods or classes are not taken for compatibility reasons.
Date Wed, 01 May 2019 16:01:18 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 f7fb5454a9892c0b6a7733c874f6d3364821f1af
Merge: 9426368 d6b8565
Author: Martin Desruisseaux <martin.desruisseaux@geomatys.com>
AuthorDate: Wed May 1 16:51:45 2019 +0200

    Merge branch 'geoapi-4.0' into geoapi-3.1, taking only the renaming in annotations.
    Renaming of methods or classes are not taken for compatibility reasons.

 .../org/apache/sis/internal/book/GEOAPI.lst          |  2 +-
 .../resources/org/apache/sis/internal/book/OGC.lst   |  2 +-
 ...Code.java => MI_PolarisationOrientationCode.java} | 12 ++++++------
 .../apache/sis/metadata/iso/content/DefaultBand.java | 20 ++++++++++++++++++++
 .../sis/metadata/iso/content/package-info.java       |  6 +++---
 .../sis/test/xml/AnnotationConsistencyCheck.java     | 16 ----------------
 6 files changed, 31 insertions(+), 27 deletions(-)

diff --cc core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PolarisationOrientationCode.java
index 843926e,8a2f8a0..d704bea
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PolarisationOrientationCode.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PolarisationOrientationCode.java
@@@ -37,8 -37,8 +37,8 @@@ import org.apache.sis.xml.Namespaces
   * @since 0.3
   * @module
   */
- public final class MI_PolarizationOrientationCode
-         extends CodeListAdapter<MI_PolarizationOrientationCode, PolarizationOrientation>
+ public final class MI_PolarisationOrientationCode
 -        extends CodeListAdapter<MI_PolarisationOrientationCode, PolarisationOrientation>
++        extends CodeListAdapter<MI_PolarisationOrientationCode, PolarizationOrientation>
  {
      /**
       * Empty constructor for JAXB only.
diff --cc core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultBand.java
index cf1d470,fa1c342..f81dc80
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultBand.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultBand.java
@@@ -387,6 -387,6 +387,11 @@@ public class DefaultBand extends Defaul
      /**
       * Returns the polarization of the radiation transmitted.
       *
++     * <div class="warning"><b>Upcoming API change</b><br>
++     * This method may be renamed {@code getTransmittedPolarization} and its return type
replaced by
++     * {@code PolarisationOrientation} ("z" letter replaced by "s" letter) in GeoAPI 4.0
++     * for compliance with ISO 19115-2:2019.</div>
++     *
       * @return polarization of the radiation transmitted, or {@code null}.
       */
      @Override
@@@ -398,16 -398,16 +403,26 @@@
      /**
       * Sets the polarization of the radiation transmitted.
       *
++     * <div class="warning"><b>Upcoming API change</b><br>
++     * This method may be renamed {@code setTransmittedPolarization} and its argument type
replaced by
++     * {@code PolarisationOrientation} ("z" letter replaced by "s" letter) in GeoAPI 4.0
++     * for compliance with ISO 19115-2:2019.</div>
++     *
       * @param  newValue  the new transmitted polarization.
       */
 -    public void setTransmittedPolarisation(final PolarisationOrientation newValue) {
 -        checkWritePermission(transmittedPolarisation);
 -        transmittedPolarisation = newValue;
 +    public void setTransmittedPolarization(final PolarizationOrientation newValue) {
 +        checkWritePermission(transmittedPolarization);
 +        transmittedPolarization = newValue;
      }
  
      /**
       * Returns polarization of the radiation detected.
       *
++     * <div class="warning"><b>Upcoming API change</b><br>
++     * This method may be renamed {@code getDetectedPolarization} and its return type replaced
by
++     * {@code PolarisationOrientation} ("z" letter replaced by "s" letter) in GeoAPI 4.0
++     * for compliance with ISO 19115-2:2019.</div>
++     *
       * @return polarization of the radiation detected, or {@code null}.
       */
      @Override
@@@ -419,10 -419,10 +434,15 @@@
      /**
       * Sets the polarization of the radiation detected.
       *
++     * <div class="warning"><b>Upcoming API change</b><br>
++     * This method may be renamed {@code setDetectedPolarization} and its argument type
replaced by
++     * {@code PolarisationOrientation} ("z" letter replaced by "s" letter) in GeoAPI 4.0
++     * for compliance with ISO 19115-2:2019.</div>
++     *
       * @param  newValue  the new detected polarization.
       */
 -    public void setDetectedPolarisation(final PolarisationOrientation newValue) {
 -        checkWritePermission(detectedPolarisation);
 -        detectedPolarisation = newValue;
 +    public void setDetectedPolarization(final PolarizationOrientation newValue) {
 +        checkWritePermission(detectedPolarization);
 +        detectedPolarization = newValue;
      }
  }
diff --cc core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/package-info.java
index df35f3a,c3976f7..4c354e7
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/package-info.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/package-info.java
@@@ -44,7 -44,7 +44,7 @@@
   * {@code  ├─} {@linkplain org.opengis.metadata.content.BandDefinition          Band
definition}<br>
   * {@code  ├─} {@linkplain org.opengis.metadata.content.CoverageContentType     Coverage
content type}<br>
   * {@code  ├─} {@linkplain org.opengis.metadata.content.ImagingCondition        Imaging
condition}<br>
-  * {@code  ├─} {@linkplain org.opengis.metadata.content.PolarizationOrientation Polarization
orientation}<br>
 - * {@code  ├─} {@linkplain org.opengis.metadata.content.PolarisationOrientation Polarisation
orientation}<br>
++ * {@code  ├─} {@linkplain org.opengis.metadata.content.PolarizationOrientation Polarisation
orientation}<br>
   * {@code  └─} {@linkplain org.opengis.metadata.content.TransferFunctionType    Transfer
function type}<br>
   * </td><td class="sep" style="width: 50%; white-space: nowrap">
   *                 {@linkplain org.apache.sis.metadata.iso.content.AbstractContentInformation
        Content information} «abstract»<br>
@@@ -57,7 -57,7 +57,7 @@@
   * {@code  └─}     {@linkplain org.apache.sis.metadata.iso.content.DefaultRangeElementDescription
    Range element description}<br>
   *                 {@linkplain org.apache.sis.metadata.iso.content.DefaultBand         
              Band}<br>
   * {@code  ├─}     {@linkplain org.opengis.metadata.content.BandDefinition        
                   Band definition} «code list»<br>
-  * {@code  ├─}     {@linkplain org.opengis.metadata.content.PolarizationOrientation
                  Polarization orientation} «code list»<br>
 - * {@code  ├─}     {@linkplain org.opengis.metadata.content.PolarisationOrientation
                  Polarisation orientation} «code list»<br>
++ * {@code  ├─}     {@linkplain org.opengis.metadata.content.PolarizationOrientation
                  Polarisation orientation} «code list»<br>
   * {@code  └─}     {@linkplain org.opengis.metadata.content.TransferFunctionType  
                   Transfer function type} «code list»<br>
   *                 {@linkplain org.apache.sis.metadata.iso.content.DefaultImageDescription
           Image description}<br>
   * {@code  └─}     {@linkplain org.opengis.metadata.content.ImagingCondition      
                   Imaging condition} «code list»<br>


Mime
View raw message