This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch geoapi-3.1 in repository https://gitbox.apache.org/repos/asf/sis.git
commit 5b57d58d6be5ff66a9718861f7683930656d0503 Merge: c912771e82 5092f522f7 Author: Martin Desruisseaux <[email protected]> AuthorDate: Tue Sep 23 16:51:40 2025 +0200 Merge branch 'geoapi-4.0' into geoapi-3.1: renaming of the "privy" internal package. endorsed/build.gradle.kts | 6 +++--- .../apache/sis/cloud/aws/s3/ClientFileSystem.java | 2 +- .../main/org/apache/sis/console/AboutCommand.java | 4 ++-- .../main/org/apache/sis/console/Command.java | 2 +- .../main/org/apache/sis/console/CommandRunner.java | 2 +- .../apache/sis/console/FormattedOutputCommand.java | 2 +- .../org/apache/sis/console/IdentifierCommand.java | 2 +- .../apache/sis/console/ResourcesDownloader.java | 2 +- .../org/apache/sis/console/TransformCommand.java | 8 ++++---- .../org.apache.sis.feature/main/module-info.java | 8 ++++---- .../org/apache/sis/coverage/CoverageCombiner.java | 6 +++--- .../org/apache/sis/coverage/SampleDimension.java | 2 +- .../org/apache/sis/coverage/SampleRangeFormat.java | 2 +- .../coverage/grid/BandAggregateGridCoverage.java | 4 ++-- .../sis/coverage/grid/ClippedGridCoverage.java | 2 +- .../coverage/grid/CoordinateOperationFinder.java | 6 +++--- .../apache/sis/coverage/grid/DefaultEvaluator.java | 8 ++++---- .../sis/coverage/grid/DimensionAppender.java | 2 +- .../apache/sis/coverage/grid/DimensionReducer.java | 2 +- .../sis/coverage/grid/DimensionalityReduction.java | 2 +- .../coverage/grid/FractionalGridCoordinates.java | 2 +- .../org/apache/sis/coverage/grid/GridCoverage.java | 4 ++-- .../apache/sis/coverage/grid/GridCoverage2D.java | 6 +++--- .../sis/coverage/grid/GridCoverageBuilder.java | 8 ++++---- .../sis/coverage/grid/GridCoverageProcessor.java | 8 ++++---- .../apache/sis/coverage/grid/GridDerivation.java | 2 +- .../org/apache/sis/coverage/grid/GridExtent.java | 10 +++++----- .../apache/sis/coverage/grid/GridExtentCRS.java | 2 +- .../org/apache/sis/coverage/grid/GridGeometry.java | 14 +++++++------- .../apache/sis/coverage/grid/ImageRenderer.java | 12 ++++++------ .../sis/coverage/grid/ReducedGridCoverage.java | 2 +- .../sis/coverage/grid/ResampledGridCoverage.java | 6 +++--- .../apache/sis/coverage/grid/SliceGeometry.java | 8 ++++---- .../shared}/BandAggregateArgument.java | 4 ++-- .../shared}/CommonDomainFinder.java | 6 +++--- .../{privy => internal/shared}/RangeArgument.java | 8 ++++---- .../shared}/SampleDimensions.java | 2 +- .../{privy => internal/shared}/package-info.java | 2 +- .../org/apache/sis/feature/AbstractFeature.java | 2 +- .../org/apache/sis/feature/CharacteristicMap.java | 8 ++++---- .../apache/sis/feature/CharacteristicTypeMap.java | 4 ++-- .../apache/sis/feature/DefaultAssociationRole.java | 2 +- .../org/apache/sis/feature/DefaultFeatureType.java | 4 ++-- .../main/org/apache/sis/feature/DenseFeature.java | 4 ++-- .../org/apache/sis/feature/EnvelopeOperation.java | 4 ++-- .../apache/sis/feature/ExpressionOperation.java | 4 ++-- .../main/org/apache/sis/feature/FeatureFormat.java | 4 ++-- .../org/apache/sis/feature/FeatureOperations.java | 4 ++-- .../sis/feature/GroupAsPolylineOperation.java | 4 ++-- .../apache/sis/feature/MultiValuedAssociation.java | 2 +- .../apache/sis/feature/MultiValuedAttribute.java | 4 ++-- .../org/apache/sis/feature/NamedFeatureType.java | 2 +- .../org/apache/sis/feature/SingletonAttribute.java | 2 +- .../main/org/apache/sis/feature/SparseFeature.java | 4 ++-- .../apache/sis/feature/StringJoinOperation.java | 6 +++--- .../sis/feature/builder/AttributeTypeBuilder.java | 8 ++++---- .../sis/feature/builder/FeatureTypeBuilder.java | 2 +- .../shared}/AttributeConvention.java | 2 +- .../shared}/FeatureExpression.java | 2 +- .../shared}/FeatureProjection.java | 6 +++--- .../shared}/FeatureProjectionBuilder.java | 4 ++-- .../{privy => internal/shared}/FeatureView.java | 2 +- .../{privy => internal/shared}/InstantList.java | 2 +- .../{privy => internal/shared}/MovingFeatures.java | 4 ++-- .../{privy => internal/shared}/package-info.java | 2 +- .../org/apache/sis/filter/ArithmeticFunction.java | 6 +++--- .../org/apache/sis/filter/AssociationValue.java | 2 +- .../apache/sis/filter/BinaryGeometryFilter.java | 2 +- .../main/org/apache/sis/filter/Capabilities.java | 2 +- .../org/apache/sis/filter/ConvertFunction.java | 6 +++--- .../apache/sis/filter/DefaultFilterFactory.java | 4 ++-- .../org/apache/sis/filter/IdentifierFilter.java | 2 +- .../main/org/apache/sis/filter/LeafExpression.java | 4 ++-- .../main/org/apache/sis/filter/LogicalFilter.java | 4 ++-- .../main/org/apache/sis/filter/Optimization.java | 2 +- .../main/org/apache/sis/filter/PropertyValue.java | 4 ++-- .../main/org/apache/sis/filter/TemporalFilter.java | 2 +- .../org/apache/sis/filter/TemporalOperation.java | 2 +- .../sis/filter/internal/GeometryFromFeature.java | 4 ++-- .../main/org/apache/sis/filter/internal/Node.java | 6 +++--- .../{privy => internal/shared}/CopyVisitor.java | 4 ++-- .../{privy => internal/shared}/EditVisitor.java | 2 +- .../{privy => internal/shared}/FunctionNames.java | 2 +- .../shared}/ListingPropertyVisitor.java | 2 +- .../shared}/SortByComparator.java | 4 ++-- .../filter/{privy => internal/shared}/Visitor.java | 2 +- .../{privy => internal/shared}/WarningEvent.java | 2 +- .../filter/{privy => internal/shared}/XPath.java | 2 +- .../{privy => internal/shared}/package-info.java | 2 +- .../apache/sis/filter/sqlmm/FunctionWithSRID.java | 4 ++-- .../main/org/apache/sis/filter/sqlmm/ST_Point.java | 2 +- .../apache/sis/filter/sqlmm/SpatialFunction.java | 4 ++-- .../org/apache/sis/filter/sqlmm/TwoGeometries.java | 2 +- .../apache/sis/geometry/wrapper/Geometries.java | 4 ++-- .../apache/sis/geometry/wrapper/GeometryType.java | 2 +- .../sis/geometry/wrapper/GeometryWrapper.java | 2 +- .../geometry/wrapper/SpatialOperationContext.java | 6 +++--- .../apache/sis/geometry/wrapper/esri/Factory.java | 2 +- .../sis/geometry/wrapper/j2d/EmptyShape.java | 2 +- .../apache/sis/geometry/wrapper/j2d/Factory.java | 6 +++--- .../apache/sis/geometry/wrapper/j2d/FlatShape.java | 2 +- .../sis/geometry/wrapper/j2d/MultiPolylines.java | 2 +- .../sis/geometry/wrapper/j2d/ShapeProperties.java | 2 +- .../sis/geometry/wrapper/j2d/ShapeWrapper.java | 2 +- .../apache/sis/geometry/wrapper/j2d/Wrapper.java | 4 ++-- .../apache/sis/geometry/wrapper/jts/Factory.java | 2 +- .../org/apache/sis/geometry/wrapper/jts/JTS.java | 2 +- .../sis/geometry/wrapper/jts/ShapeAdapter.java | 4 ++-- .../sis/geometry/wrapper/jts/ShapeConverter.java | 2 +- .../apache/sis/geometry/wrapper/jts/Wrapper.java | 2 +- .../main/org/apache/sis/image/AnnotatedImage.java | 6 +++--- .../org/apache/sis/image/BandAggregateImage.java | 4 ++-- .../org/apache/sis/image/BandAggregateLayout.java | 12 ++++++------ .../main/org/apache/sis/image/BandSelectImage.java | 8 ++++---- .../main/org/apache/sis/image/BandSharing.java | 2 +- .../apache/sis/image/BandedSampleConverter.java | 10 +++++----- .../main/org/apache/sis/image/Colorizer.java | 10 +++++----- .../main/org/apache/sis/image/ComputedImage.java | 4 ++-- .../main/org/apache/sis/image/DataType.java | 4 ++-- .../main/org/apache/sis/image/ImageCombiner.java | 4 ++-- .../main/org/apache/sis/image/ImageLayout.java | 4 ++-- .../main/org/apache/sis/image/ImageOverlay.java | 4 ++-- .../main/org/apache/sis/image/ImageProcessor.java | 4 ++-- .../main/org/apache/sis/image/MaskImage.java | 6 +++--- .../main/org/apache/sis/image/MaskedImage.java | 10 +++++----- .../org/apache/sis/image/MultiSourceImage.java | 2 +- .../org/apache/sis/image/MultiSourcePrefetch.java | 2 +- .../main/org/apache/sis/image/PixelIterator.java | 4 ++-- .../main/org/apache/sis/image/PlanarImage.java | 6 +++--- .../sis/image/PositionalConsistencyImage.java | 2 +- .../main/org/apache/sis/image/PrefetchedImage.java | 8 ++++---- .../main/org/apache/sis/image/RecoloredImage.java | 6 +++--- .../main/org/apache/sis/image/ResampledImage.java | 8 ++++---- .../main/org/apache/sis/image/ResamplingGrid.java | 2 +- .../org/apache/sis/image/SourceAlignedImage.java | 2 +- .../org/apache/sis/image/StatisticsCalculator.java | 2 +- .../main/org/apache/sis/image/TileCache.java | 2 +- .../main/org/apache/sis/image/Transferer.java | 4 ++-- .../main/org/apache/sis/image/Visualization.java | 8 ++++---- .../apache/sis/image/WritableComputedImage.java | 2 +- .../shared}/AssertionMessages.java | 2 +- .../shared}/BatchComputedImage.java | 2 +- .../shared}/ColorModelBuilder.java | 2 +- .../shared}/ColorModelFactory.java | 6 +++--- .../{privy => internal/shared}/ColorModelType.java | 2 +- .../shared}/ColorScaleBuilder.java | 4 ++-- .../{privy => internal/shared}/ColorsForRange.java | 2 +- .../shared}/DeferredProperty.java | 2 +- .../{privy => internal/shared}/FillValues.java | 2 +- .../{privy => internal/shared}/ImageUtilities.java | 6 +++--- .../shared}/MultiBandsIndexColorModel.java | 2 +- .../shared}/ObservableImage.java | 2 +- .../{privy => internal/shared}/RasterFactory.java | 2 +- .../{privy => internal/shared}/ReshapedImage.java | 2 +- .../shared}/SampleModelBuilder.java | 2 +- .../shared}/ScaledColorModel.java | 2 +- .../shared}/ScaledColorSpace.java | 4 ++-- .../shared}/TileErrorHandler.java | 2 +- .../{privy => internal/shared}/TileOpExecutor.java | 4 ++-- .../shared}/TilePlaceholder.java | 4 ++-- .../{privy => internal/shared}/TiledImage.java | 2 +- .../shared}/WritableTiledImage.java | 2 +- .../{privy => internal/shared}/package-info.java | 2 +- .../sis/image/processing/CompoundFuture.java | 2 +- .../sis/image/processing/isoline/Fragments.java | 2 +- .../org/apache/sis/index/tree/NodeIterator.java | 2 +- .../main/org/apache/sis/index/tree/PointTree.java | 2 +- .../sis/coverage/grid/ClippedGridCoverageTest.java | 2 +- .../coverage/grid/ConvertedGridCoverageTest.java | 2 +- .../coverage/grid/DimensionalityReductionTest.java | 2 +- .../sis/coverage/grid/GridCoverage2DTest.java | 2 +- .../sis/coverage/grid/GridCoverageBuilderTest.java | 2 +- .../sis/coverage/grid/GridDerivationTest.java | 4 ++-- .../apache/sis/coverage/grid/GridGeometryTest.java | 2 +- .../coverage/grid/ResampledGridCoverageTest.java | 8 ++++---- .../coverage/grid/TranslatedGridCoverageTest.java | 2 +- .../shared}/RangeArgumentTest.java | 2 +- .../apache/sis/feature/EnvelopeOperationTest.java | 2 +- .../apache/sis/feature/FeatureMemoryBenchmark.java | 2 +- .../apache/sis/feature/FeatureOperationsTest.java | 2 +- .../sis/feature/StringJoinOperationTest.java | 2 +- .../feature/builder/AttributeTypeBuilderTest.java | 2 +- .../feature/builder/FeatureTypeBuilderTest.java | 2 +- .../shared}/AttributeConventionTest.java | 2 +- .../apache/sis/feature/test/FeatureComparator.java | 2 +- .../apache/sis/filter/ComparisonFilterTest.java | 2 +- .../org/apache/sis/filter/TemporalFilterTest.java | 2 +- .../test/org/apache/sis/filter/XPathTest.java | 2 +- .../shared}/CopyVisitorTest.java | 2 +- .../shared}/FilterFactoryMock.java | 2 +- .../{privy => internal/shared}/FunctionMock.java | 2 +- .../shared}/FunctionNamesTest.java | 2 +- .../shared}/ValueReferenceMock.java | 2 +- .../apache/sis/geometry/wrapper/jts/JTSTest.java | 2 +- .../apache/sis/image/BandAggregateImageTest.java | 4 ++-- .../org/apache/sis/image/BandSelectImageTest.java | 4 ++-- .../org/apache/sis/image/ImageCombinerTest.java | 2 +- .../org/apache/sis/image/ImageOverlayTest.java | 2 +- .../org/apache/sis/image/InterpolationTest.java | 4 ++-- .../test/org/apache/sis/image/MaskedImageTest.java | 2 +- .../test/org/apache/sis/image/PlanarImageTest.java | 2 +- .../org/apache/sis/image/ResampledImageTest.java | 4 ++-- .../org/apache/sis/image/ResamplingGridTest.java | 4 ++-- .../apache/sis/image/StatisticsCalculatorTest.java | 2 +- .../test/org/apache/sis/image/TiledImageMock.java | 4 ++-- .../shared}/ColorModelBuilderTest.java | 2 +- .../shared}/ImageUtilitiesTest.java | 4 ++-- .../shared}/ReshapedImageTest.java | 2 +- .../shared}/SampleModelBuilderTest.java | 2 +- .../shared}/ScaledColorSpaceTest.java | 2 +- .../sis/image/processing/isoline/IsolinesTest.java | 2 +- .../sis/image/processing/isoline/StepsViewer.java | 2 +- ...ache.sis.util.internal.shared.MetadataServices} | 0 .../org.apache.sis.metadata/main/module-info.java | 12 ++++++------ .../org/apache/sis/metadata/MetadataStandard.java | 4 ++-- .../org/apache/sis/metadata/MetadataVisitor.java | 2 +- .../sis/metadata/MetadataVisitorException.java | 2 +- .../apache/sis/metadata/ModifiableMetadata.java | 8 ++++---- .../org/apache/sis/metadata/PropertyAccessor.java | 10 +++++----- .../main/org/apache/sis/metadata/PropertyMap.java | 2 +- .../main/org/apache/sis/metadata/Pruner.java | 2 +- .../main/org/apache/sis/metadata/StateChanger.java | 6 +++--- .../main/org/apache/sis/metadata/TreeNode.java | 4 ++-- .../org/apache/sis/metadata/TreeTableView.java | 4 ++-- .../sis/metadata/internal/CitationConstant.java | 2 +- .../sis/metadata/internal/ServicesForUtility.java | 8 ++++---- .../{privy => internal/shared}/AxisNames.java | 2 +- .../{privy => internal/shared}/Identifiers.java | 8 ++++---- .../shared}/ImplementationHelper.java | 8 ++++---- .../{privy => internal/shared}/Merger.java | 4 ++-- .../{privy => internal/shared}/NameMeaning.java | 8 ++++---- .../shared}/NameToIdentifier.java | 2 +- .../shared}/RecordSchemaSIS.java | 4 ++-- .../shared}/ReferencingServices.java | 4 ++-- .../{privy => internal/shared}/SecondaryTrait.java | 2 +- .../{privy => internal/shared}/package-info.java | 2 +- .../iso/DefaultExtendedElementInformation.java | 6 +++--- .../apache/sis/metadata/iso/DefaultMetadata.java | 6 +++--- .../org/apache/sis/metadata/iso/ISOMetadata.java | 6 +++--- .../acquisition/DefaultEnvironmentalRecord.java | 2 +- .../sis/metadata/iso/citation/Citations.java | 8 ++++---- .../sis/metadata/iso/citation/DefaultCitation.java | 2 +- .../sis/metadata/iso/citation/DefaultContact.java | 4 ++-- .../iso/citation/DefaultResponsibleParty.java | 4 ++-- .../metadata/iso/citation/DefaultTelephone.java | 4 ++-- .../sis/metadata/iso/citation/package-info.java | 2 +- .../sis/metadata/iso/content/DefaultBand.java | 2 +- .../iso/content/DefaultCoverageDescription.java | 6 +++--- .../DefaultFeatureCatalogueDescription.java | 4 ++-- .../iso/content/DefaultFeatureTypeInfo.java | 2 +- .../iso/content/DefaultImageDescription.java | 6 +++--- .../iso/content/DefaultRangeDimension.java | 2 +- .../iso/content/DefaultSampleDimension.java | 2 +- .../sis/metadata/iso/content/package-info.java | 2 +- .../metadata/iso/distribution/DefaultDataFile.java | 2 +- .../DefaultDigitalTransferOptions.java | 4 ++-- .../metadata/iso/distribution/DefaultFormat.java | 4 ++-- .../metadata/iso/distribution/DefaultMedium.java | 8 ++++---- .../metadata/iso/distribution/package-info.java | 2 +- .../sis/metadata/iso/extent/DefaultExtent.java | 2 +- .../iso/extent/DefaultGeographicBoundingBox.java | 2 +- .../iso/extent/DefaultSpatialTemporalExtent.java | 4 ++-- .../metadata/iso/extent/DefaultTemporalExtent.java | 2 +- .../metadata/iso/extent/DefaultVerticalExtent.java | 2 +- .../apache/sis/metadata/iso/extent/Extents.java | 6 +++--- .../iso/identification/AbstractIdentification.java | 2 +- .../DefaultAggregateInformation.java | 2 +- .../iso/identification/DefaultCoupledResource.java | 4 ++-- .../identification/DefaultDataIdentification.java | 2 +- .../DefaultRepresentativeFraction.java | 6 +++--- .../iso/identification/DefaultResolution.java | 2 +- .../metadata/iso/identification/DefaultUsage.java | 2 +- .../metadata/iso/identification/OperationName.java | 2 +- .../metadata/iso/identification/package-info.java | 2 +- .../metadata/iso/legacy/LegacyPropertyAdapter.java | 2 +- .../iso/lineage/DefaultNominalResolution.java | 2 +- .../metadata/iso/lineage/DefaultProcessStep.java | 2 +- .../sis/metadata/iso/lineage/DefaultSource.java | 2 +- .../sis/metadata/iso/lineage/package-info.java | 2 +- .../maintenance/DefaultMaintenanceInformation.java | 6 +++--- .../sis/metadata/iso/maintenance/package-info.java | 2 +- .../org/apache/sis/metadata/iso/package-info.java | 2 +- .../sis/metadata/iso/quality/AbstractElement.java | 2 +- .../iso/quality/DefaultCoverageResult.java | 2 +- .../metadata/iso/quality/DefaultDataQuality.java | 2 +- .../iso/quality/DefaultEvaluationMethod.java | 4 ++-- .../iso/quality/DefaultMeasureReference.java | 2 +- .../DefaultNonQuantitativeAttributeAccuracy.java | 2 +- .../iso/quality/DefaultQuantitativeResult.java | 2 +- .../sis/metadata/iso/quality/DefaultScope.java | 2 +- .../sis/metadata/iso/quality/DefaultUsability.java | 2 +- .../sis/metadata/iso/quality/package-info.java | 2 +- .../sis/metadata/iso/spatial/DefaultDimension.java | 2 +- .../iso/spatial/DefaultGeometricObjects.java | 2 +- .../spatial/DefaultGridSpatialRepresentation.java | 2 +- .../apache/sis/metadata/simple/SimpleCitation.java | 2 +- .../apache/sis/metadata/simple/SimpleExtent.java | 2 +- .../apache/sis/metadata/simple/SimpleFormat.java | 2 +- .../metadata/simple/SimpleIdentifiedObject.java | 4 ++-- .../sis/metadata/simple/SimpleIdentifier.java | 2 +- .../org/apache/sis/metadata/sql/Dispatcher.java | 4 ++-- .../sis/metadata/sql/IdentifierGenerator.java | 2 +- .../org/apache/sis/metadata/sql/Installer.java | 2 +- .../apache/sis/metadata/sql/MetadataFallback.java | 2 +- .../apache/sis/metadata/sql/MetadataSource.java | 16 ++++++++-------- .../apache/sis/metadata/sql/MetadataWriter.java | 8 ++++---- .../sql/{privy => internal/shared}/Dialect.java | 4 ++-- .../{privy => internal/shared}/Initializer.java | 6 +++--- .../shared}/LocalDataSource.java | 4 ++-- .../sql/{privy => internal/shared}/Reflection.java | 2 +- .../sql/{privy => internal/shared}/SQLBuilder.java | 4 ++-- .../{privy => internal/shared}/SQLUtilities.java | 4 ++-- .../{privy => internal/shared}/ScriptRunner.java | 4 ++-- .../sql/{privy => internal/shared}/Supports.java | 2 +- .../sql/{privy => internal/shared}/Syntax.java | 4 ++-- .../sql/{privy => internal/shared}/TypeMapper.java | 2 +- .../{privy => internal/shared}/package-info.java | 4 ++-- .../org/apache/sis/temporal/DefaultPeriod.java | 2 +- .../org/apache/sis/temporal/GeneralDuration.java | 2 +- .../org/apache/sis/temporal/LenientDateFormat.java | 2 +- .../main/org/apache/sis/temporal/TemporalDate.java | 2 +- .../main/org/apache/sis/temporal/TimeMethods.java | 2 +- .../org/apache/sis/util/iso/AbstractFactory.java | 2 +- .../apache/sis/util/iso/DefaultNameFactory.java | 2 +- .../org/apache/sis/util/iso/DefaultNameSpace.java | 4 ++-- .../org/apache/sis/util/iso/DefaultRecord.java | 6 +++--- .../apache/sis/util/iso/DefaultRecordSchema.java | 2 +- .../org/apache/sis/util/iso/DefaultRecordType.java | 2 +- .../org/apache/sis/util/iso/DefaultScopedName.java | 2 +- .../org/apache/sis/util/iso/RecordDefinition.java | 2 +- .../main/org/apache/sis/util/iso/TypeNames.java | 2 +- .../main/org/apache/sis/util/iso/Types.java | 4 ++-- .../main/org/apache/sis/xml/MarshallerPool.java | 2 +- .../main/org/apache/sis/xml/Namespaces.java | 4 ++-- .../main/org/apache/sis/xml/NilObjectHandler.java | 2 +- .../main/org/apache/sis/xml/OutputFactory.java | 2 +- .../main/org/apache/sis/xml/Pooled.java | 6 +++--- .../main/org/apache/sis/xml/PooledMarshaller.java | 2 +- .../org/apache/sis/xml/PooledUnmarshaller.java | 2 +- .../main/org/apache/sis/xml/ReferenceResolver.java | 8 ++++---- .../main/org/apache/sis/xml/TransformVersion.java | 2 +- .../org/apache/sis/xml/TransformingReader.java | 14 +++++++------- .../org/apache/sis/xml/TransformingWriter.java | 4 ++-- .../main/org/apache/sis/xml/ValueConverter.java | 2 +- .../main/org/apache/sis/xml/XML.java | 2 +- .../main/org/apache/sis/xml/XPointer.java | 2 +- .../main/org/apache/sis/xml/bind/Context.java | 6 +++--- .../apache/sis/xml/bind/IdentifierMapAdapter.java | 4 ++-- .../sis/xml/bind/NonMarshalledAuthority.java | 4 ++-- .../apache/sis/xml/bind/SpecializedIdentifier.java | 2 +- .../apache/sis/xml/bind/cat/CodeListAdapter.java | 2 +- .../org/apache/sis/xml/bind/cat/CodeListUID.java | 2 +- .../sis/xml/bind/gco/CharSequenceAdapter.java | 2 +- .../sis/xml/bind/gco/GO_CharacterString.java | 4 ++-- .../org/apache/sis/xml/bind/gco/GO_DateTime.java | 2 +- .../org/apache/sis/xml/bind/gco/GO_Temporal.java | 2 +- .../org/apache/sis/xml/bind/gco/PropertyType.java | 2 +- .../org/apache/sis/xml/bind/gmi/MI_Metadata.java | 2 +- .../org/apache/sis/xml/bind/gmi/package-info.java | 2 +- .../apache/sis/xml/bind/gml/CodeListAdapter.java | 2 +- .../org/apache/sis/xml/bind/gml/DateAdapter.java | 2 +- .../main/org/apache/sis/xml/bind/gml/Measure.java | 4 ++-- .../org/apache/sis/xml/bind/gml/TM_Primitive.java | 2 +- .../apache/sis/xml/bind/gml/TemporalAdapter.java | 2 +- .../org/apache/sis/xml/bind/gml/TimeInstant.java | 4 ++-- .../org/apache/sis/xml/bind/gml/TimePeriod.java | 4 ++-- .../sis/xml/bind/gml/UniversalTimeAdapter.java | 4 ++-- .../org/apache/sis/xml/bind/gts/TM_Duration.java | 2 +- .../org/apache/sis/xml/bind/gts/package-info.java | 2 +- .../main/org/apache/sis/xml/bind/lan/Country.java | 4 ++-- .../apache/sis/xml/bind/lan/LocaleAndCharset.java | 6 +++--- .../org/apache/sis/xml/bind/lan/PT_Locale.java | 4 ++-- .../xml/bind/metadata/code/MD_MediumNameCode.java | 2 +- .../sis/xml/bind/metadata/code/package-info.java | 2 +- .../sis/xml/bind/metadata/replace/Parameter.java | 2 +- .../xml/bind/metadata/replace/RS_Identifier.java | 2 +- .../bind/metadata/replace/ServiceParameter.java | 6 +++--- .../xml/bind/metadata/replace/package-info.java | 2 +- .../shared}/ExceptionSimplifier.java | 2 +- .../shared}/ExternalLinkHandler.java | 4 ++-- .../shared}/LegacyNamespaces.java | 4 ++-- .../shared}/StreamWriterDelegate.java | 2 +- .../xml/{privy => internal/shared}/URISource.java | 4 ++-- .../{privy => internal/shared}/XmlUtilities.java | 2 +- .../{privy => internal/shared}/package-info.java | 2 +- .../test/org/apache/sis/metadata/Assertions.java | 2 +- .../apache/sis/metadata/MetadataCopierTest.java | 2 +- .../sis/metadata/PropertyConsistencyCheck.java | 2 +- .../shared}/AxisDirectionsTest.md | 0 .../{privy => internal/shared}/AxisNamesTest.java | 2 +- .../shared}/IdentifiersTest.java | 2 +- .../shared}/ImplementationHelperTest.java | 2 +- .../{privy => internal/shared}/MergerTest.java | 2 +- .../shared}/NameMeaningTest.java | 2 +- .../sis/metadata/iso/citation/CitationsTest.java | 2 +- .../metadata/iso/citation/DefaultCitationTest.java | 2 +- .../iso/citation/DefaultResponsibilityTest.java | 2 +- .../metadata/iso/citation/HardCodedCitations.java | 4 ++-- .../constraint/DefaultLegalConstraintsTest.java | 4 ++-- .../sis/metadata/iso/content/DefaultBandTest.java | 2 +- .../sis/metadata/iso/extent/ExtentsTest.java | 2 +- .../iso/identification/DefaultResolutionTest.java | 2 +- .../metadata/iso/lineage/DefaultLineageTest.java | 2 +- .../iso/quality/DefaultQuantitativeResultTest.java | 4 ++-- .../sis/metadata/sql/IdentifierGeneratorTest.java | 2 +- .../sis/metadata/sql/MetadataFallbackVerifier.java | 4 ++-- .../sis/metadata/sql/MetadataWriterTest.java | 2 +- .../org/apache/sis/metadata/sql/TestDatabase.java | 6 +++--- .../{privy => internal/shared}/SQLBuilderTest.java | 2 +- .../shared}/SQLUtilitiesTest.java | 2 +- .../shared}/ScriptRunnerTest.java | 2 +- .../{privy => internal/shared}/SupportsTest.java | 2 +- .../{privy => internal/shared}/TypeMapperTest.java | 2 +- .../apache/sis/test/mock/FeatureAttributeMock.java | 2 +- .../apache/sis/test/mock/IdentifiedObjectMock.java | 4 ++-- .../org/apache/sis/test/mock/MetadataMock.java | 2 +- .../org/apache/sis/test/mock/package-info.java | 2 +- .../apache/sis/util/iso/DefaultLocalNameTest.java | 2 +- .../apache/sis/util/iso/NameMarshallingTest.java | 2 +- .../org/apache/sis/util/iso/TypeNamesTest.java | 2 +- .../sis/xml/CharSequenceSubstitutionTest.java | 4 ++-- .../test/org/apache/sis/xml/NamespacesTest.java | 2 +- .../org/apache/sis/xml/RenameListGenerator.java | 2 +- .../test/org/apache/sis/xml/TransformerTest.java | 2 +- .../apache/sis/xml/TransformingNamespacesTest.java | 2 +- .../sis/xml/bind/cat/CodeListMarshallingTest.java | 2 +- .../apache/sis/xml/bind/gml/TimePeriodTest.java | 2 +- .../sis/xml/bind/lan/FreeTextMarshallingTest.java | 2 +- .../apache/sis/xml/bind/lan/LanguageCodeTest.java | 4 ++-- .../shared}/DocumentComparatorTest.java | 2 +- .../shared}/XmlUtilitiesTest.java | 2 +- .../sis/xml/test/AnnotationConsistencyCheck.java | 2 +- .../apache/sis/xml/test/DocumentComparator.java | 4 ++-- .../org/apache/sis/xml/test/PackageVerifier.java | 2 +- .../test/org/apache/sis/xml/test/TestCase.java | 2 +- .../org/apache/sis/openoffice/Transformer.java | 2 +- .../sis/openoffice/ReferencingFunctionsTest.java | 2 +- .../org/apache/sis/map/coverage/RenderingData.java | 10 +++++----- .../sis/map/coverage/RenderingWorkaround.java | 2 +- .../main/org/apache/sis/portrayal/Canvas.java | 8 ++++---- .../org/apache/sis/portrayal/CanvasContext.java | 2 +- .../org/apache/sis/portrayal/CanvasExtent.java | 4 ++-- .../org/apache/sis/portrayal/CanvasFollower.java | 2 +- .../org/apache/sis/portrayal/PlanarCanvas.java | 2 +- .../org/apache/sis/style/se1/StyleFactory.java | 2 +- .../referencing/gazetteer/FinalLocationType.java | 2 +- .../referencing/gazetteer/GazetteerFactory.java | 2 +- .../gazetteer/GeohashReferenceSystem.java | 2 +- .../sis/referencing/gazetteer/LocationFormat.java | 2 +- .../gazetteer/MilitaryGridReferenceSystem.java | 6 +++--- .../gazetteer/ReferencingByIdentifiers.java | 4 ++-- .../sis/referencing/gazetteer/LocationViewer.java | 2 +- .../gazetteer/MilitaryGridReferenceSystemTest.java | 2 +- ...s.metadata.internal.shared.ReferencingServices} | 0 ...e.sis.metadata.sql.internal.shared.Initializer} | 0 .../main/module-info.java | 6 +++--- .../sis/coordinate/DefaultCoordinateMetadata.java | 4 ++-- .../sis/geometry/AbstractDirectPosition.java | 6 +++--- .../org/apache/sis/geometry/AbstractEnvelope.java | 8 ++++---- .../org/apache/sis/geometry/ArrayEnvelope.java | 2 +- .../org/apache/sis/geometry/CoordinateFormat.java | 10 +++++----- .../main/org/apache/sis/geometry/Envelope2D.java | 2 +- .../org/apache/sis/geometry/EnvelopeReducer.java | 2 +- .../main/org/apache/sis/geometry/Envelopes.java | 10 +++++----- .../org/apache/sis/geometry/GeneralEnvelope.java | 4 ++-- .../main/org/apache/sis/geometry/Shapes2D.java | 6 +++--- .../apache/sis/geometry/WraparoundAdjustment.java | 6 +++--- .../apache/sis/geometry/WraparoundInEnvelope.java | 2 +- .../main/org/apache/sis/io/wkt/Colors.java | 2 +- .../main/org/apache/sis/io/wkt/Element.java | 4 ++-- .../org/apache/sis/io/wkt/FormattableObject.java | 4 ++-- .../main/org/apache/sis/io/wkt/Formatter.java | 10 +++++----- .../apache/sis/io/wkt/GeodeticObjectParser.java | 20 ++++++++++---------- .../org/apache/sis/io/wkt/MathTransformParser.java | 6 +++--- .../main/org/apache/sis/io/wkt/StoredTree.java | 2 +- .../main/org/apache/sis/io/wkt/Transliterator.java | 6 +++--- .../main/org/apache/sis/io/wkt/VerticalInfo.java | 2 +- .../main/org/apache/sis/io/wkt/WKTDictionary.java | 10 +++++----- .../main/org/apache/sis/io/wkt/WKTFormat.java | 4 ++-- .../sis/parameter/AbstractParameterDescriptor.java | 4 ++-- .../sis/parameter/DefaultParameterDescriptor.java | 2 +- .../parameter/DefaultParameterDescriptorGroup.java | 4 ++-- .../sis/parameter/DefaultParameterValue.java | 10 +++++----- .../sis/parameter/DefaultParameterValueGroup.java | 2 +- .../apache/sis/parameter/FilteredParameters.java | 2 +- .../sis/parameter/MapProjectionDescriptor.java | 2 +- .../sis/parameter/MapProjectionParameters.java | 4 ++-- .../org/apache/sis/parameter/MatrixParameters.java | 2 +- .../sis/parameter/MatrixParametersAlphaNum.java | 4 ++-- .../org/apache/sis/parameter/ParameterFormat.java | 6 +++--- .../apache/sis/parameter/ParameterTableRow.java | 8 ++++---- .../org/apache/sis/parameter/TensorParameters.java | 2 +- .../org/apache/sis/parameter/TensorValues.java | 10 +++++----- .../sis/parameter/UninitializedParameter.java | 2 +- .../sis/parameter/UnmodifiableParameterValue.java | 2 +- .../parameter/UnmodifiableParameterValueGroup.java | 2 +- .../main/org/apache/sis/parameter/Verifier.java | 2 +- .../sis/referencing/AbstractIdentifiedObject.java | 20 ++++++++++---------- .../apache/sis/referencing/AuthorityFactories.java | 6 +++--- .../main/org/apache/sis/referencing/CRS.java | 12 ++++++------ .../main/org/apache/sis/referencing/CommonCRS.java | 6 +++--- .../sis/referencing/DefaultObjectDomain.java | 2 +- .../sis/referencing/EPSGFactoryFallback.java | 6 +++--- .../referencing/EllipsoidalHeightSeparator.java | 10 +++++----- .../sis/referencing/GeodesicsOnEllipsoid.java | 2 +- .../apache/sis/referencing/GeodeticCalculator.java | 12 ++++++------ .../apache/sis/referencing/IdentifiedObjects.java | 14 +++++++------- .../sis/referencing/ImmutableIdentifier.java | 8 ++++---- .../org/apache/sis/referencing/NameIterator.java | 8 ++++---- .../apache/sis/referencing/NamedIdentifier.java | 2 +- .../org/apache/sis/referencing/Properties.java | 4 ++-- .../sis/referencing/StandardDefinitions.java | 8 ++++---- .../apache/sis/referencing/crs/AbstractCRS.java | 6 +++--- .../sis/referencing/crs/AbstractDerivedCRS.java | 6 +++--- .../sis/referencing/crs/AbstractSingleCRS.java | 2 +- .../sis/referencing/crs/DefaultCompoundCRS.java | 10 +++++----- .../sis/referencing/crs/DefaultDerivedCRS.java | 6 +++--- .../sis/referencing/crs/DefaultEngineeringCRS.java | 2 +- .../sis/referencing/crs/DefaultGeodeticCRS.java | 8 ++++---- .../sis/referencing/crs/DefaultGeographicCRS.java | 10 +++++----- .../sis/referencing/crs/DefaultImageCRS.java | 2 +- .../sis/referencing/crs/DefaultParametricCRS.java | 2 +- .../sis/referencing/crs/DefaultProjectedCRS.java | 8 ++++---- .../sis/referencing/crs/DefaultTemporalCRS.java | 6 +++--- .../sis/referencing/crs/DefaultVerticalCRS.java | 2 +- .../org/apache/sis/referencing/crs/DynamicCRS.java | 2 +- .../sis/referencing/crs/ExplicitParameters.java | 6 +++--- .../org/apache/sis/referencing/cs/AbstractCS.java | 12 ++++++------ .../apache/sis/referencing/cs/AxesConvention.java | 2 +- .../main/org/apache/sis/referencing/cs/Codes.java | 4 ++-- .../sis/referencing/cs/CoordinateSystems.java | 6 +++--- .../apache/sis/referencing/cs/DefaultAffineCS.java | 2 +- .../sis/referencing/cs/DefaultCompoundCS.java | 4 ++-- .../cs/DefaultCoordinateSystemAxis.java | 12 ++++++------ .../sis/referencing/cs/DefaultCylindricalCS.java | 2 +- .../sis/referencing/cs/DefaultEllipsoidalCS.java | 2 +- .../apache/sis/referencing/cs/DefaultLinearCS.java | 2 +- .../apache/sis/referencing/cs/DefaultPolarCS.java | 2 +- .../sis/referencing/cs/DefaultSphericalCS.java | 2 +- .../apache/sis/referencing/cs/DefaultTimeCS.java | 2 +- .../sis/referencing/cs/DefaultVerticalCS.java | 2 +- .../sis/referencing/cs/DirectionAlongMeridian.java | 6 +++--- .../org/apache/sis/referencing/cs/Normalizer.java | 6 +++--- .../org/apache/sis/referencing/cs/SubTypes.java | 2 +- .../sis/referencing/datum/AbstractDatum.java | 12 ++++++------ .../sis/referencing/datum/BursaWolfParameters.java | 4 ++-- .../sis/referencing/datum/DatumOrEnsemble.java | 2 +- .../sis/referencing/datum/DatumShiftGrid.java | 4 ++-- .../referencing/datum/DefaultDatumEnsemble.java | 10 +++++----- .../sis/referencing/datum/DefaultEllipsoid.java | 12 ++++++------ .../referencing/datum/DefaultEngineeringDatum.java | 2 +- .../referencing/datum/DefaultGeodeticDatum.java | 12 ++++++------ .../sis/referencing/datum/DefaultImageDatum.java | 4 ++-- .../referencing/datum/DefaultParametricDatum.java | 2 +- .../referencing/datum/DefaultPrimeMeridian.java | 14 +++++++------- .../referencing/datum/DefaultTemporalDatum.java | 2 +- .../referencing/datum/DefaultVerticalDatum.java | 6 +++--- .../sis/referencing/datum/TimeDependentBWP.java | 4 ++-- .../apache/sis/referencing/datum/package-info.java | 2 +- .../factory/AuthorityFactoryIdentifier.java | 10 +++++----- .../referencing/factory/AuthorityFactoryProxy.java | 2 +- .../referencing/factory/CommonAuthorityCode.java | 4 ++-- .../factory/CommonAuthorityFactory.java | 4 ++-- .../factory/ConcurrentAuthorityFactory.java | 4 ++-- .../sis/referencing/factory/FilteredCodes.java | 2 +- .../factory/GeodeticAuthorityFactory.java | 4 ++-- .../referencing/factory/GeodeticObjectFactory.java | 2 +- .../factory/IdentifiedObjectFinder.java | 6 +++--- .../factory/LazySynchronizedIterator.java | 2 +- .../factory/MultiAuthoritiesFactory.java | 14 +++++++------- .../sis/referencing/factory/ReferenceKeeper.java | 2 +- .../referencing/factory/sql/AuthorityCodes.java | 6 +++--- .../referencing/factory/sql/EPSGCodeFinder.java | 14 +++++++------- .../referencing/factory/sql/EPSGDataAccess.java | 14 +++++++------- .../sis/referencing/factory/sql/EPSGFactory.java | 6 +++--- .../sis/referencing/factory/sql/EPSGInstaller.java | 6 +++--- .../factory/sql/InstallationScriptProvider.java | 2 +- .../referencing/factory/sql/ObjectPertinence.java | 6 +++--- .../sis/referencing/factory/sql/SQLTranslator.java | 6 +++--- .../sis/referencing/factory/sql/TableInfo.java | 2 +- .../sis/referencing/internal/AnnotatedMatrix.java | 2 +- .../sis/referencing/internal/Arithmetic.java | 6 +++--- .../sis/referencing/internal/DatabaseListener.java | 4 ++-- .../referencing/internal/EPSGParameterDomain.java | 2 +- .../org/apache/sis/referencing/internal/Epoch.java | 2 +- .../apache/sis/referencing/internal/Legacy.java | 2 +- .../sis/referencing/internal/MergedProperties.java | 2 +- .../referencing/internal/ParameterizedAffine.java | 2 +- .../internal/ParameterizedTransformBuilder.java | 8 ++++---- .../internal/PositionalAccuracyConstant.java | 2 +- .../referencing/internal/ServicesForMetadata.java | 10 +++++----- .../referencing/internal/VerticalDatumTypes.java | 2 +- .../{privy => internal/shared}/AbstractShape.java | 2 +- .../{privy => internal/shared}/AffineMatrix.java | 4 ++-- .../shared}/AffineTransform2D.java | 2 +- .../{privy => internal/shared}/AxesMapper.java | 4 ++-- .../{privy => internal/shared}/AxisDirections.java | 6 +++--- .../shared}/CoordinateOperations.java | 10 +++++----- .../shared}/DefinitionVerifier.java | 2 +- .../shared}/DirectPositionView.java | 2 +- .../shared}/EllipsoidalHeightCombiner.java | 2 +- .../shared}/ExtendedPrecisionMatrix.java | 2 +- .../{privy => internal/shared}/ExtentSelector.java | 4 ++-- .../shared}/FilteredIterator.java | 2 +- .../{privy => internal/shared}/Formulas.java | 12 ++++++------ .../shared}/GeodeticObjectBuilder.java | 2 +- .../shared}/IntervalRectangle.java | 4 ++-- .../{privy => internal/shared}/LazySet.java | 4 ++-- .../shared}/NilReferencingObject.java | 2 +- .../shared}/ReferencingFactoryContainer.java | 4 ++-- .../shared}/ReferencingUtilities.java | 4 ++-- .../{privy => internal/shared}/ShapeUtilities.java | 2 +- .../shared}/TemporalAccessor.java | 2 +- .../{privy => internal/shared}/WKTKeywords.java | 2 +- .../{privy => internal/shared}/WKTUtilities.java | 6 +++--- .../shared}/WraparoundApplicator.java | 4 ++-- .../shared}/WraparoundAxesFinder.java | 2 +- .../{privy => internal/shared}/package-info.java | 2 +- .../operation/AbstractCoordinateOperation.java | 18 +++++++++--------- .../operation/AbstractSingleOperation.java | 6 +++--- .../apache/sis/referencing/operation/CRSPair.java | 4 ++-- .../operation/CoordinateOperationContext.java | 4 ++-- .../operation/CoordinateOperationFinder.java | 12 ++++++------ .../operation/CoordinateOperationRegistry.java | 6 +++--- .../operation/DefaultConcatenatedOperation.java | 10 +++++----- .../referencing/operation/DefaultConversion.java | 2 +- .../DefaultCoordinateOperationFactory.java | 6 +++--- .../sis/referencing/operation/DefaultFormula.java | 2 +- .../operation/DefaultOperationMethod.java | 10 +++++----- .../operation/DefaultPassThroughOperation.java | 4 ++-- .../operation/InverseOperationMethod.java | 2 +- .../operation/MathTransformContext.java | 6 +++--- .../operation/builder/LinearTransformBuilder.java | 10 +++++----- .../operation/builder/LocalizationGridBuilder.java | 4 ++-- .../operation/builder/ResidualGrid.java | 6 +++--- .../operation/gridded/CompressedGrid.java | 2 +- .../referencing/operation/gridded/GridGroup.java | 6 +++--- .../referencing/operation/gridded/LoadedGrid.java | 2 +- .../sis/referencing/operation/gridded/Tile.java | 2 +- .../operation/gridded/TileOrganizer.java | 2 +- .../operation/matrix/AffineTransforms2D.java | 4 ++-- .../operation/matrix/GeneralMatrix.java | 4 ++-- .../sis/referencing/operation/matrix/Matrices.java | 8 ++++---- .../sis/referencing/operation/matrix/Matrix1.java | 2 +- .../sis/referencing/operation/matrix/Matrix2.java | 2 +- .../referencing/operation/matrix/MatrixSIS.java | 4 ++-- .../sis/referencing/operation/matrix/Solver.java | 2 +- .../operation/matrix/UnmodifiableMatrix.java | 2 +- .../operation/projection/AlbersEqualArea.java | 4 ++-- .../operation/projection/AuthalicConversion.java | 2 +- .../operation/projection/ConformalProjection.java | 2 +- .../operation/projection/CylindricalEqualArea.java | 2 +- .../projection/EquidistantCylindrical.java | 2 +- .../operation/projection/Initializer.java | 6 +++--- .../projection/LambertAzimuthalEqualArea.java | 4 ++-- .../projection/LambertConicConformal.java | 6 +++--- .../operation/projection/LongitudeWraparound.java | 4 ++-- .../referencing/operation/projection/Mercator.java | 2 +- .../operation/projection/MeridianArcBased.java | 2 +- .../operation/projection/NormalizedProjection.java | 6 +++--- .../operation/projection/ObliqueMercator.java | 2 +- .../operation/projection/ObliqueStereographic.java | 4 ++-- .../operation/projection/PolarStereographic.java | 6 +++--- .../referencing/operation/projection/Robinson.java | 2 +- .../operation/projection/SatelliteTracking.java | 2 +- .../operation/projection/TransverseMercator.java | 2 +- .../operation/projection/ZonedGridSystem.java | 2 +- .../operation/provider/AbstractProvider.java | 2 +- .../sis/referencing/operation/provider/Affine.java | 4 ++-- .../referencing/operation/provider/EPSGName.java | 2 +- .../operation/provider/Equirectangular.java | 4 ++-- .../provider/FranceGeocentricInterpolation.java | 2 +- .../operation/provider/GeocentricAffine.java | 6 +++--- .../GeocentricAffineBetweenGeographic.java | 2 +- .../operation/provider/Geographic2Dto3D.java | 2 +- .../operation/provider/Geographic3Dto2D.java | 4 ++-- .../operation/provider/GeographicOffsets2D.java | 2 +- .../operation/provider/Interpolation1D.java | 2 +- .../operation/provider/LambertConformal2SP.java | 2 +- .../operation/provider/LongitudeRotation.java | 2 +- .../operation/provider/MapProjection.java | 2 +- .../operation/provider/Mercator1SP.java | 2 +- .../provider/MercatorAuxiliarySphere.java | 2 +- .../operation/provider/MillerCylindrical.java | 2 +- .../referencing/operation/provider/Mollweide.java | 2 +- .../referencing/operation/provider/Molodensky.java | 6 +++--- .../sis/referencing/operation/provider/NTv2.java | 4 ++-- .../operation/provider/NorthPoleRotation.java | 2 +- .../provider/ObliqueMercatorTwoPoints.java | 2 +- .../operation/provider/PolarStereographicA.java | 6 +++--- .../referencing/operation/provider/Robinson.java | 2 +- .../operation/provider/SatelliteTracking.java | 2 +- .../operation/provider/SouthPoleRotation.java | 2 +- .../operation/provider/Spherical2Dto3D.java | 2 +- .../operation/provider/Spherical3Dto2D.java | 2 +- .../operation/provider/TransverseMercator.java | 6 +++--- .../transform/AbstractLinearTransform.java | 4 ++-- .../operation/transform/AbstractMathTransform.java | 4 ++-- .../transform/AbstractMathTransform2D.java | 2 +- .../operation/transform/CartesianToPolar.java | 2 +- .../operation/transform/ConcatenatedTransform.java | 4 ++-- .../operation/transform/ContextualParameters.java | 14 +++++++------- .../transform/CoordinateSystemTransform.java | 6 +++--- .../CoordinateSystemTransformBuilder.java | 2 +- .../transform/DefaultMathTransformFactory.java | 6 +++--- .../transform/EllipsoidToCentricTransform.java | 12 ++++++------ .../transform/EllipsoidToRadiusTransform.java | 10 +++++----- .../transform/ExponentialTransform1D.java | 2 +- .../operation/transform/IdentityTransform.java | 2 +- .../transform/InterpolatedGeocentricTransform.java | 2 +- .../operation/transform/InterpolatedTransform.java | 4 ++-- .../operation/transform/LinearInterpolator1D.java | 2 +- .../operation/transform/LinearTransform1D.java | 8 ++++---- .../transform/LogarithmicTransform1D.java | 2 +- .../operation/transform/MathTransformBuilder.java | 2 +- .../operation/transform/MathTransforms.java | 6 +++--- .../operation/transform/MolodenskyTransform.java | 2 +- .../operation/transform/OperationMethodSet.java | 2 +- .../operation/transform/PassThroughTransform.java | 6 +++--- .../operation/transform/PolarToCartesian.java | 2 +- .../operation/transform/PoleRotation.java | 6 +++--- .../operation/transform/PowerTransform1D.java | 2 +- .../operation/transform/ProjectiveTransform.java | 10 +++++----- .../operation/transform/ProjectiveTransform2D.java | 2 +- .../operation/transform/ScaleTransform.java | 4 ++-- .../transform/SpecializableTransform.java | 2 +- .../operation/transform/TransformJoiner.java | 2 +- .../operation/transform/TransformSeparator.java | 4 ++-- .../operation/transform/TranslationTransform.java | 4 ++-- .../operation/transform/WraparoundTransform.java | 2 +- .../org/apache/sis/referencing/package-info.java | 2 +- .../bind/referencing/CC_CoordinateOperation.java | 2 +- .../referencing/CC_GeneralOperationParameter.java | 2 +- .../sis/xml/bind/referencing/CS_AxisDirection.java | 2 +- .../sis/xml/bind/referencing/CS_RangeMeaning.java | 2 +- .../org/apache/sis/xml/bind/referencing/Code.java | 8 ++++---- .../org/apache/sis/geometry/EnvelopesTest.java | 2 +- .../apache/sis/geometry/GeneralEnvelopeTest.java | 2 +- .../org/apache/sis/geometry/TransformTestCase.java | 4 ++-- .../sis/geometry/WraparoundAdjustmentTest.java | 2 +- .../test/org/apache/sis/io/wkt/CRSParserTest.java | 2 +- .../sis/io/wkt/GeodeticObjectParserTest.java | 6 +++--- .../org/apache/sis/io/wkt/TransliteratorTest.java | 2 +- .../DefaultParameterDescriptorGroupTest.java | 2 +- .../parameter/DefaultParameterDescriptorTest.java | 2 +- .../sis/parameter/DefaultParameterValueTest.java | 2 +- .../sis/parameter/MapProjectionParametersTest.java | 18 +++++++++--------- .../apache/sis/parameter/TensorParametersTest.java | 4 ++-- .../org/apache/sis/parameter/TensorValuesTest.java | 6 +++--- .../org/apache/sis/referencing/Assertions.java | 2 +- .../sis/referencing/AuthorityFactoriesTest.java | 2 +- .../org/apache/sis/referencing/CommonCRSTest.java | 6 +++--- .../sis/referencing/GeodesicsOnEllipsoidTest.java | 4 ++-- .../sis/referencing/GeodeticCalculatorTest.java | 6 +++--- .../sis/referencing/GeodeticObjectVerifier.java | 2 +- .../sis/referencing/ImmutableIdentifierTest.java | 4 ++-- .../sis/referencing/StandardDefinitionsTest.java | 2 +- .../sis/referencing/crs/DefaultDerivedCRSTest.java | 2 +- .../referencing/crs/DefaultProjectedCRSTest.java | 4 ++-- .../referencing/crs/DefaultTemporalCRSTest.java | 4 ++-- .../apache/sis/referencing/cs/HardCodedAxes.java | 2 +- .../datum/DefaultPrimeMeridianTest.java | 2 +- .../datum/DefaultVerticalDatumTest.java | 2 +- .../sis/referencing/datum/GeodeticDatumMock.java | 2 +- .../sis/referencing/datum/HardCodedDatum.java | 2 +- .../referencing/datum/TimeDependentBWPTest.java | 2 +- .../factory/CommonAuthorityFactoryTest.java | 2 +- .../factory/ConcurrentAuthorityFactoryTest.java | 2 +- .../sis/referencing/factory/TestFactorySource.java | 4 ++-- .../referencing/factory/sql/EPSGInstallerTest.java | 4 ++-- .../factory/sql/EPSGScriptProvider.java | 2 +- .../apache/sis/referencing/internal/EpochTest.java | 2 +- .../shared}/AbstractShapeTest.java | 2 +- .../{privy => internal/shared}/AxesMapperTest.java | 2 +- .../shared}/AxisDirectionsTest.java | 2 +- .../shared}/CoordinateOperationsTest.java | 2 +- .../shared}/DefinitionVerifierTest.java | 2 +- .../shared}/EllipsoidalHeightCombinerTest.java | 2 +- .../shared}/ExtentSelectorTest.java | 2 +- .../{privy => internal/shared}/FormulasTest.java | 4 ++-- .../shared}/GeodeticObjectBuilderTest.java | 2 +- .../{privy => internal/shared}/LazySetTest.java | 2 +- .../shared}/ReferencingUtilitiesTest.java | 4 ++-- .../shared}/ShapeUtilitiesExt.java | 2 +- .../shared}/ShapeUtilitiesTest.java | 2 +- .../shared}/ShapeUtilitiesViewer.java | 2 +- .../shared}/WKTKeywordsTest.java | 2 +- .../shared}/WKTUtilitiesTest.java | 4 ++-- .../shared}/WraparoundApplicatorTest.java | 2 +- .../operation/CoordinateOperationFinderTest.java | 6 +++--- .../operation/CoordinateOperationRegistryTest.java | 2 +- .../operation/DefaultConversionTest.java | 4 ++-- .../DefaultCoordinateOperationFactoryTest.java | 4 ++-- .../operation/DefaultTransformationTest.java | 2 +- .../operation/HardCodedConversions.java | 2 +- .../operation/matrix/GeneralMatrixTest.java | 2 +- .../referencing/operation/matrix/MatricesTest.java | 2 +- .../operation/matrix/MatrixTestCase.java | 4 ++-- .../operation/projection/AlbersEqualAreaTest.java | 2 +- .../projection/AuthalicConversionTest.java | 2 +- .../projection/AzimuthalEquidistantTest.java | 2 +- .../operation/projection/CassiniSoldnerTest.java | 2 +- .../projection/ConformalProjectionTest.java | 2 +- .../projection/CylindricalEqualAreaTest.java | 2 +- .../projection/EquidistantCylindricalTest.java | 2 +- .../operation/projection/EquirectangularTest.java | 4 ++-- .../operation/projection/InitializerTest.java | 2 +- .../projection/LambertAzimuthalEqualAreaTest.java | 6 +++--- .../projection/LambertConicConformalTest.java | 2 +- .../projection/MapProjectionTestCase.java | 4 ++-- .../projection/MercatorMethodComparison.java | 4 ++-- .../operation/projection/MercatorTest.java | 4 ++-- .../operation/projection/MollweideTest.java | 2 +- .../sis/referencing/operation/projection/NoOp.java | 2 +- .../projection/NormalizedProjectionTest.java | 2 +- .../projection/ObliqueStereographicTest.java | 2 +- .../projection/PolarStereographicTest.java | 2 +- .../operation/projection/PolyconicTest.java | 2 +- .../operation/projection/ProjectionBenchmark.java | 2 +- .../projection/ProjectionResultComparator.java | 2 +- .../operation/projection/RobinsonTest.java | 2 +- .../projection/SatelliteTrackingTest.java | 2 +- .../operation/projection/SinusoidalTest.java | 2 +- .../projection/TransverseMercatorTest.java | 2 +- .../operation/projection/ZonedGridSystemTest.java | 4 ++-- .../provider/CoordinateFrameRotationTest.java | 2 +- .../provider/GeocentricTranslationTest.java | 2 +- .../operation/provider/GeographicOffsetsTest.java | 2 +- .../operation/provider/MapProjectionTest.java | 2 +- .../referencing/operation/provider/NTv2Test.java | 2 +- .../provider/PositionVector7ParamTest.java | 2 +- .../operation/provider/ProvidersTest.java | 2 +- .../operation/provider/TransverseMercatorTest.java | 2 +- .../transform/AbridgedMolodenskyTransformTest.java | 2 +- .../transform/ConcatenatedTransformTest.java | 2 +- .../operation/transform/CoordinateDomain.java | 2 +- .../transform/DefaultMathTransformFactoryTest.java | 2 +- .../operation/transform/DomainDefinitionTest.java | 2 +- .../transform/EllipsoidToCentricTransformTest.java | 2 +- .../transform/InterpolatedTransformTest.java | 2 +- .../operation/transform/LinearTransformTest.java | 2 +- .../transform/MolodenskyTransformTest.java | 4 ++-- .../transform/OperationMethodSetTest.java | 2 +- .../operation/transform/PoleRotationTest.java | 2 +- .../transform/ProjectiveTransformTest.java | 6 +++--- .../operation/transform/ScaleTransformTest.java | 2 +- .../transform/SpecializableTransformTest.java | 2 +- .../transform/TranslationTransformTest.java | 4 ++-- .../transform/WraparoundTransformTest.java | 2 +- .../report/CoordinateOperationMethods.java | 4 ++-- .../report/CoordinateReferenceSystems.java | 2 +- .../sis/referencing/report/HTMLGenerator.java | 2 +- .../sis/test/integration/ConsistencyTest.java | 2 +- .../apache/sis/test/integration/MetadataTest.java | 2 +- .../org/apache/sis/test/widget/package-info.java | 2 +- .../CC_OperationParameterGroupTest.java | 2 +- .../apache/sis/xml/bind/referencing/CodeTest.java | 2 +- .../main/org/apache/sis/storage/landsat/Band.java | 2 +- .../org/apache/sis/storage/landsat/BandGroup.java | 2 +- .../apache/sis/storage/landsat/LandsatStore.java | 2 +- .../apache/sis/storage/landsat/MetadataReader.java | 10 +++++----- .../sis/storage/geotiff/CompressedSubset.java | 2 +- .../apache/sis/storage/geotiff/Compression.java | 2 +- .../org/apache/sis/storage/geotiff/DataSubset.java | 8 ++++---- .../apache/sis/storage/geotiff/GeoTiffStore.java | 4 ++-- .../sis/storage/geotiff/GeoTiffStoreProvider.java | 2 +- .../sis/storage/geotiff/ImageFileDirectory.java | 12 ++++++------ .../sis/storage/geotiff/MultiResolutionImage.java | 2 +- .../org/apache/sis/storage/geotiff/Writer.java | 2 +- .../sis/storage/geotiff/reader/CRSBuilder.java | 14 +++++++------- .../geotiff/reader/GridGeometryBuilder.java | 2 +- .../apache/sis/storage/geotiff/reader/Type.java | 2 +- .../sis/storage/geotiff/writer/GeoEncoder.java | 10 +++++----- .../storage/geotiff/writer/ReformattedImage.java | 4 ++-- .../org/apache/sis/storage/geotiff/WriterTest.java | 2 +- .../storage/geotiff/reader/XMLMetadataTest.java | 2 +- .../apache/sis/storage/netcdf/MetadataReader.java | 10 +++++----- .../org/apache/sis/storage/netcdf/NetcdfStore.java | 6 +++--- .../sis/storage/netcdf/NetcdfStoreProvider.java | 2 +- .../org/apache/sis/storage/netcdf/base/Axis.java | 2 +- .../apache/sis/storage/netcdf/base/AxisType.java | 2 +- .../apache/sis/storage/netcdf/base/CRSBuilder.java | 2 +- .../apache/sis/storage/netcdf/base/CRSMerger.java | 4 ++-- .../apache/sis/storage/netcdf/base/Convention.java | 2 +- .../apache/sis/storage/netcdf/base/Decoder.java | 4 ++-- .../apache/sis/storage/netcdf/base/FeatureSet.java | 4 ++-- .../org/apache/sis/storage/netcdf/base/Grid.java | 2 +- .../sis/storage/netcdf/base/GridCacheKey.java | 2 +- .../sis/storage/netcdf/base/GridMapping.java | 10 +++++----- .../apache/sis/storage/netcdf/base/Linearizer.java | 6 +++--- .../sis/storage/netcdf/base/NamedElement.java | 2 +- .../org/apache/sis/storage/netcdf/base/Node.java | 2 +- .../sis/storage/netcdf/base/RasterResource.java | 8 ++++---- .../apache/sis/storage/netcdf/base/Variable.java | 6 +++--- .../storage/netcdf/base/VariableTransformer.java | 2 +- .../sis/storage/netcdf/classic/ChannelDecoder.java | 4 ++-- .../sis/storage/netcdf/classic/GridInfo.java | 2 +- .../sis/storage/netcdf/classic/VariableInfo.java | 2 +- .../sis/storage/netcdf/ucar/DecoderWrapper.java | 2 +- .../sis/storage/netcdf/ucar/DimensionWrapper.java | 2 +- .../sis/storage/netcdf/ucar/GridWrapper.java | 2 +- .../sis/storage/netcdf/ucar/VariableWrapper.java | 2 +- .../sis/storage/netcdf/base/FeatureSetTest.java | 2 +- .../main/org/apache/sis/storage/sql/SQLStore.java | 2 +- .../org/apache/sis/storage/sql/duckdb/DuckDB.java | 2 +- .../apache/sis/storage/sql/feature/Analyzer.java | 4 ++-- .../org/apache/sis/storage/sql/feature/Column.java | 6 +++--- .../apache/sis/storage/sql/feature/Database.java | 12 ++++++------ .../sis/storage/sql/feature/FeatureAdapter.java | 2 +- .../sis/storage/sql/feature/FeatureIterator.java | 4 ++-- .../sis/storage/sql/feature/FeatureStream.java | 10 +++++----- .../sis/storage/sql/feature/InfoStatements.java | 10 +++++----- .../apache/sis/storage/sql/feature/PrimaryKey.java | 4 ++-- .../sis/storage/sql/feature/QueryAnalyzer.java | 4 ++-- .../apache/sis/storage/sql/feature/Relation.java | 4 ++-- .../sis/storage/sql/feature/SelectionClause.java | 4 ++-- .../storage/sql/feature/SelectionClauseWriter.java | 4 ++-- .../org/apache/sis/storage/sql/feature/Table.java | 8 ++++---- .../sis/storage/sql/feature/TableAnalyzer.java | 4 ++-- .../sis/storage/sql/feature/TableReference.java | 2 +- .../sis/storage/sql/feature/ValueGetter.java | 4 ++-- .../sis/storage/sql/postgis/ExtentEstimator.java | 2 +- .../apache/sis/storage/sql/postgis/Postgres.java | 2 +- .../sis/storage/sql/postgis/RasterReader.java | 10 +++++----- .../org/apache/sis/storage/sql/SQLStoreTest.java | 2 +- .../storage/sql/feature/InfoStatementsTest.java | 2 +- .../sql/feature/TemporalValueGetterTest.java | 2 +- .../sis/storage/sql/postgis/PostgresTest.java | 2 +- .../apache/sis/storage/sql/postgis/TestRaster.java | 2 +- .../main/org/apache/sis/storage/gpx/Metadata.java | 2 +- .../main/org/apache/sis/storage/gpx/Reader.java | 2 +- .../main/org/apache/sis/storage/gpx/Types.java | 2 +- .../main/org/apache/sis/storage/gpx/Writer.java | 2 +- .../sis/storage/xml/stream/FormattedWriter.java | 2 +- .../sis/storage/xml/stream/NamespaceEraser.java | 2 +- .../sis/storage/xml/stream/StaxDataStore.java | 6 +++--- .../sis/storage/xml/stream/StaxStreamReader.java | 2 +- .../test/org/apache/sis/storage/gpx/TypesTest.java | 2 +- .../apache/sis/io/stream/ChannelDataOutput.java | 2 +- .../apache/sis/io/stream/FileCacheByteChannel.java | 2 +- .../main/org/apache/sis/io/stream/IOUtilities.java | 2 +- .../sis/storage/AbstractGridCoverageResource.java | 2 +- .../org/apache/sis/storage/CoverageSubset.java | 6 +++--- .../main/org/apache/sis/storage/DataStore.java | 2 +- .../org/apache/sis/storage/DataStoreRegistry.java | 4 ++-- .../main/org/apache/sis/storage/FeatureNaming.java | 2 +- .../main/org/apache/sis/storage/FeatureQuery.java | 12 ++++++------ .../main/org/apache/sis/storage/FeatureSubset.java | 2 +- .../main/org/apache/sis/storage/ProbeResult.java | 2 +- .../org/apache/sis/storage/StorageConnector.java | 4 ++-- .../sis/storage/aggregate/AggregatedResource.java | 2 +- .../aggregate/BandAggregateGridResource.java | 6 +++--- .../storage/aggregate/ConcatenatedFeatureSet.java | 4 ++-- .../aggregate/ConcatenatedGridCoverage.java | 4 ++-- .../aggregate/ConcatenatedGridResource.java | 4 ++-- .../sis/storage/aggregate/CoverageAggregator.java | 2 +- .../sis/storage/aggregate/DimensionSelector.java | 2 +- .../apache/sis/storage/aggregate/GridSlice.java | 6 +++--- .../org/apache/sis/storage/aggregate/Group.java | 2 +- .../sis/storage/aggregate/GroupAggregate.java | 2 +- .../sis/storage/aggregate/GroupByTransform.java | 2 +- .../sis/storage/aggregate/JoinFeatureSet.java | 2 +- .../sis/storage/aggregate/MergeStrategy.java | 4 ++-- .../main/org/apache/sis/storage/base/CodeType.java | 4 ++-- .../apache/sis/storage/base/MetadataBuilder.java | 10 +++++----- .../org/apache/sis/storage/base/PRJDataStore.java | 2 +- .../apache/sis/storage/base/ResourceLineage.java | 4 ++-- .../apache/sis/storage/base/SimpleAggregate.java | 2 +- .../apache/sis/storage/base/StoreUtilities.java | 2 +- .../sis/storage/base/TiledDeferredImage.java | 2 +- .../apache/sis/storage/base/TiledGridCoverage.java | 6 +++--- .../apache/sis/storage/base/TiledGridResource.java | 8 ++++---- .../org/apache/sis/storage/base/URIDataStore.java | 4 ++-- .../sis/storage/csv/MovingFeatureBuilder.java | 4 ++-- .../main/org/apache/sis/storage/csv/Store.java | 6 +++--- .../apache/sis/storage/esri/AsciiGridStore.java | 2 +- .../org/apache/sis/storage/esri/RasterStore.java | 12 ++++++------ .../apache/sis/storage/esri/RawRasterReader.java | 8 ++++---- .../apache/sis/storage/esri/RawRasterStore.java | 6 +++--- .../apache/sis/storage/event/StoreListeners.java | 2 +- .../main/org/apache/sis/storage/folder/Store.java | 2 +- .../sis/storage/image/WorldFileResource.java | 6 +++--- .../apache/sis/storage/image/WorldFileStore.java | 4 ++-- .../sis/storage/modifier/CoverageModifier.java | 2 +- .../main/org/apache/sis/storage/tiling/Tile.java | 2 +- .../org/apache/sis/storage/wkt/StoreFormat.java | 2 +- .../org/apache/sis/storage/wkt/StoreProvider.java | 2 +- .../main/org/apache/sis/storage/xml/Store.java | 4 ++-- .../org/apache/sis/storage/xml/StoreProvider.java | 2 +- .../org/apache/sis/storage/CoverageQueryTest.java | 2 +- .../org/apache/sis/storage/FeatureQueryTest.java | 2 +- .../sis/storage/aggregate/CoverageMosaicTest.java | 2 +- .../sis/storage/aggregate/JoinFeatureSetTest.java | 2 +- .../sis/storage/base/MemoryGridResourceTest.java | 2 +- .../sis/storage/test/CoverageReadConsistency.java | 4 ++-- .../apache/sis/storage/test/SubsampledImage.java | 2 +- .../sis/storage/xml/MimeTypeDetectorTest.java | 2 +- .../test/org/apache/sis/storage/xml/StoreTest.java | 2 +- .../src/org.apache.sis.util/main/module-info.java | 4 ++-- .../org/apache/sis/converter/StringConverter.java | 4 ++-- .../main/org/apache/sis/io/CompoundFormat.java | 6 +++--- .../main/org/apache/sis/io/DefaultFormat.java | 2 +- .../org/apache/sis/io/IdentifiedObjectFormat.java | 6 +++--- .../main/org/apache/sis/io/LineAppender.java | 2 +- .../main/org/apache/sis/io/TableAppender.java | 2 +- .../main/org/apache/sis/math/ArrayVector.java | 2 +- .../main/org/apache/sis/math/DecimalFunctions.java | 2 +- .../main/org/apache/sis/math/Fraction.java | 2 +- .../main/org/apache/sis/math/Line.java | 6 +++--- .../org/apache/sis/math/LinearlyDerivedVector.java | 2 +- .../main/org/apache/sis/math/MathFunctions.java | 6 +++--- .../main/org/apache/sis/math/Plane.java | 6 +++--- .../main/org/apache/sis/math/Statistics.java | 4 ++-- .../main/org/apache/sis/math/StatisticsFormat.java | 2 +- .../main/org/apache/sis/math/Vector.java | 2 +- .../main/org/apache/sis/measure/AbstractUnit.java | 2 +- .../main/org/apache/sis/measure/Angle.java | 2 +- .../main/org/apache/sis/measure/AngleFormat.java | 4 ++-- .../org/apache/sis/measure/LinearConverter.java | 4 ++-- .../main/org/apache/sis/measure/NumberRange.java | 2 +- .../main/org/apache/sis/measure/Prefixes.java | 2 +- .../main/org/apache/sis/measure/Range.java | 2 +- .../main/org/apache/sis/measure/RangeFormat.java | 4 ++-- .../main/org/apache/sis/measure/Scalar.java | 2 +- .../apache/sis/measure/SexagesimalConverter.java | 2 +- .../main/org/apache/sis/measure/UnitDimension.java | 2 +- .../main/org/apache/sis/measure/UnitFormat.java | 6 +++--- .../main/org/apache/sis/measure/UnitRegistry.java | 2 +- .../main/org/apache/sis/measure/UnitServices.java | 2 +- .../main/org/apache/sis/measure/Units.java | 6 +++--- .../main/org/apache/sis/setup/About.java | 6 +++--- .../main/org/apache/sis/setup/Configuration.java | 2 +- .../main/org/apache/sis/setup/GeometryLibrary.java | 2 +- .../apache/sis/setup/InstallationResources.java | 6 +++--- .../apache/sis/setup/OptionalInstallations.java | 2 +- .../main/org/apache/sis/system/DataDirectory.java | 2 +- .../sis/util/AbstractInternationalString.java | 2 +- .../main/org/apache/sis/util/ArgumentChecks.java | 2 +- .../main/org/apache/sis/util/Characters.java | 4 ++-- .../main/org/apache/sis/util/Numbers.java | 4 ++-- .../apache/sis/util/collection/CodeListSet.java | 2 +- .../org/apache/sis/util/collection/Containers.java | 2 +- .../sis/util/collection/DefaultTreeTable.java | 4 ++-- .../org/apache/sis/util/collection/DerivedSet.java | 2 +- .../apache/sis/util/collection/IntegerList.java | 2 +- .../sis/util/collection/TreeTableFormat.java | 6 +++--- .../sis/util/internal/AutoMessageFormat.java | 2 +- .../shared}/AbstractIterator.java | 2 +- .../{privy => internal/shared}/AbstractMap.java | 2 +- .../shared}/AbstractMapEntry.java | 2 +- .../sis/util/{privy => internal/shared}/Bag.java | 2 +- .../shared}/CheckedArrayList.java | 2 +- .../{privy => internal/shared}/CheckedHashSet.java | 2 +- .../{privy => internal/shared}/CloneAccess.java | 2 +- .../util/{privy => internal/shared}/Cloner.java | 2 +- .../util/{privy => internal/shared}/CodeLists.java | 2 +- .../{privy => internal/shared}/CollectionsExt.java | 2 +- .../util/{privy => internal/shared}/Constants.java | 2 +- .../{privy => internal/shared}/DefinitionURI.java | 8 ++++---- .../{privy => internal/shared}/DoubleDouble.java | 2 +- .../{privy => internal/shared}/EmptyQueue.java | 2 +- .../{privy => internal/shared}/LazyCandidate.java | 2 +- .../shared}/ListOfUnknownSize.java | 2 +- .../shared}/LocalizedParseException.java | 2 +- .../shared}/MetadataServices.java | 2 +- .../util/{privy => internal/shared}/Numerics.java | 6 +++--- .../{privy => internal/shared}/PropertyFormat.java | 2 +- .../shared}/SetOfUnknownSize.java | 2 +- .../util/{privy => internal/shared}/Strings.java | 2 +- .../shared}/TreeFormatCustomization.java | 2 +- .../sis/util/{privy => internal/shared}/URLs.java | 2 +- .../shared}/UnmodifiableArrayList.java | 2 +- .../util/{privy => internal/shared}/Unsafe.java | 2 +- .../sis/util/{privy => internal/shared}/X364.java | 2 +- .../{privy => internal/shared}/package-info.java | 2 +- .../apache/sis/util/logging/MonolineFormatter.java | 6 +++--- .../sis/util/resources/IndexedResourceBundle.java | 4 ++-- .../test/org/apache/sis/io/WordWrapTest.java | 2 +- .../org/apache/sis/measure/RangeFormatTest.java | 2 +- .../test/org/apache/sis/test/TestCase.java | 2 +- .../test/org/apache/sis/test/TestUtilities.java | 4 ++-- .../org/apache/sis/util/collection/CacheTest.java | 2 +- .../apache/sis/util/collection/RangeSetTest.java | 4 ++-- .../shared}/AbstractMapTest.java | 2 +- .../util/{privy => internal/shared}/BagTest.java | 2 +- .../shared}/CheckedArrayListTest.java | 2 +- .../shared}/CollectionsExtTest.java | 2 +- .../{privy => internal/shared}/ConstantsTest.java | 2 +- .../shared}/DefinitionURITest.java | 2 +- .../shared}/DoubleDoubleTest.java | 2 +- .../shared}/ListOfUnknownSizeTest.java | 2 +- .../shared}/LocalizedParseExceptionTest.java | 2 +- .../{privy => internal/shared}/NumericsTest.java | 4 ++-- .../{privy => internal/shared}/StringsTest.java | 2 +- .../util/{privy => internal/shared}/X364Test.java | 4 ++-- .../sis/util/logging/MonolineFormatterTest.java | 2 +- .../org/apache/sis/cql/FilterToCQLVisitor.java | 4 ++-- .../test/org/apache/sis/cql/FilterReadingTest.java | 2 +- .../test/org/apache/sis/cql/FilterWritingTest.java | 2 +- .../org/apache/sis/geometries/CurvePolygon.java | 2 +- .../main/org/apache/sis/geometries/Geometries.java | 4 ++-- .../org/apache/sis/geometries/GeometryFactory.java | 22 +++++++++++----------- .../main/org/apache/sis/geometries/LineString.java | 2 +- .../main/org/apache/sis/geometries/LinearRing.java | 2 +- .../org/apache/sis/geometries/MultiLineString.java | 2 +- .../main/org/apache/sis/geometries/MultiPoint.java | 2 +- .../org/apache/sis/geometries/MultiPolygon.java | 2 +- .../main/org/apache/sis/geometries/OBBox.java | 2 +- .../main/org/apache/sis/geometries/Point.java | 2 +- .../main/org/apache/sis/geometries/Polygon.java | 2 +- .../main/org/apache/sis/geometries/Sphere.java | 2 +- .../main/org/apache/sis/geometries/TIN.java | 2 +- .../main/org/apache/sis/geometries/Triangle.java | 2 +- .../main/org/apache/sis/geometries/Wrapper.java | 2 +- .../shared}/AbstractGeometry.java | 2 +- .../{privy => internal/shared}/ArraySequence.java | 2 +- .../shared}/DefaultGeometryCollection.java | 2 +- .../shared}/DefaultLineString.java | 2 +- .../shared}/DefaultLinearRing.java | 2 +- .../shared}/DefaultMultiCurve.java | 2 +- .../shared}/DefaultMultiLineString.java | 2 +- .../shared}/DefaultMultiPoint.java | 2 +- .../shared}/DefaultMultiPolygon.java | 2 +- .../shared}/DefaultMultiSurface.java | 2 +- .../{privy => internal/shared}/DefaultPoint.java | 2 +- .../shared}/DefaultPointSequence.java | 2 +- .../{privy => internal/shared}/DefaultPolygon.java | 4 ++-- .../shared}/DefaultTriangle.java | 2 +- .../org/apache/sis/geometries/math/DataType.java | 2 +- .../main/org/apache/sis/geometries/math/Maths.java | 2 +- .../apache/sis/geometries/mesh/MeshPrimitive.java | 2 +- .../sis/geometries/mesh/MultiMeshPrimitive.java | 2 +- .../sis/geometries/processor/ProcessorUtils.java | 2 +- .../processor/spatialanalysis2d/Intersection.java | 2 +- .../geometries/processor/spatialedition/To3D.java | 2 +- .../processor/spatialedition/ToPrimitive.java | 2 +- .../processor/spatialedition/Transform.java | 2 +- .../simplify/greedyinsert/WTriangle.java | 2 +- .../triangulate/delaunay/OrientedEdge.java | 2 +- .../triangulate/delaunay/OrientedTriangle.java | 4 ++-- .../shared}/ArraySequenceTest.java | 2 +- .../main/org/apache/sis/map/SEPortrayer.java | 4 ++-- .../main/org/apache/sis/map/SymbologyVisitor.java | 2 +- .../apache/sis/map/service/se1/LineToScene2D.java | 2 +- .../test/org/apache/sis/map/SEPortrayerTest.java | 2 +- .../sis/map/service/GraphicsPortrayerTest.java | 2 +- .../sis/storage/geoheif/CoverageBuilder.java | 10 +++++----- .../apache/sis/storage/geoheif/GeoHeifStore.java | 2 +- .../main/org/apache/sis/storage/geoheif/Group.java | 2 +- .../sis/storage/geoheif/UncompressedImage.java | 4 ++-- .../org/apache/sis/storage/isobmff/TreeNode.java | 2 +- .../apache/sis/storage/isobmff/base/HeaderBox.java | 2 +- .../sis/storage/isobmff/mpeg/ComponentPalette.java | 2 +- .../org/apache/sis/storage/geopackage/Content.java | 2 +- .../sis/storage/geopackage/ContentWriter.java | 2 +- .../apache/sis/storage/geopackage/GpkgStore.java | 2 +- .../sis/storage/geopackage/GpkgStoreProvider.java | 4 ++-- .../sis/storage/shapefile/ShapefileStore.java | 6 +++--- .../sis/storage/shapefile/ShapefileStoreTest.java | 2 +- netbeans-project/nbproject/project.properties | 8 ++++---- optional/build.gradle.kts | 2 +- .../apache/sis/gui/controls/SyncWindowList.java | 2 +- .../apache/sis/gui/controls/ValueColorMapper.java | 2 +- .../apache/sis/gui/coverage/CoverageCanvas.java | 4 ++-- .../main/org/apache/sis/gui/coverage/GridView.java | 2 +- .../org/apache/sis/gui/coverage/GridViewSkin.java | 4 ++-- .../apache/sis/gui/coverage/IsolineRenderer.java | 2 +- .../org/apache/sis/gui/dataset/ExpandableList.java | 2 +- .../org/apache/sis/gui/dataset/FeatureList.java | 2 +- .../org/apache/sis/gui/dataset/FeatureTable.java | 4 ++-- .../org/apache/sis/gui/dataset/ResourceCell.java | 2 +- .../apache/sis/gui/internal/DataStoreOpener.java | 2 +- .../org/apache/sis/gui/internal/GUIUtilities.java | 2 +- .../apache/sis/gui/internal/ImageConverter.java | 6 +++--- .../sis/gui/internal/PropertyValueFormats.java | 2 +- .../sis/gui/internal/PropertyValueFormatter.java | 2 +- .../apache/sis/gui/internal/io/FileAccessItem.java | 2 +- .../main/org/apache/sis/gui/map/MapCanvas.java | 8 ++++---- .../main/org/apache/sis/gui/map/MapCanvasAWT.java | 2 +- .../main/org/apache/sis/gui/map/StatusBar.java | 2 +- .../org/apache/sis/gui/map/ValuesFormatter.java | 2 +- .../sis/gui/metadata/IdentificationInfo.java | 4 ++-- .../apache/sis/gui/metadata/MetadataSummary.java | 2 +- .../sis/gui/metadata/RepresentationInfo.java | 2 +- .../sis/gui/metadata/StandardMetadataTree.java | 2 +- .../apache/sis/gui/referencing/AuthorityCodes.java | 4 ++-- .../org/apache/sis/gui/referencing/CRSChooser.java | 2 +- .../org/apache/sis/gui/referencing/CodeFilter.java | 2 +- .../org/apache/sis/gui/referencing/MenuSync.java | 2 +- .../gui/referencing/PositionableProjection.java | 4 ++-- .../gui/referencing/RecentReferenceSystems.java | 4 ++-- .../main/org/apache/sis/gui/referencing/Utils.java | 2 +- .../sis/resources/embedded/EmbeddedResources.java | 4 ++-- .../resources/embedded/EmbeddedResourcesTest.java | 2 +- .../apache/sis/resources/embedded/Generator.java | 4 ++-- .../factory/sql/epsg/ScriptProvider.java | 2 +- .../factory/sql/epsg/DataScriptFormatter.java | 6 +++--- .../main/org/apache/sis/storage/gdal/Band.java | 4 ++-- .../main/org/apache/sis/storage/gdal/Driver.java | 4 ++-- .../apache/sis/storage/gdal/FeatureIterator.java | 4 ++-- .../org/apache/sis/storage/gdal/FeatureLayer.java | 4 ++-- .../org/apache/sis/storage/gdal/FieldAccessor.java | 4 ++-- .../main/org/apache/sis/storage/gdal/GDAL.java | 2 +- .../org/apache/sis/storage/gdal/GDALStore.java | 4 ++-- .../apache/sis/storage/gdal/GDALStoreProvider.java | 2 +- .../main/org/apache/sis/storage/gdal/Opener.java | 2 +- .../org/apache/sis/storage/gdal/SpatialRef.java | 2 +- .../org/apache/sis/storage/gdal/TiledCoverage.java | 2 +- .../org/apache/sis/storage/gdal/TiledResource.java | 8 ++++---- .../org/apache/sis/storage/gdal/GDALStoreTest.java | 2 +- 1210 files changed, 2130 insertions(+), 2130 deletions(-) diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/SpatialOperationContext.java index e93cc672be,df9078b625..1ff4235dc6 --- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/SpatialOperationContext.java +++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/SpatialOperationContext.java @@@ -42,12 -42,9 +42,12 @@@ import org.apache.sis.referencing.opera import org.apache.sis.referencing.crs.DefaultProjectedCRS; import org.apache.sis.measure.Units; import org.apache.sis.util.resources.Errors; - import org.apache.sis.util.privy.Constants; + import org.apache.sis.util.internal.shared.Constants; import org.apache.sis.metadata.iso.citation.Citations; +// Specific to the main and geoapi-3.1 branches: +import org.opengis.referencing.crs.GeneralDerivedCRS; + // Specific to the geoapi-3.1 and geoapi-4.0 branches: import org.opengis.filter.SpatialOperatorName; import org.opengis.filter.DistanceOperatorName; diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/jts/Wrapper.java index 0ef18799eb,d568096b0c..ee2828c272 --- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/jts/Wrapper.java +++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/jts/Wrapper.java @@@ -45,9 -45,9 +45,9 @@@ import org.opengis.util.FactoryExceptio import org.opengis.geometry.DirectPosition; import org.opengis.referencing.crs.CoordinateReferenceSystem; import org.opengis.referencing.operation.CoordinateOperation; -import org.opengis.referencing.operation.MathTransform; import org.opengis.referencing.operation.TransformException; +import org.opengis.referencing.operation.MathTransform; - import org.apache.sis.referencing.privy.ReferencingUtilities; + import org.apache.sis.referencing.internal.shared.ReferencingUtilities; import org.apache.sis.geometry.DirectPosition2D; import org.apache.sis.geometry.GeneralDirectPosition; import org.apache.sis.geometry.GeneralEnvelope; diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/CitationConstant.java index 55e43a3ce5,1bbdce19a9..234b08bca5 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/CitationConstant.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/CitationConstant.java @@@ -31,13 -31,9 +31,13 @@@ import org.apache.sis.metadata.sql.Meta import org.apache.sis.metadata.iso.citation.Citations; import org.apache.sis.metadata.simple.SimpleCitation; import org.apache.sis.system.Loggers; - import org.apache.sis.util.privy.Strings; + import org.apache.sis.util.internal.shared.Strings; import org.apache.sis.util.logging.Logging; +// Specific to the main and geoapi-3.1 branches: +import java.util.Date; +import org.opengis.metadata.citation.ResponsibleParty; + // Specific to the geoapi-3.1 and geoapi-4.0 branches: import org.opengis.metadata.citation.OnlineResource; import org.opengis.metadata.identification.BrowseGraphic; diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/DefaultExtendedElementInformation.java index 1ed8ffc37e,354d36aad9..0b1c1d48e0 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/DefaultExtendedElementInformation.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/DefaultExtendedElementInformation.java @@@ -30,16 -30,12 +30,16 @@@ import org.apache.sis.xml.Namespaces import org.apache.sis.xml.NilReason; import org.apache.sis.xml.bind.Context; import org.apache.sis.xml.bind.FilterByVersion; - import org.apache.sis.xml.privy.LegacyNamespaces; + import org.apache.sis.xml.internal.shared.LegacyNamespaces; import org.apache.sis.metadata.internal.Dependencies; import org.apache.sis.metadata.iso.legacy.LegacyPropertyAdapter; - import org.apache.sis.util.privy.CollectionsExt; - import static org.apache.sis.metadata.privy.ImplementationHelper.ensurePositive; + import org.apache.sis.util.internal.shared.CollectionsExt; + import static org.apache.sis.metadata.internal.shared.ImplementationHelper.ensurePositive; +// Specific to the main and geoapi-3.1 branches: +import org.opengis.metadata.Obligation; +import org.opengis.metadata.citation.ResponsibleParty; + // Specific to the geoapi-3.1 and geoapi-4.0 branches: import java.util.AbstractSet; import java.util.Iterator; diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultBand.java index a8898f2b69,822b1acaaa..57a6c193ab --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultBand.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultBand.java @@@ -29,10 -29,10 +29,10 @@@ import org.opengis.metadata.content.Tra import org.apache.sis.measure.ValueRange; import org.apache.sis.xml.bind.gco.GO_Real; import org.apache.sis.xml.bind.gco.UnitAdapter; - import static org.apache.sis.metadata.privy.ImplementationHelper.ensurePositive; + import static org.apache.sis.metadata.internal.shared.ImplementationHelper.ensurePositive; -// Specific to the geoapi-4.0 branch: -import org.opengis.metadata.content.PolarisationOrientation; +// Specific to the main and geoapi-3.1 branches: +import org.opengis.metadata.content.PolarizationOrientation; /** diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultDataFile.java index 26c845bad0,aebcef4e83..85b4111de4 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultDataFile.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultDataFile.java @@@ -28,11 -28,11 +28,11 @@@ import org.opengis.util.InternationalSt import org.apache.sis.xml.Namespaces; import org.apache.sis.metadata.iso.ISOMetadata; import org.apache.sis.xml.bind.FilterByVersion; - import org.apache.sis.xml.privy.LegacyNamespaces; + import org.apache.sis.xml.internal.shared.LegacyNamespaces; import org.apache.sis.xml.bind.gcx.MimeFileTypeAdapter; -// Specific to the geoapi-4.0 branch: -import org.opengis.util.GenericName; +// Specific to the main and geoapi-3.1 branches: +import org.opengis.util.LocalName; /** diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultMedium.java index 4b41ed32eb,422806af91..00cbad7b00 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultMedium.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultMedium.java @@@ -33,17 -33,12 +33,17 @@@ import org.apache.sis.xml.bind.FilterBy import org.apache.sis.xml.bind.gco.GO_Real; import org.apache.sis.xml.bind.metadata.CI_Citation; import org.apache.sis.xml.bind.metadata.MD_Identifier; -import org.apache.sis.metadata.iso.legacy.LegacyPropertyAdapter; import org.apache.sis.metadata.internal.Dependencies; +import org.apache.sis.metadata.iso.legacy.LegacyPropertyAdapter; - import org.apache.sis.xml.privy.LegacyNamespaces; - import org.apache.sis.util.privy.CollectionsExt; - import static org.apache.sis.metadata.privy.ImplementationHelper.ensurePositive; + import org.apache.sis.xml.internal.shared.LegacyNamespaces; + import org.apache.sis.util.internal.shared.CollectionsExt; + import static org.apache.sis.metadata.internal.shared.ImplementationHelper.ensurePositive; +// Specific to the main and geoapi-3.1 branches: +import org.opengis.metadata.distribution.MediumName; - import org.apache.sis.util.privy.CodeLists; ++import org.apache.sis.util.internal.shared.CodeLists; +import org.apache.sis.metadata.iso.citation.DefaultCitation; + // Specific to the geoapi-3.1 and geoapi-4.0 branches: import java.util.AbstractSet; import java.util.Iterator; diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/AbstractIdentification.java index 30fb1db555,78b5cdead8..7f9590ee0b --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/AbstractIdentification.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/AbstractIdentification.java @@@ -46,12 -46,9 +46,12 @@@ import org.apache.sis.metadata.iso.ISOM import org.apache.sis.metadata.iso.legacy.LegacyPropertyAdapter; import org.apache.sis.xml.bind.FilterByVersion; import org.apache.sis.xml.bind.metadata.MD_Identifier; - import org.apache.sis.xml.privy.LegacyNamespaces; + import org.apache.sis.xml.internal.shared.LegacyNamespaces; import org.apache.sis.util.iso.Types; +// Specific to the main and geoapi-3.1 branches: +import org.opengis.metadata.citation.ResponsibleParty; + // Specific to the geoapi-3.1 and geoapi-4.0 branches: import org.opengis.metadata.identification.AssociatedResource; diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultDataIdentification.java index 473041e023,5814310047..7cdc653d2a --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultDataIdentification.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultDataIdentification.java @@@ -32,13 -32,9 +32,13 @@@ import org.apache.sis.xml.bind.FilterBy import org.apache.sis.xml.bind.lan.LocaleAndCharset; import org.apache.sis.xml.bind.lan.OtherLocales; import org.apache.sis.xml.bind.lan.PT_Locale; - import org.apache.sis.xml.privy.LegacyNamespaces; + import org.apache.sis.xml.internal.shared.LegacyNamespaces; import org.apache.sis.metadata.internal.Dependencies; +// Specific to the main and geoapi-3.1 branches: +import java.util.stream.Collectors; +import org.opengis.metadata.identification.CharacterSet; + /** * Information required to identify a dataset. diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/lineage/DefaultProcessStep.java index a360ecc0ef,d1772f1dd6..8c78ca5bdb --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/lineage/DefaultProcessStep.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/lineage/DefaultProcessStep.java @@@ -36,13 -36,9 +36,13 @@@ import org.apache.sis.util.iso.Types import org.apache.sis.xml.bind.FilterByVersion; import org.apache.sis.xml.bind.gml.TM_Primitive; import org.apache.sis.xml.bind.metadata.MD_Scope; - import org.apache.sis.xml.privy.LegacyNamespaces; + import org.apache.sis.xml.internal.shared.LegacyNamespaces; import org.apache.sis.temporal.TemporalObjects; +// Specific to the main and geoapi-3.1 branches: +import org.opengis.metadata.citation.ResponsibleParty; +import org.apache.sis.temporal.TemporalDate; + // Specific to the geoapi-3.1 and geoapi-4.0 branches: import org.opengis.metadata.maintenance.Scope; diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java index 252077d585,81dc199fbe..353c399007 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java @@@ -35,14 -35,10 +35,14 @@@ import org.apache.sis.metadata.iso.cita import org.apache.sis.metadata.iso.legacy.LegacyPropertyAdapter; import org.apache.sis.metadata.internal.Dependencies; import org.apache.sis.xml.bind.FilterByVersion; - import org.apache.sis.xml.privy.LegacyNamespaces; - import org.apache.sis.util.privy.CollectionsExt; - import static org.apache.sis.metadata.privy.ImplementationHelper.valueIfDefined; + import org.apache.sis.xml.internal.shared.LegacyNamespaces; + import org.apache.sis.util.internal.shared.CollectionsExt; + import static org.apache.sis.metadata.internal.shared.ImplementationHelper.valueIfDefined; +// Specific to the main and geoapi-3.1 branches: +import org.opengis.metadata.citation.ResponsibleParty; +import org.opengis.temporal.PeriodDuration; + // Specific to the geoapi-3.1 and geoapi-4.0 branches: import org.opengis.metadata.maintenance.Scope; diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultDataQuality.java index 9f8f254615,ba4a358249..ed0bbde5d3 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultDataQuality.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultDataQuality.java @@@ -25,11 -25,8 +25,11 @@@ import org.opengis.metadata.quality.Dat import org.opengis.metadata.quality.Element; import org.opengis.metadata.maintenance.ScopeCode; import org.apache.sis.xml.bind.FilterByVersion; - import org.apache.sis.xml.privy.LegacyNamespaces; + import org.apache.sis.xml.internal.shared.LegacyNamespaces; +// Specific to the main and geoapi-3.1 branches: +import org.opengis.metadata.quality.Scope; + // Specific to the geoapi-3.1 and geoapi-4.0 branches: import org.opengis.metadata.quality.StandaloneQualityReportInformation; diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleIdentifiedObject.java index c1b001cf51,8c36f19271..450116de40 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleIdentifiedObject.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleIdentifiedObject.java @@@ -22,16 -22,12 +22,16 @@@ import org.opengis.util.InternationalSt import org.opengis.metadata.Identifier; import org.opengis.metadata.citation.Citation; import org.opengis.referencing.IdentifiedObject; - import org.apache.sis.metadata.privy.Identifiers; + import org.apache.sis.metadata.internal.shared.Identifiers; import org.apache.sis.util.LenientComparable; import org.apache.sis.util.ComparisonMode; - import org.apache.sis.util.privy.Constants; + import org.apache.sis.util.internal.shared.Constants; import static org.apache.sis.util.collection.Containers.isNullOrEmpty; +// Specific to the main and geoapi-3.1 branches: +import org.opengis.referencing.ReferenceIdentifier; +import org.opengis.metadata.extent.Extent; + // Specific to the geoapi-3.1 and geoapi-4.0 branches: import java.util.Optional; diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleIdentifier.java index c2b49c30d9,a0900b5c3f..92ffa7a536 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleIdentifier.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleIdentifier.java @@@ -23,10 -23,11 +23,10 @@@ import org.opengis.metadata.citation.Ci import org.apache.sis.util.CharSequences; import org.apache.sis.util.Classes; import org.apache.sis.util.Deprecable; - import org.apache.sis.util.privy.Constants; + import org.apache.sis.util.internal.shared.Constants; -// Specific to the geoapi-4.0 branch: -import java.util.Optional; -import org.opengis.metadata.Identifier; +// Specific to the main and geoapi-3.1 branches: +import org.opengis.referencing.ReferenceIdentifier; /** diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/AbstractFactory.java index 68b8d9d007,c649b94062..eb43408a53 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/AbstractFactory.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/AbstractFactory.java @@@ -19,10 -19,10 +19,10 @@@ package org.apache.sis.util.iso import org.opengis.util.Factory; import org.opengis.metadata.citation.Citation; import org.apache.sis.metadata.simple.SimpleCitation; - import org.apache.sis.util.privy.Strings; + import org.apache.sis.util.internal.shared.Strings; -// Specific to the geoapi-4.0 branch: -import org.opengis.util.FactoryException; +// Specific to the main and geoapi-3.1 branches: +import org.apache.sis.util.collection.BackingStoreException; /** diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/code/MD_MediumNameCode.java index 4c839f2c75,ac3f4fc37c..41d0da4502 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/code/MD_MediumNameCode.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/code/MD_MediumNameCode.java @@@ -19,10 -19,10 +19,10 @@@ package org.apache.sis.xml.bind.metadat import jakarta.xml.bind.annotation.XmlElement; import org.apache.sis.xml.bind.cat.CodeListAdapter; import org.apache.sis.xml.bind.cat.CodeListUID; - import org.apache.sis.xml.privy.LegacyNamespaces; + import org.apache.sis.xml.internal.shared.LegacyNamespaces; -// Specific to the geoapi-4.0 branch: -import org.apache.sis.metadata.iso.legacy.MediumName; +// Specific to the main and geoapi-3.1 branches: +import org.opengis.metadata.distribution.MediumName; /** diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/RS_Identifier.java index b3f9f0c5ed,335445602a..6446cf3bd9 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/RS_Identifier.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/RS_Identifier.java @@@ -21,12 -21,8 +21,12 @@@ import jakarta.xml.bind.annotation.XmlR import org.opengis.metadata.Identifier; import org.apache.sis.metadata.TitleProperty; import org.apache.sis.metadata.iso.*; - import org.apache.sis.xml.privy.LegacyNamespaces; + import org.apache.sis.xml.internal.shared.LegacyNamespaces; +// Specific to the main and geoapi-3.1 branches: +import org.opengis.metadata.citation.Citation; +import org.opengis.referencing.ReferenceIdentifier; + /** * Identifier using {@code <gmd:RS_Identifier>} XML element name. diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/ServiceParameter.java index 8621ef0726,8a6d802ea0..084b09e67f --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/ServiceParameter.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/ServiceParameter.java @@@ -28,16 -28,13 +28,16 @@@ import org.opengis.util.InternationalSt import org.opengis.parameter.ParameterDescriptor; import org.apache.sis.xml.Namespaces; import org.apache.sis.xml.bind.FilterByVersion; - import org.apache.sis.xml.privy.LegacyNamespaces; + import org.apache.sis.xml.internal.shared.LegacyNamespaces; import org.apache.sis.xml.bind.gco.GO_GenericName; - import org.apache.sis.metadata.privy.NameToIdentifier; + import org.apache.sis.metadata.internal.shared.NameToIdentifier; import org.apache.sis.util.iso.DefaultMemberName; import org.apache.sis.util.iso.Names; - import static org.apache.sis.util.privy.CollectionsExt.nonNull; + import static org.apache.sis.util.internal.shared.CollectionsExt.nonNull; +// Specific to the main and geoapi-3.1 branches: +import org.opengis.referencing.ReferenceIdentifier; + // Specific to the geoapi-3.1 and geoapi-4.0 branches: import org.opengis.parameter.ParameterDirection; import org.opengis.metadata.Identifier; diff --cc endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/HardCodedCitations.java index 8f22a254f2,ecf73e185e..59246e1628 --- 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,12 -23,9 +23,12 @@@ import org.opengis.metadata.citation.On import org.opengis.metadata.citation.PresentationForm; import org.apache.sis.metadata.iso.DefaultIdentifier; import org.apache.sis.util.SimpleInternationalString; - import org.apache.sis.util.privy.Constants; - import org.apache.sis.util.privy.URLs; + import org.apache.sis.util.internal.shared.Constants; + import org.apache.sis.util.internal.shared.URLs; +// Specific to the main and geoapi-3.1 branches: +import static java.util.Collections.singleton; + /** * Hard-coded citation constants used for testing purpose only. diff --cc endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/mock/IdentifiedObjectMock.java index 97211623d7,cfc6b13a97..27a0aa0d37 --- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/mock/IdentifiedObjectMock.java +++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/mock/IdentifiedObjectMock.java @@@ -24,12 -24,12 +24,12 @@@ import jakarta.xml.bind.annotation.XmlR import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.opengis.util.GenericName; import org.opengis.referencing.IdentifiedObject; - import org.apache.sis.util.privy.Strings; - import org.apache.sis.util.privy.CollectionsExt; + import org.apache.sis.util.internal.shared.Strings; + import org.apache.sis.util.internal.shared.CollectionsExt; import org.apache.sis.xml.bind.gco.GO_GenericName; -// Specific to the geoapi-4.0 branch: -import org.opengis.metadata.Identifier; +// Specific to the main and geoapi-3.1 branches: +import org.opengis.referencing.ReferenceIdentifier; /** diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/ParameterFormat.java index 6049b10ad8,b00b38708e..e7c30dd0d2 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/ParameterFormat.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/ParameterFormat.java @@@ -53,15 -53,12 +53,15 @@@ import org.apache.sis.util.ArgumentChec import org.apache.sis.util.iso.Types; import org.apache.sis.util.resources.Errors; import org.apache.sis.util.resources.Vocabulary; - import org.apache.sis.util.privy.CollectionsExt; - import org.apache.sis.util.privy.X364; + import org.apache.sis.util.internal.shared.CollectionsExt; + import org.apache.sis.util.internal.shared.X364; import org.apache.sis.referencing.IdentifiedObjects; - import org.apache.sis.metadata.privy.NameToIdentifier; + import org.apache.sis.metadata.internal.shared.NameToIdentifier; import org.apache.sis.pending.jdk.JDK19; +// Specific to the main and geoapi-3.1 branches: +import org.opengis.referencing.ReferenceIdentifier; + // Specific to the geoapi-3.1 and geoapi-4.0 branches: import org.opengis.util.ControlledVocabulary; diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/ParameterTableRow.java index a98e17d96b,c15368d442..6537eb5429 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/ParameterTableRow.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/ParameterTableRow.java @@@ -39,15 -39,12 +39,15 @@@ import org.apache.sis.util.Characters import org.apache.sis.util.Deprecable; import org.apache.sis.measure.Range; import org.apache.sis.measure.RangeFormat; - import org.apache.sis.metadata.privy.NameToIdentifier; - import org.apache.sis.util.privy.X364; - import static org.apache.sis.util.privy.X364.*; + import org.apache.sis.metadata.internal.shared.NameToIdentifier; + import org.apache.sis.util.internal.shared.X364; + import static org.apache.sis.util.internal.shared.X364.*; import static org.apache.sis.util.CharSequences.spaces; - import static org.apache.sis.util.privy.Constants.DEFAULT_SEPARATOR; + import static org.apache.sis.util.internal.shared.Constants.DEFAULT_SEPARATOR; +// Specific to the main and geoapi-3.1 branches: +import org.opengis.util.InternationalString; + /** * A row in the table to be formatted by {@link ParameterFormat}. diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/AbstractIdentifiedObject.java index 7882c4b8e9,2e5a01df09..5f4572a82e --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/AbstractIdentifiedObject.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/AbstractIdentifiedObject.java @@@ -70,15 -70,10 +70,15 @@@ import org.apache.sis.util.iso.DefaultN import org.apache.sis.util.resources.Errors; import static org.apache.sis.util.ArgumentChecks.*; import static org.apache.sis.util.Utilities.deepEquals; - import static org.apache.sis.util.privy.CollectionsExt.nonNull; - import static org.apache.sis.util.privy.CollectionsExt.nonEmpty; - import static org.apache.sis.util.privy.CollectionsExt.immutableSet; + import static org.apache.sis.util.internal.shared.CollectionsExt.nonNull; + import static org.apache.sis.util.internal.shared.CollectionsExt.nonEmpty; + import static org.apache.sis.util.internal.shared.CollectionsExt.immutableSet; +// Specific to the main and geoapi-3.1 branches: +import org.opengis.referencing.ReferenceIdentifier; +import org.opengis.referencing.operation.Conversion; +import org.opengis.referencing.operation.Projection; + // Specific to the geoapi-3.1 and geoapi-4.0 branches: import org.opengis.referencing.ObjectDomain; diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/EllipsoidalHeightSeparator.java index 366257c40e,73a4a1a107..6cdae16c03 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/EllipsoidalHeightSeparator.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/EllipsoidalHeightSeparator.java @@@ -37,11 -37,8 +37,11 @@@ import org.apache.sis.referencing.opera import org.apache.sis.util.Utilities; import org.apache.sis.util.resources.Errors; import org.apache.sis.referencing.factory.GeodeticObjectFactory; - import static org.apache.sis.referencing.privy.ReferencingUtilities.getPropertiesForModifiedCRS; + import static org.apache.sis.referencing.internal.shared.ReferencingUtilities.getPropertiesForModifiedCRS; +// Specific to the main and geoapi-3.1 branches: +import org.opengis.referencing.crs.GeographicCRS; + // Specific to the geoapi-3.1 and geoapi-4.0 branches: import org.opengis.referencing.datum.DatumEnsemble; diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/NameIterator.java index 72788ec16d,3529a5a59c..87168a5ccd --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/NameIterator.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/NameIterator.java @@@ -22,12 -22,12 +22,12 @@@ import org.opengis.util.GenericName import org.opengis.referencing.IdentifiedObject; import org.apache.sis.xml.bind.Context; import org.apache.sis.util.resources.Errors; - import org.apache.sis.metadata.privy.NameMeaning; - import org.apache.sis.referencing.privy.NilReferencingObject; - import static org.apache.sis.util.privy.Strings.appendUnicodeIdentifier; + import org.apache.sis.metadata.internal.shared.NameMeaning; + import org.apache.sis.referencing.internal.shared.NilReferencingObject; + import static org.apache.sis.util.internal.shared.Strings.appendUnicodeIdentifier; -// Specific to the geoapi-4.0 branch: -import org.opengis.metadata.Identifier; +// Specific to the main and geoapi-3.1 branches: +import org.opengis.referencing.ReferenceIdentifier; /** diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/Properties.java index 5a3d432312,ff0fc309ec..ce354971a6 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/Properties.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/Properties.java @@@ -28,14 -28,9 +28,14 @@@ import org.opengis.referencing.operatio import org.opengis.referencing.operation.SingleOperation; import org.opengis.metadata.quality.PositionalAccuracy; import org.apache.sis.util.Deprecable; - import org.apache.sis.util.privy.AbstractMap; - import org.apache.sis.referencing.privy.CoordinateOperations; + import org.apache.sis.util.internal.shared.AbstractMap; + import org.apache.sis.referencing.internal.shared.CoordinateOperations; +// Specific to the main and geoapi-3.1 branches: +import org.opengis.referencing.ReferenceSystem; +import org.opengis.referencing.ReferenceIdentifier; +import org.opengis.referencing.datum.Datum; + // Specific to the geoapi-3.1 and geoapi-4.0 branches: import org.opengis.referencing.ObjectDomain; diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultTemporalCRS.java index 20b22556de,6c90e2b14f..5bb8e23b90 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultTemporalCRS.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultTemporalCRS.java @@@ -43,12 -43,9 +43,12 @@@ import org.apache.sis.referencing.inter import org.apache.sis.io.wkt.Formatter; import org.apache.sis.measure.Units; import org.apache.sis.math.Fraction; - import static org.apache.sis.util.privy.Constants.NANOS_PER_SECOND; - import static org.apache.sis.util.privy.Constants.MILLIS_PER_SECOND; + import static org.apache.sis.util.internal.shared.Constants.NANOS_PER_SECOND; + import static org.apache.sis.util.internal.shared.Constants.MILLIS_PER_SECOND; +// Specific to the main and geoapi-3.1 branches: +import org.apache.sis.temporal.TemporalDate; + // Specific to the geoapi-3.1 and geoapi-4.0 branches: import org.opengis.referencing.datum.DatumEnsemble; diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/SubTypes.java index f18e654f86,af854c09a0..7b3175687f --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/SubTypes.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/SubTypes.java @@@ -28,11 -28,8 +28,11 @@@ import org.opengis.referencing.cs.Polar import org.opengis.referencing.cs.SphericalCS; import org.opengis.referencing.cs.TimeCS; import org.opengis.referencing.cs.VerticalCS; - import org.apache.sis.referencing.privy.AxisDirections; + import org.apache.sis.referencing.internal.shared.AxisDirections; +// Specific to the main and geoapi-3.1 branches: +import org.opengis.referencing.cs.UserDefinedCS; + /** * Implementation of {@link AbstractCS} methods that require knowledge about subclasses. diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultDatumEnsemble.java index 57b706a18f,cc89e20292..685fae51aa --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultDatumEnsemble.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultDatumEnsemble.java @@@ -52,12 -52,8 +52,12 @@@ import org.apache.sis.util.Classes import org.apache.sis.util.ComparisonMode; import org.apache.sis.util.Utilities; import org.apache.sis.util.resources.Errors; - import org.apache.sis.util.privy.CollectionsExt; + import org.apache.sis.util.internal.shared.CollectionsExt; +// Specific to the main and geoapi-3.1 branches: +import java.util.Date; +import org.opengis.referencing.datum.VerticalDatumType; + // Specific to the geoapi-3.1 and geoapi-4.0 branches: import java.util.Optional; import java.time.temporal.Temporal; diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultVerticalDatum.java index 4cb2b7369e,d5631dce04..48582083eb --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultVerticalDatum.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultVerticalDatum.java @@@ -31,14 -31,11 +31,14 @@@ import org.apache.sis.io.wkt.Formatter import org.apache.sis.io.wkt.FormattableObject; import org.apache.sis.util.ComparisonMode; import org.apache.sis.xml.bind.Context; - import org.apache.sis.xml.privy.LegacyNamespaces; - import org.apache.sis.referencing.privy.WKTKeywords; + import org.apache.sis.xml.internal.shared.LegacyNamespaces; import org.apache.sis.referencing.internal.VerticalDatumTypes; - import org.apache.sis.metadata.privy.ImplementationHelper; + import org.apache.sis.referencing.internal.shared.WKTKeywords; + import org.apache.sis.metadata.internal.shared.ImplementationHelper; +// Specific to the main and geoapi-3.1 branches: +import org.opengis.referencing.datum.VerticalDatumType; + // Specific to the geoapi-3.1 and geoapi-4.0 branches: import java.util.Optional; import org.opengis.referencing.datum.DynamicReferenceFrame; diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/EPSGCodeFinder.java index e113272552,ff205517c6..243cb537ef --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/EPSGCodeFinder.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/EPSGCodeFinder.java @@@ -62,11 -62,8 +62,11 @@@ import org.apache.sis.referencing.inter import org.apache.sis.referencing.datum.DatumOrEnsemble; import org.apache.sis.referencing.factory.IdentifiedObjectFinder; import org.apache.sis.referencing.factory.ConcurrentAuthorityFactory; - import static org.apache.sis.metadata.privy.NameToIdentifier.Simplifier.ESRI_DATUM_PREFIX; + import static org.apache.sis.metadata.internal.shared.NameToIdentifier.Simplifier.ESRI_DATUM_PREFIX; +// Specific to the main and geoapi-3.1 branches: +import org.opengis.referencing.crs.GeneralDerivedCRS; + // Specific to the geoapi-3.1 and geoapi-4.0 branches: import org.opengis.referencing.crs.ParametricCRS; import org.opengis.referencing.datum.ParametricDatum; diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/TableInfo.java index 835c89fb5e,2167b6de02..00b9316bd2 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/TableInfo.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/TableInfo.java @@@ -25,8 -25,11 +25,8 @@@ import org.opengis.referencing.crs.* import org.opengis.referencing.datum.*; import org.opengis.referencing.operation.*; import org.opengis.parameter.ParameterDescriptor; - import org.apache.sis.referencing.privy.WKTKeywords; + import org.apache.sis.referencing.internal.shared.WKTKeywords; -// Specific to the geoapi-4.0 branch: -import org.apache.sis.referencing.crs.DefaultGeocentricCRS; - /** * Information (such as columns of particular interest) about a specific <abbr>EPSG</abbr> table. diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/VerticalDatumTypes.java index e2aacdd5c1,b74977e6c3..1b4a922b41 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/VerticalDatumTypes.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/VerticalDatumTypes.java @@@ -24,12 -24,9 +24,12 @@@ import org.opengis.referencing.cs.Coord import org.opengis.referencing.cs.AxisDirection; import org.apache.sis.util.Characters; import org.apache.sis.util.CharSequences; - import org.apache.sis.util.privy.CodeLists; + import org.apache.sis.util.internal.shared.CodeLists; import org.apache.sis.measure.Units; +// Specific to the main and geoapi-3.1 branches: +import org.opengis.referencing.datum.VerticalDatumType; + // Specific to the geoapi-3.1 and geoapi-4.0 branches: import org.opengis.referencing.datum.RealizationMethod; diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/CoordinateOperationFinder.java index 0b37425008,bfb2efc217..11c5502a4c --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/CoordinateOperationFinder.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/CoordinateOperationFinder.java @@@ -62,13 -62,10 +62,13 @@@ import org.apache.sis.referencing.opera import org.apache.sis.referencing.operation.provider.GeocentricAffine; import org.apache.sis.util.Utilities; import org.apache.sis.util.ArgumentChecks; - import org.apache.sis.util.privy.Constants; - import org.apache.sis.util.privy.DoubleDouble; + import org.apache.sis.util.internal.shared.Constants; + import org.apache.sis.util.internal.shared.DoubleDouble; import org.apache.sis.util.resources.Vocabulary; +// Specific to the main and geoapi-3.1 branches: +import org.apache.sis.temporal.TemporalDate; + /** * Finds a conversion or transformation path from a source CRS to a target CRS. diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/MapProjection.java index 4caf0db85b,367f583827..93bf19cda5 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/MapProjection.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/MapProjection.java @@@ -47,12 -47,9 +47,12 @@@ import org.apache.sis.metadata.iso.cita import org.apache.sis.parameter.DefaultParameterDescriptor; import org.apache.sis.parameter.ParameterBuilder; import org.apache.sis.parameter.Parameters; - import org.apache.sis.util.privy.Constants; + import org.apache.sis.util.internal.shared.Constants; import org.apache.sis.util.resources.Errors; +// Specific to the main and geoapi-3.1 branches: +import org.opengis.referencing.ReferenceIdentifier; + /** * Base class for most two-dimensional map projection providers defined in this package. diff --cc endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/TiledGridCoverage.java index 425ea42420,173ae9c307..938a483484 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/TiledGridCoverage.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/TiledGridCoverage.java @@@ -46,12 -46,9 +46,12 @@@ import org.apache.sis.storage.tiling.Ti import org.apache.sis.storage.internal.Resources; import org.apache.sis.util.collection.WeakValueHashMap; import org.apache.sis.util.resources.Errors; - import org.apache.sis.util.privy.Numerics; + import org.apache.sis.util.internal.shared.Numerics; import static org.apache.sis.pending.jdk.JDK18.ceilDiv; +// Specific to the main and geoapi-3.1 branches: +import org.opengis.geometry.MismatchedDimensionException; + // Specific to the geoapi-3.1 and geoapi-4.0 branches: import org.opengis.coverage.CannotEvaluateException; diff --cc optional/src/org.apache.sis.gui/main/org/apache/sis/gui/metadata/IdentificationInfo.java index 546974e84b,c92f390c2c..1853e6d6e0 --- a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/metadata/IdentificationInfo.java +++ b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/metadata/IdentificationInfo.java @@@ -60,9 -60,12 +60,9 @@@ import org.apache.sis.util.Workaround import org.apache.sis.util.logging.Logging; import org.apache.sis.util.collection.BackingStoreException; import org.apache.sis.util.resources.Vocabulary; - import static org.apache.sis.util.privy.CollectionsExt.nonNull; + import static org.apache.sis.util.internal.shared.CollectionsExt.nonNull; import static org.apache.sis.gui.internal.LogHandler.LOGGER; -// Specific to the geoapi-4.0 branch: -import org.opengis.util.InternationalString; - /** * The pane where to show the values of {@link Identification} objects.
