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 73230dbe2759cd09b5533ccfabfc8506d763d2f4 Author: Martin Desruisseaux <[email protected]> AuthorDate: Fri Apr 17 16:26:50 2026 +0200 Post-merge automatic reorganization of imports order. --- .../main/org/apache/sis/util/internal/shared/CodeLists.java | 4 ++-- .../test/org/apache/sis/util/collection/LargeCodeList.java | 4 +++- .../main/org/apache/sis/storage/shapefile/ShapefileStore.java | 2 +- .../org.apache.sis.gui/main/org/apache/sis/gui/map/MultiCanvas.java | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/internal/shared/CodeLists.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/internal/shared/CodeLists.java index 3989d5d35b..f3b1200830 100644 --- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/internal/shared/CodeLists.java +++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/internal/shared/CodeLists.java @@ -18,15 +18,15 @@ package org.apache.sis.util.internal.shared; import java.lang.reflect.Array; import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.InaccessibleObjectException; import java.lang.reflect.UndeclaredThrowableException; import org.opengis.util.CodeList; import org.apache.sis.util.CharSequences; import org.apache.sis.util.Characters.Filter; -import org.apache.sis.util.resources.Errors; // Specific to the geoapi-3.1 and geoapi-4.0 branches: +import java.lang.reflect.InaccessibleObjectException; import org.opengis.util.ControlledVocabulary; +import org.apache.sis.util.resources.Errors; /** diff --git a/endorsed/src/org.apache.sis.util/test/org/apache/sis/util/collection/LargeCodeList.java b/endorsed/src/org.apache.sis.util/test/org/apache/sis/util/collection/LargeCodeList.java index b559ff698a..6eeae02463 100644 --- a/endorsed/src/org.apache.sis.util/test/org/apache/sis/util/collection/LargeCodeList.java +++ b/endorsed/src/org.apache.sis.util/test/org/apache/sis/util/collection/LargeCodeList.java @@ -16,10 +16,12 @@ */ package org.apache.sis.util.collection; -import java.util.Arrays; import java.util.List; import org.opengis.util.CodeList; +// Specific to the geoapi-3.1 and geoapi-4.0 branches: +import java.util.Arrays; + /** * A code list containing more than 64 elements. 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 d82477a5da..49748eb474 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 @@ -97,6 +97,7 @@ import org.apache.sis.storage.Query; import org.apache.sis.storage.StorageConnector; import org.apache.sis.storage.UnsupportedQueryException; import org.apache.sis.storage.WritableFeatureSet; +import org.apache.sis.storage.DataStoreProvider; import org.apache.sis.storage.shapefile.cpg.CpgFiles; import org.apache.sis.storage.shapefile.dbf.DBFField; import org.apache.sis.storage.shapefile.dbf.DBFHeader; @@ -129,7 +130,6 @@ import org.opengis.filter.LogicalOperatorName; import org.opengis.filter.SpatialOperatorName; import org.opengis.filter.ValueReference; import org.apache.sis.geometry.wrapper.*; -import org.apache.sis.storage.DataStoreProvider; /** diff --git a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/map/MultiCanvas.java b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/map/MultiCanvas.java index 14504672a2..02151226af 100644 --- a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/map/MultiCanvas.java +++ b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/map/MultiCanvas.java @@ -47,8 +47,8 @@ import javafx.scene.layout.RowConstraints; import javafx.scene.layout.ColumnConstraints; import javafx.scene.layout.HBox; import javafx.scene.layout.VBox; -import javafx.geometry.Pos; import javafx.scene.layout.Border; +import javafx.geometry.Pos; import javafx.scene.paint.Color; import org.apache.sis.gui.Widget; import org.apache.sis.gui.coverage.CoverageCanvas;
