This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sis.git
commit 1181fecce02d609f2b388738f3deddaaf709cd69 Merge: 89daa3b 3ae456a Author: Martin Desruisseaux <[email protected]> AuthorDate: Thu May 9 12:35:37 2019 +0200 Merge branch 'geoapi-3.1'. .../sis/internal/jaxb/lan/LocaleAdapter.java | 2 +- .../sis/internal/jaxb/lan/LocaleAndCharset.java | 12 ++- .../apache/sis/internal/jaxb/lan/OtherLocales.java | 3 + .../apache/sis/internal/jaxb/lan/PT_Locale.java | 23 +++-- .../{ => legacy}/LegacyPropertyAdapter.java | 2 +- .../sis/internal/metadata/legacy/package-info.java | 9 +- .../iso/DefaultExtendedElementInformation.java | 2 +- .../apache/sis/metadata/iso/DefaultMetadata.java | 2 +- .../sis/metadata/iso/MetadataScopeAdapter.java | 2 +- .../sis/metadata/iso/citation/DefaultContact.java | 2 +- .../iso/citation/DefaultResponsibleParty.java | 2 +- .../metadata/iso/citation/LegacyTelephones.java | 2 +- .../iso/content/DefaultCoverageDescription.java | 2 +- .../DefaultFeatureCatalogueDescription.java | 2 +- .../DefaultDigitalTransferOptions.java | 2 +- .../metadata/iso/distribution/DefaultFormat.java | 2 +- .../metadata/iso/distribution/DefaultMedium.java | 2 +- .../iso/identification/AbstractIdentification.java | 2 +- .../identification/DefaultDataIdentification.java | 2 +- .../maintenance/DefaultMaintenanceInformation.java | 2 +- .../sis/metadata/iso/maintenance/DefaultScope.java | 2 +- .../java/org/apache/sis/image/DefaultIterator.java | 95 ++++++++++++------- .../java/org/apache/sis/image/LinearIterator.java | 89 ++++++++++++------ .../java/org/apache/sis/image/PixelIterator.java | 10 ++ .../org/apache/sis/image/DefaultIteratorTest.java | 89 +++++++++++++----- .../org/apache/sis/image/LinearIteratorTest.java | 25 +++-- .../org/apache/sis/internal/util/AbstractMap.java | 3 +- .../java/org/apache/sis/internal/util/Bag.java | 104 +++++++++++++++++++++ .../main/java/org/apache/sis/util/ArraysExt.java | 8 +- .../java/org/apache/sis/internal/util/BagTest.java | 80 ++++++++++++++++ .../apache/sis/test/suite/UtilityTestSuite.java | 1 + 31 files changed, 458 insertions(+), 127 deletions(-) diff --cc core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/MetadataScopeAdapter.java index c7f6e8c,4e498fa..38f99ed --- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/MetadataScopeAdapter.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/MetadataScopeAdapter.java @@@ -21,7 -21,8 +21,7 @@@ import java.util.List import java.util.Iterator; import java.util.Collection; import java.util.ConcurrentModificationException; - import org.apache.sis.internal.metadata.LegacyPropertyAdapter; -import org.opengis.metadata.MetadataScope; + import org.apache.sis.internal.metadata.legacy.LegacyPropertyAdapter; /** diff --cc core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultContact.java index bb0ff67,aaf1c89..ac19cf7 --- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultContact.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultContact.java @@@ -34,8 -35,7 +34,8 @@@ import org.apache.sis.internal.jaxb.Con import org.apache.sis.internal.jaxb.FilterByVersion; import org.apache.sis.internal.jaxb.gco.InternationalStringAdapter; import org.apache.sis.internal.metadata.Dependencies; - import org.apache.sis.internal.metadata.LegacyPropertyAdapter; +import org.apache.sis.internal.geoapi.evolution.UnsupportedCodeList; + import org.apache.sis.internal.metadata.legacy.LegacyPropertyAdapter; import org.apache.sis.internal.xml.LegacyNamespaces; import org.apache.sis.internal.util.CollectionsExt; diff --cc core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/LegacyTelephones.java index af34908,592a097..2a07bf7 --- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/LegacyTelephones.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/LegacyTelephones.java @@@ -18,9 -18,9 +18,9 @@@ package org.apache.sis.metadata.iso.cit import java.util.Collection; import java.util.Iterator; +import org.opengis.util.CodeList; import org.opengis.metadata.citation.Telephone; - import org.apache.sis.internal.metadata.LegacyPropertyAdapter; -import org.opengis.metadata.citation.TelephoneType; + import org.apache.sis.internal.metadata.legacy.LegacyPropertyAdapter; /** diff --cc core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureCatalogueDescription.java index 4aecef5,79e2382..709ecbb --- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureCatalogueDescription.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureCatalogueDescription.java @@@ -30,14 -31,9 +30,14 @@@ import org.apache.sis.internal.jaxb.Fil import org.apache.sis.internal.xml.LegacyNamespaces; import org.apache.sis.internal.jaxb.lan.PT_Locale; import org.apache.sis.internal.metadata.Dependencies; - import org.apache.sis.internal.metadata.LegacyPropertyAdapter; + import org.apache.sis.internal.metadata.legacy.LegacyPropertyAdapter; import org.apache.sis.internal.jaxb.lan.LocaleAndCharset; +// Branch-specific imports +import org.opengis.annotation.UML; +import static org.opengis.annotation.Obligation.OPTIONAL; +import static org.opengis.annotation.Obligation.CONDITIONAL; +import static org.opengis.annotation.Specification.ISO_19115; import static org.apache.sis.internal.metadata.MetadataUtilities.valueIfDefined; diff --cc core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/AbstractIdentification.java index ff8dc39,13481d5..018c09a --- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/AbstractIdentification.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/AbstractIdentification.java @@@ -42,9 -41,10 +42,9 @@@ import org.opengis.metadata.identificat import org.opengis.metadata.identification.ServiceIdentification; import org.opengis.metadata.maintenance.MaintenanceInformation; import org.opengis.metadata.spatial.SpatialRepresentationType; -import org.opengis.temporal.Duration; import org.opengis.util.InternationalString; import org.apache.sis.internal.metadata.Dependencies; - import org.apache.sis.internal.metadata.LegacyPropertyAdapter; + import org.apache.sis.internal.metadata.legacy.LegacyPropertyAdapter; import org.apache.sis.internal.jaxb.metadata.MD_Identifier; import org.apache.sis.internal.jaxb.FilterByVersion; import org.apache.sis.internal.xml.LegacyNamespaces; diff --cc core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultDataIdentification.java index 9a37a17,cbb8e54..919d663 --- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultDataIdentification.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultDataIdentification.java @@@ -33,16 -33,10 +33,16 @@@ import org.opengis.metadata.identificat import org.apache.sis.internal.jaxb.lan.LocaleAndCharset; import org.apache.sis.internal.jaxb.lan.OtherLocales; import org.apache.sis.internal.jaxb.lan.PT_Locale; - import org.apache.sis.internal.xml.LegacyNamespaces; import org.apache.sis.internal.jaxb.FilterByVersion; + import org.apache.sis.internal.xml.LegacyNamespaces; import org.apache.sis.internal.metadata.Dependencies; +// Branch-specific imports +import org.opengis.annotation.UML; +import static org.opengis.annotation.Obligation.CONDITIONAL; +import static org.opengis.annotation.Specification.ISO_19115; +import org.apache.sis.internal.jaxb.code.MD_CharacterSetCode; + /** * Information required to identify a dataset. diff --cc core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultScope.java index ef20f70,7aee4f8..df4a6a9 --- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultScope.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultScope.java @@@ -21,12 -21,9 +21,12 @@@ import javax.xml.bind.annotation.XmlTyp import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import org.opengis.metadata.extent.Extent; -import org.opengis.metadata.maintenance.Scope; +import org.opengis.metadata.quality.Scope; import org.opengis.metadata.maintenance.ScopeCode; import org.opengis.metadata.maintenance.ScopeDescription; +import org.apache.sis.internal.metadata.Dependencies; - import org.apache.sis.internal.metadata.LegacyPropertyAdapter; ++import org.apache.sis.internal.metadata.legacy.LegacyPropertyAdapter; +import org.apache.sis.internal.util.CollectionsExt; import org.apache.sis.metadata.iso.ISOMetadata; import org.apache.sis.xml.Namespaces; diff --cc core/sis-raster/src/main/java/org/apache/sis/image/DefaultIterator.java index ec6a986,5bf0dab..f873993 --- a/core/sis-raster/src/main/java/org/apache/sis/image/DefaultIterator.java +++ b/core/sis-raster/src/main/java/org/apache/sis/image/DefaultIterator.java @@@ -29,7 -29,9 +29,8 @@@ import java.nio.Buffer import java.nio.IntBuffer; import java.nio.FloatBuffer; import java.nio.DoubleBuffer; -import org.opengis.coverage.grid.SequenceType; import org.apache.sis.internal.raster.Resources; + import org.apache.sis.util.resources.Errors; import org.apache.sis.util.ArgumentChecks; diff --cc core/sis-raster/src/main/java/org/apache/sis/image/LinearIterator.java index 6be8974,6f2c699..ab6c190 --- a/core/sis-raster/src/main/java/org/apache/sis/image/LinearIterator.java +++ b/core/sis-raster/src/main/java/org/apache/sis/image/LinearIterator.java @@@ -22,6 -22,8 +22,7 @@@ import java.awt.image.Raster import java.awt.image.RenderedImage; import java.awt.image.WritableRaster; import java.awt.image.WritableRenderedImage; + import java.awt.image.RasterFormatException; -import org.opengis.coverage.grid.SequenceType; import org.apache.sis.internal.raster.Resources; diff --cc core/sis-raster/src/test/java/org/apache/sis/image/LinearIteratorTest.java index 728bd1c,99f9f93..5c2ed72 --- a/core/sis-raster/src/test/java/org/apache/sis/image/LinearIteratorTest.java +++ b/core/sis-raster/src/test/java/org/apache/sis/image/LinearIteratorTest.java @@@ -21,8 -21,7 +21,6 @@@ import java.awt.Rectangle import java.awt.image.DataBuffer; import java.awt.image.WritableRaster; import java.awt.image.WritableRenderedImage; - import org.junit.Ignore; - import org.junit.Test; -import org.opengis.coverage.grid.SequenceType; import static org.junit.Assert.*;
