sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject [sis] 04/04: Move org.apache.sis.internal.raster package to org.apache.sis.internal.coverage.
Date Tue, 04 Jun 2019 13:18:44 GMT
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 3a998cb85eb72e402424d242d3cfcd3c94d25d82
Author: Martin Desruisseaux <martin.desruisseaux@geomatys.com>
AuthorDate: Tue Jun 4 14:59:11 2019 +0200

    Move org.apache.sis.internal.raster package to org.apache.sis.internal.coverage.
---
 .../apache/sis/coverage/grid/ImageRenderer.java    |  4 +--
 .../{raster => coverage}/ColorModelFactory.java    |  2 +-
 .../{raster => coverage}/ColorModelPatch.java      |  2 +-
 .../internal/coverage/ConvertedGridCoverage.java   |  2 +-
 .../MultiBandsIndexColorModel.java                 |  2 +-
 .../{raster => coverage}/RasterFactory.java        |  2 +-
 .../{raster => coverage}/ScaledColorSpace.java     |  2 +-
 .../apache/sis/internal/raster/package-info.java   | 31 ----------------------
 .../{raster => coverage}/ScaledColorSpaceTest.java |  2 +-
 .../apache/sis/test/suite/FeatureTestSuite.java    |  2 +-
 .../apache/sis/internal/netcdf/RasterResource.java |  2 +-
 11 files changed, 11 insertions(+), 42 deletions(-)

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 57b341c..33b84a7 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.raster.ColorModelFactory;
-import org.apache.sis.internal.raster.RasterFactory;
+import org.apache.sis.internal.coverage.ColorModelFactory;
+import org.apache.sis.internal.coverage.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/raster/ColorModelFactory.java
b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/ColorModelFactory.java
similarity index 99%
rename from core/sis-feature/src/main/java/org/apache/sis/internal/raster/ColorModelFactory.java
rename to core/sis-feature/src/main/java/org/apache/sis/internal/coverage/ColorModelFactory.java
index f35deee..b68ab44 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/raster/ColorModelFactory.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/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.raster;
+package org.apache.sis.internal.coverage;
 
 import java.util.Map;
 import java.util.Arrays;
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/raster/ColorModelPatch.java
b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/ColorModelPatch.java
similarity index 99%
rename from core/sis-feature/src/main/java/org/apache/sis/internal/raster/ColorModelPatch.java
rename to core/sis-feature/src/main/java/org/apache/sis/internal/coverage/ColorModelPatch.java
index 35cce58..d8bfdf8 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/raster/ColorModelPatch.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/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.raster;
+package org.apache.sis.internal.coverage;
 
 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/ConvertedGridCoverage.java
index a7a11a7..60d6f2b 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/ConvertedGridCoverage.java
@@ -384,7 +384,7 @@ 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.raster.ScaledColorSpace
+     * @see org.apache.sis.internal.coverage.ScaledColorSpace
      */
     private static final class ScaledColorModel extends ColorModel {
 
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/raster/MultiBandsIndexColorModel.java
b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/MultiBandsIndexColorModel.java
similarity index 99%
rename from core/sis-feature/src/main/java/org/apache/sis/internal/raster/MultiBandsIndexColorModel.java
rename to core/sis-feature/src/main/java/org/apache/sis/internal/coverage/MultiBandsIndexColorModel.java
index f1f3d4d..1471df0 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/raster/MultiBandsIndexColorModel.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/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.raster;
+package org.apache.sis.internal.coverage;
 
 import java.util.Arrays;
 import java.awt.image.Raster;
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/raster/RasterFactory.java
b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/RasterFactory.java
similarity index 99%
rename from core/sis-feature/src/main/java/org/apache/sis/internal/raster/RasterFactory.java
rename to core/sis-feature/src/main/java/org/apache/sis/internal/coverage/RasterFactory.java
index 0febe69..261c968 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/raster/RasterFactory.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/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.raster;
+package org.apache.sis.internal.coverage;
 
 import java.nio.Buffer;
 import java.nio.ReadOnlyBufferException;
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/raster/ScaledColorSpace.java
b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/ScaledColorSpace.java
similarity index 99%
rename from core/sis-feature/src/main/java/org/apache/sis/internal/raster/ScaledColorSpace.java
rename to core/sis-feature/src/main/java/org/apache/sis/internal/coverage/ScaledColorSpace.java
index 784f4e7..2c3a9da 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/raster/ScaledColorSpace.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/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.raster;
+package org.apache.sis.internal.coverage;
 
 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/raster/package-info.java
b/core/sis-feature/src/main/java/org/apache/sis/internal/raster/package-info.java
deleted file mode 100644
index 29a4094..0000000
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/raster/package-info.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * A set of helper classes for the SIS implementation.
- *
- * <p><strong>Do not use!</strong></p>
- *
- * This package is for internal use by SIS only. Classes in this package
- * may change in incompatible ways in any future version without notice.
- *
- * @author  Martin Desruisseaux (Geomatys)
- * @version 1.0
- * @since   1.0
- * @module
- */
-package org.apache.sis.internal.raster;
diff --git a/core/sis-feature/src/test/java/org/apache/sis/internal/raster/ScaledColorSpaceTest.java
b/core/sis-feature/src/test/java/org/apache/sis/internal/coverage/ScaledColorSpaceTest.java
similarity index 98%
rename from core/sis-feature/src/test/java/org/apache/sis/internal/raster/ScaledColorSpaceTest.java
rename to core/sis-feature/src/test/java/org/apache/sis/internal/coverage/ScaledColorSpaceTest.java
index 66204ab..4f76c39 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/internal/raster/ScaledColorSpaceTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/internal/coverage/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.raster;
+package org.apache.sis.internal.coverage;
 
 import java.util.Random;
 import java.awt.Transparency;
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 d66a76b..43edeae 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
@@ -81,7 +81,7 @@ import org.junit.BeforeClass;
     org.apache.sis.coverage.CategoryTest.class,
     org.apache.sis.coverage.CategoryListTest.class,
     org.apache.sis.coverage.SampleDimensionTest.class,
-    org.apache.sis.internal.raster.ScaledColorSpaceTest.class,
+    org.apache.sis.internal.coverage.ScaledColorSpaceTest.class,
     org.apache.sis.internal.coverage.BufferedGridCoverageTest.class
 })
 public final strictfp class FeatureTestSuite extends TestSuite {
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 ee94c4a..d88adc0 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
@@ -31,7 +31,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.raster.RasterFactory;
+import org.apache.sis.internal.coverage.RasterFactory;
 import org.apache.sis.coverage.SampleDimension;
 import org.apache.sis.coverage.grid.GridExtent;
 import org.apache.sis.coverage.grid.GridCoverage;


Mime
View raw message