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 01ef53c8f5acb003f6e926123b425993d486587b
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Mon Aug 21 11:08:27 2023 +0200
Rename the internal packages of the `org.apache.sis.storage.geotiff` module.
The `internal` name is kept only for packages that should never be exported.
---
.../main/org/apache/sis/storage/landsat/Band.java | 2 +-
.../main/module-info.java | 2 +-
.../main/org/apache/sis/storage/geotiff/CRSBuilder.java | 2 +-
.../apache/sis/storage/geotiff/CompressedSubset.java | 2 +-
.../main/org/apache/sis/storage/geotiff/DataCube.java | 6 +++---
.../main/org/apache/sis/storage/geotiff/DataSubset.java | 2 +-
.../org/apache/sis/storage/geotiff/GeoKeysLoader.java | 2 +-
.../main/org/apache/sis/storage/geotiff/GeoTIFF.java | 2 +-
.../org/apache/sis/storage/geotiff/GeoTiffStore.java | 2 +-
.../apache/sis/storage/geotiff/GridGeometryBuilder.java | 2 +-
.../apache/sis/storage/geotiff/ImageFileDirectory.java | 6 +++---
.../sis/storage/geotiff/ImageMetadataBuilder.java | 4 ++--
.../org/apache/sis/storage/geotiff/NativeMetadata.java | 4 ++--
.../main/org/apache/sis/storage/geotiff/Reader.java | 2 +-
.../storage => storage/geotiff}/inflater/CCITTRLE.java | 2 +-
.../geotiff}/inflater/CompressionChannel.java | 4 ++--
.../geotiff}/inflater/CopyFromBytes.java | 2 +-
.../geotiff}/inflater/HorizontalPredictor.java | 4 ++--
.../storage => storage/geotiff}/inflater/Inflater.java | 8 ++++----
.../storage => storage/geotiff}/inflater/LZW.java | 4 ++--
.../storage => storage/geotiff}/inflater/PackBits.java | 2 +-
.../geotiff}/inflater/PixelChannel.java | 2 +-
.../geotiff}/inflater/PredictorChannel.java | 4 ++--
.../storage => storage/geotiff}/inflater/ZIP.java | 2 +-
.../geotiff}/inflater/package-info.java | 2 +-
.../geotiff/internal}/Compression.java | 2 +-
.../geotiff => storage/geotiff/internal}/Predictor.java | 2 +-
.../geotiff => storage/geotiff/internal}/Resources.java | 2 +-
.../geotiff/internal}/Resources.properties | 0
.../geotiff/internal}/Resources_en.java | 2 +-
.../geotiff/internal}/Resources_fr.java | 2 +-
.../geotiff/internal}/Resources_fr.properties | 0
.../geotiff/internal}/package-info.java | 2 +-
.../geotiff => storage/geotiff/spi}/SchemaModifier.java | 2 +-
.../geotiff/spi/package-info.java} | 17 ++++++-----------
.../geotiff}/inflater/CCITTRLETest.java | 2 +-
.../geotiff}/inflater/InflaterTest.java | 2 +-
.../geotiff/internal}/CompressionTest.java | 2 +-
.../sis/internal/storage/image/WorldFileResource.java | 2 +-
39 files changed, 55 insertions(+), 60 deletions(-)
diff --git
a/endorsed/src/org.apache.sis.storage.earthobservation/main/org/apache/sis/storage/landsat/Band.java
b/endorsed/src/org.apache.sis.storage.earthobservation/main/org/apache/sis/storage/landsat/Band.java
index e2a9436afc..8011332744 100644
---
a/endorsed/src/org.apache.sis.storage.earthobservation/main/org/apache/sis/storage/landsat/Band.java
+++
b/endorsed/src/org.apache.sis.storage.earthobservation/main/org/apache/sis/storage/landsat/Band.java
@@ -27,7 +27,7 @@ import org.apache.sis.storage.GridCoverageResource;
import org.apache.sis.storage.StorageConnector;
import org.apache.sis.storage.DataStoreException;
import org.apache.sis.storage.geotiff.GeoTiffStore;
-import org.apache.sis.internal.geotiff.SchemaModifier;
+import org.apache.sis.storage.geotiff.spi.SchemaModifier;
import org.apache.sis.internal.storage.GridResourceWrapper;
import org.apache.sis.metadata.iso.DefaultMetadata;
import org.apache.sis.metadata.iso.citation.DefaultCitation;
diff --git a/endorsed/src/org.apache.sis.storage.geotiff/main/module-info.java
b/endorsed/src/org.apache.sis.storage.geotiff/main/module-info.java
index 84b78171c8..a2725a5357 100644
--- a/endorsed/src/org.apache.sis.storage.geotiff/main/module-info.java
+++ b/endorsed/src/org.apache.sis.storage.geotiff/main/module-info.java
@@ -34,6 +34,6 @@ module org.apache.sis.storage.geotiff {
exports org.apache.sis.storage.geotiff;
- exports org.apache.sis.internal.geotiff to
+ exports org.apache.sis.storage.geotiff.spi to
org.apache.sis.storage.earthobservation;
}
diff --git
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/CRSBuilder.java
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/CRSBuilder.java
index c8b1cdbf74..612ccbd57e 100644
---
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/CRSBuilder.java
+++
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/CRSBuilder.java
@@ -58,7 +58,7 @@ import org.opengis.referencing.operation.OperationMethod;
import org.opengis.referencing.NoSuchAuthorityCodeException;
import org.opengis.util.FactoryException;
-import org.apache.sis.internal.geotiff.Resources;
+import org.apache.sis.storage.geotiff.internal.Resources;
import org.apache.sis.internal.referencing.WKTKeywords;
import org.apache.sis.internal.referencing.NilReferencingObject;
import org.apache.sis.internal.referencing.ReferencingUtilities;
diff --git
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/CompressedSubset.java
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/CompressedSubset.java
index fe926da63a..9cb93adf18 100644
---
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/CompressedSubset.java
+++
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/CompressedSubset.java
@@ -22,7 +22,7 @@ import java.nio.Buffer;
import java.awt.Point;
import java.awt.image.Raster;
import org.apache.sis.internal.storage.TiledGridResource;
-import org.apache.sis.internal.storage.inflater.Inflater;
+import org.apache.sis.storage.geotiff.inflater.Inflater;
import org.apache.sis.internal.coverage.j2d.RasterFactory;
import org.apache.sis.storage.DataStoreException;
import org.apache.sis.image.DataType;
diff --git
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/DataCube.java
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/DataCube.java
index e8b09a1f50..182825e169 100644
---
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/DataCube.java
+++
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/DataCube.java
@@ -28,9 +28,9 @@ import org.apache.sis.storage.DataStoreContentException;
import org.apache.sis.storage.event.StoreListeners;
import org.apache.sis.coverage.grid.GridCoverage;
import org.apache.sis.coverage.grid.GridGeometry;
-import org.apache.sis.internal.geotiff.Resources;
-import org.apache.sis.internal.geotiff.Predictor;
-import org.apache.sis.internal.geotiff.Compression;
+import org.apache.sis.storage.geotiff.internal.Resources;
+import org.apache.sis.storage.geotiff.internal.Predictor;
+import org.apache.sis.storage.geotiff.internal.Compression;
import org.apache.sis.internal.storage.TiledGridResource;
import org.apache.sis.internal.storage.ResourceOnFileSystem;
import org.apache.sis.internal.storage.StoreResource;
diff --git
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/DataSubset.java
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/DataSubset.java
index 58192bc408..e823c6f608 100644
---
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/DataSubset.java
+++
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/DataSubset.java
@@ -40,7 +40,7 @@ import org.apache.sis.internal.coverage.j2d.TilePlaceholder;
import org.apache.sis.internal.coverage.j2d.ImageUtilities;
import org.apache.sis.internal.coverage.j2d.RasterFactory;
import org.apache.sis.internal.storage.io.ChannelDataInput;
-import org.apache.sis.internal.geotiff.Resources;
+import org.apache.sis.storage.geotiff.internal.Resources;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.Localized;
import org.apache.sis.util.ArraysExt;
diff --git
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/GeoKeysLoader.java
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/GeoKeysLoader.java
index 28a7788828..31a8dbddcb 100644
---
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/GeoKeysLoader.java
+++
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/GeoKeysLoader.java
@@ -19,7 +19,7 @@ package org.apache.sis.storage.geotiff;
import java.util.Map;
import org.apache.sis.math.Vector;
import org.apache.sis.util.CharSequences;
-import org.apache.sis.internal.geotiff.Resources;
+import org.apache.sis.storage.geotiff.internal.Resources;
import static javax.imageio.plugins.tiff.GeoTIFFTagSet.*;
diff --git
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/GeoTIFF.java
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/GeoTIFF.java
index da4fe2d011..7f289e6418 100644
---
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/GeoTIFF.java
+++
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/GeoTIFF.java
@@ -22,7 +22,7 @@ import java.io.Closeable;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import org.apache.sis.util.resources.Errors;
-import org.apache.sis.internal.geotiff.Resources;
+import org.apache.sis.storage.geotiff.internal.Resources;
/**
diff --git
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/GeoTiffStore.java
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/GeoTiffStore.java
index d4bde598dc..5dc297ff87 100644
---
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/GeoTiffStore.java
+++
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/GeoTiffStore.java
@@ -50,7 +50,7 @@ import org.apache.sis.internal.storage.io.IOUtilities;
import org.apache.sis.internal.storage.MetadataBuilder;
import org.apache.sis.internal.storage.StoreUtilities;
import org.apache.sis.internal.storage.URIDataStore;
-import org.apache.sis.internal.geotiff.SchemaModifier;
+import org.apache.sis.storage.geotiff.spi.SchemaModifier;
import org.apache.sis.internal.util.Constants;
import org.apache.sis.internal.util.ListOfUnknownSize;
import org.apache.sis.metadata.iso.DefaultMetadata;
diff --git
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/GridGeometryBuilder.java
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/GridGeometryBuilder.java
index c9903f051b..66402c392c 100644
---
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/GridGeometryBuilder.java
+++
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/GridGeometryBuilder.java
@@ -33,7 +33,7 @@ import org.apache.sis.referencing.operation.matrix.MatrixSIS;
import org.apache.sis.referencing.operation.matrix.Matrices;
import
org.apache.sis.referencing.operation.transform.DefaultMathTransformFactory;
import org.apache.sis.internal.storage.MetadataBuilder;
-import org.apache.sis.internal.geotiff.Resources;
+import org.apache.sis.storage.geotiff.internal.Resources;
import org.apache.sis.internal.util.DoubleDouble;
import org.apache.sis.coverage.grid.GridGeometry;
import org.apache.sis.coverage.grid.GridExtent;
diff --git
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/ImageFileDirectory.java
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/ImageFileDirectory.java
index 12bcc7d689..02bfd01c03 100644
---
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/ImageFileDirectory.java
+++
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/ImageFileDirectory.java
@@ -36,9 +36,9 @@ import org.opengis.util.NameSpace;
import org.opengis.util.FactoryException;
import org.opengis.referencing.operation.TransformException;
import org.apache.sis.referencing.operation.transform.MathTransforms;
-import org.apache.sis.internal.geotiff.Resources;
-import org.apache.sis.internal.geotiff.Predictor;
-import org.apache.sis.internal.geotiff.Compression;
+import org.apache.sis.storage.geotiff.internal.Resources;
+import org.apache.sis.storage.geotiff.internal.Predictor;
+import org.apache.sis.storage.geotiff.internal.Compression;
import org.apache.sis.internal.storage.MetadataBuilder;
import org.apache.sis.internal.storage.io.ChannelDataInput;
import org.apache.sis.internal.coverage.j2d.ColorModelFactory;
diff --git
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/ImageMetadataBuilder.java
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/ImageMetadataBuilder.java
index 8d9ea94142..85a0868e65 100644
---
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/ImageMetadataBuilder.java
+++
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/ImageMetadataBuilder.java
@@ -18,8 +18,8 @@ package org.apache.sis.storage.geotiff;
import javax.measure.Unit;
import javax.measure.quantity.Length;
-import org.apache.sis.internal.geotiff.Resources;
-import org.apache.sis.internal.geotiff.Compression;
+import org.apache.sis.storage.geotiff.internal.Resources;
+import org.apache.sis.storage.geotiff.internal.Compression;
import org.apache.sis.internal.storage.MetadataBuilder;
import org.apache.sis.storage.event.StoreListeners;
import org.apache.sis.storage.DataStoreException;
diff --git
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/NativeMetadata.java
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/NativeMetadata.java
index 4a2afc0833..fe8ceb55ee 100644
---
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/NativeMetadata.java
+++
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/NativeMetadata.java
@@ -30,8 +30,8 @@ import org.apache.sis.util.collection.TreeTable;
import org.apache.sis.util.collection.TableColumn;
import org.apache.sis.util.collection.DefaultTreeTable;
import org.apache.sis.internal.storage.io.ChannelDataInput;
-import org.apache.sis.internal.geotiff.Compression;
-import org.apache.sis.internal.geotiff.Predictor;
+import org.apache.sis.storage.geotiff.internal.Compression;
+import org.apache.sis.storage.geotiff.internal.Predictor;
import static java.lang.Math.addExact;
import static javax.imageio.plugins.tiff.GeoTIFFTagSet.*;
diff --git
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/Reader.java
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/Reader.java
index 0c87786cb0..e07cff200b 100644
---
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/Reader.java
+++
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/Reader.java
@@ -29,7 +29,7 @@ import org.apache.sis.storage.GridCoverageResource;
import org.apache.sis.storage.DataStoreException;
import org.apache.sis.storage.DataStoreContentException;
import org.apache.sis.internal.storage.io.ChannelDataInput;
-import org.apache.sis.internal.geotiff.Resources;
+import org.apache.sis.storage.geotiff.internal.Resources;
import org.apache.sis.util.iso.DefaultNameFactory;
import org.apache.sis.util.resources.Errors;
diff --git
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/internal/storage/inflater/CCITTRLE.java
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/inflater/CCITTRLE.java
similarity index 99%
rename from
endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/internal/storage/inflater/CCITTRLE.java
rename to
endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/inflater/CCITTRLE.java
index c148d6deff..2b9156aafc 100644
---
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/internal/storage/inflater/CCITTRLE.java
+++
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/inflater/CCITTRLE.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.storage.inflater;
+package org.apache.sis.storage.geotiff.inflater;
import java.io.IOException;
import java.nio.ByteBuffer;
diff --git
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/internal/storage/inflater/CompressionChannel.java
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/inflater/CompressionChannel.java
similarity index 98%
rename from
endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/internal/storage/inflater/CompressionChannel.java
rename to
endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/inflater/CompressionChannel.java
index 1fd76a6d98..fda45708d7 100644
---
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/internal/storage/inflater/CompressionChannel.java
+++
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/inflater/CompressionChannel.java
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.storage.inflater;
+package org.apache.sis.storage.geotiff.inflater;
import java.util.Arrays;
import java.io.IOException;
import java.nio.ByteBuffer;
import org.apache.sis.math.MathFunctions;
import org.apache.sis.internal.util.Numerics;
-import org.apache.sis.internal.geotiff.Resources;
+import org.apache.sis.storage.geotiff.internal.Resources;
import org.apache.sis.internal.storage.io.ChannelDataInput;
import org.apache.sis.storage.event.StoreListeners;
import org.apache.sis.storage.StorageConnector;
diff --git
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/internal/storage/inflater/CopyFromBytes.java
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/inflater/CopyFromBytes.java
similarity index 99%
rename from
endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/internal/storage/inflater/CopyFromBytes.java
rename to
endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/inflater/CopyFromBytes.java
index 6b5a854019..2fc55bf17a 100644
---
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/internal/storage/inflater/CopyFromBytes.java
+++
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/inflater/CopyFromBytes.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.storage.inflater;
+package org.apache.sis.storage.geotiff.inflater;
import java.io.IOException;
import java.nio.Buffer;
diff --git
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/internal/storage/inflater/HorizontalPredictor.java
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/inflater/HorizontalPredictor.java
similarity index 99%
rename from
endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/internal/storage/inflater/HorizontalPredictor.java
rename to
endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/inflater/HorizontalPredictor.java
index 12bc00d32c..c94c27aec6 100644
---
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/internal/storage/inflater/HorizontalPredictor.java
+++
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/inflater/HorizontalPredictor.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.storage.inflater;
+package org.apache.sis.storage.geotiff.inflater;
import java.io.IOException;
import java.nio.ByteBuffer;
@@ -23,7 +23,7 @@ import org.apache.sis.internal.jdk17.JDK17;
/**
- * Implementation of {@link
org.apache.sis.internal.geotiff.Predictor#HORIZONTAL}.
+ * Implementation of {@link
org.apache.sis.storage.geotiff.internal.Predictor#HORIZONTAL}.
* Current implementation works only on 8, 16, 32 or 64-bits samples.
* Values packed on 4, 2 or 1 bits are not yet supported.
*
diff --git
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/internal/storage/inflater/Inflater.java
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/inflater/Inflater.java
similarity index 98%
rename from
endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/internal/storage/inflater/Inflater.java
rename to
endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/inflater/Inflater.java
index e79292bada..af8a8022ca 100644
---
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/internal/storage/inflater/Inflater.java
+++
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/inflater/Inflater.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.storage.inflater;
+package org.apache.sis.storage.geotiff.inflater;
import java.util.Arrays;
import java.io.Closeable;
@@ -23,9 +23,9 @@ import java.nio.Buffer;
import org.apache.sis.image.DataType;
import org.apache.sis.math.MathFunctions;
import org.apache.sis.internal.util.Numerics;
-import org.apache.sis.internal.geotiff.Compression;
-import org.apache.sis.internal.geotiff.Predictor;
-import org.apache.sis.internal.geotiff.Resources;
+import org.apache.sis.storage.geotiff.internal.Compression;
+import org.apache.sis.storage.geotiff.internal.Predictor;
+import org.apache.sis.storage.geotiff.internal.Resources;
import org.apache.sis.internal.storage.io.ChannelDataInput;
import org.apache.sis.storage.UnsupportedEncodingException;
import org.apache.sis.storage.event.StoreListeners;
diff --git
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/internal/storage/inflater/LZW.java
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/inflater/LZW.java
similarity index 99%
rename from
endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/internal/storage/inflater/LZW.java
rename to
endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/inflater/LZW.java
index 465fa7323b..5984b79ffe 100644
---
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/internal/storage/inflater/LZW.java
+++
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/inflater/LZW.java
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.storage.inflater;
+package org.apache.sis.storage.geotiff.inflater;
import java.util.Arrays;
import java.io.IOException;
import java.io.EOFException;
import java.nio.ByteBuffer;
-import org.apache.sis.internal.geotiff.Resources;
+import org.apache.sis.storage.geotiff.internal.Resources;
import org.apache.sis.internal.storage.io.ChannelDataInput;
import org.apache.sis.storage.event.StoreListeners;
diff --git
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/internal/storage/inflater/PackBits.java
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/inflater/PackBits.java
similarity index 99%
rename from
endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/internal/storage/inflater/PackBits.java
rename to
endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/inflater/PackBits.java
index 3c707ce70f..f42f004a68 100644
---
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/internal/storage/inflater/PackBits.java
+++
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/inflater/PackBits.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.storage.inflater;
+package org.apache.sis.storage.geotiff.inflater;
import java.io.IOException;
import java.nio.ByteBuffer;
diff --git
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/internal/storage/inflater/PixelChannel.java
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/inflater/PixelChannel.java
similarity index 97%
rename from
endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/internal/storage/inflater/PixelChannel.java
rename to
endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/inflater/PixelChannel.java
index ba67e9f9d3..ce7d7473ad 100644
---
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/internal/storage/inflater/PixelChannel.java
+++
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/inflater/PixelChannel.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.storage.inflater;
+package org.apache.sis.storage.geotiff.inflater;
import java.io.IOException;
import java.nio.channels.ReadableByteChannel;
diff --git
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/internal/storage/inflater/PredictorChannel.java
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/inflater/PredictorChannel.java
similarity index 97%
rename from
endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/internal/storage/inflater/PredictorChannel.java
rename to
endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/inflater/PredictorChannel.java
index aba68f73a5..b79b640fd8 100644
---
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/internal/storage/inflater/PredictorChannel.java
+++
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/inflater/PredictorChannel.java
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.storage.inflater;
+package org.apache.sis.storage.geotiff.inflater;
import java.io.IOException;
import java.nio.ByteBuffer;
import org.apache.sis.util.ArraysExt;
-import org.apache.sis.internal.geotiff.Predictor;
+import org.apache.sis.storage.geotiff.internal.Predictor;
import org.apache.sis.internal.jdk17.JDK17;
diff --git
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/internal/storage/inflater/ZIP.java
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/inflater/ZIP.java
similarity index 98%
rename from
endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/internal/storage/inflater/ZIP.java
rename to
endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/inflater/ZIP.java
index 8df98c0bfa..dac9017b65 100644
---
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/internal/storage/inflater/ZIP.java
+++
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/inflater/ZIP.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.storage.inflater;
+package org.apache.sis.storage.geotiff.inflater;
import java.io.IOException;
import java.nio.ByteBuffer;
diff --git
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/internal/storage/inflater/package-info.java
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/inflater/package-info.java
similarity index 97%
rename from
endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/internal/storage/inflater/package-info.java
rename to
endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/inflater/package-info.java
index 374479bc7c..aa48f20d45 100644
---
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/internal/storage/inflater/package-info.java
+++
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/inflater/package-info.java
@@ -45,4 +45,4 @@
* @version 1.4
* @since 1.1
*/
-package org.apache.sis.internal.storage.inflater;
+package org.apache.sis.storage.geotiff.inflater;
diff --git
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/internal/geotiff/Compression.java
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/internal/Compression.java
similarity index 99%
rename from
endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/internal/geotiff/Compression.java
rename to
endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/internal/Compression.java
index 3bb7f59767..9326d9c0df 100644
---
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/internal/geotiff/Compression.java
+++
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/internal/Compression.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.geotiff;
+package org.apache.sis.storage.geotiff.internal;
import static javax.imageio.plugins.tiff.BaselineTIFFTagSet.*;
diff --git
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/internal/geotiff/Predictor.java
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/internal/Predictor.java
similarity index 97%
rename from
endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/internal/geotiff/Predictor.java
rename to
endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/internal/Predictor.java
index f93e847286..c5e3247205 100644
---
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/internal/geotiff/Predictor.java
+++
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/internal/Predictor.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.geotiff;
+package org.apache.sis.storage.geotiff.internal;
import static javax.imageio.plugins.tiff.BaselineTIFFTagSet.*;
diff --git
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/internal/geotiff/Resources.java
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/internal/Resources.java
similarity index 99%
rename from
endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/internal/geotiff/Resources.java
rename to
endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/internal/Resources.java
index ed68da2323..0c21797524 100644
---
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/internal/geotiff/Resources.java
+++
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/internal/Resources.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.geotiff;
+package org.apache.sis.storage.geotiff.internal;
import java.io.InputStream;
import java.util.Locale;
diff --git
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/internal/geotiff/Resources.properties
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/internal/Resources.properties
similarity index 100%
rename from
endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/internal/geotiff/Resources.properties
rename to
endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/internal/Resources.properties
diff --git
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/internal/geotiff/Resources_en.java
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/internal/Resources_en.java
similarity index 95%
rename from
endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/internal/geotiff/Resources_en.java
rename to
endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/internal/Resources_en.java
index d464ed53b6..a09db44680 100644
---
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/internal/geotiff/Resources_en.java
+++
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/internal/Resources_en.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.geotiff;
+package org.apache.sis.storage.geotiff.internal;
/**
diff --git
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/internal/geotiff/Resources_fr.java
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/internal/Resources_fr.java
similarity index 95%
copy from
endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/internal/geotiff/Resources_fr.java
copy to
endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/internal/Resources_fr.java
index 50af0f3621..28ed9111cc 100644
---
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/internal/geotiff/Resources_fr.java
+++
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/internal/Resources_fr.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.geotiff;
+package org.apache.sis.storage.geotiff.internal;
/**
diff --git
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/internal/geotiff/Resources_fr.properties
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/internal/Resources_fr.properties
similarity index 100%
rename from
endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/internal/geotiff/Resources_fr.properties
rename to
endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/internal/Resources_fr.properties
diff --git
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/internal/geotiff/package-info.java
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/internal/package-info.java
similarity index 95%
rename from
endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/internal/geotiff/package-info.java
rename to
endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/internal/package-info.java
index 3bb6f44811..8ecbd397e5 100644
---
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/internal/geotiff/package-info.java
+++
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/internal/package-info.java
@@ -27,4 +27,4 @@
* @version 1.4
* @since 0.8
*/
-package org.apache.sis.internal.geotiff;
+package org.apache.sis.storage.geotiff.internal;
diff --git
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/internal/geotiff/SchemaModifier.java
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/spi/SchemaModifier.java
similarity index 99%
rename from
endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/internal/geotiff/SchemaModifier.java
rename to
endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/spi/SchemaModifier.java
index 0f0659c2a6..5da2ee482d 100644
---
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/internal/geotiff/SchemaModifier.java
+++
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/spi/SchemaModifier.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.geotiff;
+package org.apache.sis.storage.geotiff.spi;
import org.apache.sis.coverage.SampleDimension;
import org.apache.sis.measure.NumberRange;
diff --git
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/internal/geotiff/Resources_fr.java
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/spi/package-info.java
similarity index 73%
rename from
endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/internal/geotiff/Resources_fr.java
rename to
endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/spi/package-info.java
index 50af0f3621..3f591b2916 100644
---
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/internal/geotiff/Resources_fr.java
+++
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/spi/package-info.java
@@ -14,17 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.geotiff;
-
/**
- * Messages in French language.
+ * Extensions to GeoTIFF reader.
+ *
+ * @author Martin Desruisseaux (Geomatys)
+ * @version 1.2
+ * @since 1.1
*/
-public class Resources_fr extends Resources {
- /**
- * Constructs a new resource bundle loading data from
- * the resource file of the same name than this class.
- */
- public Resources_fr() {
- }
-}
+package org.apache.sis.storage.geotiff.spi;
diff --git
a/endorsed/src/org.apache.sis.storage.geotiff/test/org/apache/sis/internal/storage/inflater/CCITTRLETest.java
b/endorsed/src/org.apache.sis.storage.geotiff/test/org/apache/sis/storage/geotiff/inflater/CCITTRLETest.java
similarity index 99%
rename from
endorsed/src/org.apache.sis.storage.geotiff/test/org/apache/sis/internal/storage/inflater/CCITTRLETest.java
rename to
endorsed/src/org.apache.sis.storage.geotiff/test/org/apache/sis/storage/geotiff/inflater/CCITTRLETest.java
index cd18ff00d8..d223620121 100644
---
a/endorsed/src/org.apache.sis.storage.geotiff/test/org/apache/sis/internal/storage/inflater/CCITTRLETest.java
+++
b/endorsed/src/org.apache.sis.storage.geotiff/test/org/apache/sis/storage/geotiff/inflater/CCITTRLETest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.storage.inflater;
+package org.apache.sis.storage.geotiff.inflater;
import java.util.List;
import java.util.ArrayList;
diff --git
a/endorsed/src/org.apache.sis.storage.geotiff/test/org/apache/sis/internal/storage/inflater/InflaterTest.java
b/endorsed/src/org.apache.sis.storage.geotiff/test/org/apache/sis/storage/geotiff/inflater/InflaterTest.java
similarity index 97%
rename from
endorsed/src/org.apache.sis.storage.geotiff/test/org/apache/sis/internal/storage/inflater/InflaterTest.java
rename to
endorsed/src/org.apache.sis.storage.geotiff/test/org/apache/sis/storage/geotiff/inflater/InflaterTest.java
index 2eb4c1f68e..bddeaa5cd7 100644
---
a/endorsed/src/org.apache.sis.storage.geotiff/test/org/apache/sis/internal/storage/inflater/InflaterTest.java
+++
b/endorsed/src/org.apache.sis.storage.geotiff/test/org/apache/sis/storage/geotiff/inflater/InflaterTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.storage.inflater;
+package org.apache.sis.storage.geotiff.inflater;
import org.apache.sis.test.TestCase;
import org.junit.Test;
diff --git
a/endorsed/src/org.apache.sis.storage.geotiff/test/org/apache/sis/internal/geotiff/CompressionTest.java
b/endorsed/src/org.apache.sis.storage.geotiff/test/org/apache/sis/storage/geotiff/internal/CompressionTest.java
similarity index 96%
rename from
endorsed/src/org.apache.sis.storage.geotiff/test/org/apache/sis/internal/geotiff/CompressionTest.java
rename to
endorsed/src/org.apache.sis.storage.geotiff/test/org/apache/sis/storage/geotiff/internal/CompressionTest.java
index c4f531f7c8..9ecf45ccf2 100644
---
a/endorsed/src/org.apache.sis.storage.geotiff/test/org/apache/sis/internal/geotiff/CompressionTest.java
+++
b/endorsed/src/org.apache.sis.storage.geotiff/test/org/apache/sis/storage/geotiff/internal/CompressionTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.geotiff;
+package org.apache.sis.storage.geotiff.internal;
import org.apache.sis.test.TestCase;
import org.junit.Test;
diff --git
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/image/WorldFileResource.java
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/image/WorldFileResource.java
index e0da7fc8e9..c19ecdb92e 100644
---
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/image/WorldFileResource.java
+++
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/image/WorldFileResource.java
@@ -222,7 +222,7 @@ class WorldFileResource extends
AbstractGridCoverageResource implements StoreRes
final short[] names =
ImageUtilities.bandNames(type.getColorModel(), type.getSampleModel());
for (int i=0; i<bands.length; i++) {
/*
- * TODO: we could consider a mechanism similar to
org.apache.sis.internal.geotiff.SchemaModifier
+ * TODO: we could consider a mechanism similar to
org.apache.sis.storage.geotiff.spi.SchemaModifier
* if there is a need to customize the sample dimensions.
`SchemaModifier` could become a shared
* public interface.
*/
