You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2019/05/01 15:51:34 UTC
[sis] branch geoapi-4.0 updated (fceec82 -> bf56b15)
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a change to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git.
from fceec82 Fix missing "s" in "getOrderOptionsType()" for ISO 19115 compliance. https://github.com/opengeospatial/geoapi/issues/21
new 59b5551 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
new 2492289 Rename "polarization" as "polarisation" in two method names for compliance with latest ISO 19115 revision. https://github.com/opengeospatial/geoapi/issues/15
new d6b8565 Renamed PolarizationOrientation as PolarisationOrientation for compliance with latest ISO 19115-2 revision. Part of https://github.com/opengeospatial/geoapi/issues/23
new bf56b15 Renamed getCenterPoint() as getCentrePoint() for compliance with ISO 19115:2014.
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/sis/internal/book/GEOAPI.lst | 2 +-
.../resources/org/apache/sis/internal/book/OGC.lst | 2 +-
...de.java => MI_PolarisationOrientationCode.java} | 20 ++++++------
.../org/apache/sis/internal/jaxb/gmi/MI_Band.java | 4 +--
.../metadata/iso/acquisition/DefaultObjective.java | 32 +++++++++----------
.../sis/metadata/iso/content/DefaultBand.java | 36 +++++++++++-----------
.../sis/metadata/iso/content/package-info.java | 6 ++--
.../metadata/iso/spatial/DefaultGeorectified.java | 18 +++++------
.../apache/sis/metadata/iso/AllMetadataTest.java | 2 +-
.../sis/test/xml/AnnotationConsistencyCheck.java | 16 ----------
10 files changed, 61 insertions(+), 77 deletions(-)
rename core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/{MI_PolarizationOrientationCode.java => MI_PolarisationOrientationCode.java} (79%)
[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
Posted by de...@apache.org.
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 <ma...@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);
}
/**
[sis] 02/04: Rename "polarization" as "polarisation" in two method
names for compliance with latest ISO 19115 revision.
https://github.com/opengeospatial/geoapi/issues/15
Posted by de...@apache.org.
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 2492289d6bf3a732d7e09fe3cf3456ba612bf7b4
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Wed May 1 15:46:59 2019 +0200
Rename "polarization" as "polarisation" in two method names for compliance with latest ISO 19115 revision.
https://github.com/opengeospatial/geoapi/issues/15
---
.../org/apache/sis/internal/jaxb/gmi/MI_Band.java | 4 +--
.../sis/metadata/iso/content/DefaultBand.java | 34 +++++++++++-----------
.../sis/test/xml/AnnotationConsistencyCheck.java | 12 --------
3 files changed, 19 insertions(+), 31 deletions(-)
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_Band.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_Band.java
index ddbb6b2..233cc5c 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_Band.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_Band.java
@@ -69,8 +69,8 @@ public class MI_Band extends DefaultBand {
if (original.getBandBoundaryDefinition() != null ||
original.getNominalSpatialResolution() != null ||
original.getTransferFunctionType() != null ||
- original.getTransmittedPolarization() != null ||
- original.getDetectedPolarization() != null)
+ original.getTransmittedPolarisation() != null ||
+ original.getDetectedPolarisation() != null)
{
return new MI_Band(original);
}
diff --git 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
index cf1d470..097160d 100644
--- 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
@@ -69,8 +69,8 @@ import static org.apache.sis.internal.metadata.MetadataUtilities.ensurePositive;
"bandBoundaryDefinition",
"nominalSpatialResolution",
"transferFunctionType",
- "transmittedPolarization",
- "detectedPolarization"
+ "transmittedPolarisation",
+ "detectedPolarisation"
})
@XmlRootElement(name = "MD_Band")
@XmlSeeAlso(org.apache.sis.internal.jaxb.gmi.MI_Band.class)
@@ -78,7 +78,7 @@ public class DefaultBand extends DefaultSampleDimension implements Band {
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = -2474871120376144737L;
+ private static final long serialVersionUID = 2492553738885938445L;
/**
* Shortest wavelength that the sensor is capable of collecting within a designated band.
@@ -113,12 +113,12 @@ public class DefaultBand extends DefaultSampleDimension implements Band {
/**
* Polarization of the radiation transmitted.
*/
- private PolarizationOrientation transmittedPolarization;
+ private PolarizationOrientation transmittedPolarisation;
/**
* Polarization of the radiation detected.
*/
- private PolarizationOrientation detectedPolarization;
+ private PolarizationOrientation detectedPolarisation;
/**
* Constructs an initially empty band.
@@ -151,8 +151,8 @@ public class DefaultBand extends DefaultSampleDimension implements Band {
peakResponse = object.getPeakResponse();
toneGradation = object.getToneGradation();
bandBoundaryDefinition = object.getBandBoundaryDefinition();
- transmittedPolarization = object.getTransmittedPolarization();
- detectedPolarization = object.getDetectedPolarization();
+ transmittedPolarisation = object.getTransmittedPolarisation();
+ detectedPolarisation = object.getDetectedPolarisation();
}
}
@@ -391,8 +391,8 @@ public class DefaultBand extends DefaultSampleDimension implements Band {
*/
@Override
@XmlElement(name = "transmittedPolarisation")
- public PolarizationOrientation getTransmittedPolarization() {
- return transmittedPolarization;
+ public PolarizationOrientation getTransmittedPolarisation() {
+ return transmittedPolarisation;
}
/**
@@ -400,9 +400,9 @@ public class DefaultBand extends DefaultSampleDimension implements Band {
*
* @param newValue the new transmitted polarization.
*/
- public void setTransmittedPolarization(final PolarizationOrientation newValue) {
- checkWritePermission(transmittedPolarization);
- transmittedPolarization = newValue;
+ public void setTransmittedPolarisation(final PolarizationOrientation newValue) {
+ checkWritePermission(transmittedPolarisation);
+ transmittedPolarisation = newValue;
}
/**
@@ -412,8 +412,8 @@ public class DefaultBand extends DefaultSampleDimension implements Band {
*/
@Override
@XmlElement(name = "detectedPolarisation")
- public PolarizationOrientation getDetectedPolarization() {
- return detectedPolarization;
+ public PolarizationOrientation getDetectedPolarisation() {
+ return detectedPolarisation;
}
/**
@@ -421,8 +421,8 @@ public class DefaultBand extends DefaultSampleDimension implements Band {
*
* @param newValue the new detected polarization.
*/
- public void setDetectedPolarization(final PolarizationOrientation newValue) {
- checkWritePermission(detectedPolarization);
- detectedPolarization = newValue;
+ public void setDetectedPolarisation(final PolarizationOrientation newValue) {
+ checkWritePermission(detectedPolarisation);
+ detectedPolarisation = newValue;
}
}
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/test/xml/AnnotationConsistencyCheck.java b/core/sis-metadata/src/test/java/org/apache/sis/test/xml/AnnotationConsistencyCheck.java
index c659824..f6af7fe 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/test/xml/AnnotationConsistencyCheck.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/test/xml/AnnotationConsistencyCheck.java
@@ -417,18 +417,6 @@ public abstract strictfp class AnnotationConsistencyCheck extends TestCase {
}
break;
}
- case "detectedPolarization": {
- if (org.opengis.metadata.content.Band.class.isAssignableFrom(enclosing)) {
- name = "detectedPolarisation"; // Spelling change in XSD files
- }
- break;
- }
- case "transmittedPolarization": {
- if (org.opengis.metadata.content.Band.class.isAssignableFrom(enclosing)) {
- name = "transmittedPolarisation"; // Spelling change in XSD files
- }
- break;
- }
case "featureType": {
if (org.opengis.metadata.distribution.DataFile.class.isAssignableFrom(enclosing)) {
name = "featureTypes"; // Spelling change in XSD files
[sis] 04/04: Renamed getCenterPoint() as getCentrePoint() for
compliance with ISO 19115:2014.
Posted by de...@apache.org.
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 bf56b151418d710da5562e2c387f26ebccd673ce
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Wed May 1 17:51:11 2019 +0200
Renamed getCenterPoint() as getCentrePoint() for compliance with ISO 19115:2014.
---
.../sis/metadata/iso/spatial/DefaultGeorectified.java | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git 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
index e1ceea0..214b9c1 100644
--- 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
@@ -75,7 +75,7 @@ import org.apache.sis.util.resources.Messages;
"checkPointAvailable",
"checkPointDescription",
"cornerPoints",
- "centerPoint",
+ "centrePoint",
"pointInPixel",
"transformationDimensionDescription",
"transformationDimensionMapping",
@@ -87,7 +87,7 @@ public class DefaultGeorectified extends DefaultGridSpatialRepresentation implem
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = -2924562334097446037L;
+ private static final long serialVersionUID = 6234748157247202686L;
/**
* Mask for the {@code checkPointAvailable} boolean value.
@@ -115,7 +115,7 @@ public class DefaultGeorectified extends DefaultGridSpatialRepresentation implem
* and the grid coordinate of the cell halfway between opposite ends of the grid in the
* spatial dimensions.
*/
- private Point centerPoint;
+ private Point centrePoint;
/**
* Point in a pixel corresponding to the Earth location of the pixel.
@@ -157,7 +157,7 @@ public class DefaultGeorectified extends DefaultGridSpatialRepresentation implem
if (object != null) {
checkPointDescription = object.getCheckPointDescription();
cornerPoints = copyList(object.getCornerPoints(), Point.class);
- centerPoint = object.getCenterPoint();
+ centrePoint = object.getCentrePoint();
pointInPixel = object.getPointInPixel();
transformationDimensionDescription = object.getTransformationDimensionDescription();
transformationDimensionMapping = copyCollection(object.getTransformationDimensionMapping(), InternationalString.class);
@@ -298,8 +298,8 @@ public class DefaultGeorectified extends DefaultGridSpatialRepresentation implem
*/
@Override
@XmlElement(name = "centrePoint")
- public Point getCenterPoint() {
- return centerPoint;
+ public Point getCentrePoint() {
+ return centrePoint;
}
/**
@@ -307,9 +307,9 @@ public class DefaultGeorectified extends DefaultGridSpatialRepresentation implem
*
* @param newValue the new center point.
*/
- public void setCenterPoint(final Point newValue) {
- checkWritePermission(centerPoint);
- centerPoint = newValue;
+ public void setCentrePoint(final Point newValue) {
+ checkWritePermission(centrePoint);
+ centrePoint = newValue;
}
/**
[sis] 03/04: Renamed PolarizationOrientation as
PolarisationOrientation for compliance with latest ISO 19115-2 revision.
Part of https://github.com/opengeospatial/geoapi/issues/23
Posted by de...@apache.org.
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 d6b85653cde368474ddee69695eeb959bb72fd4b
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Wed May 1 16:16:33 2019 +0200
Renamed PolarizationOrientation as PolarisationOrientation for compliance with latest ISO 19115-2 revision.
Part of https://github.com/opengeospatial/geoapi/issues/23
---
.../org/apache/sis/internal/book/GEOAPI.lst | 2 +-
.../resources/org/apache/sis/internal/book/OGC.lst | 2 +-
...Code.java => MI_PolarisationOrientationCode.java} | 20 ++++++++++----------
.../apache/sis/metadata/iso/content/DefaultBand.java | 14 +++++++-------
.../sis/metadata/iso/content/package-info.java | 6 +++---
.../org/apache/sis/metadata/iso/AllMetadataTest.java | 2 +-
.../sis/test/xml/AnnotationConsistencyCheck.java | 4 ----
7 files changed, 23 insertions(+), 27 deletions(-)
diff --git a/core/sis-build-helper/src/main/resources/org/apache/sis/internal/book/GEOAPI.lst b/core/sis-build-helper/src/main/resources/org/apache/sis/internal/book/GEOAPI.lst
index 822f604..1959531 100644
--- a/core/sis-build-helper/src/main/resources/org/apache/sis/internal/book/GEOAPI.lst
+++ b/core/sis-build-helper/src/main/resources/org/apache/sis/internal/book/GEOAPI.lst
@@ -155,7 +155,7 @@ Platform
PlatformPass
Point
PolarCS
-PolarizationOrientation
+PolarisationOrientation
PortrayalCatalogueReference
Position
PositionalAccuracy
diff --git a/core/sis-build-helper/src/main/resources/org/apache/sis/internal/book/OGC.lst b/core/sis-build-helper/src/main/resources/org/apache/sis/internal/book/OGC.lst
index 62bfaea..9aec1eb 100644
--- a/core/sis-build-helper/src/main/resources/org/apache/sis/internal/book/OGC.lst
+++ b/core/sis-build-helper/src/main/resources/org/apache/sis/internal/book/OGC.lst
@@ -200,7 +200,7 @@ MI_OperationTypeCode
MI_Plan
MI_Platform
MI_PlatformPass
-MI_PolarizationOrientationCode
+MI_PolarisationOrientationCode
MI_PriorityCode
MI_RangeElementDescription
MI_RequestedDate
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PolarizationOrientationCode.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PolarisationOrientationCode.java
similarity index 79%
rename from core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PolarizationOrientationCode.java
rename to core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PolarisationOrientationCode.java
index 843926e..8a2f8a0 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PolarizationOrientationCode.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PolarisationOrientationCode.java
@@ -17,14 +17,14 @@
package org.apache.sis.internal.jaxb.code;
import javax.xml.bind.annotation.XmlElement;
-import org.opengis.metadata.content.PolarizationOrientation;
+import org.opengis.metadata.content.PolarisationOrientation;
import org.apache.sis.internal.jaxb.cat.CodeListAdapter;
import org.apache.sis.internal.jaxb.cat.CodeListUID;
import org.apache.sis.xml.Namespaces;
/**
- * JAXB adapter for {@link PolarizationOrientation}
+ * JAXB adapter for {@link PolarisationOrientation}
* in order to wrap the value in an XML element as specified by ISO 19115-3 standard.
* See package documentation for more information about the handling of {@code CodeList} in ISO 19115-3.
*
@@ -37,19 +37,19 @@ 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>
{
/**
* Empty constructor for JAXB only.
*/
- public MI_PolarizationOrientationCode() {
+ public MI_PolarisationOrientationCode() {
}
/**
* Creates a new adapter for the given value.
*/
- private MI_PolarizationOrientationCode(final CodeListUID value) {
+ private MI_PolarisationOrientationCode(final CodeListUID value) {
super(value);
}
@@ -59,8 +59,8 @@ public final class MI_PolarizationOrientationCode
* @return the wrapper for the code list value.
*/
@Override
- protected MI_PolarizationOrientationCode wrap(final CodeListUID value) {
- return new MI_PolarizationOrientationCode(value);
+ protected MI_PolarisationOrientationCode wrap(final CodeListUID value) {
+ return new MI_PolarisationOrientationCode(value);
}
/**
@@ -69,8 +69,8 @@ public final class MI_PolarizationOrientationCode
* @return the code list class.
*/
@Override
- protected Class<PolarizationOrientation> getCodeListClass() {
- return PolarizationOrientation.class;
+ protected Class<PolarisationOrientation> getCodeListClass() {
+ return PolarisationOrientation.class;
}
/**
diff --git 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
index 097160d..fa1c342 100644
--- 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
@@ -25,7 +25,7 @@ import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.opengis.metadata.content.Band;
import org.opengis.metadata.content.BandDefinition;
-import org.opengis.metadata.content.PolarizationOrientation;
+import org.opengis.metadata.content.PolarisationOrientation;
import org.opengis.metadata.content.TransferFunctionType;
import org.apache.sis.measure.ValueRange;
import org.apache.sis.internal.jaxb.gco.GO_Real;
@@ -113,12 +113,12 @@ public class DefaultBand extends DefaultSampleDimension implements Band {
/**
* Polarization of the radiation transmitted.
*/
- private PolarizationOrientation transmittedPolarisation;
+ private PolarisationOrientation transmittedPolarisation;
/**
* Polarization of the radiation detected.
*/
- private PolarizationOrientation detectedPolarisation;
+ private PolarisationOrientation detectedPolarisation;
/**
* Constructs an initially empty band.
@@ -391,7 +391,7 @@ public class DefaultBand extends DefaultSampleDimension implements Band {
*/
@Override
@XmlElement(name = "transmittedPolarisation")
- public PolarizationOrientation getTransmittedPolarisation() {
+ public PolarisationOrientation getTransmittedPolarisation() {
return transmittedPolarisation;
}
@@ -400,7 +400,7 @@ public class DefaultBand extends DefaultSampleDimension implements Band {
*
* @param newValue the new transmitted polarization.
*/
- public void setTransmittedPolarisation(final PolarizationOrientation newValue) {
+ public void setTransmittedPolarisation(final PolarisationOrientation newValue) {
checkWritePermission(transmittedPolarisation);
transmittedPolarisation = newValue;
}
@@ -412,7 +412,7 @@ public class DefaultBand extends DefaultSampleDimension implements Band {
*/
@Override
@XmlElement(name = "detectedPolarisation")
- public PolarizationOrientation getDetectedPolarisation() {
+ public PolarisationOrientation getDetectedPolarisation() {
return detectedPolarisation;
}
@@ -421,7 +421,7 @@ public class DefaultBand extends DefaultSampleDimension implements Band {
*
* @param newValue the new detected polarization.
*/
- public void setDetectedPolarisation(final PolarizationOrientation newValue) {
+ public void setDetectedPolarisation(final PolarisationOrientation newValue) {
checkWritePermission(detectedPolarisation);
detectedPolarisation = newValue;
}
diff --git 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
index df35f3a..c3976f7 100644
--- 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 @@
* {@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.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 @@
* {@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.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>
@@ -109,7 +109,7 @@
@XmlJavaTypeAdapter(MD_ImagingConditionCode.class),
@XmlJavaTypeAdapter(MD_RangeDimension.class),
@XmlJavaTypeAdapter(MI_BandDefinition.class),
- @XmlJavaTypeAdapter(MI_PolarizationOrientationCode.class),
+ @XmlJavaTypeAdapter(MI_PolarisationOrientationCode.class),
@XmlJavaTypeAdapter(MI_RangeElementDescription.class),
@XmlJavaTypeAdapter(MI_TransferFunctionTypeCode.class),
@XmlJavaTypeAdapter(PT_Locale.class),
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java
index 464cdf2a..743974b 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java
@@ -106,7 +106,7 @@ public final strictfp class AllMetadataTest extends PropertyConsistencyCheck {
org.opengis.metadata.content.FeatureCatalogueDescription.class,
org.opengis.metadata.content.ImageDescription.class,
org.opengis.metadata.content.ImagingCondition.class,
- org.opengis.metadata.content.PolarizationOrientation.class,
+ org.opengis.metadata.content.PolarisationOrientation.class,
org.opengis.metadata.content.RangeDimension.class,
org.opengis.metadata.content.RangeElementDescription.class,
org.opengis.metadata.content.SampleDimension.class,
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/test/xml/AnnotationConsistencyCheck.java b/core/sis-metadata/src/test/java/org/apache/sis/test/xml/AnnotationConsistencyCheck.java
index f6af7fe..06f4e56 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/test/xml/AnnotationConsistencyCheck.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/test/xml/AnnotationConsistencyCheck.java
@@ -372,10 +372,6 @@ public abstract strictfp class AnnotationConsistencyCheck extends TestCase {
*/
protected String getExpectedXmlRootElementName(final Stereotype stereotype, final UML uml) {
String name = uml.identifier();
- switch (name) {
- // This case can be removed if https://issues.apache.org/jira/browse/SIS-398 is fixed.
- case "MI_PolarizationOrientationCode": name = "MI_PolarisationOrientationCode"; break;
- }
if (Stereotype.ABSTRACT.equals(stereotype)) {
name = "Abstract".concat(name);
}