You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2019/12/23 15:56:13 UTC
[sis] 01/03: Move in a single package all Java2D dependencies
(except public API) used by grid coverage.
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 e2dde203a276af77b237e79e9b8870edab6b1336
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Mon Dec 23 15:13:55 2019 +0100
Move in a single package all Java2D dependencies (except public API) used by grid coverage.
---
.../main/java/org/apache/sis/coverage/grid/GridCoverage2D.java | 6 +++---
.../src/main/java/org/apache/sis/coverage/grid/ImageRenderer.java | 4 ++--
.../internal/{image => coverage/j2d}/AbstractRenderedImage.java | 2 +-
.../sis/internal/coverage/{ => j2d}/BufferedGridCoverage.java | 2 +-
.../apache/sis/internal/coverage/{ => j2d}/ColorModelFactory.java | 2 +-
.../apache/sis/internal/coverage/{ => j2d}/ColorModelPatch.java | 2 +-
.../sis/internal/coverage/{ => j2d}/ConvertedGridCoverage.java | 4 ++--
.../apache/sis/internal/coverage/{ => j2d}/ImageUtilities.java | 2 +-
.../internal/coverage/{ => j2d}/MultiBandsIndexColorModel.java | 2 +-
.../org/apache/sis/internal/coverage/{ => j2d}/RasterFactory.java | 2 +-
.../apache/sis/internal/coverage/{ => j2d}/ScaledColorSpace.java | 2 +-
.../internal/{image => coverage/j2d}/TranslatedRenderedImage.java | 2 +-
.../org/apache/sis/internal/coverage/{ => j2d}/package-info.java | 7 +++++--
.../java/org/apache/sis/coverage/grid/GridCoverage2DTest.java | 2 +-
.../sis/internal/coverage/{ => j2d}/BufferedGridCoverageTest.java | 2 +-
.../sis/internal/coverage/{ => j2d}/ImageUtilitiesTest.java | 2 +-
.../sis/internal/coverage/{ => j2d}/ScaledColorSpaceTest.java | 2 +-
.../{image => coverage/j2d}/TranslatedRenderedImageTest.java | 2 +-
.../src/test/java/org/apache/sis/test/suite/FeatureTestSuite.java | 8 ++++----
.../src/main/java/org/apache/sis/internal/netcdf/Raster.java | 2 +-
.../main/java/org/apache/sis/internal/netcdf/RasterResource.java | 2 +-
21 files changed, 32 insertions(+), 29 deletions(-)
diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridCoverage2D.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridCoverage2D.java
index 2e2d9d0..629d5b1 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridCoverage2D.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridCoverage2D.java
@@ -32,9 +32,9 @@ import org.opengis.referencing.datum.PixelInCell;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.opengis.referencing.operation.TransformException;
import org.apache.sis.coverage.SampleDimension;
-import org.apache.sis.internal.coverage.ImageUtilities;
-import org.apache.sis.internal.coverage.ConvertedGridCoverage;
-import org.apache.sis.internal.image.TranslatedRenderedImage;
+import org.apache.sis.internal.coverage.j2d.ImageUtilities;
+import org.apache.sis.internal.coverage.j2d.ConvertedGridCoverage;
+import org.apache.sis.internal.coverage.j2d.TranslatedRenderedImage;
import org.apache.sis.internal.feature.Resources;
import org.apache.sis.internal.system.DefaultFactories;
import org.apache.sis.util.resources.Vocabulary;
diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/ImageRenderer.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/ImageRenderer.java
index 42f0ffa..22eb573 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/ImageRenderer.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/ImageRenderer.java
@@ -31,8 +31,8 @@ import org.opengis.geometry.MismatchedDimensionException;
import org.apache.sis.coverage.SubspaceNotSpecifiedException;
import org.apache.sis.coverage.MismatchedCoverageRangeException;
import org.apache.sis.coverage.SampleDimension;
-import org.apache.sis.internal.coverage.ColorModelFactory;
-import org.apache.sis.internal.coverage.RasterFactory;
+import org.apache.sis.internal.coverage.j2d.ColorModelFactory;
+import org.apache.sis.internal.coverage.j2d.RasterFactory;
import org.apache.sis.internal.feature.Resources;
import org.apache.sis.internal.util.CollectionsExt;
import org.apache.sis.util.NullArgumentException;
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/image/AbstractRenderedImage.java b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/AbstractRenderedImage.java
similarity index 99%
rename from core/sis-feature/src/main/java/org/apache/sis/internal/image/AbstractRenderedImage.java
rename to core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/AbstractRenderedImage.java
index 7b138a1..4d1c4cf 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/image/AbstractRenderedImage.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/AbstractRenderedImage.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.image;
+package org.apache.sis.internal.coverage.j2d;
import java.awt.Point;
import java.awt.Rectangle;
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/BufferedGridCoverage.java b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/BufferedGridCoverage.java
similarity index 99%
rename from core/sis-feature/src/main/java/org/apache/sis/internal/coverage/BufferedGridCoverage.java
rename to core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/BufferedGridCoverage.java
index 4651f7e..e84e424 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/BufferedGridCoverage.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/BufferedGridCoverage.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.coverage;
+package org.apache.sis.internal.coverage.j2d;
import java.util.Collection;
import java.awt.image.DataBuffer;
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/ColorModelFactory.java b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ColorModelFactory.java
similarity index 99%
rename from core/sis-feature/src/main/java/org/apache/sis/internal/coverage/ColorModelFactory.java
rename to core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ColorModelFactory.java
index b68ab44..745cf06 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/ColorModelFactory.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ColorModelFactory.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.coverage;
+package org.apache.sis.internal.coverage.j2d;
import java.util.Map;
import java.util.Arrays;
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/ColorModelPatch.java b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ColorModelPatch.java
similarity index 98%
rename from core/sis-feature/src/main/java/org/apache/sis/internal/coverage/ColorModelPatch.java
rename to core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ColorModelPatch.java
index d8bfdf8..0d49525 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/ColorModelPatch.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ColorModelPatch.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.coverage;
+package org.apache.sis.internal.coverage.j2d;
import java.util.Arrays;
import java.util.Objects;
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/ConvertedGridCoverage.java b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ConvertedGridCoverage.java
similarity index 99%
rename from core/sis-feature/src/main/java/org/apache/sis/internal/coverage/ConvertedGridCoverage.java
rename to core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ConvertedGridCoverage.java
index d3c8ec8..ffd0bbf 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/ConvertedGridCoverage.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ConvertedGridCoverage.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.coverage;
+package org.apache.sis.internal.coverage.j2d;
import java.awt.Rectangle;
import java.awt.image.BufferedImage;
@@ -395,7 +395,7 @@ public final class ConvertedGridCoverage extends GridCoverage {
* of {@link SampleConverter}. This class may be replaced by another mechanism (creating new tiles) in
* a future SIS version.</p>
*
- * @see org.apache.sis.internal.coverage.ScaledColorSpace
+ * @see ScaledColorSpace
*/
private static final class ScaledColorModel extends ColorModel {
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/ImageUtilities.java b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ImageUtilities.java
similarity index 99%
rename from core/sis-feature/src/main/java/org/apache/sis/internal/coverage/ImageUtilities.java
rename to core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ImageUtilities.java
index efc1498..327f71f 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/ImageUtilities.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ImageUtilities.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.coverage;
+package org.apache.sis.internal.coverage.j2d;
import java.util.Arrays;
import java.awt.Rectangle;
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/MultiBandsIndexColorModel.java b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/MultiBandsIndexColorModel.java
similarity index 99%
rename from core/sis-feature/src/main/java/org/apache/sis/internal/coverage/MultiBandsIndexColorModel.java
rename to core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/MultiBandsIndexColorModel.java
index 1471df0..404ffa3 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/MultiBandsIndexColorModel.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/MultiBandsIndexColorModel.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.coverage;
+package org.apache.sis.internal.coverage.j2d;
import java.util.Arrays;
import java.awt.image.Raster;
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/RasterFactory.java b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/RasterFactory.java
similarity index 99%
rename from core/sis-feature/src/main/java/org/apache/sis/internal/coverage/RasterFactory.java
rename to core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/RasterFactory.java
index 65a71e4..2cdcea3 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/RasterFactory.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/RasterFactory.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.coverage;
+package org.apache.sis.internal.coverage.j2d;
import java.awt.Point;
import java.awt.image.BandedSampleModel;
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/ScaledColorSpace.java b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ScaledColorSpace.java
similarity index 99%
rename from core/sis-feature/src/main/java/org/apache/sis/internal/coverage/ScaledColorSpace.java
rename to core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ScaledColorSpace.java
index 2c3a9da..0392867 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/ScaledColorSpace.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ScaledColorSpace.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.coverage;
+package org.apache.sis.internal.coverage.j2d;
import java.awt.color.ColorSpace;
import org.apache.sis.internal.util.Strings;
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/image/TranslatedRenderedImage.java b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/TranslatedRenderedImage.java
similarity index 98%
rename from core/sis-feature/src/main/java/org/apache/sis/internal/image/TranslatedRenderedImage.java
rename to core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/TranslatedRenderedImage.java
index dd21d59..fc6d183 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/image/TranslatedRenderedImage.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/TranslatedRenderedImage.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.image;
+package org.apache.sis.internal.coverage.j2d;
import java.awt.image.ColorModel;
import java.awt.image.Raster;
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/package-info.java b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/package-info.java
similarity index 76%
rename from core/sis-feature/src/main/java/org/apache/sis/internal/coverage/package-info.java
rename to core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/package-info.java
index 68fe5d0..d9edc1d 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/package-info.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/package-info.java
@@ -16,7 +16,10 @@
*/
/**
- * A set of helper classes for the SIS implementation.
+ * A set of helper classes for the SIS implementation backed by Java2D.
+ * This package centralizes all {@link java.awt.image} dependencies used
+ * by {@link org.apache.sis.coverage} packages, except the dependencies
+ * in public API (e.g. {@link org.apache.sis.coverage.grid.GridCoverage2D}).
*
* <p><strong>Do not use!</strong></p>
*
@@ -28,4 +31,4 @@
* @since 1.0
* @module
*/
-package org.apache.sis.internal.coverage;
+package org.apache.sis.internal.coverage.j2d;
diff --git a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridCoverage2DTest.java b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridCoverage2DTest.java
index cd8bb81..366b0b8 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridCoverage2DTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridCoverage2DTest.java
@@ -31,7 +31,7 @@ import org.opengis.referencing.operation.MathTransform1D;
import org.opengis.referencing.datum.PixelInCell;
import org.apache.sis.coverage.SampleDimension;
import org.apache.sis.geometry.DirectPosition2D;
-import org.apache.sis.internal.coverage.ColorModelFactory;
+import org.apache.sis.internal.coverage.j2d.ColorModelFactory;
import org.apache.sis.measure.NumberRange;
import org.apache.sis.measure.Units;
import org.apache.sis.referencing.crs.HardCodedCRS;
diff --git a/core/sis-feature/src/test/java/org/apache/sis/internal/coverage/BufferedGridCoverageTest.java b/core/sis-feature/src/test/java/org/apache/sis/internal/coverage/j2d/BufferedGridCoverageTest.java
similarity index 99%
rename from core/sis-feature/src/test/java/org/apache/sis/internal/coverage/BufferedGridCoverageTest.java
rename to core/sis-feature/src/test/java/org/apache/sis/internal/coverage/j2d/BufferedGridCoverageTest.java
index 0904f66..2d2b748 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/internal/coverage/BufferedGridCoverageTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/internal/coverage/j2d/BufferedGridCoverageTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.coverage;
+package org.apache.sis.internal.coverage.j2d;
import java.awt.image.BufferedImage;
import java.awt.image.DataBuffer;
diff --git a/core/sis-feature/src/test/java/org/apache/sis/internal/coverage/ImageUtilitiesTest.java b/core/sis-feature/src/test/java/org/apache/sis/internal/coverage/j2d/ImageUtilitiesTest.java
similarity index 99%
rename from core/sis-feature/src/test/java/org/apache/sis/internal/coverage/ImageUtilitiesTest.java
rename to core/sis-feature/src/test/java/org/apache/sis/internal/coverage/j2d/ImageUtilitiesTest.java
index 1abd0fd..9797daa 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/internal/coverage/ImageUtilitiesTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/internal/coverage/j2d/ImageUtilitiesTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.coverage;
+package org.apache.sis.internal.coverage.j2d;
import java.awt.image.ColorModel;
import java.awt.image.BufferedImage;
diff --git a/core/sis-feature/src/test/java/org/apache/sis/internal/coverage/ScaledColorSpaceTest.java b/core/sis-feature/src/test/java/org/apache/sis/internal/coverage/j2d/ScaledColorSpaceTest.java
similarity index 98%
rename from core/sis-feature/src/test/java/org/apache/sis/internal/coverage/ScaledColorSpaceTest.java
rename to core/sis-feature/src/test/java/org/apache/sis/internal/coverage/j2d/ScaledColorSpaceTest.java
index 4f76c39..95c0452 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/internal/coverage/ScaledColorSpaceTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/internal/coverage/j2d/ScaledColorSpaceTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.coverage;
+package org.apache.sis.internal.coverage.j2d;
import java.util.Random;
import java.awt.Transparency;
diff --git a/core/sis-feature/src/test/java/org/apache/sis/internal/image/TranslatedRenderedImageTest.java b/core/sis-feature/src/test/java/org/apache/sis/internal/coverage/j2d/TranslatedRenderedImageTest.java
similarity index 98%
rename from core/sis-feature/src/test/java/org/apache/sis/internal/image/TranslatedRenderedImageTest.java
rename to core/sis-feature/src/test/java/org/apache/sis/internal/coverage/j2d/TranslatedRenderedImageTest.java
index 6c3d251..65281f7 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/internal/image/TranslatedRenderedImageTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/internal/coverage/j2d/TranslatedRenderedImageTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.image;
+package org.apache.sis.internal.coverage.j2d;
import java.awt.Point;
import java.awt.image.BufferedImage;
diff --git a/core/sis-feature/src/test/java/org/apache/sis/test/suite/FeatureTestSuite.java b/core/sis-feature/src/test/java/org/apache/sis/test/suite/FeatureTestSuite.java
index ec05519..a23bfe4 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/test/suite/FeatureTestSuite.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/test/suite/FeatureTestSuite.java
@@ -86,10 +86,10 @@ import org.junit.runners.Suite;
org.apache.sis.coverage.grid.GridDerivationTest.class,
org.apache.sis.coverage.grid.FractionalGridCoordinates.class,
org.apache.sis.coverage.grid.GridCoverage2DTest.class,
- org.apache.sis.internal.coverage.ImageUtilitiesTest.class,
- org.apache.sis.internal.coverage.ScaledColorSpaceTest.class,
- org.apache.sis.internal.coverage.BufferedGridCoverageTest.class,
- org.apache.sis.internal.image.TranslatedRenderedImageTest.class
+ org.apache.sis.internal.coverage.j2d.ImageUtilitiesTest.class,
+ org.apache.sis.internal.coverage.j2d.ScaledColorSpaceTest.class,
+ org.apache.sis.internal.coverage.j2d.BufferedGridCoverageTest.class,
+ org.apache.sis.internal.coverage.j2d.TranslatedRenderedImageTest.class
})
public final strictfp class FeatureTestSuite extends TestSuite {
/**
diff --git a/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Raster.java b/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Raster.java
index ffefe7b..b999aa6 100644
--- a/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Raster.java
+++ b/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Raster.java
@@ -25,7 +25,7 @@ import org.apache.sis.coverage.SampleDimension;
import org.apache.sis.coverage.grid.GridGeometry;
import org.apache.sis.coverage.grid.GridExtent;
import org.apache.sis.coverage.grid.ImageRenderer;
-import org.apache.sis.internal.coverage.BufferedGridCoverage;
+import org.apache.sis.internal.coverage.j2d.BufferedGridCoverage;
/**
diff --git a/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/RasterResource.java b/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/RasterResource.java
index 57f366e..e1c4adb 100644
--- a/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/RasterResource.java
+++ b/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/RasterResource.java
@@ -33,7 +33,7 @@ import org.apache.sis.internal.storage.AbstractGridResource;
import org.apache.sis.internal.storage.ResourceOnFileSystem;
import org.apache.sis.internal.util.UnmodifiableArrayList;
import org.apache.sis.internal.util.Strings;
-import org.apache.sis.internal.coverage.RasterFactory;
+import org.apache.sis.internal.coverage.j2d.RasterFactory;
import org.apache.sis.coverage.SampleDimension;
import org.apache.sis.coverage.grid.GridExtent;
import org.apache.sis.coverage.grid.GridCoverage;