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 e9dd6d16215873d50af47778946f5944219cb80e Merge: 06e105fa45 268170a330 Author: Martin Desruisseaux <[email protected]> AuthorDate: Fri Jun 7 13:13:36 2024 +0200 Post-merge import reorganization on the geoapi-3.1 branch. .../main/org/apache/sis/coverage/CoverageCombiner.java | 2 +- .../main/org/apache/sis/coverage/RegionOfInterest.java | 2 +- .../main/org/apache/sis/coverage/grid/PixelInCell.java | 4 +++- .../main/org/apache/sis/coverage/privy/CommonDomainFinder.java | 2 +- .../main/org/apache/sis/coverage/privy/MultiSourceArgument.java | 2 +- .../main/org/apache/sis/metadata/internal/CitationConstant.java | 2 +- .../test/org/apache/sis/metadata/PropertyAccessorTest.java | 2 +- .../test/org/apache/sis/metadata/TypeMapTest.java | 2 +- .../apache/sis/metadata/iso/citation/DefaultCitationDateTest.java | 8 ++++---- .../test/org/apache/sis/util/iso/TypesTest.java | 2 +- .../apache/sis/map/coverage/MultiResolutionCoverageLoader.java | 2 +- .../main/org/apache/sis/map/coverage/RenderingData.java | 2 +- .../main/org/apache/sis/portrayal/Canvas.java | 2 +- .../main/org/apache/sis/portrayal/CanvasExtent.java | 2 +- .../sis/map/coverage/MultiResolutionCoverageLoaderTest.java | 2 +- .../sis/referencing/gazetteer/ReferencingByIdentifiers.java | 2 +- .../main/org/apache/sis/referencing/crs/AbstractCRS.java | 2 +- .../main/org/apache/sis/referencing/datum/DefaultImageDatum.java | 2 +- .../org/apache/sis/referencing/factory/GeodeticObjectFactory.java | 4 +++- .../test/org/apache/sis/io/wkt/GeodeticObjectParserTest.java | 6 +++--- .../test/org/apache/sis/referencing/CommonCRSTest.java | 6 ++++-- .../test/org/apache/sis/referencing/crs/DefaultImageCRSTest.java | 4 +++- .../test/org/apache/sis/referencing/crs/HardCodedCRS.java | 4 +++- .../test/org/apache/sis/referencing/datum/HardCodedDatum.java | 4 +++- .../main/org/apache/sis/storage/geotiff/MultiResolutionImage.java | 2 +- .../apache/sis/storage/geotiff/reader/GridGeometryBuilder.java | 2 +- .../main/org/apache/sis/storage/geotiff/writer/GeoEncoder.java | 2 +- .../main/org/apache/sis/storage/netcdf/base/Grid.java | 2 +- .../main/org/apache/sis/storage/netcdf/base/GridAdjustment.java | 2 +- .../main/org/apache/sis/storage/netcdf/base/GridMapping.java | 2 +- .../org/apache/sis/storage/netcdf/classic/ChannelDecoder.java | 2 +- .../test/org/apache/sis/storage/netcdf/base/TestCase.java | 2 +- .../main/org/apache/sis/storage/aggregate/CoverageAggregator.java | 2 +- .../main/org/apache/sis/storage/aggregate/DimensionAppender.java | 2 +- .../main/org/apache/sis/storage/aggregate/GridSlice.java | 2 +- .../main/org/apache/sis/storage/base/MemoryGridResource.java | 2 +- .../main/org/apache/sis/storage/esri/AsciiGridStore.java | 2 +- .../main/org/apache/sis/storage/esri/RawRasterStore.java | 2 +- .../main/org/apache/sis/storage/esri/WritableStore.java | 2 +- .../main/org/apache/sis/storage/tiling/TileMatrix.java | 2 +- .../sis/storage/aggregate/BandAggregateGridResourceTest.java | 2 +- .../test/org/apache/sis/storage/base/MemoryGridResourceTest.java | 2 +- .../main/org/apache/sis/map/SEPortrayer.java | 2 +- .../main/org/apache/sis/map/service/se1/LineToScene2D.java | 2 +- .../org/apache/sis/storage/coveragejson/CoverageResource.java | 2 +- .../main/org/apache/sis/gui/coverage/CoverageCanvas.java | 2 +- .../main/org/apache/sis/gui/coverage/GridSliceSelector.java | 2 +- .../main/org/apache/sis/gui/coverage/StyledRenderingData.java | 2 +- .../org.apache.sis.gui/main/org/apache/sis/gui/map/MapCanvas.java | 2 +- .../main/org/apache/sis/gui/map/OperationFinder.java | 2 +- .../org.apache.sis.gui/main/org/apache/sis/gui/map/StatusBar.java | 2 +- .../org/apache/sis/gui/referencing/RecentReferenceSystems.java | 2 +- 52 files changed, 70 insertions(+), 58 deletions(-) diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/CitationConstant.java index 4be6930510,b603e2f9bb..8d2cd14af2 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/CitationConstant.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/CitationConstant.java @@@ -35,9 -34,6 +34,10 @@@ import org.apache.sis.system.Loggers import org.apache.sis.util.privy.Strings; import org.apache.sis.util.logging.Logging; +// Specific to the main and geoapi-3.1 branches: ++import java.util.Date; +import org.opengis.metadata.citation.ResponsibleParty; + // Specific to the geoapi-3.1 and geoapi-4.0 branches: import org.opengis.metadata.citation.OnlineResource; import org.opengis.metadata.identification.BrowseGraphic; diff --cc endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyAccessorTest.java index 229c4a6666,100e3278a7..283869d138 --- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyAccessorTest.java +++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyAccessorTest.java @@@ -63,10 -62,6 +62,11 @@@ import org.apache.sis.metadata.iso.cita import static org.apache.sis.test.TestUtilities.getSingleton; import static org.apache.sis.metadata.Assertions.assertTitleEquals; +// Specific to the main and geoapi-3.1 branches: ++import java.util.Date; +import org.opengis.metadata.citation.ResponsibleParty; +import org.opengis.referencing.ReferenceIdentifier; + // Specific to the geoapi-3.1 and geoapi-4.0 branches: import org.opengis.metadata.content.AttributeGroup; import org.opengis.referencing.ObjectDomain; diff --cc endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/TypeMapTest.java index 9b5f510358,c2caea2066..aee434e9c6 --- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/TypeMapTest.java +++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/TypeMapTest.java @@@ -39,8 -38,9 +38,9 @@@ import org.junit.jupiter.api.Test import static org.junit.jupiter.api.Assertions.*; import org.apache.sis.test.TestCase; -// Specific to the geoapi-4.0 branch: -import java.time.temporal.Temporal; -import org.opengis.metadata.citation.Responsibility; +// Specific to the main and geoapi-3.1 branches: ++import java.util.Date; +import org.opengis.metadata.citation.ResponsibleParty; /** diff --cc endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/portrayal/Canvas.java index 4511f97de2,d174280828..675e1512dd --- a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/portrayal/Canvas.java +++ b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/portrayal/Canvas.java @@@ -55,10 -54,8 +54,11 @@@ import org.apache.sis.util.privy.Double import org.apache.sis.coverage.grid.IncompleteGridGeometryException; import org.apache.sis.coverage.grid.GridGeometry; import org.apache.sis.coverage.grid.GridExtent; + import org.apache.sis.coverage.grid.PixelInCell; +// Specific to the main and geoapi-3.1 branches: +import org.apache.sis.geometry.MismatchedReferenceSystemException; + // Specific to the geoapi-3.1 and geoapi-4.0 branches: import org.opengis.coordinate.MismatchedDimensionException; import org.opengis.coverage.CannotEvaluateException; diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractCRS.java index 2e03edc7db,19e3593b72..fa32041ea3 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractCRS.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractCRS.java @@@ -42,10 -42,6 +42,10 @@@ import org.apache.sis.util.Utilities import org.apache.sis.util.ComparisonMode; import org.apache.sis.util.resources.Errors; +// Specific to the main and geoapi-3.1 branches: - import org.opengis.geometry.MismatchedDimensionException; +import org.opengis.referencing.crs.GeneralDerivedCRS; ++import org.opengis.geometry.MismatchedDimensionException; + // Specific to the geoapi-3.1 and geoapi-4.0 branches: import org.opengis.metadata.Identifier; diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultImageDatum.java index 958903d8d5,5dab8d4ed2..dd64749bc5 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultImageDatum.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultImageDatum.java @@@ -30,9 -29,6 +29,10 @@@ import org.apache.sis.io.wkt.Formatter import org.apache.sis.io.wkt.Convention; import org.apache.sis.util.ComparisonMode; +// Specific to the main and geoapi-3.1 branches: ++import org.opengis.referencing.datum.PixelInCell; +import org.opengis.referencing.datum.ImageDatum; + // Specific to the geoapi-3.1 and geoapi-4.0 branches: import org.opengis.metadata.Identifier; diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/GeodeticObjectParserTest.java index 6356d054c5,4610b54611..1010d8ac43 --- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/GeodeticObjectParserTest.java +++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/GeodeticObjectParserTest.java @@@ -58,6 -55,6 +55,9 @@@ import static org.apache.sis.referencin import static org.apache.sis.referencing.Assertions.assertDiagonalEquals; import static org.apache.sis.test.TestUtilities.getSingleton; ++// Specific to the main and geoapi-3.1 branches: ++import org.apache.sis.util.privy.TemporalDate; ++ /** * Tests {@link GeodeticObjectParser}. diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/CommonCRSTest.java index d2a66ce416,028a9d1cb7..1bd6f16f54 --- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/CommonCRSTest.java +++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/CommonCRSTest.java @@@ -49,8 -50,7 +50,10 @@@ import org.apache.sis.test.TestCase import static org.apache.sis.test.Assertions.assertEqualsIgnoreMetadata; import static org.apache.sis.test.Assertions.assertMessageContains; import static org.apache.sis.test.TestUtilities.*; - import static org.apache.sis.util.privy.Constants.UTC; + ++// Specific to the main and geoapi-3.1 branches: ++import org.apache.sis.util.privy.TemporalDate; + // Specific to the geoapi-3.1 and geoapi-4.0 branches: import org.opengis.referencing.datum.RealizationMethod; import static org.opengis.test.Assertions.assertAxisDirectionsEqual; diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultImageCRSTest.java index a1cbedb837,ec4649df72..6bf4332864 --- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultImageCRSTest.java +++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultImageCRSTest.java @@@ -37,6 -36,6 +36,9 @@@ import org.apache.sis.referencing.cs.Ha import static org.apache.sis.metadata.Assertions.assertXmlEquals; import static org.apache.sis.referencing.Assertions.assertWktEquals; ++// Specific to the main and geoapi-3.1 branches: ++import org.opengis.referencing.datum.PixelInCell; ++ // Specific to the geoapi-3.1 and geoapi-4.0 branches: import static org.opengis.test.Assertions.assertAxisDirectionsEqual; diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/HardCodedCRS.java index 3a7a54c66a,6f5d81257b..d00fde65f9 --- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/HardCodedCRS.java +++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/HardCodedCRS.java @@@ -30,6 -29,6 +29,9 @@@ import org.apache.sis.referencing.cs.Ha import org.apache.sis.referencing.datum.HardCodedDatum; import org.apache.sis.metadata.iso.citation.HardCodedCitations; ++// Specific to the main and geoapi-3.1 branches: ++import org.opengis.referencing.datum.PixelInCell; ++ // Specific to the geoapi-3.1 and geoapi-4.0 branches: import static org.opengis.referencing.ObjectDomain.DOMAIN_OF_VALIDITY_KEY; diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/HardCodedDatum.java index dedd0764fd,3edb04e959..182f209bbb --- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/HardCodedDatum.java +++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/HardCodedDatum.java @@@ -28,6 -27,6 +27,9 @@@ import static org.apache.sis.util.privy // Test dependencies import org.apache.sis.metadata.iso.citation.HardCodedCitations; ++// Specific to the main and geoapi-3.1 branches: ++import org.opengis.referencing.datum.PixelInCell; ++ // Specific to the geoapi-3.1 and geoapi-4.0 branches: import org.opengis.referencing.datum.RealizationMethod; import static org.opengis.referencing.IdentifiedObject.*;
