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 bc9edad9902fc0d385714f6f20aa2f4180010dce
Merge: fb00d38fa4 d2d5ef87ea
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Thu Nov 23 19:48:35 2023 +0100
Merge branch 'geoapi-4.0' into geoapi-3.1.
This merge is only about imports order.
.../org/apache/sis/buildtools/book/Assembler.java | 1 -
.../resources/IndexedResourceCompilerTest.java | 1 -
.../sis/cloud/aws/s3/ClientFileSystemTest.java | 3 +--
.../sis/cloud/aws/s3/KeyPathMatcherTest.java | 3 +--
.../org/apache/sis/cloud/aws/s3/KeyPathTest.java | 3 +--
.../org/apache/sis/console/TransformCommand.java | 3 +--
.../org/apache/sis/console/TranslateCommand.java | 2 +-
.../org/apache/sis/console/AboutCommandTest.java | 3 +--
.../org/apache/sis/console/CRSCommandTest.java | 3 +--
.../org/apache/sis/console/CommandRunnerTest.java | 3 +--
.../org/apache/sis/console/HelpCommandTest.java | 3 +--
.../apache/sis/console/MetadataCommandTest.java | 3 +--
.../apache/sis/console/MimeTypeCommandTest.java | 3 +--
.../main/org/apache/sis/coverage/Category.java | 3 +--
.../main/org/apache/sis/coverage/CategoryList.java | 5 ++---
.../org/apache/sis/coverage/CoverageCombiner.java | 3 +--
.../apache/sis/coverage/grid/GridCoverage2D.java | 9 ++++----
.../org/apache/sis/coverage/grid/GridGeometry.java | 1 -
.../apache/sis/coverage/grid/ImageRenderer.java | 11 +++++----
.../apache/sis/coverage/grid/PixelTranslation.java | 3 +--
.../apache/sis/coverage/grid/ReshapedImage.java | 5 ++---
.../sis/coverage/grid/j2d/ImageUtilities.java | 11 +++++----
.../sis/coverage/grid/j2d/TileOpExecutor.java | 15 ++++++-------
.../apache/sis/feature/AbstractIdentifiedType.java | 1 -
.../apache/sis/feature/CharacteristicTypeMap.java | 1 -
.../apache/sis/feature/DefaultAssociationRole.java | 1 -
.../apache/sis/feature/DefaultAttributeType.java | 1 -
.../org/apache/sis/feature/PropertySingleton.java | 1 -
.../main/org/apache/sis/filter/internal/XPath.java | 1 -
.../main/org/apache/sis/filter/sqlmm/SQLMM.java | 1 -
.../main/org/apache/sis/filter/sqlmm/ST_Point.java | 3 +--
.../org/apache/sis/geometry/wrapper/jts/JTS.java | 1 -
.../apache/sis/image/BandedSampleConverter.java | 1 -
.../main/org/apache/sis/image/DataType.java | 1 -
.../main/org/apache/sis/image/MaskImage.java | 1 -
.../main/org/apache/sis/image/MaskedImage.java | 1 -
.../main/org/apache/sis/image/PixelIterator.java | 3 +--
.../main/org/apache/sis/image/PlanarImage.java | 3 +--
.../main/org/apache/sis/image/ResampledImage.java | 1 -
.../main/org/apache/sis/image/ResamplingGrid.java | 3 +--
.../sis/image/processing/isoline/Isolines.java | 1 -
.../org/apache/sis/coverage/CategoryListTest.java | 3 +--
.../test/org/apache/sis/coverage/CategoryTest.java | 5 ++---
.../apache/sis/coverage/CoverageCombinerTest.java | 3 +--
.../apache/sis/coverage/SampleDimensionTest.java | 3 +--
.../apache/sis/coverage/SampleRangeFormatTest.java | 1 -
.../grid/BandAggregateGridCoverageTest.java | 5 ++---
.../coverage/grid/BufferedGridCoverageTest.java | 1 -
.../coverage/grid/ConvertedGridCoverageTest.java | 7 +++---
.../coverage/grid/DimensionalityReductionTest.java | 3 +--
.../grid/FractionalGridCoordinatesTest.java | 3 +--
.../sis/coverage/grid/GridCoverage2DTest.java | 5 ++---
.../sis/coverage/grid/GridCoverageBuilderTest.java | 3 +--
.../sis/coverage/grid/GridDerivationTest.java | 7 +++---
.../apache/sis/coverage/grid/GridExtentTest.java | 4 +---
.../apache/sis/coverage/grid/GridGeometryTest.java | 3 +--
.../sis/coverage/grid/GridOrientationTest.java | 3 +--
.../sis/coverage/grid/PixelTranslationTest.java | 3 +--
.../coverage/grid/ResampledGridCoverageTest.java | 7 +++---
.../sis/coverage/grid/ReshapedImageTest.java | 3 +--
.../coverage/grid/TranslatedGridCoverageTest.java | 3 +--
.../coverage/grid/j2d/ColorModelBuilderTest.java | 3 +--
.../sis/coverage/grid/j2d/ImageLayoutTest.java | 3 +--
.../sis/coverage/grid/j2d/ImageUtilitiesTest.java | 5 ++---
.../coverage/grid/j2d/SampleModelFactoryTest.java | 3 +--
.../coverage/grid/j2d/ScaledColorSpaceTest.java | 7 +++---
.../sis/coverage/internal/RangeArgumentTest.java | 3 +--
.../apache/sis/feature/AbstractFeatureTest.java | 3 +--
.../apache/sis/feature/AbstractOperationTest.java | 3 +--
.../test/org/apache/sis/feature/Assertions.java | 1 +
.../apache/sis/feature/CharacteristicMapTest.java | 3 +--
.../sis/feature/CharacteristicTypeMapTest.java | 5 ++---
.../sis/feature/DefaultAssociationRoleTest.java | 5 ++---
.../sis/feature/DefaultAttributeTypeTest.java | 5 ++---
.../apache/sis/feature/DefaultFeatureTypeTest.java | 3 +--
.../apache/sis/feature/EnvelopeOperationTest.java | 5 ++---
.../org/apache/sis/feature/FeatureFormatTest.java | 1 -
.../apache/sis/feature/FeatureOperationsTest.java | 5 ++---
.../org/apache/sis/feature/FeatureTestCase.java | 5 ++---
.../test/org/apache/sis/feature/FeaturesTest.java | 3 +--
.../sis/feature/GroupAsPolylineOperationTest.java | 3 +--
.../org/apache/sis/feature/LinkOperationTest.java | 3 +--
.../sis/feature/MultiValuedAttributeTest.java | 3 +--
.../apache/sis/feature/PropertySingletonTest.java | 3 +--
.../sis/feature/SingletonAssociationTest.java | 3 +--
.../apache/sis/feature/SingletonAttributeTest.java | 3 +--
.../sis/feature/StringJoinOperationTest.java | 3 +--
.../builder/AssociationRoleBuilderTest.java | 3 +--
.../feature/builder/AttributeTypeBuilderTest.java | 5 ++---
.../builder/CharacteristicTypeBuilderTest.java | 3 +--
.../feature/builder/FeatureTypeBuilderTest.java | 5 ++---
.../feature/internal/AttributeConventionTest.java | 3 +--
.../apache/sis/feature/test/FeatureComparator.java | 1 +
.../apache/sis/filter/ArithmeticFunctionTest.java | 3 +--
.../sis/filter/BinarySpatialFilterTestCase.java | 5 ++---
.../org/apache/sis/filter/CapabilitiesTest.java | 3 +--
.../apache/sis/filter/ComparisonFilterTest.java | 3 +--
.../apache/sis/filter/IdentifierFilterTest.java | 3 +--
.../org/apache/sis/filter/LeafExpressionTest.java | 3 +--
.../test/org/apache/sis/filter/LikeFilterTest.java | 3 +--
.../org/apache/sis/filter/LogicalFilterTest.java | 3 +--
.../org/apache/sis/filter/TemporalFilterTest.java | 7 +++---
.../test/org/apache/sis/filter/XPathTest.java | 3 +--
.../sis/filter/internal/CopyVisitorTest.java | 3 +--
.../sis/filter/internal/FunctionNamesTest.java | 3 +--
.../apache/sis/filter/sqlmm/RegistryTestCase.java | 5 ++---
.../org/apache/sis/filter/sqlmm/SQLMMTest.java | 5 ++---
.../sis/geometry/wrapper/GeometriesTestCase.java | 5 ++---
.../sis/geometry/wrapper/GeometryTypeTest.java | 3 +--
.../geometry/wrapper/StandardGeometriesTest.java | 1 -
.../sis/geometry/wrapper/esri/FactoryTest.java | 1 -
.../sis/geometry/wrapper/j2d/FactoryTest.java | 3 +--
.../sis/geometry/wrapper/j2d/FlatShapeTest.java | 1 -
.../geometry/wrapper/j2d/ShapePropertiesTest.java | 3 +--
.../sis/geometry/wrapper/jts/FactoryTest.java | 3 +--
.../apache/sis/geometry/wrapper/jts/JTSTest.java | 3 +--
.../sis/geometry/wrapper/jts/ShapeAdapterTest.java | 3 +--
.../geometry/wrapper/jts/ShapeConverterTest.java | 3 +--
.../apache/sis/image/BandAggregateImageTest.java | 3 +--
.../org/apache/sis/image/BandSelectImageTest.java | 5 ++---
.../org/apache/sis/image/BandedIteratorTest.java | 1 +
.../sis/image/BandedSampleConverterTest.java | 1 -
.../org/apache/sis/image/ComputedImageTest.java | 5 ++---
.../test/org/apache/sis/image/DataTypeTest.java | 3 +--
.../org/apache/sis/image/ImageCombinerTest.java | 3 +--
.../org/apache/sis/image/ImageProcessorTest.java | 3 +--
.../test/org/apache/sis/image/ImageTestCase.java | 5 ++---
.../org/apache/sis/image/InterpolationTest.java | 3 +--
.../org/apache/sis/image/LinearIteratorTest.java | 1 +
.../test/org/apache/sis/image/MaskedImageTest.java | 3 +--
.../org/apache/sis/image/PixelIteratorTest.java | 3 +--
.../test/org/apache/sis/image/PlanarImageTest.java | 1 -
.../org/apache/sis/image/ResampledImageTest.java | 3 +--
.../org/apache/sis/image/ResamplingGridTest.java | 5 ++---
.../apache/sis/image/StatisticsCalculatorTest.java | 5 ++---
.../test/org/apache/sis/image/TestViewer.java | 1 -
.../test/org/apache/sis/image/TiledImageMock.java | 1 +
.../sis/image/processing/isoline/IsolinesTest.java | 3 +--
.../sis/image/processing/isoline/StepsViewer.java | 1 +
.../apache/sis/index/tree/PointTreeNodeTest.java | 3 +--
.../org/apache/sis/index/tree/PointTreeTest.java | 3 +--
.../org/apache/sis/metadata/MetadataStandard.java | 1 -
.../apache/sis/metadata/ModifiableMetadata.java | 1 -
.../org/apache/sis/metadata/PropertyAccessor.java | 1 -
.../main/org/apache/sis/metadata/Pruner.java | 1 -
.../main/org/apache/sis/metadata/ValueMap.java | 1 -
.../apache/sis/metadata/internal/AxisNames.java | 3 +--
.../sis/metadata/internal/NameToIdentifier.java | 1 -
.../iso/DefaultExtendedElementInformation.java | 1 -
.../org/apache/sis/metadata/iso/ISOMetadata.java | 1 -
.../acquisition/DefaultEnvironmentalRecord.java | 1 -
.../sis/metadata/iso/acquisition/DefaultEvent.java | 1 -
.../iso/acquisition/DefaultRequestedDate.java | 1 -
.../iso/acquisition/DefaultRequirement.java | 1 -
.../sis/metadata/iso/citation/DefaultCitation.java | 1 -
.../metadata/iso/citation/DefaultCitationDate.java | 1 -
.../iso/citation/DefaultResponsibleParty.java | 1 -
.../sis/metadata/iso/content/DefaultBand.java | 1 -
.../iso/content/DefaultCoverageDescription.java | 1 -
.../DefaultFeatureCatalogueDescription.java | 1 -
.../iso/content/DefaultFeatureTypeInfo.java | 1 -
.../iso/content/DefaultImageDescription.java | 1 -
.../iso/content/DefaultSampleDimension.java | 1 -
.../DefaultDigitalTransferOptions.java | 1 -
.../metadata/iso/distribution/DefaultMedium.java | 1 -
.../distribution/DefaultStandardOrderProcess.java | 1 -
.../iso/extent/DefaultGeographicBoundingBox.java | 3 +--
.../iso/extent/DefaultSpatialTemporalExtent.java | 1 -
.../apache/sis/metadata/iso/extent/Extents.java | 3 +--
.../DefaultRepresentativeFraction.java | 1 -
.../iso/identification/DefaultResolution.java | 1 -
.../metadata/iso/identification/DefaultUsage.java | 1 -
.../iso/lineage/DefaultNominalResolution.java | 1 -
.../maintenance/DefaultMaintenanceInformation.java | 1 -
.../iso/maintenance/DefaultScopeDescription.java | 1 -
.../sis/metadata/iso/quality/AbstractElement.java | 1 -
.../iso/quality/DefaultEvaluationMethod.java | 1 -
.../sis/metadata/iso/spatial/DefaultDimension.java | 1 -
.../iso/spatial/DefaultGeometricObjects.java | 1 -
.../spatial/DefaultGridSpatialRepresentation.java | 1 -
.../apache/sis/metadata/simple/SimpleExtent.java | 1 -
.../metadata/simple/SimpleIdentifiedObject.java | 1 -
.../apache/sis/metadata/sql/MetadataFallback.java | 3 +--
.../apache/sis/metadata/sql/util/Initializer.java | 1 -
.../org/apache/sis/util/iso/DefaultMemberName.java | 1 -
.../org/apache/sis/util/iso/DefaultNameSpace.java | 1 -
.../main/org/apache/sis/util/iso/Names.java | 1 -
.../main/org/apache/sis/xml/Namespaces.java | 1 -
.../main/org/apache/sis/xml/ReferenceResolver.java | 1 -
.../org/apache/sis/xml/TransformingReader.java | 3 +--
.../org/apache/sis/xml/TransformingWriter.java | 3 +--
.../main/org/apache/sis/xml/XML.java | 1 -
.../apache/sis/xml/bind/IdentifierMapAdapter.java | 1 -
.../org/apache/sis/xml/bind/cat/CodeListUID.java | 1 -
.../apache/sis/xml/bind/gmi/LE_ProcessStep.java | 1 -
.../sis/xml/bind/gmi/MI_CoverageDescription.java | 1 -
.../apache/sis/xml/bind/gmi/MI_Georectified.java | 1 -
.../sis/xml/bind/gmi/MI_Georeferenceable.java | 1 -
.../sis/xml/bind/gmi/MI_ImageDescription.java | 1 -
.../org/apache/sis/xml/bind/gmi/MI_Metadata.java | 1 -
.../org/apache/sis/xml/bind/gml/TimePeriod.java | 1 -
.../bind/metadata/replace/ServiceParameter.java | 1 -
.../org/apache/sis/xml/util/LegacyNamespaces.java | 1 -
.../main/org/apache/sis/xml/util/XmlUtilities.java | 3 +--
.../apache/sis/metadata/AbstractMetadataTest.java | 3 +--
.../test/org/apache/sis/metadata/Assertions.java | 3 +--
.../test/org/apache/sis/metadata/HashCodeTest.java | 3 +--
.../apache/sis/metadata/InformationMapTest.java | 3 +--
.../apache/sis/metadata/MetadataCopierTest.java | 3 +--
.../apache/sis/metadata/MetadataStandardTest.java | 3 +--
.../sis/metadata/ModifiableMetadataTest.java | 5 ++---
.../test/org/apache/sis/metadata/NameMapTest.java | 7 +++---
.../org/apache/sis/metadata/NilReasonMapTest.java | 5 ++---
.../apache/sis/metadata/PropertyAccessorTest.java | 11 +++++----
.../sis/metadata/PropertyInformationTest.java | 5 ++---
.../test/org/apache/sis/metadata/PrunerTest.java | 5 ++---
.../org/apache/sis/metadata/SpecialCasesTest.java | 5 ++---
.../apache/sis/metadata/TreeNodeChildrenTest.java | 3 +--
.../test/org/apache/sis/metadata/TreeNodeTest.java | 3 +--
.../apache/sis/metadata/TreeTableFormatTest.java | 3 +--
.../org/apache/sis/metadata/TreeTableViewTest.java | 3 +--
.../test/org/apache/sis/metadata/TypeMapTest.java | 5 ++---
.../test/org/apache/sis/metadata/ValueMapTest.java | 9 ++++----
.../sis/metadata/internal/AxisNamesTest.java | 3 +--
.../sis/metadata/internal/IdentifiersTest.java | 3 +--
.../internal/ImplementationHelperTest.java | 5 ++---
.../apache/sis/metadata/internal/MergerTest.java | 3 +--
.../sis/metadata/internal/NameMeaningTest.java | 3 +--
.../org/apache/sis/metadata/iso/APIVerifier.java | 3 +--
.../sis/metadata/iso/CustomMetadataTest.java | 3 +--
.../sis/metadata/iso/DefaultIdentifierTest.java | 3 +--
.../sis/metadata/iso/DefaultMetadataTest.java | 3 +--
.../sis/metadata/iso/citation/CitationsTest.java | 5 ++---
.../iso/citation/DefaultCitationDateTest.java | 3 +--
.../metadata/iso/citation/DefaultCitationTest.java | 5 ++---
.../metadata/iso/citation/DefaultContactTest.java | 3 +--
.../iso/citation/DefaultResponsibilityTest.java | 1 -
.../constraint/DefaultLegalConstraintsTest.java | 5 ++---
.../sis/metadata/iso/content/DefaultBandTest.java | 5 ++---
.../sis/metadata/iso/extent/DefaultExtentTest.java | 5 ++---
.../extent/DefaultGeographicBoundingBoxTest.java | 5 ++---
.../sis/metadata/iso/extent/ExtentsTest.java | 5 ++---
.../identification/DefaultBrowseGraphicTest.java | 5 ++---
.../identification/DefaultCoupledResourceTest.java | 3 +--
.../DefaultDataIdentificationTest.java | 3 +--
.../iso/identification/DefaultKeywordsTest.java | 3 +--
.../DefaultRepresentativeFractionTest.java | 3 +--
.../iso/identification/DefaultResolutionTest.java | 5 ++---
.../DefaultServiceIdentificationTest.java | 5 ++---
.../metadata/iso/lineage/DefaultLineageTest.java | 3 +--
.../iso/lineage/DefaultProcessStepTest.java | 3 +--
.../maintenance/DefaultScopeDescriptionTest.java | 3 +--
.../metadata/iso/quality/AbstractElementTest.java | 3 +--
.../quality/AbstractPositionalAccuracyTest.java | 9 ++++----
.../iso/quality/DefaultConformanceResultTest.java | 3 +--
.../iso/quality/DefaultDomainConsistencyTest.java | 3 +--
.../iso/quality/DefaultEvaluationMethodTest.java | 3 +--
.../iso/quality/DefaultQuantitativeResultTest.java | 3 +--
.../sis/metadata/iso/quality/ScopeCodeTest.java | 3 +--
.../iso/spatial/DefaultGeorectifiedTest.java | 3 +--
.../sis/metadata/simple/SimpleIdentifierTest.java | 3 +--
.../sis/metadata/sql/IdentifierGeneratorTest.java | 3 +--
.../sis/metadata/sql/MetadataFallbackVerifier.java | 3 +--
.../sis/metadata/sql/MetadataSourceTest.java | 3 +--
.../sis/metadata/sql/MetadataWriterTest.java | 3 +--
.../org/apache/sis/metadata/sql/TestDatabase.java | 3 +--
.../sis/metadata/sql/util/SQLUtilitiesTest.java | 3 +--
.../sis/metadata/sql/util/ScriptRunnerTest.java | 3 +--
.../sis/metadata/sql/util/TypeMapperTest.java | 3 +--
.../sis/metadata/xml/SchemaComplianceTest.java | 3 +--
.../apache/sis/util/iso/DefaultLocalNameTest.java | 8 +++----
.../sis/util/iso/DefaultNameFactoryTest.java | 3 +--
.../sis/util/iso/DefaultRecordSchemaTest.java | 3 +--
.../org/apache/sis/util/iso/DefaultRecordTest.java | 3 +--
.../apache/sis/util/iso/DefaultRecordTypeTest.java | 3 +--
.../apache/sis/util/iso/DefaultScopedNameTest.java | 5 ++---
.../apache/sis/util/iso/NameMarshallingTest.java | 3 +--
.../test/org/apache/sis/util/iso/NamesTest.java | 3 +--
.../org/apache/sis/util/iso/TypeNamesTest.java | 5 ++---
.../test/org/apache/sis/util/iso/TypesTest.java | 3 +--
.../sis/xml/CharSequenceSubstitutionTest.java | 7 +++---
.../test/org/apache/sis/xml/LegacyCodesTest.java | 6 ++---
.../org/apache/sis/xml/MarshallerPoolTest.java | 3 +--
.../test/org/apache/sis/xml/NamespacesTest.java | 6 ++---
.../apache/sis/xml/NilReasonMarshallingTest.java | 5 ++---
.../test/org/apache/sis/xml/NilReasonTest.java | 3 +--
.../test/org/apache/sis/xml/TransformerTest.java | 3 +--
.../apache/sis/xml/TransformingNamespacesTest.java | 3 +--
.../org/apache/sis/xml/UUIDMarshallingTest.java | 5 ++---
.../org/apache/sis/xml/ValueConverterTest.java | 9 ++++----
.../org/apache/sis/xml/XLinkMarshallingTest.java | 5 ++---
.../test/org/apache/sis/xml/XLinkTest.java | 3 +--
.../test/org/apache/sis/xml/XPointerTest.java | 3 +--
.../sis/xml/bind/IdentifierMapAdapterTest.java | 5 ++---
.../sis/xml/bind/ModifiableIdentifierMapTest.java | 7 +++---
.../sis/xml/bind/cat/CodeListMarshallingTest.java | 3 +--
.../apache/sis/xml/bind/cat/EnumAdapterTest.java | 3 +--
.../sis/xml/bind/cat/EnumMarshallingTest.java | 3 +--
.../apache/sis/xml/bind/gco/MultiplicityTest.java | 5 ++---
.../apache/sis/xml/bind/gco/PropertyTypeTest.java | 3 +--
.../apache/sis/xml/bind/gco/StringAdapterTest.java | 3 +--
.../org/apache/sis/xml/bind/gml/MeasureTest.java | 3 +--
.../apache/sis/xml/bind/gml/TimePeriodTest.java | 3 +--
.../sis/xml/bind/lan/FreeTextMarshallingTest.java | 3 +--
.../apache/sis/xml/bind/lan/LanguageCodeTest.java | 5 ++---
.../apache/sis/xml/bind/lan/OtherLocalesTest.java | 5 ++---
.../org/apache/sis/xml/bind/lan/PT_LocaleTest.java | 3 +--
.../metadata/replace/QualityParameterTest.java | 3 +--
.../metadata/replace/ServiceParameterTest.java | 3 +--
.../apache/sis/xml/test/DocumentComparator.java | 5 +++--
.../org/apache/sis/xml/test/PackageVerifier.java | 5 ++---
.../test/org/apache/sis/xml/test/TestCase.java | 1 -
.../sis/xml/util/DocumentComparatorTest.java | 3 +--
.../org/apache/sis/xml/util/XmlUtilitiesTest.java | 5 ++---
.../sis/openoffice/ReferencingFunctionsTest.java | 5 ++---
.../org/apache/sis/openoffice/TransformerTest.java | 5 ++---
.../main/org/apache/sis/map/SymbologyVisitor.java | 1 -
.../test/org/apache/sis/map/SEPortrayerTest.java | 3 +--
.../MultiResolutionCoverageLoaderTest.java | 3 +--
.../org/apache/sis/portrayal/MapLayersTest.java | 3 +--
.../apache/sis/style/se1/ChannelSelectionTest.java | 1 -
.../sis/style/se1/ContrastEnhancementTest.java | 1 -
.../apache/sis/style/se1/ExternalGraphicTest.java | 1 -
.../apache/sis/style/se1/FeatureTypeStyleTest.java | 1 -
.../test/org/apache/sis/style/se1/FontTest.java | 1 -
.../test/org/apache/sis/style/se1/GraphicTest.java | 1 -
.../test/org/apache/sis/style/se1/HaloTest.java | 1 -
.../apache/sis/style/se1/LineSymbolizerTest.java | 1 -
.../test/org/apache/sis/style/se1/MarkTest.java | 1 -
.../apache/sis/style/se1/PointPlacementTest.java | 1 -
.../apache/sis/style/se1/PointSymbolizerTest.java | 1 -
.../sis/style/se1/PolygonSymbolizerTest.java | 1 -
.../apache/sis/style/se1/RasterSymbolizerTest.java | 1 -
.../test/org/apache/sis/style/se1/RuleTest.java | 1 -
.../apache/sis/style/se1/SelectedChannelTest.java | 1 -
.../org/apache/sis/style/se1/ShadedReliefTest.java | 1 -
.../test/org/apache/sis/style/se1/StrokeTest.java | 1 -
.../org/apache/sis/style/se1/StyleTestCase.java | 3 +--
.../org/apache/sis/style/se1/SymbolizerTest.java | 1 -
.../org/apache/sis/style/se1/SymbologyTest.java | 1 -
.../apache/sis/style/se1/TextSymbolizerTest.java | 1 -
.../sis/profile/france/FrenchProfileTest.java | 3 +--
.../sis/xml/bind/fra/DataIdentificationTest.java | 1 -
.../xml/bind/fra/DirectReferenceSystemTest.java | 3 +--
.../apache/sis/profile/japan/JapanProfileTest.java | 3 +--
.../gazetteer/GazetteerFactoryTest.java | 3 +--
.../gazetteer/GeohashReferenceSystemTest.java | 3 +--
.../referencing/gazetteer/LocationFormatTest.java | 1 -
.../referencing/gazetteer/LocationTypeTest.java | 3 +--
.../gazetteer/MilitaryGridReferenceSystemTest.java | 7 +++---
.../gazetteer/ReferencingByIdentifiersTest.java | 3 +--
.../org/apache/sis/geometry/DirectPosition2D.java | 3 +--
.../main/org/apache/sis/geometry/Envelope2D.java | 7 +++---
.../main/org/apache/sis/io/wkt/AbstractParser.java | 1 -
.../main/org/apache/sis/io/wkt/Element.java | 1 -
.../apache/sis/io/wkt/GeodeticObjectParser.java | 3 +--
.../org/apache/sis/io/wkt/MathTransformParser.java | 1 -
.../main/org/apache/sis/io/wkt/Symbols.java | 1 -
.../sis/parameter/AbstractParameterDescriptor.java | 2 --
.../sis/parameter/DefaultParameterDescriptor.java | 1 -
.../parameter/DefaultParameterDescriptorGroup.java | 1 -
.../sis/parameter/DefaultParameterValue.java | 1 -
.../sis/parameter/MapProjectionParameters.java | 3 +--
.../sis/parameter/MatrixParametersAlphaNum.java | 1 -
.../org/apache/sis/parameter/ParameterBuilder.java | 1 -
.../org/apache/sis/parameter/ParameterFormat.java | 1 -
.../apache/sis/parameter/ParameterTableRow.java | 1 -
.../sis/referencing/AbstractIdentifiedObject.java | 1 -
.../main/org/apache/sis/referencing/Builder.java | 1 -
.../main/org/apache/sis/referencing/CommonCRS.java | 5 ++---
.../referencing/EllipsoidalHeightSeparator.java | 1 -
.../sis/referencing/GeodesicsOnEllipsoid.java | 3 +--
.../apache/sis/referencing/GeodeticCalculator.java | 3 +--
.../apache/sis/referencing/IdentifiedObjects.java | 1 -
.../sis/referencing/ImmutableIdentifier.java | 1 -
.../org/apache/sis/referencing/NameIterator.java | 1 -
.../sis/referencing/PropertiesConverter.java | 5 ++---
.../sis/referencing/StandardDefinitions.java | 11 +++++----
.../apache/sis/referencing/crs/AbstractCRS.java | 1 -
.../sis/referencing/crs/AbstractDerivedCRS.java | 1 -
.../sis/referencing/crs/DefaultEngineeringCRS.java | 1 -
.../sis/referencing/crs/DefaultGeodeticCRS.java | 1 -
.../sis/referencing/crs/DefaultGeographicCRS.java | 1 -
.../sis/referencing/crs/DefaultImageCRS.java | 1 -
.../sis/referencing/crs/DefaultParametricCRS.java | 1 -
.../sis/referencing/crs/DefaultProjectedCRS.java | 1 -
.../sis/referencing/crs/DefaultTemporalCRS.java | 1 -
.../sis/referencing/crs/DefaultVerticalCRS.java | 1 -
.../org/apache/sis/referencing/cs/AbstractCS.java | 1 -
.../main/org/apache/sis/referencing/cs/Codes.java | 1 -
.../sis/referencing/cs/DefaultCompoundCS.java | 3 +--
.../cs/DefaultCoordinateSystemAxis.java | 7 +++---
.../org/apache/sis/referencing/cs/Normalizer.java | 5 ++---
.../sis/referencing/datum/AbstractDatum.java | 1 -
.../sis/referencing/datum/BursaWolfParameters.java | 3 +--
.../sis/referencing/datum/DefaultEllipsoid.java | 3 +--
.../referencing/datum/DefaultGeodeticDatum.java | 1 -
.../sis/referencing/datum/DefaultImageDatum.java | 1 -
.../referencing/datum/DefaultPrimeMeridian.java | 1 -
.../referencing/datum/DefaultTemporalDatum.java | 1 -
.../referencing/datum/DefaultVerticalDatum.java | 1 -
.../sis/referencing/datum/TimeDependentBWP.java | 1 -
.../referencing/factory/sql/EPSGCodeFinder.java | 1 -
.../referencing/factory/sql/EPSGDataAccess.java | 1 -
.../sis/referencing/factory/sql/EPSGInstaller.java | 1 -
.../sis/referencing/internal/DatabaseListener.java | 3 +--
.../apache/sis/referencing/internal/Legacy.java | 3 +--
.../referencing/internal/ServicesForMetadata.java | 3 +--
.../operation/AbstractCoordinateOperation.java | 1 -
.../operation/AbstractSingleOperation.java | 1 -
.../operation/CoordinateOperationFinder.java | 1 -
.../operation/DefaultConcatenatedOperation.java | 1 -
.../sis/referencing/operation/DefaultFormula.java | 1 -
.../operation/DefaultPassThroughOperation.java | 1 -
.../operation/builder/LocalizationGridBuilder.java | 1 -
.../operation/matrix/AffineTransforms2D.java | 5 ++---
.../sis/referencing/operation/matrix/Solver.java | 1 -
.../operation/projection/AlbersEqualArea.java | 3 +--
.../operation/projection/AuthalicConversion.java | 3 +--
.../operation/projection/AuthalicMercator.java | 3 +--
.../operation/projection/AzimuthalEquidistant.java | 3 +--
.../operation/projection/CassiniSoldner.java | 3 +--
.../operation/projection/ConformalProjection.java | 3 +--
.../operation/projection/CylindricalEqualArea.java | 3 +--
.../operation/projection/Initializer.java | 3 +--
.../referencing/operation/projection/Inverter.java | 3 +--
.../projection/LambertAzimuthalEqualArea.java | 3 +--
.../projection/LambertConicConformal.java | 5 ++---
.../referencing/operation/projection/Mercator.java | 5 ++---
.../operation/projection/MeridianArcBased.java | 3 +--
.../projection/ModifiedAzimuthalEquidistant.java | 3 +--
.../operation/projection/Mollweide.java | 3 +--
.../operation/projection/NormalizedProjection.java | 3 +--
.../operation/projection/ObliqueMercator.java | 3 +--
.../operation/projection/ObliqueStereographic.java | 3 +--
.../operation/projection/Orthographic.java | 3 +--
.../operation/projection/PolarStereographic.java | 3 +--
.../operation/projection/Polyconic.java | 3 +--
.../operation/projection/SatelliteTracking.java | 3 +--
.../operation/projection/Sinusoidal.java | 3 +--
.../operation/projection/TransverseMercator.java | 3 +--
.../operation/projection/ZonedGridSystem.java | 5 ++---
.../referencing/operation/provider/EPSGName.java | 7 +++---
.../operation/provider/Equirectangular.java | 3 +--
.../provider/FranceGeocentricInterpolation.java | 3 +--
.../provider/GeocentricToTopocentric.java | 7 +++---
.../operation/provider/MapProjection.java | 3 +--
.../operation/provider/ObliqueMercatorCenter.java | 1 -
.../operation/provider/Orthographic.java | 1 -
.../transform/AbridgedMolodenskyTransform2D.java | 3 +--
.../operation/transform/AbstractMathTransform.java | 1 -
.../transform/AbstractMathTransform1D.java | 1 -
.../operation/transform/CartesianToPolar.java | 3 +--
.../operation/transform/CartesianToSpherical.java | 3 +--
.../operation/transform/ContextualParameters.java | 1 -
.../transform/EllipsoidToCentricTransform.java | 3 +--
.../operation/transform/MolodenskyTransform.java | 3 +--
.../operation/transform/PolarToCartesian.java | 3 +--
.../operation/transform/PoleRotation.java | 3 +--
.../operation/transform/SphericalToCartesian.java | 3 +--
.../apache/sis/referencing/util/AxesMapper.java | 3 +--
.../sis/referencing/util/AxisDirections.java | 5 ++---
.../org/apache/sis/referencing/util/Formulas.java | 3 +--
.../apache/sis/referencing/util/j2d/Bezier.java | 3 +--
.../sis/referencing/util/j2d/ShapeUtilities.java | 3 +--
.../sis/xml/bind/referencing/CS_AxisDirection.java | 1 -
.../sis/xml/bind/referencing/CS_RangeMeaning.java | 1 -
.../org/apache/sis/xml/bind/referencing/Code.java | 1 -
.../sis/geometry/AbstractDirectPositionTest.java | 3 +--
.../apache/sis/geometry/AbstractEnvelopeTest.java | 7 +++---
.../org/apache/sis/geometry/ArrayEnvelopeTest.java | 3 +--
.../apache/sis/geometry/CoordinateFormatTest.java | 3 +--
.../org/apache/sis/geometry/CurveExtremumTest.java | 3 +--
.../apache/sis/geometry/DirectPosition1DTest.java | 5 ++---
.../apache/sis/geometry/DirectPosition2DTest.java | 5 ++---
.../org/apache/sis/geometry/Envelope2DTest.java | 5 ++---
.../apache/sis/geometry/EnvelopeReducerTest.java | 1 -
.../org/apache/sis/geometry/EnvelopesTest.java | 9 ++++----
.../sis/geometry/GeneralDirectPositionTest.java | 5 ++---
.../apache/sis/geometry/GeneralEnvelopeTest.java | 7 +++---
.../apache/sis/geometry/ImmutableEnvelopeTest.java | 5 ++---
.../test/org/apache/sis/geometry/Shapes2DTest.java | 1 -
.../org/apache/sis/geometry/SubEnvelopeTest.java | 6 ++---
.../org/apache/sis/geometry/TransformTestCase.java | 7 +++---
.../sis/geometry/WraparoundAdjustmentTest.java | 3 +--
.../test/org/apache/sis/io/wkt/ColorsTest.java | 3 +--
.../org/apache/sis/io/wkt/ComparisonWithEPSG.java | 3 +--
.../test/org/apache/sis/io/wkt/ConventionTest.java | 3 +--
.../test/org/apache/sis/io/wkt/ElementTest.java | 3 +--
.../test/org/apache/sis/io/wkt/FormatterTest.java | 3 +--
.../sis/io/wkt/GeodeticObjectParserTest.java | 7 +++---
.../apache/sis/io/wkt/MathTransformParserTest.java | 3 +--
.../test/org/apache/sis/io/wkt/SymbolsTest.java | 3 +--
.../org/apache/sis/io/wkt/TransliteratorTest.java | 3 +--
.../org/apache/sis/io/wkt/WKTDictionaryTest.java | 4 +---
.../test/org/apache/sis/io/wkt/WKTFormatTest.java | 3 +--
.../test/org/apache/sis/io/wkt/WKTParserTest.java | 3 +--
.../DefaultParameterDescriptorGroupTest.java | 7 +++---
.../parameter/DefaultParameterDescriptorTest.java | 5 ++---
.../parameter/DefaultParameterValueGroupTest.java | 7 +++---
.../sis/parameter/DefaultParameterValueTest.java | 7 +++---
.../sis/parameter/MapProjectionParametersTest.java | 11 +++++----
.../parameter/MatrixParametersAlphaNumTest.java | 3 +--
.../apache/sis/parameter/MatrixParametersTest.java | 3 +--
.../apache/sis/parameter/ParameterBuilderTest.java | 3 +--
.../apache/sis/parameter/ParameterFormatTest.java | 7 +++---
.../sis/parameter/ParameterMarshallingTest.java | 5 ++---
.../org/apache/sis/parameter/ParametersTest.java | 3 +--
.../apache/sis/parameter/TensorParametersTest.java | 7 +++---
.../org/apache/sis/parameter/TensorValuesTest.java | 9 ++++----
.../UnmodifiableParameterValueGroupTest.java | 3 +--
.../parameter/UnmodifiableParameterValueTest.java | 3 +--
.../referencing/AbstractIdentifiedObjectTest.java | 5 ++---
.../referencing/AbstractReferenceSystemTest.java | 5 ++---
.../org/apache/sis/referencing/Assertions.java | 5 ++---
.../sis/referencing/AuthorityFactoriesTest.java | 3 +--
.../org/apache/sis/referencing/BuilderTest.java | 3 +--
.../test/org/apache/sis/referencing/CRSTest.java | 5 ++---
.../org/apache/sis/referencing/CommonCRSTest.java | 3 +--
.../sis/referencing/EPSGFactoryFallbackTest.java | 3 +--
.../sis/referencing/GeodesicsOnEllipsoidTest.java | 7 +++---
.../sis/referencing/GeodeticCalculatorTest.java | 12 +++++-----
.../sis/referencing/GeodeticObjectVerifier.java | 1 +
.../sis/referencing/IdentifiedObjectsTest.java | 5 ++---
.../sis/referencing/ImmutableIdentifierTest.java | 3 +--
.../sis/referencing/NamedIdentifierTest.java | 3 +--
.../sis/referencing/StandardDefinitionsTest.java | 7 +++---
.../sis/referencing/crs/AbstractCRSTest.java | 9 ++++----
.../referencing/crs/DefaultCompoundCRSTest.java | 7 +++---
.../sis/referencing/crs/DefaultDerivedCRSTest.java | 5 ++---
.../referencing/crs/DefaultEngineeringCRSTest.java | 5 ++---
.../referencing/crs/DefaultGeocentricCRSTest.java | 3 +--
.../referencing/crs/DefaultGeodeticCRSTest.java | 3 +--
.../referencing/crs/DefaultGeographicCRSTest.java | 3 +--
.../sis/referencing/crs/DefaultImageCRSTest.java | 5 ++---
.../referencing/crs/DefaultProjectedCRSTest.java | 3 +--
.../referencing/crs/DefaultTemporalCRSTest.java | 7 +++---
.../referencing/crs/DefaultVerticalCRSTest.java | 1 -
.../apache/sis/referencing/crs/HardCodedCRS.java | 9 ++++----
.../sis/referencing/crs/HardCodedCRSTest.java | 3 +--
.../apache/sis/referencing/crs/SubTypesTest.java | 3 +--
.../apache/sis/referencing/cs/AbstractCSTest.java | 5 ++---
.../org/apache/sis/referencing/cs/CodesTest.java | 5 ++---
.../sis/referencing/cs/CoordinateSystemsTest.java | 11 +++++----
.../sis/referencing/cs/DefaultCartesianCSTest.java | 5 ++---
.../sis/referencing/cs/DefaultCompoundCSTest.java | 3 +--
.../cs/DefaultCoordinateSystemAxisTest.java | 5 ++---
.../referencing/cs/DefaultCylindricalCSTest.java | 3 +--
.../referencing/cs/DefaultEllipsoidalCSTest.java | 3 +--
.../sis/referencing/cs/DefaultPolarCSTest.java | 3 +--
.../sis/referencing/cs/DefaultSphericalCSTest.java | 3 +--
.../referencing/cs/DirectionAlongMeridianTest.java | 3 +--
.../org/apache/sis/referencing/cs/HardCodedCS.java | 3 +--
.../apache/sis/referencing/cs/HardCodedCSTest.java | 3 +--
.../apache/sis/referencing/cs/NormalizerTest.java | 5 ++---
.../referencing/datum/BursaWolfParametersTest.java | 3 +--
.../referencing/datum/DefaultEllipsoidTest.java | 5 ++---
.../datum/DefaultGeodeticDatumTest.java | 7 +++---
.../datum/DefaultPrimeMeridianTest.java | 5 ++---
.../datum/DefaultTemporalDatumTest.java | 5 ++---
.../datum/DefaultVerticalDatumTest.java | 5 ++---
.../sis/referencing/datum/HardCodedDatum.java | 5 ++---
.../referencing/datum/TimeDependentBWPTest.java | 5 ++---
.../referencing/factory/AuthorityFactoryMock.java | 3 +--
.../factory/AuthorityFactoryProxyTest.java | 3 +--
.../factory/CommonAuthorityFactoryTest.java | 5 ++---
.../factory/ConcurrentAuthorityFactoryTest.java | 5 ++---
.../factory/GeodeticObjectFactoryTest.java | 3 +--
.../factory/IdentifiedObjectFinderTest.java | 3 +--
.../factory/MultiAuthoritiesFactoryTest.java | 5 ++---
.../sis/referencing/factory/TestFactorySource.java | 1 +
.../referencing/factory/sql/EPSGFactoryTest.java | 7 +++---
.../referencing/factory/sql/EPSGInstallerTest.java | 5 ++---
.../sis/referencing/factory/sql/TableInfoTest.java | 3 +--
.../factory/sql/epsg/DataScriptFormatterTest.java | 3 +--
.../geoapi/ParameterizedTransformTest.java | 1 -
.../internal/ServicesForMetadataTest.java | 3 +--
.../internal/VerticalDatumTypesTest.java | 3 +--
.../operation/CoordinateOperationFinderTest.java | 11 +++++----
.../operation/CoordinateOperationRegistryTest.java | 7 +++---
.../DefaultConcatenatedOperationTest.java | 5 ++---
.../operation/DefaultConversionTest.java | 3 +--
.../DefaultCoordinateOperationFactoryTest.java | 7 +++---
.../referencing/operation/DefaultFormulaTest.java | 1 -
.../operation/DefaultOperationMethodTest.java | 3 +--
.../operation/DefaultPassThroughOperationTest.java | 5 ++---
.../operation/DefaultTransformationTest.java | 5 ++---
.../operation/SingleOperationMarshallingTest.java | 7 +++---
.../builder/LinearTransformBuilderTest.java | 3 +--
.../operation/builder/LinearizerTest.java | 3 +--
.../builder/LocalizationGridBuilderTest.java | 3 +--
.../operation/builder/ResidualGridTest.java | 3 +--
.../operation/matrix/AffineTransforms2DTest.java | 5 ++---
.../operation/matrix/GeneralMatrixTest.java | 1 -
.../referencing/operation/matrix/MatricesTest.java | 7 +++---
.../referencing/operation/matrix/Matrix1Test.java | 6 ++---
.../referencing/operation/matrix/Matrix2Test.java | 6 ++---
.../referencing/operation/matrix/Matrix3Test.java | 6 ++---
.../referencing/operation/matrix/Matrix4Test.java | 8 +++----
.../operation/matrix/MatrixTestCase.java | 5 ++---
.../operation/matrix/NonSquareMatrixTest.java | 5 ++---
.../referencing/operation/matrix/SolverTest.java | 7 +++---
.../operation/projection/AlbersEqualAreaTest.java | 7 +++---
.../projection/AuthalicConversionTest.java | 7 +++---
.../operation/projection/CassiniSoldnerTest.java | 5 ++---
.../projection/ConformalProjectionTest.java | 9 ++++----
.../projection/CylindricalEqualAreaTest.java | 5 ++---
.../operation/projection/EquirectangularTest.java | 9 ++++----
.../operation/projection/InitializerTest.java | 5 ++---
.../projection/LambertAzimuthalEqualAreaTest.java | 11 +++++----
.../projection/LambertConicConformalTest.java | 7 +++---
.../projection/MapProjectionTestCase.java | 7 +++---
.../projection/MercatorMethodComparison.java | 3 +--
.../operation/projection/MercatorTest.java | 11 +++++----
.../operation/projection/MeridianArcTest.java | 5 ++---
.../operation/projection/MollweideTest.java | 3 +--
.../projection/NormalizedProjectionTest.java | 8 +++----
.../operation/projection/ObliqueMercatorTest.java | 3 +--
.../projection/ObliqueStereographicTest.java | 5 ++---
.../operation/projection/OrthographicTest.java | 3 +--
.../projection/PolarStereographicTest.java | 5 ++---
.../projection/ProjectionResultComparator.java | 1 +
.../projection/SatelliteTrackingTest.java | 5 ++---
.../projection/TransverseMercatorTest.java | 9 ++++----
.../operation/projection/ZonedGridSystemTest.java | 3 +--
.../referencing/operation/provider/AffineTest.java | 3 +--
.../provider/CoordinateFrameRotationTest.java | 5 ++---
.../provider/DatumShiftGridCompressedTest.java | 1 +
.../operation/provider/DatumShiftGridFileTest.java | 3 +--
.../operation/provider/DatumShiftTestCase.java | 3 +--
.../FranceGeocentricInterpolationTest.java | 5 ++---
.../provider/GeocentricTranslationTest.java | 9 ++++----
.../operation/provider/Geographic3Dto2DTest.java | 5 ++---
.../operation/provider/LongitudeRotationTest.java | 3 +--
.../operation/provider/MapProjectionTest.java | 5 ++---
.../operation/provider/MolodenskyTest.java | 3 +--
.../referencing/operation/provider/NADCONTest.java | 1 -
.../referencing/operation/provider/NTv2Test.java | 5 ++---
.../provider/ParameterNameTableGenerator.java | 3 +--
.../provider/PositionVector7ParamTest.java | 5 ++---
.../operation/provider/ProvidersTest.java | 3 +--
.../operation/provider/TransverseMercatorTest.java | 3 +--
.../transform/AbridgedMolodenskyTransformTest.java | 7 +++---
.../transform/AbstractMathTransformTest.java | 9 ++++----
.../transform/ConcatenatedTransformTest.java | 3 +--
.../transform/ContextualParametersTest.java | 7 +++---
.../operation/transform/CoordinateDomain.java | 3 +--
.../operation/transform/CoordinateDomainTest.java | 3 +--
.../transform/CoordinateSystemTransformTest.java | 3 +--
.../operation/transform/CopyTransformTest.java | 5 ++---
.../transform/DefaultMathTransformFactoryTest.java | 5 ++---
.../operation/transform/DomainDefinitionTest.java | 1 -
.../transform/EllipsoidToCentricTransformTest.java | 7 +++---
.../transform/ExponentialTransform1DTest.java | 7 +++---
.../InterpolatedGeocentricTransformTest.java | 4 ++--
.../transform/InterpolatedTransformTest.java | 6 ++---
.../operation/transform/IterationStrategyTest.java | 7 +++---
.../transform/LinearInterpolator1DTest.java | 3 +--
.../operation/transform/LinearTransformTest.java | 3 +--
.../transform/LogarithmicTransform1DTest.java | 5 ++---
.../operation/transform/MathTransformTestCase.java | 9 ++++----
.../operation/transform/MathTransformsTest.java | 5 ++---
.../transform/MolodenskyTransformTest.java | 14 +++++-------
.../transform/OperationMethodSetTest.java | 3 +--
.../transform/PassThroughTransformTest.java | 3 +--
.../operation/transform/PolarToCartesianTest.java | 3 +--
.../transform/ProjectiveTransformTest.java | 3 +--
.../operation/transform/PseudoTransform.java | 3 +--
.../transform/RandomFailureTransform.java | 1 +
.../operation/transform/ScaleTransformTest.java | 5 ++---
.../operation/transform/SinusoidalShiftGrid.java | 1 +
.../transform/SpecializableTransformTest.java | 3 +--
.../transform/SphericalToCartesianTest.java | 3 +--
.../operation/transform/TransferFunctionTest.java | 5 ++---
.../transform/TransformResultComparator.java | 1 +
.../transform/TransformSeparatorTest.java | 7 +++---
.../transform/TranslationTransformTest.java | 3 +--
.../operation/transform/UnitConversionTest.java | 3 +--
.../transform/WraparoundTransformTest.java | 3 +--
.../report/CoordinateReferenceSystems.java | 3 +--
.../sis/referencing/util/AxesMapperTest.java | 3 +--
.../sis/referencing/util/AxisDirectionsTest.java | 17 +++++++-------
.../referencing/util/CoordinateOperationsTest.java | 3 +--
.../referencing/util/DefinitionVerifierTest.java | 5 ++---
.../util/EllipsoidalHeightCombinerTest.java | 7 +++---
.../sis/referencing/util/ExtentSelectorTest.java | 3 +--
.../apache/sis/referencing/util/FormulasTest.java | 3 +--
.../util/GeodeticObjectBuilderTest.java | 3 +--
.../apache/sis/referencing/util/LazySetTest.java | 3 +--
.../util/PositionalAccuracyConstantTest.java | 3 +--
.../referencing/util/ReferencingUtilitiesTest.java | 5 ++---
.../sis/referencing/util/WKTKeywordsTest.java | 3 +--
.../sis/referencing/util/WKTUtilitiesTest.java | 5 ++---
.../referencing/util/WraparoundApplicatorTest.java | 3 +--
.../referencing/util/j2d/AbstractShapeTest.java | 3 +--
.../referencing/util/j2d/ShapeUtilitiesTest.java | 3 +--
.../sis/test/integration/ConsistencyTest.java | 5 ++---
.../test/integration/CoordinateOperationTest.java | 3 +--
.../integration/CoordinateReferenceSystemTest.java | 7 +++---
.../sis/test/integration/DatumShiftTest.java | 1 -
.../apache/sis/test/integration/MetadataTest.java | 3 +--
.../sis/test/integration/MetadataVerticalTest.java | 6 ++---
.../apache/sis/test/widget/SwingAssertions.java | 1 +
.../CC_GeneralOperationParameterTest.java | 3 +--
.../CC_OperationParameterGroupTest.java | 7 +++---
.../apache/sis/xml/bind/referencing/CodeTest.java | 3 +--
.../referencing/SecondDefiningParameterTest.java | 3 +--
.../main/org/apache/sis/storage/landsat/Band.java | 1 -
.../apache/sis/storage/landsat/MetadataReader.java | 1 -
.../storage/landsat/LandsatStoreProviderTest.java | 3 +--
.../sis/storage/landsat/MetadataReaderTest.java | 4 +---
.../sis/storage/geotiff/CompressedSubset.java | 5 ++---
.../org/apache/sis/storage/geotiff/DataCube.java | 3 +--
.../org/apache/sis/storage/geotiff/DataSubset.java | 9 ++++----
.../sis/storage/geotiff/ImageFileDirectory.java | 5 ++---
.../apache/sis/storage/geotiff/NativeMetadata.java | 7 +++---
.../org/apache/sis/storage/geotiff/Writer.java | 5 ++---
.../sis/storage/geotiff/inflater/Inflater.java | 1 -
.../sis/storage/geotiff/reader/CRSBuilder.java | 1 -
.../sis/storage/geotiff/reader/GeoKeysLoader.java | 3 +--
.../geotiff/reader/ImageMetadataBuilder.java | 3 +--
.../sis/storage/geotiff/reader/XMLMetadata.java | 1 -
.../sis/storage/geotiff/writer/GeoEncoder.java | 5 ++---
.../storage/geotiff/writer/ReformattedImage.java | 3 +--
.../sis/storage/geotiff/SelfConsistencyTest.java | 5 ++---
.../org/apache/sis/storage/geotiff/WriterTest.java | 5 ++---
.../sis/storage/geotiff/base/CompressionTest.java | 3 +--
.../sis/storage/geotiff/base/GeoCodesTest.java | 3 +--
.../sis/storage/geotiff/base/GeoKeysTest.java | 3 +--
.../apache/sis/storage/geotiff/base/TagsTest.java | 8 +++----
.../sis/storage/geotiff/inflater/CCITTRLETest.java | 3 +--
.../sis/storage/geotiff/inflater/InflaterTest.java | 3 +--
.../sis/storage/geotiff/reader/CRSBuilderTest.java | 3 +--
.../sis/storage/geotiff/reader/TypeTest.java | 3 +--
.../storage/geotiff/reader/XMLMetadataTest.java | 3 +--
.../apache/sis/storage/netcdf/MetadataReader.java | 1 -
.../apache/sis/storage/netcdf/base/Variable.java | 1 -
.../sis/storage/netcdf/MetadataReaderTest.java | 3 +--
.../storage/netcdf/NetcdfStoreProviderTest.java | 5 ++---
.../apache/sis/storage/netcdf/NetcdfStoreTest.java | 3 +--
.../sis/storage/netcdf/SelfConsistencyTest.java | 3 +--
.../apache/sis/storage/netcdf/base/AxisTest.java | 3 +--
.../sis/storage/netcdf/base/DataTypeTest.java | 3 +--
.../sis/storage/netcdf/base/DecoderTest.java | 3 +--
.../sis/storage/netcdf/base/FeatureSetTest.java | 5 ++---
.../apache/sis/storage/netcdf/base/GridTest.java | 5 ++---
.../apache/sis/storage/netcdf/base/TestCase.java | 1 -
.../sis/storage/netcdf/base/VariableTest.java | 3 +--
.../storage/netcdf/classic/ChannelDecoderTest.java | 2 +-
.../sis/storage/netcdf/classic/GridInfoTest.java | 2 +-
.../storage/netcdf/classic/VariableInfoTest.java | 2 +-
.../apache/sis/storage/sql/ResourceDefinition.java | 1 -
.../apache/sis/storage/sql/SQLStoreProvider.java | 1 -
.../sis/storage/sql/feature/TableReference.java | 1 -
.../sis/storage/sql/postgis/RasterReader.java | 1 -
.../org/apache/sis/storage/sql/SQLStoreTest.java | 5 ++---
.../storage/sql/feature/GeometryGetterTest.java | 3 +--
.../sql/feature/SelectionClauseWriterTest.java | 3 +--
.../sql/feature/TemporalValueGetterTest.java | 5 ++---
.../apache/sis/storage/sql/postgis/BandTest.java | 3 +--
.../sis/storage/sql/postgis/PostgresTest.java | 9 ++++----
.../sis/storage/sql/postgis/RasterReaderTest.java | 3 +--
.../sis/storage/sql/postgis/RasterWriterTest.java | 3 +--
.../apache/sis/storage/sql/postgis/TestRaster.java | 1 +
.../org/apache/sis/storage/gpx/MetadataTest.java | 3 +--
.../org/apache/sis/storage/gpx/ReaderTest.java | 3 +--
.../test/org/apache/sis/storage/gpx/TypesTest.java | 3 +--
.../org/apache/sis/storage/gpx/UpdaterTest.java | 3 +--
.../org/apache/sis/storage/gpx/WriterTest.java | 3 +--
.../main/org/apache/sis/io/stream/ChannelData.java | 1 -
.../org/apache/sis/io/stream/ChannelDataInput.java | 1 -
.../apache/sis/io/stream/ChannelDataOutput.java | 1 -
.../apache/sis/io/stream/FileCacheByteChannel.java | 1 -
.../main/org/apache/sis/io/stream/Region.java | 3 +--
.../aggregate/ConcatenatedGridCoverage.java | 1 -
.../apache/sis/storage/base/MetadataBuilder.java | 1 -
.../apache/sis/storage/base/ResourceLineage.java | 1 -
.../apache/sis/storage/base/TiledGridCoverage.java | 17 +++++++-------
.../apache/sis/storage/base/TiledGridResource.java | 1 -
.../sis/storage/base/WritableAggregateSupport.java | 8 +++----
.../apache/sis/storage/esri/RawRasterReader.java | 11 +++++----
.../apache/sis/storage/esri/RawRasterStore.java | 3 +--
.../sis/storage/image/WorldFileResource.java | 3 +--
.../apache/sis/io/stream/ChannelDataInputTest.java | 1 -
.../sis/io/stream/ChannelDataOutputTest.java | 3 +--
.../sis/io/stream/ChannelImageInputStreamTest.java | 3 +--
.../io/stream/ChannelImageOutputStreamTest.java | 3 +--
.../apache/sis/io/stream/ComputedInputStream.java | 1 +
.../org/apache/sis/io/stream/DripByteChannel.java | 1 -
.../sis/io/stream/FileCacheByteChannelTest.java | 3 +--
.../sis/io/stream/HyperRectangleReaderTest.java | 3 +--
.../sis/io/stream/HyperRectangleWriterTest.java | 3 +--
.../org/apache/sis/io/stream/IOUtilitiesTest.java | 3 +--
.../sis/io/stream/ImageInputStreamComparator.java | 1 +
.../sis/io/stream/InputStreamArrayGetterTest.java | 3 +--
.../sis/io/stream/RewindableLineReaderTest.java | 3 +--
.../io/stream/SubsampledRectangleWriterTest.java | 3 +--
.../apache/sis/io/stream/UpdatableWriteTest.java | 3 +--
.../org/apache/sis/storage/CoverageQueryTest.java | 3 +--
.../org/apache/sis/storage/CoverageSubsetTest.java | 3 +--
.../apache/sis/storage/DataStoreProviderTest.java | 3 +--
.../org/apache/sis/storage/DataStoresTest.java | 3 +--
.../org/apache/sis/storage/FeatureNamingTest.java | 3 +--
.../org/apache/sis/storage/FeatureQueryTest.java | 3 +--
.../org/apache/sis/storage/GridResourceMock.java | 1 +
.../org/apache/sis/storage/ProbeResultTest.java | 6 ++---
.../apache/sis/storage/StorageConnectorTest.java | 7 +++---
.../aggregate/BandAggregateGridResourceTest.java | 3 +--
.../aggregate/ConcatenatedFeatureSetTest.java | 3 +--
.../storage/aggregate/CoverageAggregatorTest.java | 3 +--
.../sis/storage/aggregate/JoinFeatureSetTest.java | 3 +--
.../org/apache/sis/storage/base/CodeTypeTest.java | 3 +--
.../sis/storage/base/MemoryGridResourceTest.java | 3 +--
.../sis/storage/base/MetadataBuilderTest.java | 3 +--
.../sis/storage/base/StoreUtilitiesTest.java | 3 +--
.../apache/sis/storage/csv/StoreProviderTest.java | 3 +--
.../test/org/apache/sis/storage/csv/StoreTest.java | 3 +--
.../sis/storage/esri/AsciiGridStoreTest.java | 3 +--
.../sis/storage/esri/BILConsistencyTest.java | 3 +--
.../sis/storage/esri/BIPConsistencyTest.java | 3 +--
.../sis/storage/esri/BSQConsistencyTest.java | 3 +--
.../apache/sis/storage/esri/WritableStoreTest.java | 3 +--
.../sis/storage/event/StoreListenersTest.java | 3 +--
.../org/apache/sis/storage/folder/StoreTest.java | 3 +--
.../sis/storage/image/SelfConsistencyTest.java | 3 +--
.../sis/storage/image/WorldFileStoreTest.java | 3 +--
.../sis/storage/test/CoverageReadConsistency.java | 3 +--
.../apache/sis/storage/test/SubsampledImage.java | 3 ++-
.../apache/sis/storage/wkt/StoreProviderTest.java | 3 +--
.../test/org/apache/sis/storage/wkt/StoreTest.java | 3 +--
.../sis/storage/xml/MimeTypeDetectorTest.java | 5 ++---
.../apache/sis/storage/xml/StoreProviderTest.java | 3 +--
.../test/org/apache/sis/storage/xml/StoreTest.java | 5 ++---
.../main/org/apache/sis/io/Appender.java | 1 -
.../main/org/apache/sis/io/CompoundFormat.java | 1 -
.../main/org/apache/sis/io/TableAppender.java | 1 -
.../main/org/apache/sis/math/DecimalFunctions.java | 1 -
.../main/org/apache/sis/math/Line.java | 3 +--
.../main/org/apache/sis/math/MathFunctions.java | 11 +++++----
.../main/org/apache/sis/math/Plane.java | 7 +++---
.../main/org/apache/sis/math/Statistics.java | 11 +++++----
.../main/org/apache/sis/math/Vector.java | 3 +--
.../main/org/apache/sis/measure/Angle.java | 3 +--
.../main/org/apache/sis/measure/AngleFormat.java | 5 ++---
.../apache/sis/measure/SexagesimalConverter.java | 1 -
.../main/org/apache/sis/measure/Units.java | 1 -
.../main/org/apache/sis/setup/About.java | 5 ++---
.../main/org/apache/sis/setup/OptionKey.java | 3 +--
.../apache/sis/setup/OptionalInstallations.java | 1 -
.../main/org/apache/sis/util/CharSequences.java | 3 +--
.../main/org/apache/sis/util/Classes.java | 1 -
.../main/org/apache/sis/util/Locales.java | 1 -
.../main/org/apache/sis/util/Numbers.java | 3 +--
.../main/org/apache/sis/util/StringBuilders.java | 3 +--
.../main/org/apache/sis/util/Version.java | 1 -
.../sis/util/collection/DefaultTreeTable.java | 1 -
.../org/apache/sis/util/collection/RangeSet.java | 1 -
.../sis/util/collection/TreeTableFormat.java | 1 -
.../apache/sis/util/collection/WeakHashSet.java | 1 -
.../sis/util/collection/WeakValueHashMap.java | 1 -
.../apache/sis/util/internal/CheckedArrayList.java | 1 -
.../apache/sis/util/internal/CheckedHashSet.java | 1 -
.../apache/sis/util/internal/CollectionsExt.java | 1 -
.../apache/sis/util/internal/DefinitionURI.java | 3 +--
.../org/apache/sis/util/internal/Numerics.java | 9 ++++----
.../apache/sis/util/logging/MonolineFormatter.java | 1 -
.../apache/sis/converter/AngleConverterTest.java | 3 +--
.../apache/sis/converter/ArrayConverterTest.java | 3 +--
.../sis/converter/ConverterRegistryTest.java | 5 ++---
.../sis/converter/FallbackConverterTest.java | 3 +--
.../apache/sis/converter/NumberConverterTest.java | 5 ++---
.../apache/sis/converter/PathConverterTest.java | 5 ++---
.../apache/sis/converter/StringConverterTest.java | 3 +--
.../apache/sis/converter/SystemRegistryTest.java | 7 +++---
.../test/org/apache/sis/io/AppenderTestCase.java | 3 +--
.../test/org/apache/sis/io/EchoAppendable.java | 1 +
.../test/org/apache/sis/io/LeftMarginTest.java | 3 +--
.../test/org/apache/sis/io/LineAppenderTest.java | 3 +--
.../test/org/apache/sis/io/TableAppenderTest.java | 3 +--
.../org/apache/sis/io/TabulationExpansionTest.java | 3 +--
.../test/org/apache/sis/io/WordWrapTest.java | 5 ++---
.../org/apache/sis/math/DecimalFunctionsTest.java | 7 +++---
.../test/org/apache/sis/math/FractionTest.java | 3 +--
.../org/apache/sis/math/FunctionPropertyTest.java | 3 +--
.../test/org/apache/sis/math/LineTest.java | 3 +--
.../apache/sis/math/LinearlyDerivedVectorTest.java | 3 +--
.../org/apache/sis/math/MathFunctionsTest.java | 11 +++++----
.../test/org/apache/sis/math/PlaneTest.java | 3 +--
.../org/apache/sis/math/RepeatedVectorTest.java | 3 +--
.../org/apache/sis/math/StatisticsFormatTest.java | 1 -
.../test/org/apache/sis/math/StatisticsTest.java | 9 ++++----
.../test/org/apache/sis/math/VectorTest.java | 5 ++---
.../org/apache/sis/measure/AngleFormatTest.java | 3 +--
.../test/org/apache/sis/measure/AngleTest.java | 7 +++---
.../apache/sis/measure/ConventionalUnitTest.java | 3 +--
.../test/org/apache/sis/measure/DateRangeTest.java | 3 +--
.../measure/FormattedCharacterIteratorTest.java | 13 +++++------
.../apache/sis/measure/LinearConverterTest.java | 5 ++---
.../apache/sis/measure/MeasurementRangeTest.java | 3 +--
.../org/apache/sis/measure/NumberRangeTest.java | 3 +--
.../test/org/apache/sis/measure/PrefixesTest.java | 3 +--
.../org/apache/sis/measure/QuantitiesTest.java | 5 ++---
.../org/apache/sis/measure/RangeFormatTest.java | 11 +++++----
.../test/org/apache/sis/measure/RangeTest.java | 3 +--
.../test/org/apache/sis/measure/ScalarTest.java | 5 ++---
.../sis/measure/SexagesimalConverterTest.java | 5 ++---
.../org/apache/sis/measure/SystemUnitTest.java | 5 ++---
.../org/apache/sis/measure/UnitDimensionTest.java | 3 +--
.../org/apache/sis/measure/UnitFormatTest.java | 3 +--
.../org/apache/sis/measure/UnitServicesTest.java | 3 +--
.../test/org/apache/sis/measure/UnitsTest.java | 7 +++---
.../test/org/apache/sis/setup/OptionKeyTest.java | 5 ++---
.../test/org/apache/sis/system/LoggersTest.java | 3 +--
.../sis/system/ReferenceQueueConsumerTest.java | 3 +--
.../test/org/apache/sis/test/Assertions.java | 1 +
.../test/org/apache/sis/test/Assume.java | 1 +
.../test/org/apache/sis/test/LoggingWatcher.java | 1 +
.../test/org/apache/sis/test/OptionalTestData.java | 1 +
.../org/apache/sis/test/ProjectDirectories.java | 1 +
.../test/org/apache/sis/test/TestRunner.java | 5 ++---
.../test/org/apache/sis/test/TestUtilities.java | 3 ++-
.../test/org/apache/sis/test/self/AssertTest.java | 3 +--
.../apache/sis/test/self/TestUtilitiesTest.java | 3 +--
.../org/apache/sis/util/ArgumentChecksTest.java | 3 +--
.../test/org/apache/sis/util/ArraysExtTest.java | 3 +--
.../org/apache/sis/util/CharSequencesTest.java | 5 ++---
.../test/org/apache/sis/util/CharactersTest.java | 6 ++---
.../test/org/apache/sis/util/ClassesTest.java | 5 ++---
.../sis/util/DefaultInternationalStringTest.java | 5 ++---
.../test/org/apache/sis/util/ExceptionsTest.java | 3 +--
.../test/org/apache/sis/util/LocalesTest.java | 3 +--
.../test/org/apache/sis/util/NumbersTest.java | 5 ++---
.../sis/util/SimpleInternationalStringTest.java | 5 ++---
.../org/apache/sis/util/StringBuildersTest.java | 6 ++---
.../test/org/apache/sis/util/UtilitiesTest.java | 3 +--
.../test/org/apache/sis/util/VersionTest.java | 3 +--
.../org/apache/sis/util/collection/CacheTest.java | 5 ++---
.../sis/util/collection/CodeListSetTest.java | 5 ++---
.../sis/util/collection/DefaultTreeTableTest.java | 7 +++---
.../apache/sis/util/collection/DerivedMapTest.java | 3 +--
.../apache/sis/util/collection/DerivedSetTest.java | 3 +--
.../util/collection/FrequencySortedSetTest.java | 3 +--
.../sis/util/collection/IntegerListTest.java | 5 ++---
.../apache/sis/util/collection/LargeCodeList.java | 1 +
.../apache/sis/util/collection/RangeSetTest.java | 7 +++---
.../sis/util/collection/TableColumnTest.java | 5 ++---
.../sis/util/collection/TreeTableFormatTest.java | 5 ++---
.../apache/sis/util/collection/TreeTablesTest.java | 9 ++++----
.../sis/util/collection/WeakHashSetTest.java | 3 +--
.../sis/util/collection/WeakValueHashMapTest.java | 3 +--
.../apache/sis/util/internal/AbstractMapTest.java | 3 +--
.../test/org/apache/sis/util/internal/BagTest.java | 3 +--
.../sis/util/internal/CheckedArrayListTest.java | 3 +--
.../sis/util/internal/CollectionsExtTest.java | 3 +--
.../sis/util/internal/DefinitionURITest.java | 3 +--
.../apache/sis/util/internal/DoubleDoubleTest.java | 5 ++---
.../sis/util/internal/ListOfUnknownSizeTest.java | 3 +--
.../util/internal/LocalizedParseExceptionTest.java | 3 +--
.../org/apache/sis/util/internal/NumericsTest.java | 11 +++++----
.../sis/util/internal/StandardDateFormatTest.java | 3 +--
.../org/apache/sis/util/internal/StringsTest.java | 3 +--
.../org/apache/sis/util/internal/X364Test.java | 8 +++----
.../sis/util/logging/MonolineFormatterTest.java | 3 +--
.../sis/util/logging/PerformanceLevelTest.java | 7 +++---
.../util/resources/IndexedResourceBundleTest.java | 3 +--
.../main/org/apache/sis/cql/CQL.java | 1 -
.../org/apache/sis/cql/ExpressionReadingTest.java | 1 -
.../org/apache/sis/cql/ExpressionWritingTest.java | 1 -
.../test/org/apache/sis/cql/FilterReadingTest.java | 1 -
.../test/org/apache/sis/cql/FilterWritingTest.java | 1 -
.../test/org/apache/sis/cql/QueryReadingTest.java | 1 -
.../test/org/apache/sis/cql/QueryWritingTest.java | 1 -
.../coveragejson/CoverageJsonStoreTest.java | 1 -
.../storage/coveragejson/binding/BindingTest.java | 1 -
.../storage/shapefile/ListingPropertyVisitor.java | 2 +-
.../sis/storage/shapefile/ShapefileStore.java | 21 +++++++++--------
.../sis/storage/shapefile/dbf/DBFHeader.java | 2 +-
.../sis/storage/shapefile/dbf/DBFReader.java | 2 +-
.../sis/storage/shapefile/dbf/DBFRecord.java | 1 +
.../sis/storage/shapefile/dbf/DBFWriter.java | 1 +
.../shapefile/shp/ShapeGeometryEncoder.java | 8 +++----
.../sis/storage/shapefile/shp/ShapeHeader.java | 7 +++---
.../sis/storage/shapefile/shp/ShapeReader.java | 4 ++--
.../sis/storage/shapefile/shp/ShapeRecord.java | 8 +++----
.../sis/storage/shapefile/shp/ShapeType.java | 1 +
.../sis/storage/shapefile/shp/ShapeWriter.java | 4 ++--
.../sis/storage/shapefile/shx/IndexReader.java | 5 ++---
.../sis/storage/shapefile/shx/IndexWriter.java | 3 ++-
.../sis/storage/shapefile/ShapeFileTest.java | 1 -
.../sis/storage/shapefile/ShapefileStoreTest.java | 6 +++--
.../sis/storage/shapefile/dbf/DBFIOTest.java | 3 +++
.../jdbc/AbstractTestBaseForInternalJDBC.java | 3 +--
.../storage/shapefile/jdbc/DBFConnectionTest.java | 1 -
.../storage/shapefile/jdbc/DBFResultSetTest.java | 1 -
.../storage/shapefile/jdbc/DBFStatementTest.java | 1 -
.../shapefile/jdbc/sql/WhereClauseTest.java | 1 -
.../sis/storage/shapefile/shp/ShapeIOTest.java | 26 +++++++++++-----------
.../apache/sis/gui/coverage/CoverageCanvas.java | 1 -
.../apache/sis/gui/coverage/GridSliceSelector.java | 1 -
.../org/apache/sis/gui/dataset/FeatureTable.java | 1 -
.../org/apache/sis/gui/dataset/ResourceTree.java | 1 -
.../org/apache/sis/gui/dataset/WindowHandler.java | 1 -
.../apache/sis/gui/internal/BackgroundThreads.java | 1 -
.../apache/sis/gui/internal/ImageConverter.java | 1 -
.../main/org/apache/sis/gui/internal/Styles.java | 1 -
.../org/apache/sis/gui/map/GestureFollower.java | 1 -
.../main/org/apache/sis/gui/map/MapCanvas.java | 1 -
.../org/apache/sis/gui/map/OperationFinder.java | 1 -
.../main/org/apache/sis/gui/map/StatusBar.java | 1 -
.../org/apache/sis/gui/map/ValuesFormatter.java | 1 -
.../sis/gui/metadata/IdentificationInfo.java | 1 -
.../org/apache/sis/gui/metadata/MetadataTree.java | 1 -
.../sis/gui/metadata/RepresentationInfo.java | 1 -
.../apache/sis/gui/referencing/AuthorityCodes.java | 1 -
.../gui/referencing/PositionableProjection.java | 1 -
.../gui/referencing/RecentReferenceSystems.java | 1 -
.../main/org/apache/sis/gui/referencing/Utils.java | 1 -
.../apache/sis/gui/internal/GUIUtilitiesTest.java | 3 +--
1018 files changed, 1274 insertions(+), 2197 deletions(-)
diff --cc
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/DefaultExtendedElementInformation.java
index 45418bed4a,92033611e8..5dc31db8e1
---
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
@@@ -34,13 -34,8 +34,12 @@@ import org.apache.sis.xml.util.LegacyNa
import org.apache.sis.metadata.internal.Dependencies;
import org.apache.sis.metadata.iso.legacy.LegacyPropertyAdapter;
import org.apache.sis.util.internal.CollectionsExt;
-
import static
org.apache.sis.metadata.internal.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 7cba48d2b5,63517a13e8..2d29983b29
---
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,11 -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.internal.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/DefaultMedium.java
index 520232a035,5a5ff45bb1..711d17008d
---
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,18 -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.util.LegacyNamespaces;
import org.apache.sis.util.internal.CollectionsExt;
-
import static
org.apache.sis.metadata.internal.ImplementationHelper.ensurePositive;
+// Specific to the main and geoapi-3.1 branches:
+import org.opengis.metadata.distribution.MediumName;
+import org.apache.sis.util.internal.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/maintenance/DefaultMaintenanceInformation.java
index d9df3f1ee5,8431d50f43..b9571b8343
---
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
@@@ -38,12 -38,8 +38,11 @@@ import org.apache.sis.metadata.internal
import org.apache.sis.xml.bind.FilterByVersion;
import org.apache.sis.xml.util.LegacyNamespaces;
import org.apache.sis.util.internal.CollectionsExt;
-
import static
org.apache.sis.metadata.internal.ImplementationHelper.valueIfDefined;
+// 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.maintenance.Scope;
diff --cc
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescription.java
index 2c43f40dc1,a137cc9abf..9f3c5bf2d7
---
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescription.java
+++
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescription.java
@@@ -31,12 -31,10 +31,11 @@@ import org.apache.sis.xml.bind.Context
import org.apache.sis.system.Semaphores;
import org.apache.sis.util.collection.CheckedContainer;
import org.apache.sis.util.resources.Messages;
-
import static org.apache.sis.util.collection.Containers.isNullOrEmpty;
-// Specific to the geoapi-4.0 branch:
-import org.apache.sis.util.iso.Types;
+// Specific to the main and geoapi-3.1 branches:
+import org.opengis.feature.type.AttributeType;
+import org.opengis.feature.type.FeatureType;
/**
diff --cc
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleIdentifiedObject.java
index 284e1b50c7,1cb84756b5..ffb284745b
---
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
@@@ -27,12 -27,8 +27,11 @@@ import org.apache.sis.metadata.internal
import org.apache.sis.util.LenientComparable;
import org.apache.sis.util.ComparisonMode;
import org.apache.sis.util.internal.Constants;
-
import static org.apache.sis.util.collection.Containers.isNullOrEmpty;
+// Specific to the main and geoapi-3.1 branches:
+import org.opengis.referencing.ReferenceIdentifier;
+
/**
* A trivial implementation of {@link IdentifiedObject} containing only a
primary name.
diff --cc
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/MetadataFallback.java
index 02457864d5,12db845aa9..871fdf975b
---
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/MetadataFallback.java
+++
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/MetadataFallback.java
@@@ -27,11 -28,6 +28,9 @@@ import org.apache.sis.util.internal.Con
import org.apache.sis.util.iso.Types;
import org.apache.sis.xml.NilReason;
- import static java.util.Collections.singleton;
-
+// Specific to the main and geoapi-3.1 branches:
+import org.apache.sis.metadata.iso.citation.DefaultResponsibleParty;
+
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.util.ControlledVocabulary;
diff --cc
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/ServiceParameter.java
index 28ea1dc68d,4530a245df..296979e762
---
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
@@@ -32,12 -32,8 +32,11 @@@ import org.apache.sis.xml.bind.gco.GO_G
import org.apache.sis.metadata.internal.NameToIdentifier;
import org.apache.sis.util.iso.DefaultMemberName;
import org.apache.sis.util.iso.Names;
-
import static org.apache.sis.util.internal.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/HashCodeTest.java
index 16cc059643,669ce48d5a..0b78758748
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/HashCodeTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/HashCodeTest.java
@@@ -37,12 -38,6 +38,10 @@@ import org.apache.sis.test.DependsOnMet
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
- import static org.junit.Assert.*;
-
+// Specific to the main and geoapi-3.1 branches:
+import org.opengis.metadata.citation.ResponsibleParty;
+import org.apache.sis.metadata.iso.citation.DefaultResponsibleParty;
+
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.metadata.citation.Individual;
diff --cc
endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyAccessorTest.java
index 5049f495f1,94e1975336..5f8c048be0
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyAccessorTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyAccessorTest.java
@@@ -56,19 -61,9 +61,13 @@@ import org.apache.sis.test.TestCase
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.metadata.iso.citation.HardCodedCitations;
-
- import static org.junit.Assert.*;
- import static org.opengis.test.Assert.assertInstanceOf;
import static org.apache.sis.test.TestUtilities.getSingleton;
import static org.apache.sis.metadata.Assertions.assertTitleEquals;
- import static org.apache.sis.metadata.PropertyAccessor.APPEND;
- import static org.apache.sis.metadata.PropertyAccessor.RETURN_NULL;
- import static org.apache.sis.metadata.PropertyAccessor.RETURN_PREVIOUS;
+// Specific to the main and geoapi-3.1 branches:
+import org.opengis.metadata.citation.ResponsibleParty;
+import org.opengis.referencing.ReferenceIdentifier;
+
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.metadata.content.AttributeGroup;
import org.opengis.referencing.ObjectDomain;
diff --cc
endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/TreeNodeChildrenTest.java
index 59fded81a2,af7e3730b1..4d81cbfe20
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/TreeNodeChildrenTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/TreeNodeChildrenTest.java
@@@ -38,8 -39,9 +39,6 @@@ import org.apache.sis.test.DependsOn
import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.TestCase;
- import static org.junit.Assert.*;
-// Specific to the geoapi-4.0 branch:
-import java.util.Set;
--
/**
* Tests the {@link TreeNodeChildren} class.
diff --cc
endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/TreeNodeTest.java
index a5387e507a,8dd2d1019f..bb754a9f8a
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/TreeNodeTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/TreeNodeTest.java
@@@ -39,14 -40,8 +40,12 @@@ import static org.junit.Assert.*
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-
- import static org.junit.Assert.*;
import static org.apache.sis.metadata.Assertions.assertTitleEquals;
+// Specific to the main and geoapi-3.1 branches:
+import org.opengis.metadata.citation.ResponsibleParty;
+import org.apache.sis.metadata.iso.citation.DefaultResponsibleParty;
+
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.metadata.citation.Party;
diff --cc
endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/TreeTableFormatTest.java
index 9bea8c5446,4d8f3fcef1..4c6b17753e
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/TreeTableFormatTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/TreeTableFormatTest.java
@@@ -34,13 -33,13 +33,13 @@@ import org.apache.sis.measure.Units
// Test dependencies
import org.junit.Test;
+ import org.apache.sis.metadata.iso.citation.DefaultCitationTest;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-
import static org.apache.sis.test.Assertions.assertMultilinesEquals;
-// Specific to the geoapi-4.0 branch:
-import org.apache.sis.metadata.iso.citation.DefaultResponsibility;
+// Specific to the main and geoapi-3.1 branches:
+import org.apache.sis.metadata.iso.citation.DefaultResponsibleParty;
/**
diff --cc
endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/TypeMapTest.java
index 87d93dec09,800ce64ec0..d911c9f784
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/TypeMapTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/TypeMapTest.java
@@@ -38,11 -40,8 +40,8 @@@ import static org.junit.Assert.*
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
- import static java.util.AbstractMap.SimpleEntry;
- import static org.junit.Assert.*;
-
-// Specific to the geoapi-4.0 branch:
-import org.opengis.metadata.citation.Responsibility;
+// Specific to the main and geoapi-3.1 branches:
+import org.opengis.metadata.citation.ResponsibleParty;
/**
diff --cc
endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/ValueMapTest.java
index d1ec458ec1,7a2621363d..02b9f39027
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/ValueMapTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/ValueMapTest.java
@@@ -32,15 -36,10 +36,10 @@@ import static org.opengis.test.Assert.a
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-
- import static java.util.AbstractMap.SimpleEntry;
- import static
org.opengis.metadata.citation.PresentationForm.DOCUMENT_HARDCOPY;
- import static org.junit.Assert.*;
- import static org.opengis.test.Assert.assertInstanceOf;
import static org.apache.sis.test.TestUtilities.getSingleton;
-// Specific to the geoapi-4.0 branch:
-import org.apache.sis.metadata.iso.citation.DefaultResponsibility;
+// Specific to the main and geoapi-3.1 branches:
+import org.apache.sis.metadata.iso.citation.DefaultResponsibleParty;
/**
diff --cc
endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/content/DefaultBandTest.java
index 9c38771f69,0e4bcbab85..c17b870eb2
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/content/DefaultBandTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/content/DefaultBandTest.java
@@@ -21,14 -22,12 +22,12 @@@ import static org.apache.sis.metadata.i
// Test dependencies
import org.junit.Test;
- import org.apache.sis.xml.test.TestCase;
-
- import static
org.apache.sis.metadata.internal.ImplementationHelper.ISO_NAMESPACE;
import static org.junit.Assert.*;
+ import org.apache.sis.xml.test.TestCase;
import static org.apache.sis.metadata.Assertions.assertXmlEquals;
-// 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/test/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescriptionTest.java
index 126b0fc7a2,a3ad5e3cf5..12f8c50928
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescriptionTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescriptionTest.java
@@@ -25,8 -26,9 +26,6 @@@ import static org.junit.Assert.*
import org.apache.sis.test.LoggingWatcher;
import org.apache.sis.test.TestCase;
- import static org.junit.Assert.*;
-// Specific to the geoapi-4.0 branch:
-import org.apache.sis.util.SimpleInternationalString;
--
/**
* Tests {@link DefaultScopeDescription}.
diff --cc
endorsed/src/org.apache.sis.profile.france/test/org/apache/sis/profile/france/FrenchProfileTest.java
index ba5109d730,8eca193936..9a0d1a9349
---
a/endorsed/src/org.apache.sis.profile.france/test/org/apache/sis/profile/france/FrenchProfileTest.java
+++
b/endorsed/src/org.apache.sis.profile.france/test/org/apache/sis/profile/france/FrenchProfileTest.java
@@@ -29,14 -29,13 +29,13 @@@ import org.apache.sis.xml.bind.fra.Dire
// Test dependencies
import org.junit.Test;
- import org.apache.sis.test.TestCase;
-
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertInstanceOf;
+ import org.apache.sis.test.TestCase;
import static org.apache.sis.test.TestUtilities.getSingleton;
-// Specific to the geoapi-4.0 branch:
-import org.apache.sis.metadata.iso.DefaultIdentifier;
+// Specific to the main and geoapi-3.1 branches:
+import org.apache.sis.xml.bind.metadata.replace.RS_Identifier;
/**
diff --cc
endorsed/src/org.apache.sis.profile.france/test/org/apache/sis/xml/bind/fra/DirectReferenceSystemTest.java
index 0044534ebc,6f2fe9d44b..900a65851b
---
a/endorsed/src/org.apache.sis.profile.france/test/org/apache/sis/xml/bind/fra/DirectReferenceSystemTest.java
+++
b/endorsed/src/org.apache.sis.profile.france/test/org/apache/sis/xml/bind/fra/DirectReferenceSystemTest.java
@@@ -31,11 -32,9 +32,9 @@@ import org.apache.sis.xml.test.TestCase
import org.apache.sis.test.TestUtilities;
import org.apache.sis.metadata.iso.citation.HardCodedCitations;
- import static org.junit.Assert.*;
-
-// Specific to the geoapi-4.0 branch:
-import org.opengis.metadata.citation.Responsibility;
-import org.apache.sis.metadata.iso.DefaultIdentifier;
+// Specific to the main and geoapi-3.1 branches:
+import org.opengis.metadata.citation.ResponsibleParty;
+import org.apache.sis.xml.bind.metadata.replace.RS_Identifier;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java
index 1b0cb03128,1610727a53..23ef1e85dc
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java
@@@ -82,11 -83,6 +83,9 @@@ import org.apache.sis.util.internal.Str
import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.iso.Types;
- import static java.util.Collections.singletonMap;
-
+// Specific to the main and geoapi-3.1 branches:
+import org.opengis.referencing.ReferenceIdentifier;
+
/**
* Well Known Text (WKT) parser for referencing objects. This include, but is
not limited too,
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/ParameterFormat.java
index 99e89360f0,9d9bd82a46..3c83d68e83
---
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
@@@ -55,12 -55,8 +55,11 @@@ import org.apache.sis.referencing.Ident
import org.apache.sis.metadata.internal.NameToIdentifier;
import org.apache.sis.util.internal.CollectionsExt;
import org.apache.sis.util.internal.X364;
-
import static org.apache.sis.util.collection.Containers.hashMapCapacity;
+// 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/referencing/Builder.java
index 601e09c94f,e7ba464822..ecaaef2149
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/Builder.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/Builder.java
@@@ -37,12 -37,8 +37,11 @@@ import org.apache.sis.util.Deprecable
import org.apache.sis.util.iso.DefaultNameFactory;
import org.apache.sis.util.iso.Types;
import org.apache.sis.util.resources.Errors;
-
import static org.apache.sis.util.ArgumentChecks.*;
+// Specific to the main and geoapi-3.1 branches:
+import org.opengis.referencing.ReferenceIdentifier;
+
/**
* Base class of builders for various kinds of {@link IdentifiedObject}. This
class provides convenience methods
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/NameIterator.java
index 274042225e,cd5689d661..aa7ea43473
---
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
@@@ -24,11 -24,10 +24,10 @@@ import org.apache.sis.xml.bind.Context
import org.apache.sis.util.resources.Errors;
import org.apache.sis.metadata.internal.NameMeaning;
import org.apache.sis.referencing.util.NilReferencingObject;
-
import static org.apache.sis.util.internal.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/operation/DefaultConcatenatedOperation.java
index 81ffd25710,cad53a37b7..73d129a5b9
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultConcatenatedOperation.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultConcatenatedOperation.java
@@@ -40,12 -40,8 +40,11 @@@ import org.apache.sis.util.ArgumentChec
import org.apache.sis.util.internal.UnmodifiableArrayList;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.io.wkt.Formatter;
-
import static org.apache.sis.util.Utilities.deepEquals;
+// Specific to the main and geoapi-3.1 branches:
+import org.opengis.referencing.operation.SingleOperation;
+
/**
* An ordered sequence of two or more single coordinate operations. The
sequence of operations is constrained
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultPassThroughOperation.java
index 4ea9d800ae,e14f5b5b8a..0d2019c3ef
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultPassThroughOperation.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultPassThroughOperation.java
@@@ -40,14 -40,8 +40,13 @@@ import org.apache.sis.util.ComparisonMo
import org.apache.sis.util.resources.Errors;
import org.apache.sis.io.wkt.FormattableObject;
import org.apache.sis.io.wkt.Formatter;
-
import static org.apache.sis.util.Utilities.deepEquals;
+// Specific to the main and geoapi-3.1 branches:
+import org.opengis.referencing.operation.OperationMethod;
+import org.opengis.referencing.operation.SingleOperation;
+import org.opengis.parameter.ParameterValueGroup;
+
/**
* Specifies that a subset of a coordinate tuple is subject to a specific
coordinate operation.
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/MapProjection.java
index 4e52b75636,4e13dc2d50..ba76d91c6b
---
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
@@@ -50,11 -51,6 +51,9 @@@ import org.apache.sis.parameter.Paramet
import org.apache.sis.parameter.Parameters;
import org.apache.sis.util.resources.Errors;
- import static org.opengis.metadata.Identifier.AUTHORITY_KEY;
-
+// 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.referencing/main/org/apache/sis/referencing/operation/provider/ObliqueMercatorCenter.java
index d379aa7e6c,dd979027fe..7d96e26447
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/ObliqueMercatorCenter.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/ObliqueMercatorCenter.java
@@@ -21,12 -21,8 +21,11 @@@ import org.opengis.parameter.ParameterD
import org.opengis.parameter.ParameterDescriptorGroup;
import org.apache.sis.parameter.ParameterBuilder;
import org.apache.sis.metadata.iso.citation.Citations;
-
import static org.apache.sis.referencing.IdentifiedObjects.getIdentifier;
+// Specific to the main and geoapi-3.1 branches:
+import org.opengis.referencing.ReferenceIdentifier;
+
/**
* The provider for <q>Hotine Oblique Mercator (variant B)</q> projection
(EPSG:9815).
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/Code.java
index b754bb1c42,9681ae9b94..a0e086be8f
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/Code.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/Code.java
@@@ -27,12 -27,8 +27,11 @@@ import org.apache.sis.metadata.internal
import org.apache.sis.metadata.internal.Identifiers;
import org.apache.sis.referencing.NamedIdentifier;
import org.apache.sis.metadata.iso.citation.Citations;
-
import static org.apache.sis.metadata.iso.citation.Citations.toCodeSpace;
+// Specific to the main and geoapi-3.1 branches:
+import org.opengis.referencing.ReferenceIdentifier;
+
/**
* The {@code gml:CodeType}, which is made of a code space and a code value.
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/parameter/ParametersTest.java
index 49e81006da,93f5e0c8e6..7719cad4c2
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/parameter/ParametersTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/parameter/ParametersTest.java
@@@ -36,11 -37,6 +37,9 @@@ import org.apache.sis.test.DependsOn
import org.apache.sis.test.TestCase;
import org.apache.sis.test.TestUtilities;
- import static org.junit.Assert.*;
-
+// 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.util.TypeName;
diff --cc
optional/src/org.apache.sis.gui/main/org/apache/sis/gui/metadata/IdentificationInfo.java
index a7a4913571,110c4b0b71..83b3e38490
---
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
@@@ -57,9 -57,11 +57,8 @@@ import org.apache.sis.storage.DataStore
import org.apache.sis.util.CharSequences;
import org.apache.sis.util.Workaround;
import org.apache.sis.util.resources.Vocabulary;
-
import static org.apache.sis.util.internal.CollectionsExt.nonNull;
-// Specific to the geoapi-4.0 branch:
-import org.opengis.util.InternationalString;
-
/**
* The pane where to show the values of {@link Identification} objects.
