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 d584684ed9b1b3ba27754d7ebdcfc9b483181b03 Author: Martin Desruisseaux <[email protected]> AuthorDate: Wed Oct 1 20:41:22 2025 +0200 Remove the `org.apache.sis.util.Static` class. --- .../main/org/apache/sis/console/SIS.java | 3 +- .../apache/sis/coverage/grid/PixelTranslation.java | 3 +- .../org/apache/sis/feature/FeatureOperations.java | 3 +- .../main/org/apache/sis/feature/Features.java | 3 +- .../sis/metadata/iso/citation/Citations.java | 3 +- .../apache/sis/metadata/iso/extent/Extents.java | 3 +- .../main/org/apache/sis/util/iso/Names.java | 3 +- .../main/org/apache/sis/util/iso/Types.java | 3 +- .../main/org/apache/sis/xml/Namespaces.java | 3 +- .../main/org/apache/sis/xml/XML.java | 3 +- .../apache/sis/profile/france/FrenchProfile.java | 3 +- .../apache/sis/profile/japan/JapaneseProfile.java | 4 +- .../main/org/apache/sis/geometry/Envelopes.java | 3 +- .../main/org/apache/sis/geometry/Shapes2D.java | 3 +- .../main/org/apache/sis/referencing/CRS.java | 3 +- .../apache/sis/referencing/IdentifiedObjects.java | 3 +- .../sis/referencing/cs/CoordinateSystems.java | 3 +- .../sis/referencing/datum/DatumOrEnsemble.java | 3 +- .../operation/matrix/AffineTransforms2D.java | 3 +- .../sis/referencing/operation/matrix/Matrices.java | 3 +- .../operation/transform/MathTransforms.java | 3 +- .../main/org/apache/sis/storage/DataStores.java | 3 +- .../main/org/apache/sis/io/IO.java | 3 +- .../main/org/apache/sis/math/DecimalFunctions.java | 3 +- .../main/org/apache/sis/math/MathFunctions.java | 3 +- .../main/org/apache/sis/measure/Quantities.java | 3 +- .../main/org/apache/sis/measure/Units.java | 3 +- .../main/org/apache/sis/system/Environment.java | 3 +- .../main/org/apache/sis/system/Loggers.java | 3 +- .../main/org/apache/sis/system/Threads.java | 3 +- .../main/org/apache/sis/util/ArgumentChecks.java | 2 +- .../main/org/apache/sis/util/ArraysExt.java | 2 +- .../main/org/apache/sis/util/CharSequences.java | 2 +- .../main/org/apache/sis/util/Characters.java | 2 +- .../main/org/apache/sis/util/Classes.java | 2 +- .../main/org/apache/sis/util/Exceptions.java | 2 +- .../main/org/apache/sis/util/Locales.java | 2 +- .../main/org/apache/sis/util/Numbers.java | 2 +- .../main/org/apache/sis/util/ObjectConverters.java | 2 +- .../main/org/apache/sis/util/Static.java | 119 --------------------- .../main/org/apache/sis/util/Utilities.java | 2 +- .../org/apache/sis/util/collection/Containers.java | 3 +- .../org/apache/sis/util/collection/TreeTables.java | 3 +- .../main/org/apache/sis/util/logging/Logging.java | 3 +- 44 files changed, 43 insertions(+), 196 deletions(-) diff --git a/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/SIS.java b/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/SIS.java index d9d333fb90..d989c11e6e 100644 --- a/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/SIS.java +++ b/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/SIS.java @@ -18,7 +18,6 @@ package org.apache.sis.console; import java.util.EnumMap; import java.io.PrintWriter; -import org.apache.sis.util.Static; import org.apache.sis.util.Version; import org.apache.sis.util.Printable; import org.apache.sis.util.CharSequences; @@ -42,7 +41,7 @@ import org.apache.sis.system.Environment; * @version 1.5 * @since 1.5 */ -public final class SIS extends Static { +public final class SIS { /* * Usages of `Console#writer()` within JShell seems incompatible with JShell own writer. * Problems observed with Java 21 on Linux when printing non-ASCII characters. diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/PixelTranslation.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/PixelTranslation.java index e98fa07134..d69d21b33b 100644 --- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/PixelTranslation.java +++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/PixelTranslation.java @@ -22,7 +22,6 @@ import org.opengis.referencing.operation.Matrix; import org.opengis.referencing.operation.MathTransform; import org.opengis.metadata.spatial.PixelOrientation; import static org.opengis.metadata.spatial.PixelOrientation.*; -import org.apache.sis.util.Static; import org.apache.sis.util.resources.Errors; import org.apache.sis.referencing.operation.matrix.Matrices; import org.apache.sis.referencing.operation.transform.MathTransforms; @@ -70,7 +69,7 @@ import org.apache.sis.referencing.operation.transform.MathTransforms; * * @since 1.0 */ -public final class PixelTranslation extends Static implements Serializable { +public final class PixelTranslation implements Serializable { /** * For cross-version compatibility. */ diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/FeatureOperations.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/FeatureOperations.java index ae5b2c7c98..6ee03b6926 100644 --- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/FeatureOperations.java +++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/FeatureOperations.java @@ -23,7 +23,6 @@ import org.opengis.util.FactoryException; import org.opengis.util.InternationalString; import org.opengis.referencing.crs.CoordinateReferenceSystem; import org.apache.sis.util.ArgumentChecks; -import org.apache.sis.util.Static; import org.apache.sis.util.collection.WeakHashSet; import org.apache.sis.util.resources.Errors; import org.apache.sis.util.internal.shared.Strings; @@ -108,7 +107,7 @@ import org.opengis.filter.Expression; * @version 1.5 * @since 0.7 */ -public final class FeatureOperations extends Static { +public final class FeatureOperations { /** * The pool of operations or operation dependencies created so far, for sharing exiting instances. */ diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/Features.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/Features.java index 41f4b15392..d87f934aba 100644 --- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/Features.java +++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/Features.java @@ -26,7 +26,6 @@ import org.opengis.metadata.quality.ConformanceResult; import org.opengis.metadata.quality.DataQuality; import org.opengis.metadata.quality.Element; import org.opengis.metadata.quality.Result; -import org.apache.sis.util.Static; import org.apache.sis.util.iso.Names; import org.apache.sis.util.iso.DefaultNameFactory; import org.apache.sis.feature.internal.Resources; @@ -53,7 +52,7 @@ import org.opengis.feature.PropertyType; * @version 1.5 * @since 0.5 */ -public final class Features extends Static { +public final class Features { /** * Do not allow instantiation of this class. */ diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/Citations.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/Citations.java index d2f26888e0..2bef69f00a 100644 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/Citations.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/Citations.java @@ -26,7 +26,6 @@ import java.util.Optional; import org.opengis.util.InternationalString; import org.opengis.metadata.Identifier; import org.opengis.metadata.citation.Citation; -import org.apache.sis.util.Static; import org.apache.sis.util.Characters; import org.apache.sis.util.CharSequences; import org.apache.sis.xml.IdentifierSpace; @@ -78,7 +77,7 @@ import org.apache.sis.metadata.iso.DefaultIdentifier; // For javadoc * @version 1.5 * @since 0.3 */ -public final class Citations extends Static { +public final class Citations { /** * The <cite>Geographic Information — Metadata</cite> standards defined by ISO 19115. * This list contains two standards published by the diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/Extents.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/Extents.java index 8197f440fd..05a6ad861c 100644 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/Extents.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/Extents.java @@ -66,7 +66,6 @@ import org.apache.sis.util.OptionalCandidate; import org.apache.sis.util.ArgumentChecks; import org.apache.sis.util.ComparisonMode; import org.apache.sis.util.Emptiable; -import org.apache.sis.util.Static; import org.apache.sis.util.iso.Types; import org.apache.sis.util.resources.Vocabulary; import org.apache.sis.util.resources.Errors; @@ -99,7 +98,7 @@ import org.opengis.coordinate.MismatchedCoordinateMetadataException; * * @since 0.3 */ -public final class Extents extends Static { +public final class Extents { /** * The bounding box computed by this class. */ diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/Names.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/Names.java index 50ee62a5b4..fdb7e69a80 100644 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/Names.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/Names.java @@ -26,7 +26,6 @@ import org.opengis.util.GenericName; import org.opengis.util.NameSpace; import org.opengis.util.NameFactory; import org.opengis.util.InternationalString; -import org.apache.sis.util.Static; import org.apache.sis.util.ArgumentChecks; import org.apache.sis.util.OptionalCandidate; import org.apache.sis.util.UnknownNameException; @@ -84,7 +83,7 @@ import org.apache.sis.util.resources.Errors; * * @since 0.5 */ -public final class Names extends Static { +public final class Names { /** * Sequence numbers, created when first needed. * diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/Types.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/Types.java index d3e33867d8..9cbce5bd40 100644 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/Types.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/Types.java @@ -35,7 +35,6 @@ import org.opengis.util.InternationalString; import org.apache.sis.util.SimpleInternationalString; import org.apache.sis.util.DefaultInternationalString; import org.apache.sis.util.ResourceInternationalString; -import org.apache.sis.util.Static; import org.apache.sis.util.Locales; import org.apache.sis.util.CharSequences; import org.apache.sis.util.ArgumentChecks; @@ -104,7 +103,7 @@ import org.opengis.util.ControlledVocabulary; * @version 1.5 * @since 0.3 */ -public final class Types extends Static { +public final class Types { /** * The separator character between class name and attribute name in resource files. */ diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/Namespaces.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/Namespaces.java index 077ac5fabe..bab5aae9cb 100644 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/Namespaces.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/Namespaces.java @@ -20,7 +20,6 @@ import java.util.Map; import java.util.Locale; import java.util.Objects; import javax.xml.XMLConstants; -import org.apache.sis.util.Static; import org.apache.sis.xml.internal.shared.LegacyNamespaces; import static org.apache.sis.metadata.internal.shared.ImplementationHelper.ISO_NAMESPACE; @@ -92,7 +91,7 @@ import static org.apache.sis.metadata.internal.shared.ImplementationHelper.ISO_N * @version 1.4 * @since 0.3 */ -public final class Namespaces extends Static { +public final class Namespaces { /** * Do not allow instantiation of this class. */ diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/XML.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/XML.java index cc5103f783..5da5ebf64d 100644 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/XML.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/XML.java @@ -44,7 +44,6 @@ import jakarta.xml.bind.Marshaller; import jakarta.xml.bind.Unmarshaller; import jakarta.xml.bind.JAXBElement; import jakarta.xml.bind.JAXBException; -import org.apache.sis.util.Static; import org.apache.sis.util.Version; import org.apache.sis.util.Workaround; import org.apache.sis.util.resources.Errors; @@ -91,7 +90,7 @@ import static org.apache.sis.util.ArgumentChecks.ensureNonNull; * @version 1.5 * @since 0.3 */ -public final class XML extends Static { +public final class XML { /** * Specifies the locale to use for marshalling * {@link org.opengis.util.InternationalString} and {@link org.opengis.util.CodeList} diff --git a/endorsed/src/org.apache.sis.profile.france/main/org/apache/sis/profile/france/FrenchProfile.java b/endorsed/src/org.apache.sis.profile.france/main/org/apache/sis/profile/france/FrenchProfile.java index 6f8a367885..4721ba281e 100644 --- a/endorsed/src/org.apache.sis.profile.france/main/org/apache/sis/profile/france/FrenchProfile.java +++ b/endorsed/src/org.apache.sis.profile.france/main/org/apache/sis/profile/france/FrenchProfile.java @@ -18,7 +18,6 @@ package org.apache.sis.profile.france; import org.opengis.referencing.ReferenceSystem; import org.apache.sis.xml.bind.fra.*; -import org.apache.sis.util.Static; /** @@ -28,7 +27,7 @@ import org.apache.sis.util.Static; * @version 0.4 * @since 0.4 */ -public final class FrenchProfile extends Static { +public final class FrenchProfile { /** * The <code>{@value}</code> URL. * The usual prefix for this namespace is {@code "fra"}. diff --git a/endorsed/src/org.apache.sis.profile.japan/main/org/apache/sis/profile/japan/JapaneseProfile.java b/endorsed/src/org.apache.sis.profile.japan/main/org/apache/sis/profile/japan/JapaneseProfile.java index 70b4e68e2e..66ac22ef38 100644 --- a/endorsed/src/org.apache.sis.profile.japan/main/org/apache/sis/profile/japan/JapaneseProfile.java +++ b/endorsed/src/org.apache.sis.profile.japan/main/org/apache/sis/profile/japan/JapaneseProfile.java @@ -16,8 +16,6 @@ */ package org.apache.sis.profile.japan; -import org.apache.sis.util.Static; - /** * Provides implementations of Japanese extensions. @@ -33,7 +31,7 @@ import org.apache.sis.util.Static; * @version 1.0 * @since 1.0 */ -public final class JapaneseProfile extends Static { +public final class JapaneseProfile { /** * Do not allow instantiation of this class. */ 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 c7a2b0d39a..4901fe52db 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 @@ -60,7 +60,6 @@ import org.apache.sis.util.resources.Errors; import org.apache.sis.util.ArgumentChecks; import org.apache.sis.util.ComparisonMode; import org.apache.sis.util.Utilities; -import org.apache.sis.util.Static; import org.apache.sis.measure.Range; import org.apache.sis.math.MathFunctions; @@ -110,7 +109,7 @@ import static org.apache.sis.util.StringBuilders.trimFractionalPart; * * @since 0.3 */ -public final class Envelopes extends Static { +public final class Envelopes { /** * The logger for geometry operations. */ diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/Shapes2D.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/Shapes2D.java index 08290f34ea..8196510f19 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/Shapes2D.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/Shapes2D.java @@ -40,7 +40,6 @@ import org.apache.sis.referencing.operation.AbstractCoordinateOperation; import org.apache.sis.referencing.operation.matrix.AffineTransforms2D; import org.apache.sis.referencing.operation.transform.MathTransforms; import org.apache.sis.util.ArgumentChecks; -import org.apache.sis.util.Static; /** @@ -54,7 +53,7 @@ import org.apache.sis.util.Static; * @version 1.3 * @since 0.8 */ -public final class Shapes2D extends Static { +public final class Shapes2D { /** * Do not allow instantiation of this class. */ diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CRS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CRS.java index 304dc71970..d6889ba187 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CRS.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CRS.java @@ -90,7 +90,6 @@ import org.apache.sis.metadata.iso.extent.Extents; import org.apache.sis.util.ArgumentChecks; import org.apache.sis.util.ComparisonMode; import org.apache.sis.util.OptionalCandidate; -import org.apache.sis.util.Static; import org.apache.sis.util.Utilities; import org.apache.sis.util.internal.shared.Numerics; import org.apache.sis.util.internal.shared.Constants; @@ -152,7 +151,7 @@ import org.opengis.coordinate.CoordinateMetadata; * @version 1.5 * @since 0.3 */ -public final class CRS extends Static { +public final class CRS { /** * The logger for referencing operations. */ diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/IdentifiedObjects.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/IdentifiedObjects.java index 55e7361c35..255b4df11b 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/IdentifiedObjects.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/IdentifiedObjects.java @@ -36,7 +36,6 @@ import org.opengis.referencing.IdentifiedObject; import org.opengis.referencing.crs.CompoundCRS; import org.opengis.referencing.operation.CoordinateOperation; import org.opengis.referencing.operation.ConcatenatedOperation; -import org.apache.sis.util.Static; import org.apache.sis.util.Emptiable; import org.apache.sis.util.CharSequences; import org.apache.sis.util.ArgumentChecks; @@ -75,7 +74,7 @@ import org.opengis.referencing.ObjectDomain; * * @since 0.4 */ -public final class IdentifiedObjects extends Static { +public final class IdentifiedObjects { /** * Do not allows instantiation of this class. */ diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/CoordinateSystems.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/CoordinateSystems.java index caed042182..f497b1bc42 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/CoordinateSystems.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/CoordinateSystems.java @@ -37,7 +37,6 @@ import org.apache.sis.measure.Angle; import org.apache.sis.measure.Longitude; import org.apache.sis.measure.ElevationAngle; import org.apache.sis.measure.Units; -import org.apache.sis.util.Static; import org.apache.sis.util.Classes; import org.apache.sis.util.ArgumentChecks; import org.apache.sis.util.logging.Logging; @@ -59,7 +58,7 @@ import org.apache.sis.referencing.operation.matrix.MatrixSIS; * @version 1.5 * @since 0.4 */ -public final class CoordinateSystems extends Static { +public final class CoordinateSystems { /** * Do not allow instantiation of this class. */ diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DatumOrEnsemble.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DatumOrEnsemble.java index 2902efc28c..2ec5a4c69d 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DatumOrEnsemble.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DatumOrEnsemble.java @@ -40,7 +40,6 @@ import org.opengis.referencing.datum.PrimeMeridian; import org.opengis.referencing.datum.Ellipsoid; import org.opengis.referencing.operation.CoordinateOperation; import org.opengis.metadata.quality.PositionalAccuracy; -import org.apache.sis.util.Static; import org.apache.sis.util.Utilities; import org.apache.sis.util.CharSequences; import org.apache.sis.util.ComparisonMode; @@ -67,7 +66,7 @@ import org.opengis.referencing.datum.RealizationMethod; * @version 1.5 * @since 1.5 */ -public final class DatumOrEnsemble extends Static { +public final class DatumOrEnsemble { /** * The {@value} keyword which sometime appear at the end of a datum ensemble name. */ diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/matrix/AffineTransforms2D.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/matrix/AffineTransforms2D.java index e09850882c..d5fefdb1c8 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/matrix/AffineTransforms2D.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/matrix/AffineTransforms2D.java @@ -32,7 +32,6 @@ import org.apache.sis.referencing.operation.transform.LinearTransform; import org.apache.sis.referencing.internal.Resources; import org.apache.sis.referencing.internal.shared.AffineTransform2D; import org.apache.sis.referencing.internal.shared.IntervalRectangle; -import org.apache.sis.util.Static; /** @@ -44,7 +43,7 @@ import org.apache.sis.util.Static; * @version 1.1 * @since 0.4 */ -public final class AffineTransforms2D extends Static { +public final class AffineTransforms2D { /** * Do not allows instantiation of this class. */ diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/matrix/Matrices.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/matrix/Matrices.java index 0d6a02a0a4..47d553a0db 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/matrix/Matrices.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/matrix/Matrices.java @@ -24,7 +24,6 @@ import org.opengis.referencing.cs.AxisDirection; import org.opengis.referencing.cs.CoordinateSystem; // For javadoc import org.opengis.referencing.operation.Matrix; import org.opengis.referencing.operation.MathTransform; -import org.apache.sis.util.Static; import org.apache.sis.util.CharSequences; import org.apache.sis.util.ComparisonMode; import org.apache.sis.util.ArgumentChecks; @@ -81,7 +80,7 @@ import org.opengis.coordinate.MismatchedDimensionException; * * @since 0.4 */ -public final class Matrices extends Static { +public final class Matrices { /** * Number of spaces to put between columns formatted by {@link #toString(Matrix)}. */ diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/MathTransforms.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/MathTransforms.java index 150c169fca..3a764936a9 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/MathTransforms.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/MathTransforms.java @@ -40,7 +40,6 @@ import org.apache.sis.referencing.operation.matrix.Matrices; import org.apache.sis.util.OptionalCandidate; import org.apache.sis.util.ArgumentChecks; import org.apache.sis.util.ArraysExt; -import org.apache.sis.util.Static; import org.apache.sis.util.internal.shared.DoubleDouble; // Specific to the geoapi-3.1 and geoapi-4.0 branches: @@ -68,7 +67,7 @@ import org.opengis.coordinate.MismatchedDimensionException; * * @since 0.5 */ -public final class MathTransforms extends Static { +public final class MathTransforms { /** * Do not allow instantiation of this class. */ diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/DataStores.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/DataStores.java index a5739a4d76..b44809486d 100644 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/DataStores.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/DataStores.java @@ -20,7 +20,6 @@ import java.util.Optional; import java.util.Collection; import java.util.function.Predicate; import org.opengis.geometry.Envelope; -import org.apache.sis.util.Static; import org.apache.sis.util.collection.BackingStoreException; import org.apache.sis.storage.base.Capability; import org.apache.sis.storage.image.DataStoreFilter; @@ -42,7 +41,7 @@ import org.apache.sis.coverage.grid.DisjointExtentException; * * @since 0.4 */ -public final class DataStores extends Static { +public final class DataStores { /** * Do not allow instantiation of this class. */ diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/io/IO.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/io/IO.java index 87d0672266..6601b35f41 100644 --- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/io/IO.java +++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/io/IO.java @@ -22,7 +22,6 @@ import java.io.IOException; import java.io.Writer; import java.io.StringWriter; import java.io.CharArrayWriter; -import org.apache.sis.util.Static; import org.apache.sis.util.resources.Vocabulary; @@ -33,7 +32,7 @@ import org.apache.sis.util.resources.Vocabulary; * @version 0.3 * @since 0.3 */ -public final class IO extends Static { +public final class IO { /** * Do not allow instantiation of this class. */ diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/DecimalFunctions.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/DecimalFunctions.java index cf674e9f83..70bc3e7271 100644 --- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/DecimalFunctions.java +++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/DecimalFunctions.java @@ -16,7 +16,6 @@ */ package org.apache.sis.math; -import org.apache.sis.util.Static; import org.apache.sis.util.Workaround; import org.apache.sis.util.ArgumentChecks; import org.apache.sis.util.internal.shared.Numerics; @@ -53,7 +52,7 @@ import static org.apache.sis.pending.jdk.JDK19.DOUBLE_PRECISION; * * @since 0.4 */ -public final class DecimalFunctions extends Static { +public final class DecimalFunctions { /** * The greatest power of 10 such as {@code Math.pow(10, EXPONENT_FOR_ZERO) == 0}. * This is the exponent in {@code parseDouble("1E-324")} < {@link Double#MIN_VALUE}, diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/MathFunctions.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/MathFunctions.java index f973bb3c72..c5db5370eb 100644 --- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/MathFunctions.java +++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/MathFunctions.java @@ -34,7 +34,6 @@ import static java.lang.Float.floatToRawIntBits; import static java.lang.Double.longBitsToDouble; import static java.lang.Double.doubleToLongBits; import static java.lang.Double.doubleToRawLongBits; -import org.apache.sis.util.Static; import org.apache.sis.util.ArraysExt; import org.apache.sis.util.ArgumentChecks; import org.apache.sis.util.resources.Errors; @@ -77,7 +76,7 @@ import static org.apache.sis.pending.jdk.JDK19.DOUBLE_PRECISION; * * @since 0.3 */ -public final class MathFunctions extends Static { +public final class MathFunctions { /** * The square root of 2, which is approximated by {@value}. * diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/Quantities.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/Quantities.java index bc0bc47a22..1d2371c5d3 100644 --- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/Quantities.java +++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/Quantities.java @@ -25,7 +25,6 @@ import javax.measure.quantity.Time; import javax.measure.quantity.Angle; import javax.measure.quantity.Length; import javax.measure.format.MeasurementParseException; -import org.apache.sis.util.Static; import org.apache.sis.util.Numbers; import org.apache.sis.util.resources.Errors; @@ -44,7 +43,7 @@ import org.apache.sis.util.resources.Errors; * @version 1.3 * @since 0.8 */ -public final class Quantities extends Static { +public final class Quantities { /** * Do not allow instantiation of this class. */ diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/Units.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/Units.java index 4eb17cecff..9377d93f79 100644 --- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/Units.java +++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/Units.java @@ -25,7 +25,6 @@ import javax.measure.quantity.*; import javax.measure.quantity.Angle; // Because of name collision with Angle in this SIS package. import org.opengis.geometry.DirectPosition; // For javadoc import org.opengis.referencing.cs.AxisDirection; // For javadoc -import org.apache.sis.util.Static; import org.apache.sis.util.OptionalCandidate; import org.apache.sis.util.resources.Errors; import org.apache.sis.util.internal.shared.Constants; @@ -80,7 +79,7 @@ import static org.apache.sis.util.internal.shared.Constants.MILLIS_PER_TROPICAL_ * @version 1.5 * @since 0.3 */ -public final class Units extends Static { +public final class Units { /** * Unit of measurement defined as 10<sup>-9</sup> metres (1 nm). This unit is often used in * {@linkplain org.apache.sis.metadata.iso.content.DefaultBand#getBoundUnits() wavelength measurements}. diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/system/Environment.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/system/Environment.java index a6bdd1f6cf..dc2844327c 100644 --- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/system/Environment.java +++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/system/Environment.java @@ -20,7 +20,6 @@ import java.io.Console; import java.io.PrintStream; import java.io.PrintWriter; import java.io.OutputStreamWriter; -import org.apache.sis.util.Static; import org.apache.sis.util.Workaround; import org.apache.sis.pending.jdk.JDK17; @@ -30,7 +29,7 @@ import org.apache.sis.pending.jdk.JDK17; * * @author Martin Desruisseaux (Geomatys) */ -public final class Environment extends Static { +public final class Environment { /** * Whether the use of the console writer should be avoided. * diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/system/Loggers.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/system/Loggers.java index bebe42a3ab..a5b6928ddf 100644 --- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/system/Loggers.java +++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/system/Loggers.java @@ -25,7 +25,6 @@ import java.util.logging.Logger; import java.util.logging.Handler; import java.lang.reflect.Field; import java.lang.reflect.Modifier; -import org.apache.sis.util.Static; import org.apache.sis.util.logging.Logging; @@ -36,7 +35,7 @@ import org.apache.sis.util.logging.Logging; * * @author Martin Desruisseaux (Geomatys) */ -public final class Loggers extends Static { +public final class Loggers { /** * The root logger. */ diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/system/Threads.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/system/Threads.java index e436409df2..a0d6291043 100644 --- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/system/Threads.java +++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/system/Threads.java @@ -16,7 +16,6 @@ */ package org.apache.sis.system; -import org.apache.sis.util.Static; import org.apache.sis.util.logging.Logging; @@ -32,7 +31,7 @@ import org.apache.sis.util.logging.Logging; * * @author Martin Desruisseaux (Geomatys) */ -public final class Threads extends Static { +public final class Threads { /** * The parent of every threads declared in this class. This parent will be declared as close * as possible to the root of all thread groups (i.e. not as an application thread subgroup). diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/ArgumentChecks.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/ArgumentChecks.java index a7515d675b..d842f5a165 100644 --- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/ArgumentChecks.java +++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/ArgumentChecks.java @@ -86,7 +86,7 @@ import org.opengis.coverage.grid.GridEnvelope; * @version 1.6 * @since 0.3 */ -public final class ArgumentChecks extends Static { +public final class ArgumentChecks { /** * Forbid object creation. */ diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/ArraysExt.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/ArraysExt.java index e3488a4952..6adb3fbd21 100644 --- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/ArraysExt.java +++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/ArraysExt.java @@ -74,7 +74,7 @@ import java.lang.reflect.Array; * @since 0.3 */ @SuppressWarnings("ReturnOfCollectionOrArrayField") // Array constants in this class are immutable empty arrays. -public final class ArraysExt extends Static { +public final class ArraysExt { /** * An empty array of {@code double} primitive type. * Such arrays are immutable and can be safely shared. diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/CharSequences.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/CharSequences.java index 61e12993ec..4b5a9c9f71 100644 --- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/CharSequences.java +++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/CharSequences.java @@ -73,7 +73,7 @@ import org.opengis.referencing.IdentifiedObject; // For javadoc * * @since 0.3 */ -public final class CharSequences extends Static { +public final class CharSequences { /** * An array of zero-length. This constant play a role equivalents to * {@link java.util.Collections#EMPTY_LIST}. diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/Characters.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/Characters.java index 4af2be9178..e6aadf6794 100644 --- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/Characters.java +++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/Characters.java @@ -32,7 +32,7 @@ import org.apache.sis.util.resources.Errors; * @version 1.2 * @since 0.3 */ -public final class Characters extends Static { +public final class Characters { /** * Hyphen character ('\u2010', Unicode {@code 2010}). * This code tells to {@link org.apache.sis.io.LineAppender} diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/Classes.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/Classes.java index 03b1ea2bd4..60823765c4 100644 --- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/Classes.java +++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/Classes.java @@ -58,7 +58,7 @@ import org.apache.sis.pending.jdk.JDK19; * @version 1.5 * @since 0.3 */ -public final class Classes extends Static { +public final class Classes { /** * An empty array of classes. */ diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/Exceptions.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/Exceptions.java index fd71139c3a..e327c54cbf 100644 --- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/Exceptions.java +++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/Exceptions.java @@ -37,7 +37,7 @@ import org.apache.sis.util.collection.BackingStoreException; * @version 1.3 * @since 0.3 */ -public final class Exceptions extends Static { +public final class Exceptions { /** * Do not allow instantiation of this class. */ diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/Locales.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/Locales.java index 439fdd0b05..7ae0d8b24a 100644 --- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/Locales.java +++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/Locales.java @@ -46,7 +46,7 @@ import static org.apache.sis.util.resources.IndexedResourceBundle.LOGGER; * @version 1.5 * @since 0.3 */ -public final class Locales extends Static { +public final class Locales { /** * A read-only map for canonicalizing the locales. Filled on class * initialization in order to avoid the need for synchronization. diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/Numbers.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/Numbers.java index d9f57d625e..a112360312 100644 --- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/Numbers.java +++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/Numbers.java @@ -48,7 +48,7 @@ import org.apache.sis.util.internal.shared.CollectionsExt; "UnnecessaryBoxing", "ResultOfObjectAllocationIgnored" }) -public final class Numbers extends Static { +public final class Numbers { /** * Constant of value {@value} used in {@code switch} statements or as index in arrays. * This enumeration provides the following guarantees (some Apache SIS codes rely on them): diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/ObjectConverters.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/ObjectConverters.java index 3ba1df4ef2..5d76ea2a72 100644 --- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/ObjectConverters.java +++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/ObjectConverters.java @@ -65,7 +65,7 @@ import org.apache.sis.converter.SystemRegistry; * * @since 0.3 */ -public final class ObjectConverters extends Static { +public final class ObjectConverters { /** * Do not allow instantiation of this class. */ 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 deleted file mode 100644 index edcbc67247..0000000000 --- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/Static.java +++ /dev/null @@ -1,119 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.sis.util; - - -/** - * Parent of SIS classes that contain only static utility methods. - * This parent class is used for documentation purpose only. - * The list below summarizes some of the utility classes: - * - * <table class="sis"> - * <caption>Static utility classes (non exhaustive list)</caption> - * <tr><th colspan="2" class="hsep">OGC/ISO objects (metadata, referencing, geometries)</th></tr> - * <tr><td>{@link org.apache.sis.metadata.iso.citation.Citations}</td> - * <td>Predefined {@link org.opengis.metadata.citation.Citation} - * and methods for comparing against titles or identifiers.</td></tr> - * <tr><td>{@link org.apache.sis.referencing.cs.CoordinateSystems}</td> - * <td>Parses axis names and creates transforms between {@link org.opengis.referencing.cs.CoordinateSystem} - * instances.</td></tr> - * <tr><td>{@link org.apache.sis.referencing.CRS}</td> - * <td>Instantiates or provides information about {@link org.opengis.referencing.crs.CoordinateReferenceSystem}.</td></tr> - * <tr><td>{@link org.apache.sis.geometry.Envelopes}</td> - * <td>Parse, format and transform {@link org.opengis.geometry.Envelope} objects.</td></tr> - * <tr><td>{@link org.apache.sis.metadata.iso.extent.Extents}</td> - * <td>Extract information from {@link org.opengis.metadata.extent.Extent} objects.</td></tr> - * <tr><td>{@link org.apache.sis.referencing.IdentifiedObjects}</td> - * <td>Handle names, identifiers or properties of - * {@link org.opengis.referencing.IdentifiedObject} instances.</td></tr> - * <tr><td>{@link org.apache.sis.util.iso.Names}</td> - * <td>Simple creation and operations on {@link org.opengis.util.GenericName} objects.</td></tr> - * <tr><td>{@link org.apache.sis.parameter.Parameters}</td> - * <td>Creates, searches or modifies {@link org.opengis.parameter.ParameterValue} instances - * in a group of parameters.</td></tr> - * <tr><td>{@link org.apache.sis.util.iso.Types}</td> - * <td>UML identifier and description for GeoAPI types.</td></tr> - * - * <tr><th colspan="2" class="hsep">Mathematics and units of measurement</th></tr> - * <tr><td>{@link org.apache.sis.math.DecimalFunctions}</td> - * <td>Mathematical methods related to base 10 representation of numbers.</td></tr> - * <tr><td>{@link org.apache.sis.math.MathFunctions}</td> - * <td>Additions to the {@link java.lang.Math} methods.</td></tr> - * <tr><td>{@link org.apache.sis.referencing.operation.matrix.Matrices}</td> - * <td>Create and compare {@link org.opengis.referencing.operation.Matrix} objects</td></tr> - * <tr><td>{@link org.apache.sis.measure.Quantities}</td> - * <td>Operations on {@linkplain javax.measure.Quantity quantities} - * (values with units of measurement).</td></tr> - * <tr><td>{@link org.apache.sis.measure.Units}</td> - * <td>Get a {@linkplain javax.measure.Unit unit} from a symbol or EPSG code, - * and test if a unit is angular, linear or temporal.</td></tr> - * - * <tr><th colspan="2" class="hsep">Input / Output (including CRS, XML, images)</th></tr> - * <tr><td>{@link org.apache.sis.storage.DataStores}</td> - * <td>Read or write geospatial data in various backends.</td></tr> - * <tr><td>{@link org.apache.sis.io.IO}</td> - * <td>Methods working on {@link Appendable} instances.</td></tr> - * <tr><td>{@link org.apache.sis.xml.Namespaces}</td> - * <td>{@code String} constants for commonly used namespaces.</td></tr> - * <tr><td>{@link org.apache.sis.xml.XML}</td> - * <td>Marshal or unmarshal ISO 19115 objects.</td></tr> - * - * <tr><th colspan="2">Miscellaneous utilities</th></tr> - * <tr><td>{@link ArraysExt}</td> - * <td>Additions to the JDK {@link java.util.Arrays} methods - * (include insert or remove of elements in the middle of arrays).</td></tr> - * <tr><td>{@link Characters}</td> - * <td>Find subscript and superscript digit characters.</td></tr> - * <tr><td>{@link CharSequences}</td> - * <td>Methods working on {@link CharSequence} or {@link String} instances.</td></tr> - * <tr><td>{@link Classes}</td> - * <td>Methods working with {@link Class} instances.</td></tr> - * <tr><td>{@link org.apache.sis.util.collection.Containers}</td> - * <td>Additions to the JDK {@link java.util.Collections} methods, also related to the - * {@link org.apache.sis.util.collection.CheckedContainer} interface.</td></tr> - * <tr><td>{@link Numbers}</td> - * <td>Methods working with {@link Number} instances (include conversions between different types).</td></tr> - * <tr><td>{@link ObjectConverters}</td> - * <td>Create {@link ObjectConverter} instances, or collection views using object converters.</td></tr> - * <tr><td>{@link StringBuilders}</td> - * <td>Methods modifying {@link StringBuilder} content in-place.</td></tr> - * - * <tr><th colspan="2" class="hsep">Loggings and exceptions</th></tr> - * <tr><td>{@link ArgumentChecks}</td> - * <td>Perform argument checks and throw {@link IllegalArgumentException} if needed.</td></tr> - * <tr><td>{@link org.apache.sis.util.Exceptions}</td> - * <td>Format a stack trace summary or change the exception message.</td></tr> - * <tr><td>{@link org.apache.sis.util.logging.Logging}</td> - * <td>Get a JDK {@linkplain java.util.logging.Logger logger}, which may be a wrapper around - * the <i>Apache Commons Logging</i> or <i>Log4J</i> framework.</td></tr> - * </table> - * - * @author Martin Desruisseaux (Geomatys) - * @version 0.3 - * @since 0.3 - * - * @deprecated Unnecessary. - */ -@Deprecated(since = "1.5", forRemoval = true) -public class Static { - /** - * For subclasses only. - * Subclasses shall declare a private constructor for preventing instantiation. - */ - protected Static() { - } -} diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/Utilities.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/Utilities.java index e281e42d0b..4587b71572 100644 --- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/Utilities.java +++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/Utilities.java @@ -34,7 +34,7 @@ import org.apache.sis.util.collection.CheckedContainer; * @version 1.5 * @since 0.3 */ -public final class Utilities extends Static { +public final class Utilities { /** * Do not allow object creation. */ diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/Containers.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/Containers.java index bbc8755ba0..5448bb1195 100644 --- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/Containers.java +++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/Containers.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Iterator; import java.util.Collection; import java.util.Objects; -import org.apache.sis.util.Static; import org.apache.sis.util.ArgumentChecks; import org.apache.sis.util.ObjectConverter; import org.apache.sis.util.resources.Errors; @@ -38,7 +37,7 @@ import org.apache.sis.util.internal.shared.UnmodifiableArrayList; * @version 1.0 * @since 0.3 */ -public final class Containers extends Static { +public final class Containers { /** * Do not allow instantiation of this class. */ diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/TreeTables.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/TreeTables.java index f09d2d7750..c375cc49b0 100644 --- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/TreeTables.java +++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/TreeTables.java @@ -26,7 +26,6 @@ import java.io.File; import java.nio.file.Path; import java.text.ParseException; import org.opengis.util.InternationalString; -import org.apache.sis.util.Static; import org.apache.sis.util.ArraysExt; import org.apache.sis.util.ArgumentChecks; @@ -104,7 +103,7 @@ import org.apache.sis.util.ArgumentChecks; * * @since 0.3 */ -public final class TreeTables extends Static { +public final class TreeTables { /** * Do not allow instantiation of this class. */ diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/logging/Logging.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/logging/Logging.java index d964ed27e9..d25c1352ee 100644 --- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/logging/Logging.java +++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/logging/Logging.java @@ -22,7 +22,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import java.util.logging.LogRecord; import org.apache.sis.util.ArgumentChecks; -import org.apache.sis.util.Static; import org.apache.sis.util.Exceptions; import org.apache.sis.util.Classes; import org.apache.sis.system.Modules; @@ -46,7 +45,7 @@ import org.apache.sis.system.SystemListener; * @version 1.5 * @since 0.3 */ -public final class Logging extends Static { +public final class Logging { /** * The threshold at which {@link #unexpectedException(Logger, String, String, Throwable, Level)} shall * set the throwable in the {@link LogRecord}. For any record to be logged at a lower {@link Level},
