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

[de...@apache.org]

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

commit f4dabcdb1985400396d6105ab9b1a1b57b10f927
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Sat Dec 29 10:13:59 2018 +0100

    Post-merge cleanup.
---
 .../src/main/java/org/apache/sis/coverage/grid/GridCoverage.java    | 6 ++++--
 .../main/java/org/apache/sis/geometry/AbstractDirectPosition.java   | 2 +-
 .../test/java/org/apache/sis/internal/netcdf/impl/GridInfoTest.java | 2 ++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/core/sis-raster/src/main/java/org/apache/sis/coverage/grid/GridCoverage.java b/core/sis-raster/src/main/java/org/apache/sis/coverage/grid/GridCoverage.java
index aebef90..78ab4b5 100644
--- a/core/sis-raster/src/main/java/org/apache/sis/coverage/grid/GridCoverage.java
+++ b/core/sis-raster/src/main/java/org/apache/sis/coverage/grid/GridCoverage.java
@@ -21,8 +21,6 @@ import java.util.Collection;
 import java.util.Locale;
 import java.awt.image.RenderedImage;
 import org.opengis.geometry.DirectPosition;
-import org.opengis.coverage.CannotEvaluateException;
-import org.opengis.coverage.PointOutsideCoverageException;
 import org.opengis.referencing.crs.CoordinateReferenceSystem;
 import org.apache.sis.internal.util.UnmodifiableArrayList;
 import org.apache.sis.coverage.SampleDimension;
@@ -34,6 +32,10 @@ import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.Classes;
 import org.apache.sis.util.Debug;
 
+// Branch-specific imports
+import org.opengis.coverage.CannotEvaluateException;
+import org.opengis.coverage.PointOutsideCoverageException;
+
 
 /**
  * Base class of coverages with domains defined as a set of grid points.
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractDirectPosition.java b/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractDirectPosition.java
index 3573944..d4bf4c5 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractDirectPosition.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractDirectPosition.java
@@ -255,7 +255,7 @@ public abstract class AbstractDirectPosition extends FormattableObject implement
      * @param  isSinglePrecision  {@code true} if every ordinate values can be casted to {@code float}.
      * @return the point as a {@code POINT} in WKT format.
      *
-     * @see Numerics#isSinglePrecision(double[])
+     * @see ArraysExt#isSinglePrecision(double[])
      */
     static String toString(final DirectPosition position, final boolean isSinglePrecision) {
         final StringBuilder buffer = new StringBuilder(32).append("POINT");
diff --git a/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/impl/GridInfoTest.java b/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/impl/GridInfoTest.java
index eb23e9b..1ae3598 100644
--- a/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/impl/GridInfoTest.java
+++ b/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/impl/GridInfoTest.java
@@ -23,6 +23,8 @@ import org.apache.sis.internal.netcdf.GridTest;
 import org.apache.sis.storage.DataStoreException;
 import org.apache.sis.util.ArraysExt;
 import org.apache.sis.test.DependsOn;
+
+// Branch-specific imports
 import org.opengis.test.dataset.TestData;