This is an automated email from the ASF dual-hosted git repository. asf-gitbox-commits pushed a commit to branch geoapi-4.0 in repository https://gitbox.apache.org/repos/asf/sis.git
commit c1f0c188164a5697af799a23bb3f17c6633d931f Author: Martin Desruisseaux <[email protected]> AuthorDate: Tue Jun 23 17:45:58 2026 +0200 Post-merge automatic reorganization of imports order. --- .../main/org/apache/sis/coverage/grid/GridGeometry.java | 2 +- .../test/org/apache/sis/coverage/CategoryListTest.java | 2 +- .../test/org/apache/sis/coverage/grid/GridGeometryTest.java | 6 ++++-- .../test/org/apache/sis/image/OverviewImageTest.java | 6 +++--- .../main/org/apache/sis/metadata/iso/citation/DefaultTelephone.java | 2 +- .../org/apache/sis/metadata/iso/distribution/DefaultFormat.java | 2 +- .../org/apache/sis/metadata/iso/distribution/DefaultMedium.java | 2 +- .../org/apache/sis/referencing/gazetteer/AbstractLocationType.java | 2 +- .../apache/sis/referencing/gazetteer/ReferencingByIdentifiers.java | 2 +- .../main/org/apache/sis/coordinate/DefaultCoordinateMetadata.java | 4 ++-- .../main/org/apache/sis/parameter/DefaultParameterDescriptor.java | 2 +- .../main/org/apache/sis/referencing/DefaultObjectDomain.java | 2 +- .../main/org/apache/sis/referencing/crs/DefaultCompoundCRS.java | 2 +- .../main/org/apache/sis/referencing/crs/DefaultParametricCRS.java | 2 +- .../org/apache/sis/referencing/datum/DefaultParametricDatum.java | 2 +- .../org/apache/sis/referencing/operation/DefiningConversion.java | 2 +- .../main/org/apache/sis/storage/OptionKey.java | 2 +- .../main/org/apache/sis/storage/image/WorldFileStore.java | 2 +- .../main/org/apache/sis/storage/tiling/ImageTileMatrix.java | 4 +++- .../main/org/apache/sis/geometries/Capsule.java | 2 +- .../main/org/apache/sis/geometries/Cylinder.java | 2 +- .../main/org/apache/sis/geometries/Frustrum.java | 3 ++- .../main/org/apache/sis/geometries/OrientedGeometry.java | 2 +- .../main/org/apache/sis/geometries/Plane.java | 2 +- .../org.apache.sis.geometry/main/org/apache/sis/geometries/Ray.java | 4 ++-- .../sis/geometries/internal/shared/AbstractOrientedGeometry.java | 2 +- .../main/org/apache/sis/geometries/math/EasingMethod.java | 1 + .../main/org/apache/sis/geometries/scene/physics/Collider.java | 1 + .../org/apache/sis/geometries/scene/physics/ColliderGeometry.java | 1 + .../org/apache/sis/geometries/scene/physics/CollisionFilter.java | 3 ++- .../main/org/apache/sis/geometries/scene/physics/Joint.java | 1 + .../main/org/apache/sis/geometries/scene/physics/Motion.java | 1 + .../org/apache/sis/geometries/scene/physics/PhysicalMaterial.java | 3 ++- .../main/org/apache/sis/geometries/scene/physics/Trigger.java | 1 + .../test/org/apache/sis/geometries/math/EasingMethodTest.java | 2 ++ .../main/org/apache/sis/storage/geoheif/CoverageBuilder.java | 4 ++-- .../main/org/apache/sis/storage/geoheif/ImageModel.java | 2 +- .../main/org/apache/sis/storage/gsf/GSFStoreProvider.java | 2 +- .../main/org/apache/sis/storage/shapefile/ShapefileStore.java | 4 ++-- .../test/org/apache/sis/storage/shapefile/ShapefileStoreTest.java | 2 +- .../main/org/apache/sis/gui/dataset/PathAction.java | 2 +- .../main/org/apache/sis/gui/referencing/FilterByDatum.java | 2 +- 42 files changed, 57 insertions(+), 42 deletions(-) diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridGeometry.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridGeometry.java index 46f7035f68..4195bf8913 100644 --- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridGeometry.java +++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridGeometry.java @@ -39,6 +39,7 @@ import org.opengis.referencing.operation.TransformException; import org.opengis.referencing.operation.CoordinateOperation; import org.opengis.referencing.crs.CoordinateReferenceSystem; import org.opengis.referencing.crs.DerivedCRS; +import org.opengis.referencing.crs.EngineeringCRS; import org.opengis.referencing.cs.CoordinateSystem; import org.opengis.referencing.cs.CoordinateSystemAxis; import org.apache.sis.math.MathFunctions; @@ -95,7 +96,6 @@ import static org.apache.sis.referencing.CRS.SeparationMode; // Specific to the geoapi-3.1 and geoapi-4.0 branches: import org.opengis.coordinate.CoordinateMetadata; import org.opengis.coordinate.MismatchedDimensionException; -import org.opengis.referencing.crs.EngineeringCRS; /** diff --git a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/CategoryListTest.java b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/CategoryListTest.java index 70c9b865bb..aba05be06e 100644 --- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/CategoryListTest.java +++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/CategoryListTest.java @@ -26,6 +26,7 @@ import org.apache.sis.math.MathFunctions; import org.apache.sis.measure.NumberRange; import org.apache.sis.util.ComparisonMode; import org.apache.sis.util.Utilities; +import org.apache.sis.util.internal.shared.Numerics; // Test dependencies import org.junit.jupiter.api.Test; @@ -33,7 +34,6 @@ import static org.junit.jupiter.api.Assertions.*; import static org.apache.sis.test.Assertions.assertMessageContains; import org.apache.sis.test.TestUtilities; import org.apache.sis.test.TestCase; -import org.apache.sis.util.internal.shared.Numerics; /** diff --git a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridGeometryTest.java b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridGeometryTest.java index e981013b6a..028e0f15e0 100644 --- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridGeometryTest.java +++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridGeometryTest.java @@ -23,7 +23,6 @@ import org.opengis.geometry.Envelope; import org.opengis.metadata.Identifier; import org.opengis.metadata.spatial.DimensionNameType; import org.opengis.metadata.extent.GeographicBoundingBox; -import org.opengis.referencing.ObjectDomain; import org.opengis.referencing.cs.AxisDirection; import org.opengis.referencing.cs.CoordinateSystem; import org.opengis.referencing.crs.SingleCRS; @@ -51,7 +50,6 @@ import org.apache.sis.util.ComparisonMode; // Test dependencies import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; -import static org.opengis.test.Assertions.assertAxisDirectionsEqual; import org.apache.sis.test.TestCase; import org.apache.sis.referencing.crs.HardCodedCRS; import org.apache.sis.referencing.operation.HardCodedConversions; @@ -63,6 +61,10 @@ import static org.apache.sis.referencing.Assertions.assertEnvelopeEquals; import static org.apache.sis.feature.Assertions.assertGridToCenterEquals; import static org.apache.sis.feature.Assertions.assertGridToCornerEquals; +// Specific to the geoapi-3.1 and geoapi-4.0 branches: +import org.opengis.referencing.ObjectDomain; +import static org.opengis.test.Assertions.assertAxisDirectionsEqual; + /** * Tests the {@link GridGeometry} implementation. diff --git a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/OverviewImageTest.java b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/OverviewImageTest.java index e67639cbd0..6a925c18f4 100644 --- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/OverviewImageTest.java +++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/OverviewImageTest.java @@ -20,15 +20,15 @@ import java.awt.Point; import java.awt.image.RenderedImage; import java.util.Random; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.coverage.grid.SequenceType; - // Test dependencies import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; import org.apache.sis.test.TestCase; import org.apache.sis.test.TestUtilities; +// Specific to the geoapi-3.1 and geoapi-4.0 branches: +import org.opengis.coverage.grid.SequenceType; + /** * Tests {@link OverviewImage}. diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultTelephone.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultTelephone.java index fb1d58421e..25b5e4e952 100644 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultTelephone.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultTelephone.java @@ -25,12 +25,12 @@ import jakarta.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlRootElement; import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.opengis.metadata.citation.Telephone; +import org.apache.sis.metadata.TitleProperty; import org.apache.sis.metadata.iso.ISOMetadata; import org.apache.sis.xml.bind.FilterByVersion; import org.apache.sis.xml.internal.shared.LegacyNamespaces; import org.apache.sis.xml.bind.gco.StringAdapter; import org.apache.sis.xml.bind.metadata.code.CI_TelephoneTypeCode; -import org.apache.sis.metadata.TitleProperty; import org.apache.sis.metadata.internal.Dependencies; // Specific to the geoapi-3.1 and geoapi-4.0 branches: diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultFormat.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultFormat.java index 9b13f58861..adab33e990 100644 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultFormat.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultFormat.java @@ -27,6 +27,7 @@ import org.opengis.metadata.citation.Citation; import org.opengis.metadata.distribution.Format; import org.opengis.metadata.distribution.Medium; import org.opengis.metadata.distribution.Distributor; +import org.apache.sis.metadata.TitleProperty; import org.apache.sis.metadata.internal.Dependencies; import org.apache.sis.metadata.iso.ISOMetadata; import org.apache.sis.metadata.iso.legacy.LegacyPropertyAdapter; @@ -35,7 +36,6 @@ import org.apache.sis.xml.internal.shared.LegacyNamespaces; import org.apache.sis.xml.bind.metadata.MD_Medium; import org.apache.sis.xml.bind.metadata.CI_Citation; import org.apache.sis.util.collection.Containers; -import org.apache.sis.metadata.TitleProperty; import org.apache.sis.metadata.iso.citation.DefaultCitation; diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultMedium.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultMedium.java index 21701bbe7e..560e23321a 100644 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultMedium.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultMedium.java @@ -28,13 +28,13 @@ import org.opengis.metadata.citation.Citation; import org.opengis.metadata.distribution.Medium; import org.opengis.metadata.distribution.MediumFormat; import org.apache.sis.measure.ValueRange; +import org.apache.sis.metadata.TitleProperty; import org.apache.sis.metadata.iso.ISOMetadata; import org.apache.sis.xml.bind.FilterByVersion; import org.apache.sis.xml.bind.gco.GO_Real; import org.apache.sis.xml.bind.metadata.CI_Citation; import org.apache.sis.xml.bind.metadata.MD_Identifier; import org.apache.sis.xml.internal.shared.LegacyNamespaces; -import org.apache.sis.metadata.TitleProperty; import org.apache.sis.metadata.iso.legacy.LegacyPropertyAdapter; import org.apache.sis.metadata.internal.Dependencies; import org.apache.sis.util.collection.Containers; diff --git a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/AbstractLocationType.java b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/AbstractLocationType.java index 776462d476..99994045af 100644 --- a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/AbstractLocationType.java +++ b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/AbstractLocationType.java @@ -21,7 +21,6 @@ import java.util.Arrays; import java.util.Objects; import java.util.IdentityHashMap; import java.util.Map; -import java.lang.reflect.Type; import org.apache.sis.referencing.gazetteer.internal.Resources; import org.apache.sis.util.LenientComparable; import org.apache.sis.util.ComparisonMode; @@ -32,6 +31,7 @@ import org.apache.sis.util.collection.TableColumn; import org.apache.sis.util.collection.TreeTable; // Specific to the geoapi-3.1 and geoapi-4.0 branches: +import java.lang.reflect.Type; import org.opengis.referencing.gazetteer.LocationType; import org.opengis.referencing.gazetteer.ReferenceSystemUsingIdentifiers; diff --git a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/ReferencingByIdentifiers.java b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/ReferencingByIdentifiers.java index 440541fbba..97ef017ad5 100644 --- a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/ReferencingByIdentifiers.java +++ b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/ReferencingByIdentifiers.java @@ -21,7 +21,6 @@ import java.util.List; import java.util.Objects; import java.util.HashMap; import java.util.logging.Logger; -import java.lang.reflect.Type; import jakarta.xml.bind.annotation.XmlTransient; import javax.measure.Quantity; import javax.measure.IncommensurableException; @@ -47,6 +46,7 @@ import org.apache.sis.util.internal.shared.Constants; import org.apache.sis.util.resources.Vocabulary; // Specific to the geoapi-3.1 and geoapi-4.0 branches: +import java.lang.reflect.Type; import org.opengis.referencing.ObjectDomain; import org.opengis.metadata.citation.Party; import org.opengis.referencing.gazetteer.Location; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/coordinate/DefaultCoordinateMetadata.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/coordinate/DefaultCoordinateMetadata.java index 4a16dc4448..ab283c0990 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/coordinate/DefaultCoordinateMetadata.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/coordinate/DefaultCoordinateMetadata.java @@ -19,7 +19,6 @@ package org.apache.sis.coordinate; import java.util.Objects; import java.util.Optional; import java.io.Serializable; -import java.lang.reflect.Type; import java.time.temporal.Temporal; import org.opengis.referencing.crs.CoordinateReferenceSystem; import org.apache.sis.referencing.IdentifiedObjects; @@ -32,10 +31,11 @@ import org.apache.sis.io.wkt.FormattableObject; import org.apache.sis.io.wkt.Formatter; import org.apache.sis.util.ComparisonMode; import org.apache.sis.util.LenientComparable; -import org.apache.sis.util.Utilities; // Specific to the geoapi-3.1 and geoapi-4.0 branches: +import java.lang.reflect.Type; import org.opengis.coordinate.CoordinateMetadata; +import org.apache.sis.util.Utilities; /** diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/DefaultParameterDescriptor.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/DefaultParameterDescriptor.java index 339897b7dd..60bfa8e004 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/DefaultParameterDescriptor.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/DefaultParameterDescriptor.java @@ -21,9 +21,9 @@ import java.util.Set; import java.util.Map; import java.util.EnumSet; import java.util.Objects; +import java.lang.reflect.Type; import jakarta.xml.bind.annotation.XmlType; import jakarta.xml.bind.annotation.XmlRootElement; -import java.lang.reflect.Type; import javax.measure.Unit; import org.opengis.util.CodeList; import org.opengis.util.TypeName; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/DefaultObjectDomain.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/DefaultObjectDomain.java index 13b940abb6..1048f603ba 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/DefaultObjectDomain.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/DefaultObjectDomain.java @@ -19,7 +19,6 @@ package org.apache.sis.referencing; import java.util.Objects; import java.io.Serializable; import java.io.ObjectStreamException; -import java.lang.reflect.Type; import org.opengis.metadata.extent.Extent; import org.opengis.util.InternationalString; import org.apache.sis.util.ComparisonMode; @@ -34,6 +33,7 @@ import org.apache.sis.xml.NilReason; import org.apache.sis.metadata.iso.extent.DefaultExtent; // Specific to the geoapi-3.1 and geoapi-4.0 branches: +import java.lang.reflect.Type; import org.opengis.referencing.ObjectDomain; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultCompoundCRS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultCompoundCRS.java index 9118b42224..21532edfcf 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultCompoundCRS.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultCompoundCRS.java @@ -45,7 +45,6 @@ import org.apache.sis.referencing.internal.Resources; import org.apache.sis.referencing.internal.shared.WKTKeywords; import org.apache.sis.referencing.internal.shared.WKTUtilities; import org.apache.sis.referencing.internal.shared.ReferencingUtilities; -import org.apache.sis.util.Classes; import org.apache.sis.util.ArgumentChecks; import org.apache.sis.util.ComparisonMode; import org.apache.sis.util.Utilities; @@ -60,6 +59,7 @@ import org.apache.sis.io.wkt.Convention; import java.util.Collection; import java.util.NoSuchElementException; import org.opengis.referencing.crs.ParametricCRS; +import org.apache.sis.util.Classes; import org.apache.sis.xml.NilObject; import org.apache.sis.metadata.internal.shared.Identifiers; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultParametricCRS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultParametricCRS.java index 62d4e50f32..ef1a560591 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultParametricCRS.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultParametricCRS.java @@ -17,7 +17,6 @@ package org.apache.sis.referencing.crs; import java.util.Map; -import java.lang.reflect.Type; import jakarta.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlRootElement; import jakarta.xml.bind.annotation.XmlType; @@ -28,6 +27,7 @@ import org.apache.sis.referencing.datum.DefaultParametricDatum; import org.apache.sis.io.wkt.Formatter; // Specific to the geoapi-3.1 and geoapi-4.0 branches: +import java.lang.reflect.Type; import org.opengis.referencing.cs.ParametricCS; import org.opengis.referencing.crs.ParametricCRS; import org.opengis.referencing.datum.ParametricDatum; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultParametricDatum.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultParametricDatum.java index f9331426ab..17b14a25d4 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultParametricDatum.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultParametricDatum.java @@ -17,13 +17,13 @@ package org.apache.sis.referencing.datum; import java.util.Map; -import java.lang.reflect.Type; import jakarta.xml.bind.annotation.XmlRootElement; import jakarta.xml.bind.annotation.XmlType; import org.apache.sis.referencing.internal.shared.WKTKeywords; import org.apache.sis.io.wkt.Formatter; // Specific to the geoapi-3.1 and geoapi-4.0 branches: +import java.lang.reflect.Type; import org.opengis.referencing.datum.ParametricDatum; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefiningConversion.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefiningConversion.java index 3cc74d1c78..c5e05da4bc 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefiningConversion.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefiningConversion.java @@ -20,9 +20,9 @@ import java.util.Map; import jakarta.xml.bind.annotation.XmlTransient; import org.opengis.parameter.ParameterValueGroup; import org.opengis.referencing.crs.DerivedCRS; +import org.opengis.referencing.crs.CoordinateReferenceSystem; import org.opengis.referencing.operation.OperationMethod; import org.opengis.referencing.operation.MathTransform; -import org.opengis.referencing.crs.CoordinateReferenceSystem; import org.apache.sis.referencing.cs.AxesConvention; import org.apache.sis.referencing.internal.Resources; import org.apache.sis.referencing.operation.transform.DefaultMathTransformFactory; diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/OptionKey.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/OptionKey.java index 343e591405..41950789e8 100644 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/OptionKey.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/OptionKey.java @@ -22,11 +22,11 @@ import java.util.logging.Logger; import java.util.function.Supplier; import java.time.ZoneId; import java.nio.ByteBuffer; +import java.io.ObjectStreamException; import java.nio.charset.Charset; import java.nio.file.Path; import java.nio.file.OpenOption; import java.nio.file.StandardOpenOption; -import java.io.ObjectStreamException; import javax.xml.XMLConstants; import javax.xml.stream.XMLInputFactory; import org.opengis.parameter.ParameterValue; diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/image/WorldFileStore.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/image/WorldFileStore.java index e3cbd3a9b2..cd41c51c40 100644 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/image/WorldFileStore.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/image/WorldFileStore.java @@ -54,8 +54,8 @@ import org.apache.sis.storage.ReadOnlyStorageException; import org.apache.sis.storage.UnsupportedStorageException; import org.apache.sis.storage.modifier.CoverageModifier; import org.apache.sis.storage.base.PRJDataStore; -import org.apache.sis.storage.metadata.MetadataBuilder; import org.apache.sis.storage.base.AuxiliaryContent; +import org.apache.sis.storage.metadata.MetadataBuilder; import org.apache.sis.referencing.internal.shared.AffineTransform2D; import org.apache.sis.util.CharSequences; import org.apache.sis.util.ArraysExt; diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/tiling/ImageTileMatrix.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/tiling/ImageTileMatrix.java index 3587faa0a7..278ef89ced 100644 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/tiling/ImageTileMatrix.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/tiling/ImageTileMatrix.java @@ -52,7 +52,6 @@ import org.apache.sis.coverage.grid.IncompleteGridGeometryException; import org.apache.sis.image.ComputedImage; import org.apache.sis.image.internal.shared.ReshapedImage; import org.apache.sis.pending.jdk.JDK18; -import org.apache.sis.util.ArgumentChecks; import org.apache.sis.util.iso.Names; import org.apache.sis.util.logging.Logging; import org.apache.sis.util.resources.Errors; @@ -60,6 +59,9 @@ import org.apache.sis.util.collection.BackingStoreException; import org.apache.sis.math.DecimalFunctions; import org.apache.sis.storage.internal.Resources; +// Specific to the geoapi-3.1 and geoapi-4.0 branches: +import org.apache.sis.util.ArgumentChecks; + /** * Default implementation of {@code TileMatrix} as a wrapper for a {@code GridCoverage}. diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Capsule.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Capsule.java index 3c4f3952e0..5e1b2b4e31 100644 --- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Capsule.java +++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Capsule.java @@ -16,11 +16,11 @@ */ package org.apache.sis.geometries; -import org.apache.sis.geometries.internal.shared.AbstractOrientedGeometry; import static org.opengis.annotation.Specification.ISO_12113; import org.opengis.annotation.UML; import org.opengis.geometry.Envelope; import org.opengis.referencing.crs.CoordinateReferenceSystem; +import org.apache.sis.geometries.internal.shared.AbstractOrientedGeometry; /** diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Cylinder.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Cylinder.java index 50e254aaf3..4daca93ba3 100644 --- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Cylinder.java +++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Cylinder.java @@ -16,11 +16,11 @@ */ package org.apache.sis.geometries; -import org.apache.sis.geometries.internal.shared.AbstractOrientedGeometry; import static org.opengis.annotation.Specification.ISO_12113; import org.opengis.annotation.UML; import org.opengis.geometry.Envelope; import org.opengis.referencing.crs.CoordinateReferenceSystem; +import org.apache.sis.geometries.internal.shared.AbstractOrientedGeometry; /** diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Frustrum.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Frustrum.java index c0d8a2d361..864602c55a 100644 --- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Frustrum.java +++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Frustrum.java @@ -16,9 +16,10 @@ */ package org.apache.sis.geometries; -import org.apache.sis.geometries.internal.shared.AbstractGeometry; import org.opengis.geometry.Envelope; import org.opengis.referencing.crs.CoordinateReferenceSystem; +import org.apache.sis.geometries.internal.shared.AbstractGeometry; + /** * A Frustum is a delimited space defined by one or many planes. diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/OrientedGeometry.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/OrientedGeometry.java index 8ae57d78a6..7cfa3cae0d 100644 --- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/OrientedGeometry.java +++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/OrientedGeometry.java @@ -16,8 +16,8 @@ */ package org.apache.sis.geometries; -import org.apache.sis.geometries.math.Similarity; import org.opengis.geometry.Envelope; +import org.apache.sis.geometries.math.Similarity; /** diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Plane.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Plane.java index 166a1edb41..c914ab52f9 100644 --- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Plane.java +++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Plane.java @@ -16,11 +16,11 @@ */ package org.apache.sis.geometries; -import org.apache.sis.geometries.internal.shared.AbstractOrientedGeometry; import static org.opengis.annotation.Specification.ISO_12113; import org.opengis.annotation.UML; import org.opengis.geometry.Envelope; import org.opengis.referencing.crs.CoordinateReferenceSystem; +import org.apache.sis.geometries.internal.shared.AbstractOrientedGeometry; /** diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Ray.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Ray.java index 0099ddf63f..f57e14f7b8 100644 --- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Ray.java +++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Ray.java @@ -17,12 +17,12 @@ package org.apache.sis.geometries; import java.util.Objects; +import org.opengis.geometry.Envelope; +import org.opengis.referencing.crs.CoordinateReferenceSystem; import org.apache.sis.geometries.internal.shared.AbstractGeometry; import org.apache.sis.geometries.math.Tuple; import org.apache.sis.geometries.math.Vector; import org.apache.sis.geometries.math.Vectors; -import org.opengis.geometry.Envelope; -import org.opengis.referencing.crs.CoordinateReferenceSystem; /** diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/AbstractOrientedGeometry.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/AbstractOrientedGeometry.java index a6b08fd9c9..67c6b422d1 100644 --- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/AbstractOrientedGeometry.java +++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/AbstractOrientedGeometry.java @@ -16,10 +16,10 @@ */ package org.apache.sis.geometries.internal.shared; +import org.opengis.geometry.Envelope; import org.apache.sis.geometries.OrientedGeometry; import org.apache.sis.geometries.math.Similarity; import org.apache.sis.geometries.math.Similarity3D; -import org.opengis.geometry.Envelope; /** diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/EasingMethod.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/EasingMethod.java index 68b11a6d35..37b6c65027 100644 --- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/EasingMethod.java +++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/EasingMethod.java @@ -18,6 +18,7 @@ package org.apache.sis.geometries.math; import java.util.function.DoubleUnaryOperator; + /** * Interpolation methods. The next methods provide non linear interpolation * between zero and one. Such methods are often use for animations. diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/scene/physics/Collider.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/scene/physics/Collider.java index a00d50401c..4d38126ae7 100644 --- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/scene/physics/Collider.java +++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/scene/physics/Collider.java @@ -16,6 +16,7 @@ */ package org.apache.sis.geometries.scene.physics; + /** * Describes the physical representation of a node's shape for collision detection. * diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/scene/physics/ColliderGeometry.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/scene/physics/ColliderGeometry.java index dfe04b1e33..b3716674f5 100644 --- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/scene/physics/ColliderGeometry.java +++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/scene/physics/ColliderGeometry.java @@ -18,6 +18,7 @@ package org.apache.sis.geometries.scene.physics; import org.apache.sis.geometries.Geometry; + /** * * @author Johann Sorel diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/scene/physics/CollisionFilter.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/scene/physics/CollisionFilter.java index 95c0815d93..c0d92c85ba 100644 --- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/scene/physics/CollisionFilter.java +++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/scene/physics/CollisionFilter.java @@ -18,6 +18,7 @@ package org.apache.sis.geometries.scene.physics; import java.util.Set; + /** * Describes a filter which determines if this collider should perform collision detection * against another collider. @@ -77,7 +78,7 @@ public final class CollisionFilter { /** * @param collideWithSystems the collideWithSystems to set - * @see #getCollideWithSystems() + * @see #getCollideWithSystems() */ public void setCollideWithSystems(Set<String> collideWithSystems) { this.collideWithSystems = collideWithSystems; diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/scene/physics/Joint.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/scene/physics/Joint.java index aa6ceb6ac3..3d2161de76 100644 --- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/scene/physics/Joint.java +++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/scene/physics/Joint.java @@ -19,6 +19,7 @@ package org.apache.sis.geometries.scene.physics; import java.util.List; import org.apache.sis.geometries.scene.SceneNode; + /** * Constrains the motion of this node relative to another. * diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/scene/physics/Motion.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/scene/physics/Motion.java index b9321af596..83ee4ea9f9 100644 --- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/scene/physics/Motion.java +++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/scene/physics/Motion.java @@ -19,6 +19,7 @@ package org.apache.sis.geometries.scene.physics; import org.apache.sis.geometries.math.Quaternion; import org.apache.sis.geometries.math.Vector3D; + /** * Allows the simulation to move this node, describing parameters for that motion. * diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/scene/physics/PhysicalMaterial.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/scene/physics/PhysicalMaterial.java index 99701cbe72..7988a19737 100644 --- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/scene/physics/PhysicalMaterial.java +++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/scene/physics/PhysicalMaterial.java @@ -16,6 +16,7 @@ */ package org.apache.sis.geometries.scene.physics; + /** * Describes how the collider should respond to collisions. * @@ -120,7 +121,7 @@ public final class PhysicalMaterial { /** * @param restitutionCombine the restitutionCombine to set - * @see #getRestitutionCombine() + * @see #getRestitutionCombine() */ public void setRestitutionCombine(Combine restitutionCombine) { this.restitutionCombine = restitutionCombine; diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/scene/physics/Trigger.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/scene/physics/Trigger.java index f9d8cbeb84..245f888d9e 100644 --- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/scene/physics/Trigger.java +++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/scene/physics/Trigger.java @@ -19,6 +19,7 @@ package org.apache.sis.geometries.scene.physics; import java.util.List; import org.apache.sis.geometries.scene.SceneNode; + /** * Describes a volume which can detect collisions, but does not generate a physical response. * diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/EasingMethodTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/EasingMethodTest.java index 7d2e729c4b..dd7b5de970 100644 --- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/EasingMethodTest.java +++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/EasingMethodTest.java @@ -16,9 +16,11 @@ */ package org.apache.sis.geometries.math; +// Test dependencies import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; + /** * Easing method tests. * diff --git a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/geoheif/CoverageBuilder.java b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/geoheif/CoverageBuilder.java index 3b0f6ff1fb..cd2c285ed7 100644 --- a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/geoheif/CoverageBuilder.java +++ b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/geoheif/CoverageBuilder.java @@ -46,6 +46,8 @@ import org.apache.sis.storage.isobmff.Box; import org.apache.sis.storage.isobmff.base.ItemInfoEntry; import org.apache.sis.storage.isobmff.base.ItemProperties; import org.apache.sis.storage.isobmff.image.TiledImageConfiguration; +import org.apache.sis.storage.isobmff.image.ImageSpatialExtents; +import org.apache.sis.storage.isobmff.image.PixelInformation; import org.apache.sis.storage.isobmff.geo.ModelTransformation; import org.apache.sis.storage.isobmff.geo.ModelCRS; import org.apache.sis.storage.isobmff.mpeg.ComponentType; @@ -55,8 +57,6 @@ import org.apache.sis.storage.isobmff.mpeg.CompressedUnitsItemInfo; import org.apache.sis.storage.isobmff.mpeg.CompressionConfiguration; import org.apache.sis.storage.isobmff.mpeg.UncompressedFrameConfig; import org.apache.sis.storage.isobmff.mpeg.UnitType; -import org.apache.sis.storage.isobmff.image.ImageSpatialExtents; -import org.apache.sis.storage.isobmff.image.PixelInformation; import org.apache.sis.util.ArraysExt; import org.apache.sis.util.Emptiable; import org.apache.sis.util.resources.Errors; diff --git a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/geoheif/ImageModel.java b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/geoheif/ImageModel.java index d623266779..02d01cdc35 100644 --- a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/geoheif/ImageModel.java +++ b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/geoheif/ImageModel.java @@ -26,8 +26,8 @@ import org.opengis.util.GenericName; import org.apache.sis.image.DataType; import org.apache.sis.image.internal.shared.ColorModelBuilder; import org.apache.sis.image.internal.shared.ColorModelFactory; -import org.apache.sis.coverage.SampleDimension; import org.apache.sis.image.internal.shared.SampleModelBuilder; +import org.apache.sis.coverage.SampleDimension; import org.apache.sis.storage.DataStoreException; import org.apache.sis.storage.DataStoreContentException; import org.apache.sis.storage.UnsupportedEncodingException; diff --git a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/GSFStoreProvider.java b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/GSFStoreProvider.java index 187cd7bf42..90ad521095 100644 --- a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/GSFStoreProvider.java +++ b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/GSFStoreProvider.java @@ -27,8 +27,8 @@ import org.apache.sis.storage.ProbeResult; import org.apache.sis.storage.StorageConnector; import org.apache.sis.storage.base.StoreMetadata; import org.apache.sis.storage.base.Capability; -import org.apache.sis.storage.gsf.panama.LibraryStatus; import org.apache.sis.storage.base.URIDataStoreOption; +import org.apache.sis.storage.gsf.panama.LibraryStatus; import org.apache.sis.system.Cleaners; diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/ShapefileStore.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/ShapefileStore.java index b3c1e6b611..90f5f1096a 100644 --- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/ShapefileStore.java +++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/ShapefileStore.java @@ -94,6 +94,7 @@ import org.apache.sis.storage.UnsupportedQueryException; import org.apache.sis.storage.WritableFeatureSet; import org.apache.sis.storage.DataStoreProvider; import org.apache.sis.storage.base.URIDataStore; +import org.apache.sis.storage.base.WarningAdapter; import org.apache.sis.storage.shapefile.cpg.CpgFiles; import org.apache.sis.storage.shapefile.dbf.DBFField; import org.apache.sis.storage.shapefile.dbf.DBFHeader; @@ -110,7 +111,6 @@ import org.apache.sis.util.ArraysExt; import org.apache.sis.util.Classes; import org.apache.sis.util.Utilities; import org.apache.sis.util.collection.BackingStoreException; -import org.apache.sis.storage.base.WarningAdapter; // Specific to the geoapi-3.1 and geoapi-4.0 branches: import org.opengis.util.CodeList; @@ -118,6 +118,7 @@ import org.opengis.feature.Feature; import org.opengis.feature.FeatureType; import org.opengis.feature.PropertyType; import org.opengis.feature.AttributeType; +import org.opengis.feature.PropertyNotFoundException; import org.opengis.filter.Expression; import org.opengis.filter.Filter; import org.opengis.filter.Literal; @@ -126,7 +127,6 @@ import org.opengis.filter.LogicalOperatorName; import org.opengis.filter.SpatialOperatorName; import org.opengis.filter.ValueReference; import org.apache.sis.geometry.wrapper.*; -import org.opengis.feature.PropertyNotFoundException; /** diff --git a/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/ShapefileStoreTest.java b/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/ShapefileStoreTest.java index 3f8586bc93..45e53c70cf 100644 --- a/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/ShapefileStoreTest.java +++ b/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/ShapefileStoreTest.java @@ -38,8 +38,8 @@ import org.apache.sis.referencing.CommonCRS; import org.apache.sis.storage.DataStoreException; import org.apache.sis.storage.FeatureQuery; import org.apache.sis.storage.FeatureSet; -import org.apache.sis.feature.internal.shared.AttributeConvention; import org.apache.sis.storage.StorageConnector; +import org.apache.sis.feature.internal.shared.AttributeConvention; // Test dependencies import static org.junit.jupiter.api.Assertions.*; diff --git a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/PathAction.java b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/PathAction.java index 5a3fc16ceb..4e4ba926cc 100644 --- a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/PathAction.java +++ b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/PathAction.java @@ -36,9 +36,9 @@ import org.opengis.parameter.ParameterNotFoundException; import org.apache.sis.gui.internal.ExceptionReporter; import org.apache.sis.storage.DataStoreException; import org.apache.sis.storage.Resource; -import org.apache.sis.io.stream.IOUtilities; import org.apache.sis.storage.DataStore; import org.apache.sis.storage.DataStoreProvider; +import org.apache.sis.io.stream.IOUtilities; import org.apache.sis.util.logging.Logging; import static org.apache.sis.gui.internal.LogHandler.LOGGER; diff --git a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/referencing/FilterByDatum.java b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/referencing/FilterByDatum.java index 22884a35b0..fd4283740f 100644 --- a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/referencing/FilterByDatum.java +++ b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/referencing/FilterByDatum.java @@ -33,8 +33,8 @@ import org.opengis.referencing.crs.TemporalCRS; import org.opengis.referencing.crs.VerticalCRS; import org.opengis.referencing.crs.EngineeringCRS; import org.apache.sis.util.Classes; -import org.apache.sis.referencing.CRS; import org.apache.sis.util.Utilities; +import org.apache.sis.referencing.CRS; /**
