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 92af9cbb75ee308c4e5000ab2370ee47c1521a32 Author: Martin Desruisseaux <[email protected]> AuthorDate: Wed Sep 17 01:36:15 2025 +0200 Prepare for the removal of the `Static` class. That class serves no useful purpose. Its original intend was documentation, but its Javadoc was not really maintained for that purpose and the number of subclasses listed by Javadoc become too large. --- .../org/apache/sis/coverage/privy/SampleDimensions.java | 3 +-- .../org/apache/sis/feature/privy/AttributeConvention.java | 3 +-- .../main/org/apache/sis/filter/privy/FunctionNames.java | 3 +-- .../main/org/apache/sis/geometry/wrapper/jts/JTS.java | 3 +-- .../main/org/apache/sis/image/privy/ImageUtilities.java | 3 +-- .../main/org/apache/sis/image/privy/RasterFactory.java | 3 +-- .../test/org/apache/sis/feature/Assertions.java | 3 +-- .../main/org/apache/sis/metadata/privy/Identifiers.java | 3 +-- .../org/apache/sis/metadata/privy/ImplementationHelper.java | 3 +-- .../main/org/apache/sis/metadata/privy/NameMeaning.java | 3 +-- .../org/apache/sis/metadata/sql/privy/SQLUtilities.java | 3 +-- .../main/org/apache/sis/xml/InputFactory.java | 3 +-- .../main/org/apache/sis/xml/OutputFactory.java | 3 +-- .../test/org/apache/sis/metadata/Assertions.java | 3 +-- .../sis/metadata/iso/citation/HardCodedCitations.java | 3 +-- .../main/org/apache/sis/geometry/Envelopes.java | 2 +- .../org/apache/sis/referencing/operation/provider/ESRI.java | 3 +-- .../org/apache/sis/referencing/privy/AxisDirections.java | 3 +-- .../apache/sis/referencing/privy/CoordinateOperations.java | 3 +-- .../main/org/apache/sis/referencing/privy/Formulas.java | 3 +-- .../apache/sis/referencing/privy/ReferencingUtilities.java | 3 +-- .../org/apache/sis/referencing/privy/ShapeUtilities.java | 3 +-- .../main/org/apache/sis/referencing/privy/WKTKeywords.java | 3 +-- .../main/org/apache/sis/referencing/privy/WKTUtilities.java | 3 +-- .../test/org/apache/sis/referencing/Assertions.java | 3 +-- .../main/org/apache/sis/storage/gpx/Attributes.java | 4 +--- .../main/org/apache/sis/storage/gpx/Tags.java | 4 +--- .../main/org/apache/sis/io/stream/IOUtilities.java | 3 +-- .../main/org/apache/sis/storage/base/StoreUtilities.java | 3 +-- .../main/org/apache/sis/util/Printable.java | 2 +- .../main/org/apache/sis/util/Static.java | 3 +++ .../main/org/apache/sis/util/privy/CollectionsExt.java | 3 +-- .../main/org/apache/sis/util/privy/Constants.java | 4 +--- .../main/org/apache/sis/util/privy/Numerics.java | 3 +-- .../main/org/apache/sis/util/privy/Strings.java | 3 +-- .../main/org/apache/sis/util/privy/URLs.java | 4 +--- .../main/org/apache/sis/util/privy/Unsafe.java | 3 +-- .../test/org/apache/sis/test/Assertions.java | 3 +-- .../test/org/apache/sis/test/TestConfiguration.java | 4 +--- .../test/org/apache/sis/test/TestUtilities.java | 3 +-- .../main/org/apache/sis/geometries/Geometries.java | 3 +-- .../main/org/apache/sis/geometries/math/Maths.java | 3 +-- .../main/org/apache/sis/geometries/math/Matrices.java | 3 +-- .../main/org/apache/sis/geometries/math/Quaternions.java | 4 +--- .../main/org/apache/sis/geometries/math/TupleArrays.java | 3 +-- .../main/org/apache/sis/geometries/math/Vectors.java | 3 +-- .../apache/sis/geometries/operation/GeometryOperations.java | 13 ++++++------- .../org/apache/sis/geometries/processor/ProcessorUtils.java | 3 +-- .../main/org/apache/sis/storage/shapefile/cpg/CpgFiles.java | 3 +-- .../main/org/apache/sis/gui/internal/FontGIS.java | 5 ++--- .../main/org/apache/sis/gui/internal/GUIUtilities.java | 3 +-- .../main/org/apache/sis/gui/internal/Styles.java | 3 +-- 52 files changed, 60 insertions(+), 112 deletions(-) diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/privy/SampleDimensions.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/privy/SampleDimensions.java index e76e23ce7f..32665632db 100644 --- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/privy/SampleDimensions.java +++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/privy/SampleDimensions.java @@ -27,7 +27,6 @@ import org.apache.sis.coverage.SampleDimension; import org.apache.sis.coverage.Category; import org.apache.sis.image.ImageProcessor; import org.apache.sis.measure.NumberRange; -import org.apache.sis.util.Static; /** @@ -35,7 +34,7 @@ import org.apache.sis.util.Static; * * @author Martin Desruisseaux (Geomatys) */ -public final class SampleDimensions extends Static { +public final class SampleDimensions { /** * A hidden argument passed to some {@link ImageProcessor} operations. * Used for a parameter that we do not want to expose in the public API, diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/privy/AttributeConvention.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/privy/AttributeConvention.java index c927308d49..088c5b53d4 100644 --- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/privy/AttributeConvention.java +++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/privy/AttributeConvention.java @@ -21,7 +21,6 @@ import org.opengis.util.LocalName; import org.opengis.util.ScopedName; import org.opengis.util.GenericName; import org.opengis.referencing.crs.CoordinateReferenceSystem; -import org.apache.sis.util.Static; import org.apache.sis.util.iso.Names; import org.apache.sis.feature.Features; import org.apache.sis.feature.AbstractFeature; @@ -72,7 +71,7 @@ import org.opengis.feature.PropertyNotFoundException; * @author Johann Sorel (Geomatys) * @author Martin Desruisseaux (Geomatys) */ -public final class AttributeConvention extends Static { +public final class AttributeConvention { /** * Scope of all names defined by SIS convention. */ diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/privy/FunctionNames.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/privy/FunctionNames.java index 06be9b3463..cd225b2019 100644 --- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/privy/FunctionNames.java +++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/privy/FunctionNames.java @@ -16,7 +16,6 @@ */ package org.apache.sis.filter.privy; -import org.apache.sis.util.Static; import org.apache.sis.filter.sqlmm.SQLMM; @@ -26,7 +25,7 @@ import org.apache.sis.filter.sqlmm.SQLMM; * * @author Martin Desruisseaux (Geomatys) */ -public final class FunctionNames extends Static { +public final class FunctionNames { /** Value of {@link org.opengis.filter.NullOperator#getOperatorType()}. */ public static final String PROPERTY_IS_NULL = "PROPERTY_IS_NULL"; diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/jts/JTS.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/jts/JTS.java index 0abd88f558..d331cb79d9 100644 --- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/jts/JTS.java +++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/jts/JTS.java @@ -39,7 +39,6 @@ import org.apache.sis.referencing.CRS; import org.apache.sis.referencing.IdentifiedObjects; import org.apache.sis.referencing.crs.AbstractCRS; import org.apache.sis.referencing.cs.AxesConvention; -import org.apache.sis.util.Static; import org.apache.sis.util.logging.Logging; import org.apache.sis.metadata.iso.citation.Citations; import org.apache.sis.metadata.iso.extent.DefaultGeographicBoundingBox; @@ -59,7 +58,7 @@ import static org.apache.sis.geometry.wrapper.Geometries.LOGGER; * @author Johann Sorel (Geomatys) * @author Alexis Manin (Geomatys) */ -public final class JTS extends Static { +public final class JTS { /** * Key used in {@linkplain Geometry#getUserData() user data} map for storing an instance of {@link CoordinateReferenceSystem}. * diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/ImageUtilities.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/ImageUtilities.java index 01f0325d61..5067933ea4 100644 --- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/ImageUtilities.java +++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/ImageUtilities.java @@ -40,7 +40,6 @@ import org.apache.sis.image.DataType; import org.apache.sis.image.PlanarImage; import org.apache.sis.system.Modules; import org.apache.sis.util.Numbers; -import org.apache.sis.util.Static; import org.apache.sis.util.privy.Numerics; import org.apache.sis.util.resources.Vocabulary; import static org.apache.sis.util.privy.Numerics.COMPARISON_THRESHOLD; @@ -53,7 +52,7 @@ import static org.apache.sis.util.privy.Numerics.COMPARISON_THRESHOLD; * * @author Martin Desruisseaux (Geomatys) */ -public final class ImageUtilities extends Static { +public final class ImageUtilities { /** * The logger for operations on images and rasters. */ diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/RasterFactory.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/RasterFactory.java index bff3284753..1f31da0596 100644 --- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/RasterFactory.java +++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/RasterFactory.java @@ -43,7 +43,6 @@ import org.apache.sis.image.DataType; import org.apache.sis.feature.internal.Resources; import org.apache.sis.util.ArgumentChecks; import org.apache.sis.util.ArraysExt; -import org.apache.sis.util.Static; import org.apache.sis.util.Workaround; import org.apache.sis.util.collection.WeakHashSet; @@ -54,7 +53,7 @@ import org.apache.sis.util.collection.WeakHashSet; * * @author Martin Desruisseaux (IRD, Geomatys) */ -public final class RasterFactory extends Static { +public final class RasterFactory { /** * Shared instances of {@link SampleModel}s. * diff --git a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/Assertions.java b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/Assertions.java index 20545eff26..da9c589310 100644 --- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/Assertions.java +++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/Assertions.java @@ -21,7 +21,6 @@ import java.awt.Rectangle; import java.awt.image.Raster; import java.awt.image.RenderedImage; import org.apache.sis.image.PixelIterator; -import org.apache.sis.util.Static; // Test dependencies import static org.junit.jupiter.api.Assertions.*; @@ -36,7 +35,7 @@ import org.opengis.coverage.grid.SequenceType; * * @author Martin Desruisseaux (Geomatys) */ -public final class Assertions extends Static { +public final class Assertions { /** * Do not allow instantiation of this class. */ diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/privy/Identifiers.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/privy/Identifiers.java index 61e52aad6b..a6daeaa3ce 100644 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/privy/Identifiers.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/privy/Identifiers.java @@ -23,7 +23,6 @@ import org.opengis.util.InternationalString; import org.apache.sis.util.CharSequences; import org.apache.sis.util.Characters; import org.apache.sis.util.Deprecable; -import org.apache.sis.util.Static; import org.apache.sis.util.privy.Strings; import org.apache.sis.util.privy.Constants; import org.apache.sis.util.privy.CollectionsExt; @@ -39,7 +38,7 @@ import org.apache.sis.xml.NilReason; * * @author Martin Desruisseaux (Geomatys) */ -public final class Identifiers extends Static { +public final class Identifiers { /** * Do not allow instantiation of this class. */ diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/privy/ImplementationHelper.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/privy/ImplementationHelper.java index de1e3393ef..6a5fe88599 100644 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/privy/ImplementationHelper.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/privy/ImplementationHelper.java @@ -25,7 +25,6 @@ import org.apache.sis.xml.NilObject; import org.apache.sis.xml.NilReason; import org.apache.sis.xml.IdentifierSpace; import org.apache.sis.xml.IdentifiedObject; -import org.apache.sis.util.Static; import org.apache.sis.util.resources.Errors; import org.apache.sis.xml.bind.Context; import org.apache.sis.util.privy.Strings; @@ -39,7 +38,7 @@ import org.apache.sis.util.privy.CollectionsExt; * * @author Martin Desruisseaux (Geomatys) */ -public final class ImplementationHelper extends Static { +public final class ImplementationHelper { /** * The root directory of ISO namespaces. Value is {@value}. */ diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/privy/NameMeaning.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/privy/NameMeaning.java index 7484a8adc2..26e2a50181 100644 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/privy/NameMeaning.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/privy/NameMeaning.java @@ -27,7 +27,6 @@ import org.opengis.referencing.datum.*; import org.opengis.referencing.operation.*; import org.opengis.util.InternationalString; import org.opengis.metadata.citation.Citation; -import org.apache.sis.util.Static; import org.apache.sis.util.privy.Strings; import org.apache.sis.util.privy.Constants; import org.apache.sis.util.privy.DefinitionURI; @@ -44,7 +43,7 @@ import org.apache.sis.metadata.iso.citation.Citations; * @see <a href="https://www.ogc.org/ogcna";>https://www.ogc.org/ogcna</a> * @see <a href="https://portal.ogc.org/files/?artifact_id=24045";>Definition identifier URNs in OGC namespace</a> */ -public final class NameMeaning extends Static { +public final class NameMeaning { /** * Subtypes of {@link IdentifiedObject} for which an object type is defined. * For each interface at index <var>i</var>, the type is {@code TYPES[i]}. diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/privy/SQLUtilities.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/privy/SQLUtilities.java index 38e6e1f423..66d74f5a68 100644 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/privy/SQLUtilities.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/privy/SQLUtilities.java @@ -19,7 +19,6 @@ package org.apache.sis.metadata.sql.privy; import java.sql.SQLException; import java.sql.SQLDataException; import java.sql.DatabaseMetaData; -import org.apache.sis.util.Static; import org.apache.sis.util.Characters; import org.apache.sis.util.CharSequences; import org.apache.sis.util.Workaround; @@ -36,7 +35,7 @@ import org.apache.sis.util.resources.Errors; * * @author Martin Desruisseaux (Geomatys) */ -public final class SQLUtilities extends Static { +public final class SQLUtilities { /** * Do not allow instantiation of this class. */ diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/InputFactory.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/InputFactory.java index 64afb3825d..6e193fcf80 100644 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/InputFactory.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/InputFactory.java @@ -28,7 +28,6 @@ import javax.xml.transform.dom.DOMSource; import javax.xml.transform.sax.SAXSource; import org.w3c.dom.Node; import org.xml.sax.InputSource; -import org.apache.sis.util.Static; /** @@ -38,7 +37,7 @@ import org.apache.sis.util.Static; * * @author Martin Desruisseaux (Geomatys) */ -final class InputFactory extends Static { +final class InputFactory { /** * The SIS-wide factory. This factory can be specified by the user, for example using the * {@code javax.xml.stream.XMLInputFactory} system property. diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/OutputFactory.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/OutputFactory.java index af0455d22d..61d68f4d4c 100644 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/OutputFactory.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/OutputFactory.java @@ -28,7 +28,6 @@ import javax.xml.transform.sax.SAXResult; import javax.xml.transform.stax.StAXResult; import org.w3c.dom.Node; import org.xml.sax.ContentHandler; -import org.apache.sis.util.Static; import org.apache.sis.xml.privy.StreamWriterDelegate; @@ -39,7 +38,7 @@ import org.apache.sis.xml.privy.StreamWriterDelegate; * * @author Martin Desruisseaux (Geomatys) */ -final class OutputFactory extends Static { +final class OutputFactory { /** * The SIS-wide factory. This factory can be specified by the user, for example using the * {@code javax.xml.stream.XMLOutputFactory} system property. diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/Assertions.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/Assertions.java index 7ac728f868..d4b004cc8e 100644 --- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/Assertions.java +++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/Assertions.java @@ -25,7 +25,6 @@ import org.opengis.metadata.citation.Citation; import org.opengis.metadata.lineage.Source; import org.opengis.metadata.maintenance.ScopeCode; import org.opengis.metadata.content.FeatureCatalogueDescription; -import org.apache.sis.util.Static; import org.apache.sis.xml.Namespaces; import org.apache.sis.xml.privy.LegacyNamespaces; @@ -45,7 +44,7 @@ import org.opengis.metadata.content.FeatureTypeInfo; * * @author Martin Desruisseaux (Geomatys) */ -public final class Assertions extends Static { +public final class Assertions { /** * Do not allow instantiation of this class. */ diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/HardCodedCitations.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/HardCodedCitations.java index aeb0ae764c..a75f18ab41 100644 --- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/HardCodedCitations.java +++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/HardCodedCitations.java @@ -23,7 +23,6 @@ import org.opengis.metadata.citation.OnLineFunction; import org.opengis.metadata.citation.PresentationForm; import org.apache.sis.metadata.iso.DefaultIdentifier; import org.apache.sis.util.SimpleInternationalString; -import org.apache.sis.util.Static; import org.apache.sis.util.privy.Constants; import org.apache.sis.util.privy.URLs; @@ -37,7 +36,7 @@ import org.apache.sis.util.privy.URLs; * * @author Martin Desruisseaux (Geomatys) */ -public final class HardCodedCitations extends Static { +public final class HardCodedCitations { /** * The ISO 19111 standard. */ diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/Envelopes.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/Envelopes.java index a8ac8e4390..e9e49cd511 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/Envelopes.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/Envelopes.java @@ -292,7 +292,7 @@ public final class Envelopes extends Static { * Invoked when a recoverable exception occurred. * Those exceptions must be minor enough that they can be silently ignored in most cases. */ - static void recoverableException(final Class<? extends Static> caller, final TransformException exception) { + static void recoverableException(final Class<?> caller, final TransformException exception) { Logging.recoverableException(LOGGER, caller, "transform", exception); } diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/ESRI.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/ESRI.java index 3a8116325c..fe0c763039 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/ESRI.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/ESRI.java @@ -19,7 +19,6 @@ package org.apache.sis.referencing.operation.provider; import org.opengis.parameter.ParameterDescriptor; import org.apache.sis.parameter.ParameterBuilder; import org.apache.sis.metadata.iso.citation.Citations; -import org.apache.sis.util.Static; /** @@ -31,7 +30,7 @@ import org.apache.sis.util.Static; * * @author Martin Desruisseaux (Geomatys) */ -final class ESRI extends Static { +final class ESRI { /** * The operation parameter descriptor for the <cite>Longitude of origin</cite> (λ₀) parameter value. * Valid values range is [-180 … 180]° and default value is 0°. diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/AxisDirections.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/AxisDirections.java index d25a371428..23743e904c 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/AxisDirections.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/AxisDirections.java @@ -29,7 +29,6 @@ import org.apache.sis.util.ComparisonMode; import org.apache.sis.util.Characters; import org.apache.sis.util.Utilities; import org.apache.sis.util.ArraysExt; -import org.apache.sis.util.Static; import org.apache.sis.util.iso.Types; import org.apache.sis.measure.Units; import static org.apache.sis.util.CharSequences.*; @@ -40,7 +39,7 @@ import static org.apache.sis.util.CharSequences.*; * * @author Martin Desruisseaux (Geomatys) */ -public final class AxisDirections extends Static { +public final class AxisDirections { /** * Number of directions like "North", "North-North-East", "North-East", etc. * The first of those directions is {@link AxisDirection#NORTH}. diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/CoordinateOperations.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/CoordinateOperations.java index 74f9b133b4..bd7cddb105 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/CoordinateOperations.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/CoordinateOperations.java @@ -46,7 +46,6 @@ import org.apache.sis.referencing.factory.GeodeticObjectFactory; import org.apache.sis.referencing.internal.Resources; import org.apache.sis.metadata.privy.NameToIdentifier; import org.apache.sis.util.Deprecable; -import org.apache.sis.util.Static; import org.apache.sis.util.privy.CollectionsExt; import org.apache.sis.util.privy.Numerics; import org.apache.sis.util.privy.URLs; @@ -63,7 +62,7 @@ import org.opengis.referencing.crs.DerivedCRS; * * @author Martin Desruisseaux (Geomatys) */ -public final class CoordinateOperations extends Static { +public final class CoordinateOperations { /** * The logger where to report warnings. */ diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/Formulas.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/Formulas.java index a1fb1be2a2..7e7deb6389 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/Formulas.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/Formulas.java @@ -18,7 +18,6 @@ package org.apache.sis.referencing.privy; import static java.lang.Math.*; import org.opengis.referencing.datum.Ellipsoid; -import org.apache.sis.util.Static; import org.apache.sis.measure.Latitude; import org.apache.sis.util.privy.Numerics; import org.apache.sis.system.Configuration; @@ -35,7 +34,7 @@ import static org.apache.sis.metadata.privy.ReferencingServices.AUTHALIC_RADIUS; * * @author Martin Desruisseaux (Geomatys) */ -public final class Formulas extends Static { +public final class Formulas { /** * Default tolerance threshold for comparing coordinate values in a projected CRS, * assuming that the unit of measurement is metre. This constant determines also diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/ReferencingUtilities.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/ReferencingUtilities.java index 6b17576c97..93c8754153 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/ReferencingUtilities.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/ReferencingUtilities.java @@ -32,7 +32,6 @@ import org.opengis.referencing.crs.*; import org.opengis.referencing.datum.PrimeMeridian; import org.opengis.referencing.datum.VerticalDatum; import org.opengis.referencing.operation.MathTransformFactory; -import org.apache.sis.util.Static; import org.apache.sis.util.Classes; import org.apache.sis.util.Utilities; import org.apache.sis.util.CharSequences; @@ -61,7 +60,7 @@ import org.apache.sis.parameter.DefaultParameterDescriptorGroup; * * @author Martin Desruisseaux (IRD, Geomatys) */ -public final class ReferencingUtilities extends Static { +public final class ReferencingUtilities { /** * Do not allow instantiation of this class. */ diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/ShapeUtilities.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/ShapeUtilities.java index dba1a7a16d..60c35f70d2 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/ShapeUtilities.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/ShapeUtilities.java @@ -27,7 +27,6 @@ import static java.lang.Math.abs; import static java.lang.Math.sqrt; import static java.lang.Math.hypot; import static java.lang.Double.isInfinite; -import org.apache.sis.util.Static; /** @@ -35,7 +34,7 @@ import org.apache.sis.util.Static; * * @author Martin Desruisseaux (MPO, IRD, Geomatys) */ -public final class ShapeUtilities extends Static { +public final class ShapeUtilities { /** * Threshold value for determining whether two points are the same, or whether two lines are colinear. */ diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/WKTKeywords.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/WKTKeywords.java index 62a9bf6949..55e820b4f9 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/WKTKeywords.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/WKTKeywords.java @@ -18,7 +18,6 @@ package org.apache.sis.referencing.privy; import java.util.Map; import java.util.HashMap; -import org.apache.sis.util.Static; import org.apache.sis.util.ArraysExt; @@ -39,7 +38,7 @@ import org.apache.sis.util.ArraysExt; * @author Martin Desruisseaux (Geomatys) * @author Johann Sorel (Geomatys) */ -public final class WKTKeywords extends Static { +public final class WKTKeywords { /** * Do not allow instantiation of this class. */ diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/WKTUtilities.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/WKTUtilities.java index ca583fd6dd..8bff5af18a 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/WKTUtilities.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/WKTUtilities.java @@ -43,7 +43,6 @@ import org.apache.sis.io.wkt.ElementKind; import org.apache.sis.io.wkt.FormattableObject; import org.apache.sis.io.wkt.Formatter; import org.apache.sis.measure.Units; -import org.apache.sis.util.Static; import org.apache.sis.util.CharSequences; import org.apache.sis.util.resources.Vocabulary; import org.apache.sis.util.privy.Constants; @@ -66,7 +65,7 @@ import org.opengis.metadata.Identifier; * * @author Martin Desruisseaux (Geomatys) */ -public final class WKTUtilities extends Static { +public final class WKTUtilities { /** * The logger for Well Known Text operations. */ diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/Assertions.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/Assertions.java index aeac79e29b..d1ca1abbbf 100644 --- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/Assertions.java +++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/Assertions.java @@ -39,7 +39,6 @@ import org.opengis.referencing.cs.AxisDirection; import org.opengis.referencing.cs.CoordinateSystemAxis; import org.opengis.referencing.cs.RangeMeaning; import org.opengis.referencing.crs.CoordinateReferenceSystem; -import org.apache.sis.util.Static; import org.apache.sis.util.Utilities; import org.apache.sis.util.ComparisonMode; import org.apache.sis.io.wkt.Symbols; @@ -64,7 +63,7 @@ import static org.apache.sis.test.Assertions.assertMultilinesEquals; * * @author Martin Desruisseaux (Geomatys) */ -public final class Assertions extends Static { +public final class Assertions { /** * The formatter to be used by {@link #assertWktEquals(Convention, String, Object)}. * This formatter uses the {@code “…”} quotation marks instead of {@code "…"} diff --git a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Attributes.java b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Attributes.java index e64452979b..39fa214d93 100644 --- a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Attributes.java +++ b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Attributes.java @@ -16,8 +16,6 @@ */ package org.apache.sis.storage.gpx; -import org.apache.sis.util.Static; - /** * GPX attribute names in XML files. @@ -27,7 +25,7 @@ import org.apache.sis.util.Static; * * @author Johann Sorel (Geomatys) */ -final class Attributes extends Static { +final class Attributes { /** A main GPX attribute. */ static final String VERSION = "version"; /** A main GPX attribute. */ static final String CREATOR = "creator"; /** A copyright attribute (v1.1+). */ static final String AUTHOR = "author"; diff --git a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Tags.java b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Tags.java index 1fbd21c6aa..253d8fc89f 100644 --- a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Tags.java +++ b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Tags.java @@ -16,8 +16,6 @@ */ package org.apache.sis.storage.gpx; -import org.apache.sis.util.Static; - /** * GPX tag names in XML files and their namespaces. Also used for feature property names. @@ -26,7 +24,7 @@ import org.apache.sis.util.Static; * * @author Johann Sorel (Geomatys) */ -final class Tags extends Static { +final class Tags { /** * GPX scope name used for feature type names. */ diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/io/stream/IOUtilities.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/io/stream/IOUtilities.java index 02a71bcfe1..09a5f8fc07 100644 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/io/stream/IOUtilities.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/io/stream/IOUtilities.java @@ -48,7 +48,6 @@ import javax.xml.stream.Location; import javax.xml.stream.XMLStreamReader; import org.apache.sis.pending.jdk.JDK20; import org.apache.sis.util.CharSequences; -import org.apache.sis.util.Static; import org.apache.sis.util.resources.Errors; import org.apache.sis.util.privy.Constants; import org.apache.sis.storage.internal.Resources; @@ -69,7 +68,7 @@ import org.apache.sis.storage.internal.InputStreamAdapter; * * @see org.apache.sis.io.IO */ -public final class IOUtilities extends Static { +public final class IOUtilities { /** * The symbol for current directory. */ diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/StoreUtilities.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/StoreUtilities.java index 3b3a539645..cbe6f72d06 100644 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/StoreUtilities.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/StoreUtilities.java @@ -34,7 +34,6 @@ import org.opengis.metadata.extent.GeographicExtent; import org.opengis.metadata.extent.GeographicBoundingBox; import org.opengis.metadata.identification.Identification; import org.opengis.metadata.identification.DataIdentification; -import org.apache.sis.util.Static; import org.apache.sis.util.CharSequences; import org.apache.sis.util.Classes; import org.apache.sis.util.ArraysExt; @@ -65,7 +64,7 @@ import org.opengis.feature.Feature; * * @author Martin Desruisseaux (Geomatys) */ -public final class StoreUtilities extends Static { +public final class StoreUtilities { /** * Whether to allow computation of statistics when no minimum/maximum values can be determined. * This is a costly operation because it requires loading all data, so any code enabled by this diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/Printable.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/Printable.java index fe5ec894f4..528c45e788 100644 --- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/Printable.java +++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/Printable.java @@ -21,7 +21,7 @@ package org.apache.sis.util; * Object providing a {@code print()} method for sending a string representation to the standard output stream. * A call to {@code object.print()} is often (but not necessarily) equivalent to {@code System.out.println(object)}, * except that <i>ANSI escape codes</i> (a.k.a. ECMA-48, ISO/IEC 6429 and X3.64 standards) may be used for - * syntax coloring if the terminal support it. The character encoding may also be more suitable on some platforms. + * syntax coloring if the terminal supports it. The character encoding may also be more suitable on some platforms. * Finally, some implementations may be more verbose than {@code toString()}. * * @author Martin Desruisseaux (Geomatys) diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/Static.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/Static.java index 27905c69ca..edcbc67247 100644 --- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/Static.java +++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/Static.java @@ -105,7 +105,10 @@ package org.apache.sis.util; * @author Martin Desruisseaux (Geomatys) * @version 0.3 * @since 0.3 + * + * @deprecated Unnecessary. */ +@Deprecated(since = "1.5", forRemoval = true) public class Static { /** * For subclasses only. diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/privy/CollectionsExt.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/privy/CollectionsExt.java index 1b84986236..5e597b22af 100644 --- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/privy/CollectionsExt.java +++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/privy/CollectionsExt.java @@ -20,7 +20,6 @@ import java.util.*; import java.lang.reflect.Array; import org.opengis.util.CodeList; import org.opengis.parameter.InvalidParameterCardinalityException; -import org.apache.sis.util.Static; import org.apache.sis.util.Numbers; import org.apache.sis.util.collection.CodeListSet; import org.apache.sis.util.collection.CheckedContainer; @@ -53,7 +52,7 @@ import org.apache.sis.pending.jdk.JDK19; * * @author Martin Desruisseaux (IRD, Geomatys) */ -public final class CollectionsExt extends Static { +public final class CollectionsExt { /** * Do not allow instantiation of this class. */ diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/privy/Constants.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/privy/Constants.java index bc47d7a9be..130cea516b 100644 --- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/privy/Constants.java +++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/privy/Constants.java @@ -16,8 +16,6 @@ */ package org.apache.sis.util.privy; -import org.apache.sis.util.Static; - /** * Hard coded values (typically identifiers). @@ -32,7 +30,7 @@ import org.apache.sis.util.Static; * * @author Martin Desruisseaux (Geomatys) */ -public final class Constants extends Static { +public final class Constants { /** * The default separator, which is {@code ':'}. * The separator is inserted between the code space and the code in identifiers. diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/privy/Numerics.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/privy/Numerics.java index dff8bca68e..791d252ef7 100644 --- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/privy/Numerics.java +++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/privy/Numerics.java @@ -25,7 +25,6 @@ import static java.lang.Math.max; import static java.lang.Math.abs; import static java.lang.Math.ulp; import org.apache.sis.util.Debug; -import org.apache.sis.util.Static; import org.apache.sis.util.Workaround; import org.apache.sis.util.ComparisonMode; import org.apache.sis.math.DecimalFunctions; @@ -42,7 +41,7 @@ import static org.apache.sis.pending.jdk.JDK19.DOUBLE_PRECISION; * * @author Martin Desruisseaux (Geomatys) */ -public final class Numerics extends Static { +public final class Numerics { /** * Maximum number of rows or columns in Apache SIS matrices. We define a maximum because SIS is expected to work * mostly with small matrices, because their sizes are related to the number of dimensions in coordinate systems. diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/privy/Strings.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/privy/Strings.java index c72193a321..fd1f34e327 100644 --- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/privy/Strings.java +++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/privy/Strings.java @@ -19,7 +19,6 @@ package org.apache.sis.util.privy; import java.lang.reflect.Array; import java.util.Formatter; import java.util.FormattableFlags; -import org.apache.sis.util.Static; import org.apache.sis.util.Classes; import org.apache.sis.util.ArraysExt; import org.apache.sis.util.Characters; @@ -33,7 +32,7 @@ import org.apache.sis.pending.jdk.JDK15; * * @author Martin Desruisseaux (Geomatys) */ -public final class Strings extends Static { +public final class Strings { /** * The character to write at the beginning of lines that are continuation of a single log record. * This constant is defined here only for a little bit more uniform {@code toString()} in SIS. diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/privy/URLs.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/privy/URLs.java index 1d1b56e5a2..64e1729448 100644 --- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/privy/URLs.java +++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/privy/URLs.java @@ -16,8 +16,6 @@ */ package org.apache.sis.util.privy; -import org.apache.sis.util.Static; - /** * Hard-coded URLs other than XML namespaces. Those URLs are mostly for documentation. @@ -30,7 +28,7 @@ import org.apache.sis.util.Static; * * @author Martin Desruisseaux (Geomatys) */ -public final class URLs extends Static { +public final class URLs { /** * EPSG home page. */ diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/privy/Unsafe.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/privy/Unsafe.java index 7c092079bf..1bec7bac2a 100644 --- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/privy/Unsafe.java +++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/privy/Unsafe.java @@ -20,7 +20,6 @@ import java.util.List; import java.util.Collection; import java.util.Map; import java.util.function.BiFunction; -import org.apache.sis.util.Static; import org.apache.sis.util.ConditionallySafe; @@ -32,7 +31,7 @@ import org.apache.sis.util.ConditionallySafe; * * @author Martin Desruisseaux (Geomatys) */ -public final class Unsafe extends Static { +public final class Unsafe { /** * Do not allow instantiation of this class. */ diff --git a/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/Assertions.java b/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/Assertions.java index ff0b32b86b..3235079d17 100644 --- a/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/Assertions.java +++ b/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/Assertions.java @@ -35,7 +35,6 @@ import org.apache.sis.util.Utilities; import org.apache.sis.util.CharSequences; import org.apache.sis.util.ComparisonMode; import org.apache.sis.util.Classes; -import org.apache.sis.util.Static; // Test dependencies import static org.junit.jupiter.api.Assertions.*; @@ -47,7 +46,7 @@ import static org.junit.jupiter.api.Assertions.*; * @author Martin Desruisseaux (Geomatys) * @author Alexis Manin (Geomatys) */ -public final class Assertions extends Static { +public final class Assertions { /** * Do not allow instantiation of this class. */ diff --git a/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/TestConfiguration.java b/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/TestConfiguration.java index 941666aa51..63d1823320 100644 --- a/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/TestConfiguration.java +++ b/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/TestConfiguration.java @@ -16,15 +16,13 @@ */ package org.apache.sis.test; -import org.apache.sis.util.Static; - /** * Information about the configuration of tests * * @author Martin Desruisseaux (Geomatys) */ -public final class TestConfiguration extends Static { +public final class TestConfiguration { /** * Environment variable to use as a fallback if a system property is not set. * This is a comma-separated list of the following keywords, without spaces: diff --git a/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/TestUtilities.java b/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/TestUtilities.java index af4723715a..89baf700d1 100644 --- a/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/TestUtilities.java +++ b/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/TestUtilities.java @@ -40,7 +40,6 @@ import org.opengis.util.InternationalString; import org.opengis.referencing.IdentifiedObject; import org.opengis.metadata.extent.GeographicBoundingBox; import org.apache.sis.util.Debug; -import org.apache.sis.util.Static; import org.apache.sis.util.CharSequences; import org.apache.sis.util.ArgumentChecks; import org.apache.sis.util.collection.TreeTable; @@ -62,7 +61,7 @@ import org.opengis.metadata.extent.GeographicExtent; * * @author Martin Desruisseaux (Geomatys) */ -public final class TestUtilities extends Static { +public final class TestUtilities { /** * Width of the separator to print to {@link TestCase#out}, in number of characters. */ diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Geometries.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Geometries.java index c890aff7f3..75ffa81085 100644 --- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Geometries.java +++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Geometries.java @@ -68,7 +68,6 @@ import org.apache.sis.referencing.operation.transform.LinearTransform; import org.apache.sis.referencing.privy.AxisDirections; import org.apache.sis.util.ArgumentChecks; import org.apache.sis.util.SimpleInternationalString; -import org.apache.sis.util.Static; /** @@ -76,7 +75,7 @@ import org.apache.sis.util.Static; * * @author Johann Sorel (Geomatys) */ -public final class Geometries extends Static { +public final class Geometries { private static final CoordinateReferenceSystem UNDEFINED_CRS_1D = createUndefined(1); private static final CoordinateReferenceSystem UNDEFINED_CRS_2D = createUndefined(2); diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Maths.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Maths.java index 074f0b5fdb..1e4e6bcebb 100644 --- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Maths.java +++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Maths.java @@ -23,7 +23,6 @@ import static org.apache.sis.geometries.math.Vectors.*; import org.apache.sis.geometry.GeneralEnvelope; import org.apache.sis.referencing.operation.matrix.Matrix4; import org.apache.sis.referencing.operation.matrix.MatrixSIS; -import org.apache.sis.util.Static; import org.apache.sis.util.privy.Numerics; @@ -32,7 +31,7 @@ import org.apache.sis.util.privy.Numerics; * * Math utilities. */ -public final class Maths extends Static { +public final class Maths { /** * Calculate normal of triangle made of given 3 points. diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Matrices.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Matrices.java index 85315b5bf5..eba27d334a 100644 --- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Matrices.java +++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Matrices.java @@ -20,7 +20,6 @@ import org.apache.sis.referencing.operation.matrix.Matrix2; import org.apache.sis.referencing.operation.matrix.Matrix3; import org.apache.sis.referencing.operation.matrix.Matrix4; import org.apache.sis.referencing.operation.matrix.MatrixSIS; -import org.apache.sis.util.Static; /** @@ -29,7 +28,7 @@ import org.apache.sis.util.Static; * @author Johann Sorel * @author Bertrand COTE */ -public final class Matrices extends Static { +public final class Matrices { public static Matrix2 toMatrix2(double[][] m) { return new Matrix2( diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Quaternions.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Quaternions.java index da9a1000ce..542d472ea7 100644 --- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Quaternions.java +++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Quaternions.java @@ -16,14 +16,12 @@ */ package org.apache.sis.geometries.math; -import org.apache.sis.util.Static; - /** * * Original code from Unlicense.science */ -public final class Quaternions extends Static { +public final class Quaternions { private static final double DELTA = 0.00001; diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/TupleArrays.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/TupleArrays.java index 1e9f7aa06c..e7f5fd68c2 100644 --- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/TupleArrays.java +++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/TupleArrays.java @@ -31,14 +31,13 @@ import org.apache.sis.geometries.Geometries; import org.apache.sis.measure.NumberRange; import org.apache.sis.referencing.CRS; import org.apache.sis.util.ArgumentChecks; -import org.apache.sis.util.Static; /** * * @author Johann Sorel (Geomatys) */ -public final class TupleArrays extends Static { +public final class TupleArrays { public static TupleArray of(List<? extends Tuple> vectors, int dimension, DataType dataType) { return of(vectors, SampleSystem.ofSize(dimension), dataType); diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Vectors.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Vectors.java index 7384c7c020..9f5e0c2578 100644 --- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Vectors.java +++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Vectors.java @@ -26,7 +26,6 @@ import org.apache.sis.measure.NumberRange; import org.apache.sis.referencing.operation.matrix.MatrixSIS; import org.apache.sis.referencing.operation.transform.MathTransforms; import org.apache.sis.util.ArgumentChecks; -import org.apache.sis.util.Static; /** @@ -35,7 +34,7 @@ import org.apache.sis.util.Static; * @author Johann Sorel * @author Bertrand COTE */ -public final class Vectors extends Static { +public final class Vectors { public static Vector<?> create(CoordinateReferenceSystem crs, DataType dataType) { return create(SampleSystem.of(crs), dataType); diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/GeometryOperations.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/GeometryOperations.java index 0a47545af6..b9f259f5ef 100644 --- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/GeometryOperations.java +++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/GeometryOperations.java @@ -69,14 +69,13 @@ import org.apache.sis.geometries.operation.spatialrelations2d.Relate; import org.apache.sis.geometries.operation.spatialrelations2d.Touches; import org.apache.sis.geometries.operation.spatialrelations2d.Within; import org.apache.sis.geometries.processor.Processor; -import org.apache.sis.util.Static; /** * * @author Johann Sorel (Geomatys) */ -public final class GeometryOperations extends Static { +public final class GeometryOperations { private static final Processor NONE = new Processor() { @Override @@ -123,7 +122,7 @@ public final class GeometryOperations extends Static { * @see OGC Simple Feature Access 1.2.1 - 6.1.2.4 Methods that support spatial analysis */ @UML(identifier="Query2D", specification=ISO_19107) // section 6.4.8 - public static final class SpatialAnalysis2D extends Static { + public static final class SpatialAnalysis2D { private SpatialAnalysis2D(){} @@ -201,7 +200,7 @@ public final class GeometryOperations extends Static { } @UML(identifier="Query3D", specification=ISO_19107) // section 6.4.9 - public static final class SpatialAnalysis3D extends Static { + public static final class SpatialAnalysis3D { private SpatialAnalysis3D(){} @@ -245,7 +244,7 @@ public final class GeometryOperations extends Static { * @see OGC Simple Feature Access 1.2.1 - 6.1.2.3 Methods for testing spatial relations between geometric objects */ @UML(identifier="Query2D", specification=ISO_19107) // section 6.4.8 - public static final class SpatialRelations2D extends Static { + public static final class SpatialRelations2D { private SpatialRelations2D(){} @@ -357,7 +356,7 @@ public final class GeometryOperations extends Static { } @UML(identifier="Query3D", specification=ISO_19107) // section 6.4.9 - public static final class SpatialRelations3D extends Static { + public static final class SpatialRelations3D { private SpatialRelations3D(){} @@ -412,7 +411,7 @@ public final class GeometryOperations extends Static { } } - public static final class SpatialEdition extends Static { + public static final class SpatialEdition { private SpatialEdition(){} diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/processor/ProcessorUtils.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/processor/ProcessorUtils.java index a3e0a8c8a0..8e0efba1d9 100644 --- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/processor/ProcessorUtils.java +++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/processor/ProcessorUtils.java @@ -24,14 +24,13 @@ import org.opengis.util.FactoryException; import org.apache.sis.geometries.Geometry; import org.apache.sis.geometries.operation.OperationException; import org.apache.sis.referencing.CRS; -import org.apache.sis.util.Static; /** * * @author Johann Sorel (Geomatys) */ -public final class ProcessorUtils extends Static { +public final class ProcessorUtils { /** * Ensure given geometries have the same CRS. diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/cpg/CpgFiles.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/cpg/CpgFiles.java index afa5313f61..e0d2c3312d 100644 --- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/cpg/CpgFiles.java +++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/cpg/CpgFiles.java @@ -26,7 +26,6 @@ import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; -import org.apache.sis.util.Static; /** @@ -35,7 +34,7 @@ import org.apache.sis.util.Static; * * @author Johann Sorel (Geomatys) */ -public final class CpgFiles extends Static { +public final class CpgFiles { /** * Do not allow instantiation of this class. */ diff --git a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/FontGIS.java b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/FontGIS.java index fcf2e6b870..c937fad6b0 100644 --- a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/FontGIS.java +++ b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/FontGIS.java @@ -24,7 +24,6 @@ import javafx.scene.text.Font; import javafx.scene.control.Button; import javafx.scene.control.Labeled; import javafx.scene.control.ToggleButton; -import org.apache.sis.util.Static; import org.apache.sis.system.Modules; import org.apache.sis.util.logging.Logging; @@ -41,7 +40,7 @@ import org.apache.sis.util.logging.Logging; * * @see <a href="https://viglino.github.io/font-gis/";>Font-GIS project</a> */ -public final class FontGIS extends Static { +public final class FontGIS { /** * The font, or {@code null} if not found or if an error occurred. * This is loaded at class-initialization time. @@ -157,7 +156,7 @@ public final class FontGIS extends Static { * Those constants are defined in a separated class for avoiding to load hundreds of field names in memory. * Because all field values are constants of primitive type, the compiler should inline them in the caller code. */ - public static final class Code extends Static { + public static final class Code { /** * Do not allow instantiation of this class. */ diff --git a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/GUIUtilities.java b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/GUIUtilities.java index 94336a1ac8..20787cf3ff 100644 --- a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/GUIUtilities.java +++ b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/GUIUtilities.java @@ -39,7 +39,6 @@ import javax.measure.quantity.Length; import org.apache.sis.referencing.privy.Formulas; import org.apache.sis.measure.Quantities; import org.apache.sis.measure.Units; -import org.apache.sis.util.Static; import org.apache.sis.util.Localized; import org.apache.sis.util.Workaround; @@ -49,7 +48,7 @@ import org.apache.sis.util.Workaround; * * @author Martin Desruisseaux (Geomatys) */ -public final class GUIUtilities extends Static { +public final class GUIUtilities { /** * Do not allow instantiation of this class. */ diff --git a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/Styles.java b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/Styles.java index f72e0b6589..52d2ef15db 100644 --- a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/Styles.java +++ b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/Styles.java @@ -29,7 +29,6 @@ import javafx.scene.layout.ColumnConstraints; import javafx.scene.layout.GridPane; import javafx.scene.layout.Priority; import javafx.scene.layout.RowConstraints; -import org.apache.sis.util.Static; import org.apache.sis.util.logging.Logging; import static org.apache.sis.gui.internal.LogHandler.LOGGER; @@ -43,7 +42,7 @@ import static org.apache.sis.gui.internal.LogHandler.LOGGER; * * @author Martin Desruisseaux (Geomatys) */ -public final class Styles extends Static { +public final class Styles { /** * Approximate size of vertical scroll bar. */
