[sis] 01/02: Post-merge cleanup.

[desruisseaux]

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 fa0f89c70f5bba5d7dce0f7a69a969ec3e33f8c9
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Tue Apr 26 18:26:42 2022 +0200

    Post-merge cleanup.
---
 .../src/main/java/org/apache/sis/metadata/sql/Dispatcher.java         | 2 +-
 .../main/java/org/apache/sis/internal/storage/esri/WritableStore.java | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git 
a/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/Dispatcher.java 
b/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/Dispatcher.java
index adb318d941..13e06a9ab9 100644
--- 
a/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/Dispatcher.java
+++ 
b/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/Dispatcher.java
@@ -336,7 +336,7 @@ final class Dispatcher implements InvocationHandler {
             } else {
                 /*
                  * `getIndividualName()`, `getOrganisationName()`, 
`getPositionName()` and
-                 * `getContactInfo()` has no direct equivalence in 
`Responsibility` class.
+                 * `getContactInfo()` have no direct equivalence in 
`Responsibility` class.
                  */
                 return null;
             }
diff --git 
a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/esri/WritableStore.java
 
b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/esri/WritableStore.java
index 5e57c11003..1b51c553c2 100644
--- 
a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/esri/WritableStore.java
+++ 
b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/esri/WritableStore.java
@@ -22,7 +22,6 @@ import java.io.IOException;
 import java.awt.image.DataBuffer;
 import java.awt.image.RenderedImage;
 import java.awt.geom.AffineTransform;
-import org.opengis.coverage.grid.SequenceType;
 import org.opengis.referencing.datum.PixelInCell;
 import org.opengis.referencing.operation.Matrix;
 import org.opengis.referencing.operation.MathTransform;
@@ -42,6 +41,9 @@ import org.apache.sis.image.PixelIterator;
 import org.apache.sis.util.CharSequences;
 import org.apache.sis.util.StringBuilders;
 
+// Branch-dependent imports
+import org.opengis.coverage.grid.SequenceType;
+
 
 /**
  * An ASCII Grid store with writing capabilities.