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
The following commit(s) were added to refs/heads/geoapi-4.0 by this push:
new 0b7455bf80 Post-merge imports reordering.
0b7455bf80 is described below
commit 0b7455bf80aae9b6c16477158ee9776c52dd6df8
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Sat Feb 10 14:02:24 2024 +0100
Post-merge imports reordering.
---
.../apache/sis/referencing/operation/DefaultFormula.java | 2 +-
.../operation/builder/LinearTransformBuilder.java | 2 +-
.../main/org/apache/sis/storage/base/LegalSymbols.java | 14 ++++++++++----
.../main/org/apache/sis/gui/map/MapCanvas.java | 2 +-
4 files changed, 13 insertions(+), 7 deletions(-)
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultFormula.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultFormula.java
index e0a793cbd9..c4cea2ddea 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultFormula.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultFormula.java
@@ -25,8 +25,8 @@ import org.apache.sis.referencing.util.WKTKeywords;
import org.apache.sis.io.wkt.ElementKind;
import org.apache.sis.io.wkt.FormattableObject;
import org.apache.sis.io.wkt.Formatter;
-import org.apache.sis.util.iso.Types;
import org.apache.sis.util.ArgumentChecks;
+import org.apache.sis.util.iso.Types;
/**
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/builder/LinearTransformBuilder.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/builder/LinearTransformBuilder.java
index 92681dd3c4..30887e65b6 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/builder/LinearTransformBuilder.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/builder/LinearTransformBuilder.java
@@ -25,8 +25,8 @@ import java.util.ArrayDeque;
import java.util.NoSuchElementException;
import java.util.Optional;
import java.util.Locale;
-import java.text.NumberFormat;
import java.util.Objects;
+import java.text.NumberFormat;
import java.io.IOException;
import java.io.UncheckedIOException;
import org.opengis.util.FactoryException;
diff --git
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/LegalSymbols.java
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/LegalSymbols.java
index c2916e1a64..ffd3155d80 100644
---
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/LegalSymbols.java
+++
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/LegalSymbols.java
@@ -19,13 +19,19 @@ package org.apache.sis.storage.base;
import java.time.LocalDate;
import java.util.Date;
import java.util.Collections;
-import org.opengis.metadata.citation.*;
-import org.opengis.metadata.constraint.*;
+import org.opengis.metadata.citation.Role;
+import org.opengis.metadata.citation.DateType;
+import org.opengis.metadata.constraint.Restriction;
import org.apache.sis.util.CharSequences;
-import org.apache.sis.metadata.iso.citation.*;
-import org.apache.sis.metadata.iso.constraint.*;
+import org.apache.sis.metadata.iso.citation.AbstractParty;
+import org.apache.sis.metadata.iso.citation.DefaultCitation;
+import org.apache.sis.metadata.iso.citation.DefaultCitationDate;
+import org.apache.sis.metadata.iso.constraint.DefaultLegalConstraints;
import static
org.apache.sis.util.internal.StandardDateFormat.MILLISECONDS_PER_DAY;
+// Specific to the geoapi-3.1 and geoapi-4.0 branches:
+import org.apache.sis.metadata.iso.citation.DefaultResponsibility;
+
/**
* Elements to omit in the legal notice to be parsed by {@link
MetadataBuilder#parseLegalNotice(String)}.
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/map/MapCanvas.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/map/MapCanvas.java
index b86b94aed7..2378978a82 100644
--- a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/map/MapCanvas.java
+++ b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/map/MapCanvas.java
@@ -28,6 +28,7 @@ import javafx.application.Platform;
import javafx.geometry.Bounds;
import javafx.geometry.Point2D;
import javafx.scene.Cursor;
+import javafx.scene.Node;
import javafx.scene.layout.Pane;
import javafx.scene.layout.StackPane;
import javafx.scene.input.KeyEvent;
@@ -46,7 +47,6 @@ import javafx.beans.value.ObservableValue;
import javafx.beans.value.WritableValue;
import javafx.concurrent.Task;
import javafx.concurrent.Worker;
-import javafx.scene.Node;
import javafx.scene.control.ContextMenu;
import javafx.scene.control.ToggleGroup;
import javafx.scene.transform.Affine;
