Some Apache SIS "internal" packages have been renamed as "privy".

https://issues.apache.org/jira/browse/SIS-596

Author: desruisseaux

benchmark/src/main/java/org/geotoolkit/benchmarks/AggregatedCoverageBenchmark.java

@@ -11,7 +11,7 @@
 import org.apache.sis.coverage.grid.GridExtent;
 import org.apache.sis.coverage.grid.GridGeometry;
 import org.apache.sis.geometry.GeneralEnvelope;
-import org.apache.sis.referencing.util.j2d.AffineTransform2D;
+import org.apache.sis.referencing.privy.AffineTransform2D;
 import org.apache.sis.referencing.CommonCRS;
 import org.apache.sis.storage.DataStoreException;
 import org.apache.sis.storage.GridCoverageResource;

geotk-analytics/src/main/java/org/geotoolkit/math/ObjectiveAnalysis.java

@@ -29,7 +29,7 @@
 import java.awt.image.WritableRaster;
 import javax.media.jai.RasterFactory;
 import org.apache.sis.coverage.grid.PixelTranslation;
-import org.apache.sis.coverage.grid.j2d.ColorModelFactory;
+import org.apache.sis.coverage.privy.ColorModelFactory;
 import org.apache.sis.math.Plane;
 import org.apache.sis.referencing.operation.matrix.Matrices;
 import org.apache.sis.referencing.operation.matrix.MatrixSIS;

geotk-client-osm/src/main/java/org/geotoolkit/data/osm/client/v060/ChangeElement060.java

@@ -17,7 +17,7 @@
 
 package org.geotoolkit.data.osm.client.v060;
 
-import org.apache.sis.feature.internal.AttributeConvention;
+import org.apache.sis.feature.privy.AttributeConvention;
 import org.geotoolkit.data.osm.client.AbstractChangeElement;
 import org.geotoolkit.data.osm.client.OpenStreetMapClient;
 import org.geotoolkit.data.osm.model.OSMModelConstants;

geotk-client-store/src/main/java/org/geotoolkit/client/RequestsUtilities.java

@@ -38,7 +38,7 @@
 import org.opengis.util.FactoryException;
 
 import org.apache.sis.geometry.GeneralEnvelope;
-import org.apache.sis.referencing.util.GeodeticObjectBuilder;
+import org.apache.sis.referencing.privy.GeodeticObjectBuilder;
 import org.apache.sis.referencing.CRS;
 import org.apache.sis.referencing.crs.DefaultTemporalCRS;
 import org.apache.sis.referencing.CommonCRS;

geotk-client-wcs/src/main/java/org/geotoolkit/wcs/WCSResource.java

@@ -32,7 +32,7 @@
 import org.apache.sis.coverage.grid.GridOrientation;
 import org.apache.sis.geometry.Envelopes;
 import org.apache.sis.geometry.GeneralEnvelope;
-import org.apache.sis.referencing.util.j2d.AffineTransform2D;
+import org.apache.sis.referencing.privy.AffineTransform2D;
 import org.apache.sis.storage.AbstractGridCoverageResource;
 import org.apache.sis.storage.base.StoreResource;
 import org.apache.sis.referencing.CRS;

geotk-client-wfs/src/main/java/org/geotoolkit/data/wfs/AbstractGetFeature.java

@@ -36,7 +36,7 @@
 import jakarta.xml.bind.JAXBException;
 import jakarta.xml.bind.Marshaller;
 import javax.xml.namespace.QName;
-import org.apache.sis.filter.internal.FunctionNames;
+import org.apache.sis.filter.privy.FunctionNames;
 
 import org.geotoolkit.client.AbstractRequest;
 import org.geotoolkit.util.NamesExt;

geotk-client-wfs/src/main/java/org/geotoolkit/data/wfs/WFSFeatureSet.java

@@ -48,7 +48,7 @@
 import org.apache.sis.feature.builder.FeatureTypeBuilder;
 import org.apache.sis.feature.builder.PropertyTypeBuilder;
 import org.apache.sis.geometry.GeneralEnvelope;
-import org.apache.sis.filter.internal.FunctionNames;
+import org.apache.sis.filter.privy.FunctionNames;
 import org.apache.sis.metadata.iso.DefaultMetadata;
 import org.apache.sis.metadata.iso.citation.DefaultCitation;
 import org.apache.sis.metadata.iso.identification.DefaultDataIdentification;

geotk-client-wms/src/main/java/org/geotoolkit/wms/WMSResource.java

@@ -46,8 +46,8 @@
 import org.apache.sis.geometry.Envelopes;
 import org.apache.sis.geometry.GeneralDirectPosition;
 import org.apache.sis.geometry.GeneralEnvelope;
-import org.apache.sis.referencing.util.AxisDirections;
-import org.apache.sis.referencing.util.j2d.AffineTransform2D;
+import org.apache.sis.referencing.privy.AxisDirections;
+import org.apache.sis.referencing.privy.AffineTransform2D;
 import org.apache.sis.storage.AbstractGridCoverageResource;
 import org.apache.sis.storage.base.StoreResource;
 import org.apache.sis.referencing.CRS;

geotk-client-wms/src/main/java/org/geotoolkit/wms/WMSUtilities.java

@@ -32,7 +32,7 @@
 import org.apache.sis.coverage.grid.GridOrientation;
 import org.apache.sis.coverage.grid.IncompleteGridGeometryException;
 import org.apache.sis.geometry.GeneralEnvelope;
-import org.apache.sis.referencing.util.GeodeticObjectBuilder;
+import org.apache.sis.referencing.privy.GeodeticObjectBuilder;
 import org.apache.sis.measure.Units;
 import org.apache.sis.referencing.CRS;
 import org.apache.sis.referencing.CommonCRS;

geotk-coverage-geotiff/src/main/java/org/geotoolkit/metadata/geotiff/GeoTiffCRSReader.java

@@ -42,8 +42,8 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.measure.Unit;
-import org.apache.sis.referencing.util.Formulas;
-import org.apache.sis.referencing.util.ReferencingFactoryContainer;
+import org.apache.sis.referencing.privy.Formulas;
+import org.apache.sis.referencing.privy.ReferencingFactoryContainer;
 import org.apache.sis.referencing.operation.provider.AlbersEqualArea;
 import org.apache.sis.referencing.operation.provider.Equirectangular;
 import org.apache.sis.referencing.operation.provider.LambertConformal1SP;

geotk-coverage-geotiff/src/main/java/org/geotoolkit/metadata/geotiff/GeoTiffCRSWriter.java

@@ -49,7 +49,7 @@
 import org.apache.sis.referencing.operation.provider.PolarStereographicA;
 import org.apache.sis.referencing.operation.provider.PolarStereographicB;
 import org.apache.sis.referencing.operation.provider.TransverseMercator;
-import org.apache.sis.referencing.util.ReferencingUtilities;
+import org.apache.sis.referencing.privy.ReferencingUtilities;
 
 import org.geotoolkit.internal.referencing.CRSUtilities;
 import org.apache.sis.metadata.iso.citation.Citations;

geotk-coverage-geotiff/src/main/java/org/geotoolkit/metadata/geotiff/GeoTiffExtension.java

@@ -29,7 +29,7 @@
 import org.opengis.util.FactoryException;
 
 import org.apache.sis.geometry.GeneralDirectPosition;
-import org.apache.sis.referencing.util.GeodeticObjectBuilder;
+import org.apache.sis.referencing.privy.GeodeticObjectBuilder;
 import org.apache.sis.referencing.CRS;
 
 import org.geotoolkit.image.io.metadata.ReferencingBuilder;

geotk-coverage-geotiff/src/main/java/org/geotoolkit/metadata/geotiff/GeoTiffMetaDataWriter.java

@@ -30,7 +30,7 @@
 import org.geotoolkit.image.io.metadata.MetadataHelper;
 import org.geotoolkit.image.io.metadata.SpatialMetadata;
 import org.apache.sis.coverage.grid.PixelTranslation;
-import org.apache.sis.referencing.util.j2d.AffineTransform2D;
+import org.apache.sis.referencing.privy.AffineTransform2D;
 import org.apache.sis.referencing.CRS;
 import org.apache.sis.referencing.CommonCRS;
 import org.apache.sis.referencing.crs.DefaultTemporalCRS;

geotk-coverage-geotiff/src/test/java/org/geotoolkit/image/io/GeoTiffRWTest.java

@@ -30,7 +30,7 @@
 import javax.imageio.ImageReader;
 import javax.imageio.ImageWriter;
 import org.apache.sis.coverage.grid.GridCoverage;
-import org.apache.sis.referencing.util.j2d.AffineTransform2D;
+import org.apache.sis.referencing.privy.AffineTransform2D;
 import org.apache.sis.referencing.CRS;
 import org.apache.sis.referencing.crs.AbstractCRS;
 import org.apache.sis.referencing.cs.AxesConvention;

geotk-coverage-geotiff/src/test/java/org/geotoolkit/metadata/geotiff/GeotiffTest.java

@@ -29,7 +29,7 @@
 import org.opengis.util.FactoryException;
 import org.opengis.util.GenericName;
 
-import org.apache.sis.referencing.util.GeodeticObjectBuilder;
+import org.apache.sis.referencing.privy.GeodeticObjectBuilder;
 import org.apache.sis.measure.NumberRange;
 import org.apache.sis.referencing.CommonCRS;
 import org.apache.sis.referencing.NamedIdentifier;

geotk-coverage-hgt/src/main/java/org/geotoolkit/coverage/hgt/HGTStore.java

@@ -33,7 +33,7 @@
 import org.apache.sis.coverage.grid.GridCoverageBuilder;
 import org.apache.sis.coverage.grid.GridExtent;
 import org.apache.sis.coverage.grid.GridGeometry;
-import org.apache.sis.referencing.util.j2d.AffineTransform2D;
+import org.apache.sis.referencing.privy.AffineTransform2D;
 import org.apache.sis.storage.base.ResourceOnFileSystem;
 import org.apache.sis.io.stream.ChannelImageInputStream;
 import org.apache.sis.io.stream.HyperRectangleReader;

geotk-coverage-hgt/src/test/java/org/geotoolkit/coverage/hgt/HGTReaderTest.java

@@ -30,7 +30,7 @@
 import org.apache.sis.coverage.grid.GridGeometry;
 import org.apache.sis.geometry.GeneralEnvelope;
 import org.apache.sis.image.PixelIterator;
-import org.apache.sis.referencing.util.j2d.AffineTransform2D;
+import org.apache.sis.referencing.privy.AffineTransform2D;
 import org.apache.sis.referencing.CommonCRS;
 import org.apache.sis.storage.DataStoreException;
 import org.apache.sis.storage.StorageConnector;

geotk-coverage-imagery/src/main/java/org/geotoolkit/image/BufferedImages.java

@@ -41,9 +41,9 @@
 import org.apache.sis.image.PixelIterator;
 import org.apache.sis.image.PlanarImage;
 import org.apache.sis.image.WritablePixelIterator;
-import org.apache.sis.coverage.grid.j2d.ColorModelFactory;
-import org.apache.sis.coverage.grid.j2d.ObservableImage;
-import org.apache.sis.coverage.grid.j2d.FillValues;
+import org.apache.sis.coverage.privy.ColorModelFactory;
+import org.apache.sis.coverage.privy.ObservableImage;
+import org.apache.sis.coverage.privy.FillValues;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.Static;
 import org.geotoolkit.image.internal.ImageUtilities;
@@ -180,7 +180,7 @@ public static WritableRaster createRaster(int width, int height, int nbBand, int
                 }
                 final int[] zero = new int[1];
                 //TODO create our own raster factory to avoid JAI
-                raster = org.apache.sis.coverage.grid.j2d.RasterFactory.createRaster(buffer, width, height, 1, width, zero, zero, upperLeft);
+                raster = org.apache.sis.coverage.privy.RasterFactory.createRaster(buffer, width, height, 1, width, zero, zero, upperLeft);
                 //raster = RasterFactory.createBandedRaster(buffer, width, height, width, zero, zero, upperLeft);
             }
 

geotk-coverage-imagery/src/main/java/org/geotoolkit/image/color/ColorUtilities.java

@@ -21,7 +21,7 @@
 import java.awt.color.ColorSpace;
 import java.awt.image.IndexColorModel;
 import java.awt.image.DataBuffer;
-import org.apache.sis.coverage.grid.j2d.ColorModelFactory;
+import org.apache.sis.coverage.privy.ColorModelFactory;
 
 import org.geotoolkit.lang.Static;
 

geotk-coverage-imagery/src/main/java/org/geotoolkit/image/internal/ImageUtilities.java

@@ -25,7 +25,7 @@
 import javax.media.jai.ImageLayout;
 
 import org.geotoolkit.lang.Static;
-import org.apache.sis.coverage.grid.j2d.FillValues;
+import org.apache.sis.coverage.privy.FillValues;
 
 
 
@@ -104,7 +104,7 @@ public static ImageLayout createIntersection(final ImageLayout layout,
             // If the bounds changed, adjust the tile size.
             if (result != layout) {
                 source = sources.get(0);
-                final Dimension tileSize = org.apache.sis.coverage.grid.j2d.ImageLayout.DEFAULT.suggestTileSize(source, null, false);
+                final Dimension tileSize = org.apache.sis.coverage.privy.ImageLayout.DEFAULT.suggestTileSize(source, null, false);
                 if (result.isValid(ImageLayout.TILE_WIDTH_MASK)) {
                     final int oldSize = result.getTileWidth(source);
                     final int newSize = tileSize.width;

geotk-coverage-imagery/src/main/java/org/geotoolkit/image/internal/ImageUtils.java

@@ -30,7 +30,7 @@
 import java.awt.image.SampleModel;
 import java.util.Arrays;
 import javax.imageio.ImageTypeSpecifier;
-import org.apache.sis.coverage.grid.j2d.ColorModelFactory;
+import org.apache.sis.coverage.privy.ColorModelFactory;
 import org.geotoolkit.lang.Static;
 
 import static org.geotoolkit.image.internal.PlanarConfiguration.INTERLEAVED;

geotk-coverage-imagery/src/main/java/org/geotoolkit/image/io/DeferredImageRead.java

@@ -32,7 +32,7 @@
 import javax.imageio.ImageReader;
 import javax.imageio.ImageTypeSpecifier;
 import org.apache.sis.image.ComputedImage;
-import org.apache.sis.coverage.grid.j2d.ImageLayout;
+import org.apache.sis.coverage.privy.ImageLayout;
 import org.apache.sis.util.ArgumentChecks;
 
 

geotk-coverage-imagery/src/main/java/org/geotoolkit/image/palette/ContinuousPalette.java

@@ -24,7 +24,7 @@
 import javax.imageio.ImageTypeSpecifier;
 
 import org.geotoolkit.util.Utilities;
-import org.apache.sis.coverage.grid.j2d.ColorModelFactory;
+import org.apache.sis.coverage.privy.ColorModelFactory;
 
 
 /**

geotk-coverage-imagery/src/main/java/org/geotoolkit/image/palette/IndexedPalette.java

@@ -27,7 +27,7 @@
 
 import org.geotoolkit.resources.Errors;
 import org.geotoolkit.image.color.ColorUtilities;
-import org.apache.sis.coverage.grid.j2d.ColorModelFactory;
+import org.apache.sis.coverage.privy.ColorModelFactory;
 
 
 /**

geotk-coverage-imagery/src/test/java/org/geotoolkit/image/io/mosaic/PanelTest.java

@@ -20,7 +20,7 @@
 import java.awt.Graphics2D;
 import java.awt.image.RenderedImage;
 import javax.swing.JPanel;
-import org.apache.sis.referencing.util.j2d.AffineTransform2D;
+import org.apache.sis.referencing.privy.AffineTransform2D;
 
 /**
  *

geotk-coverage-postgresql/src/main/java/org/geotoolkit/coverage/postgresql/epsg/PGEPSGWriter.java

@@ -27,7 +27,7 @@
 import org.opengis.metadata.Identifier;
 import javax.measure.Unit;
 import javax.sql.DataSource;
-import org.apache.sis.referencing.util.GeodeticObjectBuilder;
+import org.apache.sis.referencing.privy.GeodeticObjectBuilder;
 import org.geotoolkit.coverage.postgresql.PGCoverageStore;
 import org.opengis.referencing.crs.CompoundCRS;
 import org.opengis.referencing.crs.CoordinateReferenceSystem;

geotk-coverage-sql/src/main/java/org/geotoolkit/coverage/sql/AdditionalAxisTable.java

@@ -50,8 +50,8 @@
 import org.apache.sis.measure.Units;
 import org.apache.sis.util.iso.Types;
 import org.apache.sis.referencing.internal.VerticalDatumTypes;
-import org.apache.sis.referencing.util.AxisDirections;
-import org.apache.sis.referencing.util.ReferencingFactoryContainer;
+import org.apache.sis.referencing.privy.AxisDirections;
+import org.apache.sis.referencing.privy.ReferencingFactoryContainer;
 import org.apache.sis.referencing.CommonCRS;
 import org.apache.sis.referencing.IdentifiedObjects;
 import org.apache.sis.referencing.cs.DefaultTimeCS;

geotk-coverage-sql/src/main/java/org/geotoolkit/coverage/sql/Database.java

@@ -32,7 +32,7 @@
 import org.apache.sis.referencing.CommonCRS;
 import org.apache.sis.util.collection.Cache;
 import org.apache.sis.referencing.crs.DefaultTemporalCRS;
-import org.apache.sis.referencing.util.ReferencingFactoryContainer;
+import org.apache.sis.referencing.privy.ReferencingFactoryContainer;
 import org.apache.sis.util.iso.DefaultNameFactory;
 
 

geotk-coverage-sql/src/main/java/org/geotoolkit/coverage/sql/DatabaseStore.java

@@ -17,9 +17,9 @@
 package org.geotoolkit.coverage.sql;
 
 import org.apache.sis.coverage.grid.GridGeometry;
-import org.apache.sis.metadata.sql.util.ScriptRunner;
-import org.apache.sis.util.internal.Constants;
-import org.apache.sis.util.internal.UnmodifiableArrayList;
+import org.apache.sis.metadata.sql.privy.ScriptRunner;
+import org.apache.sis.util.privy.Constants;
+import org.apache.sis.util.privy.UnmodifiableArrayList;
 import org.apache.sis.measure.MeasurementRange;
 import org.apache.sis.measure.Units;
 import org.apache.sis.metadata.sql.MetadataSource;

geotk-coverage-sql/src/main/java/org/geotoolkit/coverage/sql/FormatTable.java

@@ -19,7 +19,7 @@
 
 import org.apache.sis.coverage.Category;
 import org.apache.sis.coverage.SampleDimension;
-import org.apache.sis.util.internal.UnmodifiableArrayList;
+import org.apache.sis.util.privy.UnmodifiableArrayList;
 import org.apache.sis.measure.MeasurementRange;
 import org.apache.sis.storage.DataStoreException;
 

geotk-coverage-sql/src/main/java/org/geotoolkit/coverage/sql/GridCoverageEntry.java

@@ -37,8 +37,8 @@
 import org.apache.sis.coverage.grid.GridCoverage;
 import org.apache.sis.coverage.grid.GridGeometry;
 import org.apache.sis.coverage.grid.GridExtent;
-import org.apache.sis.referencing.util.AxisDirections;
-import org.apache.sis.referencing.util.ExtentSelector;
+import org.apache.sis.referencing.privy.AxisDirections;
+import org.apache.sis.referencing.privy.ExtentSelector;
 import org.apache.sis.storage.*;
 
 // JMDA branch-specific

geotk-coverage-sql/src/main/java/org/geotoolkit/coverage/sql/GridCoverageTable.java

@@ -33,7 +33,7 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.apache.sis.geometry.GeneralEnvelope;
-import org.apache.sis.referencing.util.AxisDirections;
+import org.apache.sis.referencing.privy.AxisDirections;
 import org.apache.sis.referencing.CRS;
 import org.apache.sis.referencing.crs.DefaultTemporalCRS;
 import org.apache.sis.storage.DataStoreException;

geotk-coverage-sql/src/main/java/org/geotoolkit/coverage/sql/GridGeometryEntry.java

@@ -45,7 +45,7 @@
 import org.apache.sis.referencing.IdentifiedObjects;
 import org.apache.sis.referencing.operation.transform.MathTransforms;
 import org.apache.sis.referencing.operation.matrix.AffineTransforms2D;
-import org.apache.sis.referencing.util.j2d.AffineTransform2D;
+import org.apache.sis.referencing.privy.AffineTransform2D;
 
 
 /**

geotk-coverage-sql/src/main/java/org/geotoolkit/coverage/sql/GridGeometryTable.java

@@ -37,9 +37,9 @@
 import org.apache.sis.geometry.GeneralDirectPosition;
 import org.apache.sis.geometry.GeneralEnvelope;
 import org.apache.sis.geometry.wrapper.Geometries;
-import org.apache.sis.referencing.util.Formulas;
-import org.apache.sis.referencing.util.j2d.AffineTransform2D;
-import org.apache.sis.referencing.util.j2d.IntervalRectangle;
+import org.apache.sis.referencing.privy.Formulas;
+import org.apache.sis.referencing.privy.AffineTransform2D;
+import org.apache.sis.referencing.privy.IntervalRectangle;
 import org.apache.sis.measure.Latitude;
 import org.apache.sis.measure.Longitude;
 import org.apache.sis.referencing.CRS;

geotk-coverage-sql/src/main/java/org/geotoolkit/coverage/sql/PostgisFactory.java

@@ -28,7 +28,7 @@
 import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
-import org.apache.sis.referencing.util.WKTKeywords;
+import org.apache.sis.referencing.privy.WKTKeywords;
 
 import org.opengis.util.FactoryException;
 import org.opengis.util.InternationalString;

geotk-coverage-sql/src/main/java/org/geotoolkit/coverage/sql/ProductAggregate.java

@@ -21,7 +21,7 @@
 import org.apache.sis.storage.Resource;
 import org.apache.sis.storage.Aggregate;
 import org.apache.sis.storage.DataStoreException;
-import org.apache.sis.util.internal.UnmodifiableArrayList;
+import org.apache.sis.util.privy.UnmodifiableArrayList;
 import org.apache.sis.metadata.iso.DefaultMetadata;
 import org.geotoolkit.storage.AbstractResource;
 

geotk-coverage-sql/src/main/java/org/geotoolkit/coverage/sql/ProductEntry.java

@@ -21,7 +21,7 @@
 import org.apache.sis.coverage.grid.GridCoverage;
 import org.apache.sis.coverage.grid.GridGeometry;
 import org.apache.sis.storage.base.MetadataBuilder;
-import org.apache.sis.util.internal.CollectionsExt;
+import org.apache.sis.util.privy.CollectionsExt;
 import org.apache.sis.storage.Aggregate;
 import org.apache.sis.storage.DataStoreException;
 import org.apache.sis.storage.DataStoreReferencingException;

geotk-coverage-sql/src/main/java/org/geotoolkit/coverage/sql/ProductSubset.java

@@ -24,7 +24,7 @@
 import org.apache.sis.coverage.SampleDimension;
 import org.apache.sis.coverage.grid.GridCoverage;
 import org.apache.sis.coverage.grid.GridGeometry;
-import org.apache.sis.referencing.util.ExtentSelector;
+import org.apache.sis.referencing.privy.ExtentSelector;
 import org.apache.sis.storage.DataStoreException;
 import org.apache.sis.storage.AbstractGridCoverageResource;
 import org.apache.sis.metadata.iso.extent.DefaultExtent;

geotk-coverage-sql/src/main/java/org/geotoolkit/coverage/sql/ProductTable.java

@@ -31,7 +31,7 @@
 import org.opengis.referencing.operation.TransformException;
 import org.apache.sis.coverage.grid.GridGeometry;
 import org.apache.sis.geometry.GeneralEnvelope;
-import org.apache.sis.util.internal.UnmodifiableArrayList;
+import org.apache.sis.util.privy.UnmodifiableArrayList;
 import org.apache.sis.storage.DataStoreException;
 import org.apache.sis.storage.DataStoreReferencingException;
 import org.apache.sis.util.ArgumentChecks;

geotk-coverage-sql/src/main/java/org/geotoolkit/coverage/sql/SpatialReferencingTable.java

@@ -21,7 +21,7 @@
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.text.ParseException;
-import org.apache.sis.util.internal.Constants;
+import org.apache.sis.util.privy.Constants;
 import org.apache.sis.io.wkt.Convention;
 import org.apache.sis.io.wkt.WKTFormat;
 import org.apache.sis.metadata.iso.citation.Citations;