You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2022/11/19 15:29:16 UTC
[sis] 05/05: Merge branch 'geoapi-3.1'. This is mostly spelling fixes and dependency upgrades.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 34813b658c3c3e0c66418dd3fb784f3a96010592
Merge: c63c2ab4e4 34b68d4160
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Sat Nov 19 16:28:24 2022 +0100
Merge branch 'geoapi-3.1'.
This is mostly spelling fixes and dependency upgrades.
.../java/org/apache/sis/console/AboutCommand.java | 2 +-
.../java/org/apache/sis/console/CommandRunner.java | 8 +-
.../org/apache/sis/console/IdentifierCommand.java | 2 +-
.../apache/sis/console/ResourcesDownloader.java | 2 +-
.../java/org/apache/sis/console/package-info.java | 2 +-
.../apache/sis/console/IdentifierState.properties | 2 +-
application/sis-javafx/pom.xml | 2 +-
.../main/java/org/apache/sis/gui/DataViewer.java | 4 +-
.../org/apache/sis/gui/coverage/CellFormat.java | 4 +-
.../apache/sis/gui/coverage/CoverageCanvas.java | 6 +-
.../apache/sis/gui/coverage/CoverageControls.java | 2 +-
.../org/apache/sis/gui/coverage/GridControls.java | 2 +-
.../org/apache/sis/gui/coverage/GridError.java | 2 +-
.../apache/sis/gui/coverage/GridSliceSelector.java | 2 +-
.../java/org/apache/sis/gui/coverage/GridView.java | 2 +-
.../org/apache/sis/gui/coverage/GridViewSkin.java | 4 +-
.../apache/sis/gui/coverage/IsolineRenderer.java | 2 +-
.../sis/gui/coverage/StyledRenderingData.java | 2 +-
.../apache/sis/gui/coverage/ViewAndControls.java | 2 +-
.../org/apache/sis/gui/dataset/ExpandableList.java | 2 +-
.../org/apache/sis/gui/dataset/FeatureList.java | 4 +-
.../org/apache/sis/gui/dataset/FeatureLoader.java | 2 +-
.../org/apache/sis/gui/dataset/FeatureTable.java | 4 +-
.../org/apache/sis/gui/dataset/PathAction.java | 2 +-
.../apache/sis/gui/dataset/ResourceExplorer.java | 6 +-
.../org/apache/sis/gui/dataset/ResourceItem.java | 6 +-
.../org/apache/sis/gui/dataset/ResourceTree.java | 4 +-
.../java/org/apache/sis/gui/map/MapCanvas.java | 10 +--
.../org/apache/sis/gui/map/OperationFinder.java | 2 +-
.../java/org/apache/sis/gui/map/StatusBar.java | 12 +--
.../org/apache/sis/gui/map/ValuesFormatter.java | 2 +-
.../sis/gui/metadata/IdentificationInfo.java | 2 +-
.../apache/sis/gui/metadata/MetadataSummary.java | 2 +-
.../org/apache/sis/gui/metadata/MetadataTree.java | 2 +-
.../sis/gui/metadata/RepresentationInfo.java | 2 +-
.../sis/gui/metadata/StandardMetadataTree.java | 2 +-
.../apache/sis/gui/referencing/AuthorityCodes.java | 4 +-
.../gui/referencing/RecentReferenceSystems.java | 8 +-
.../apache/sis/internal/gui/DataStoreOpener.java | 6 +-
.../apache/sis/internal/gui/ExceptionReporter.java | 8 +-
.../org/apache/sis/internal/gui/Resources.java | 22 +++---
.../apache/sis/internal/gui/Resources.properties | 18 ++---
.../internal/gui/control/ColorColumnHandler.java | 2 +-
.../sis/internal/gui/control/FormatApplicator.java | 2 +-
.../org/apache/sis/internal/setup/FXFinder.java | 8 +-
.../org/apache/sis/internal/setup/Inflater.java | 2 +-
.../java/org/apache/sis/internal/setup/Wizard.java | 12 +--
.../java/org/apache/sis/openoffice/CalcAddins.java | 2 +-
.../org/apache/sis/openoffice/Registration.java | 2 +-
.../org/apache/sis/openoffice/Transformer.java | 2 +-
.../apache/sis/cloud/aws/internal/Resources.java | 6 +-
.../sis/cloud/aws/internal/Resources.properties | 4 +-
.../apache/sis/cloud/aws/s3/CachedByteChannel.java | 2 +-
.../org/apache/sis/cloud/aws/s3/FileService.java | 4 +-
.../java/org/apache/sis/cloud/aws/s3/KeyPath.java | 8 +-
.../apache/sis/cloud/aws/s3/ObjectAttributes.java | 4 +-
core/sis-build-helper/pom.xml | 2 +-
.../org/apache/sis/internal/book/Assembler.java | 2 +-
.../apache/sis/internal/book/CodeColorizer.java | 6 +-
.../org/apache/sis/internal/doclet/Doclet.java | 2 +-
.../org/apache/sis/internal/doclet/Preformat.java | 2 +-
.../org/apache/sis/internal/doclet/Taglet.java | 2 +-
.../apache/sis/internal/maven/JarCollector.java | 4 +-
.../util/resources/IndexedResourceCompiler.java | 4 +-
.../sis/util/resources/ResourceCompilerMojo.java | 2 +-
.../org/apache/sis/coverage/BandedCoverage.java | 4 +-
.../java/org/apache/sis/coverage/Category.java | 6 +-
.../java/org/apache/sis/coverage/CategoryList.java | 22 +++---
.../org/apache/sis/coverage/ConvertedRange.java | 2 +-
.../coverage/IllegalSampleDimensionException.java | 2 +-
.../org/apache/sis/coverage/RegionOfInterest.java | 2 +-
.../org/apache/sis/coverage/SampleDimension.java | 26 +++----
.../sis/coverage/grid/BufferedGridCoverage.java | 2 +-
.../sis/coverage/grid/ConvertedGridCoverage.java | 8 +-
.../coverage/grid/CoordinateOperationFinder.java | 12 +--
.../apache/sis/coverage/grid/DefaultEvaluator.java | 10 +--
.../apache/sis/coverage/grid/DimensionReducer.java | 8 +-
.../apache/sis/coverage/grid/DomainLinearizer.java | 4 +-
.../apache/sis/coverage/grid/EvaluatorWrapper.java | 2 +-
.../coverage/grid/FractionalGridCoordinates.java | 10 +--
.../org/apache/sis/coverage/grid/GridCoverage.java | 4 +-
.../apache/sis/coverage/grid/GridCoverage2D.java | 8 +-
.../sis/coverage/grid/GridCoverageBuilder.java | 8 +-
.../sis/coverage/grid/GridCoverageProcessor.java | 14 ++--
.../apache/sis/coverage/grid/GridDerivation.java | 22 +++---
.../org/apache/sis/coverage/grid/GridExtent.java | 14 ++--
.../apache/sis/coverage/grid/GridExtentCRS.java | 4 +-
.../org/apache/sis/coverage/grid/GridGeometry.java | 26 +++----
.../apache/sis/coverage/grid/ImageRenderer.java | 10 +--
.../grid/IncompleteGridGeometryException.java | 2 +-
.../sis/coverage/grid/ResampledGridCoverage.java | 16 ++--
.../apache/sis/coverage/grid/SliceGeometry.java | 6 +-
.../apache/sis/feature/AbstractAssociation.java | 2 +-
.../org/apache/sis/feature/AbstractAttribute.java | 2 +-
.../org/apache/sis/feature/AbstractFeature.java | 14 ++--
.../org/apache/sis/feature/AbstractOperation.java | 2 +-
.../apache/sis/feature/CharacteristicTypeMap.java | 2 +-
.../apache/sis/feature/DefaultAssociationRole.java | 2 +-
.../apache/sis/feature/DefaultAttributeType.java | 2 +-
.../org/apache/sis/feature/DefaultFeatureType.java | 4 +-
.../java/org/apache/sis/feature/DenseFeature.java | 6 +-
.../org/apache/sis/feature/EnvelopeOperation.java | 4 +-
.../java/org/apache/sis/feature/FeatureFormat.java | 2 +-
.../sis/feature/FeatureOperationException.java | 2 +-
.../org/apache/sis/feature/FeatureOperations.java | 6 +-
.../java/org/apache/sis/feature/FieldType.java | 4 +-
.../apache/sis/feature/MultiValuedAssociation.java | 4 +-
.../apache/sis/feature/MultiValuedAttribute.java | 4 +-
.../java/org/apache/sis/feature/PropertyView.java | 2 +-
.../java/org/apache/sis/feature/SparseFeature.java | 6 +-
.../apache/sis/feature/StringJoinOperation.java | 4 +-
.../java/org/apache/sis/feature/Validator.java | 4 +-
.../apache/sis/feature/builder/AttributeRole.java | 8 +-
.../sis/feature/builder/AttributeTypeBuilder.java | 12 +--
.../feature/builder/CharacteristicTypeBuilder.java | 6 +-
.../sis/feature/builder/FeatureTypeBuilder.java | 6 +-
.../sis/feature/builder/OperationWrapper.java | 2 +-
.../apache/sis/feature/builder/TypeBuilder.java | 2 +-
.../org/apache/sis/filter/AssociationValue.java | 4 +-
.../java/org/apache/sis/filter/BinaryFunction.java | 14 ++--
.../apache/sis/filter/BinaryGeometryFilter.java | 2 +-
.../org/apache/sis/filter/BinarySpatialFilter.java | 2 +-
.../org/apache/sis/filter/ComparisonFilter.java | 4 +-
.../org/apache/sis/filter/ConvertFunction.java | 6 +-
.../apache/sis/filter/DefaultFilterFactory.java | 2 +-
.../java/org/apache/sis/filter/DistanceFilter.java | 2 +-
.../java/org/apache/sis/filter/FilterNode.java | 2 +-
.../java/org/apache/sis/filter/LeafExpression.java | 4 +-
.../java/org/apache/sis/filter/Optimization.java | 6 +-
.../java/org/apache/sis/filter/PropertyValue.java | 6 +-
.../java/org/apache/sis/filter/UnaryFunction.java | 2 +-
.../java/org/apache/sis/image/AnnotatedImage.java | 6 +-
.../java/org/apache/sis/image/BandedIterator.java | 4 +-
.../apache/sis/image/BandedSampleConverter.java | 2 +-
.../java/org/apache/sis/image/ComputedImage.java | 4 +-
.../java/org/apache/sis/image/ComputedTiles.java | 2 +-
.../main/java/org/apache/sis/image/DataType.java | 4 +-
.../java/org/apache/sis/image/ImageCombiner.java | 4 +-
.../java/org/apache/sis/image/ImageProcessor.java | 18 ++---
.../java/org/apache/sis/image/Interpolation.java | 2 +-
.../java/org/apache/sis/image/PlanarImage.java | 2 +-
.../java/org/apache/sis/image/PrefetchedImage.java | 2 +-
.../java/org/apache/sis/image/RecoloredImage.java | 4 +-
.../java/org/apache/sis/image/ResampledImage.java | 14 ++--
.../java/org/apache/sis/image/ResamplingGrid.java | 6 +-
.../main/java/org/apache/sis/image/TileCache.java | 2 +-
.../main/java/org/apache/sis/image/Transferer.java | 4 +-
.../java/org/apache/sis/image/Visualization.java | 6 +-
.../org/apache/sis/index/tree/NodeIterator.java | 4 +-
.../java/org/apache/sis/index/tree/PointTree.java | 4 +-
.../sis/internal/coverage/CompoundTransform.java | 4 +-
.../internal/coverage/CompoundTransformOf1D.java | 2 +-
.../sis/internal/coverage/CoverageCombiner.java | 4 +-
.../internal/coverage/j2d/ColorModelFactory.java | 6 +-
.../sis/internal/coverage/j2d/ColorModelType.java | 2 +-
.../sis/internal/coverage/j2d/Colorizer.java | 8 +-
.../internal/coverage/j2d/DeferredProperty.java | 2 +-
.../sis/internal/coverage/j2d/FillValues.java | 2 +-
.../sis/internal/coverage/j2d/ImageLayout.java | 4 +-
.../sis/internal/coverage/j2d/ImageUtilities.java | 6 +-
.../sis/internal/coverage/j2d/TileOpExecutor.java | 8 +-
.../sis/internal/coverage/j2d/TilePlaceholder.java | 4 +-
.../sis/internal/feature/FeatureExpression.java | 6 +-
.../apache/sis/internal/feature/Geometries.java | 10 +--
.../sis/internal/feature/GeometryWrapper.java | 32 ++++----
.../sis/internal/feature/MovingFeatures.java | 2 +-
.../org/apache/sis/internal/feature/Resources.java | 38 ++++-----
.../sis/internal/feature/Resources.properties | 36 ++++-----
.../internal/feature/SpatialOperationContext.java | 4 +-
.../apache/sis/internal/feature/j2d/Factory.java | 2 +-
.../apache/sis/internal/feature/j2d/Wrapper.java | 4 +-
.../apache/sis/internal/feature/jts/Factory.java | 4 +-
.../org/apache/sis/internal/feature/jts/JTS.java | 16 ++--
.../sis/internal/feature/jts/ShapeConverter.java | 2 +-
.../apache/sis/internal/feature/jts/Wrapper.java | 12 +--
.../apache/sis/internal/feature/package-info.java | 2 +-
.../sis/internal/filter/GeometryConverter.java | 2 +-
.../sis/internal/filter/sqlmm/ST_Transform.java | 2 +-
.../sis/internal/filter/sqlmm/SpatialFunction.java | 2 +-
.../internal/processing/image/TiledProcess.java | 2 +-
.../sis/internal/processing/isoline/Isolines.java | 4 +-
.../sis/internal/processing/isoline/Joiner.java | 2 +-
.../sis/internal/processing/isoline/Tracer.java | 6 +-
.../org/apache/sis/coverage/CategoryListTest.java | 2 +-
.../apache/sis/coverage/grid/GridGeometryTest.java | 6 +-
.../coverage/grid/ResampledGridCoverageTest.java | 36 ++++-----
.../apache/sis/feature/AbstractFeatureTest.java | 2 +-
.../sis/feature/DefaultAssociationRoleTest.java | 4 +-
.../apache/sis/feature/DefaultFeatureTypeTest.java | 14 ++--
.../org/apache/sis/feature/FeatureTestCase.java | 4 +-
.../apache/sis/feature/PropertySingletonTest.java | 2 +-
.../java/org/apache/sis/image/ImageTestCase.java | 4 +-
.../org/apache/sis/image/ResamplingGridTest.java | 6 +-
.../apache/sis/index/tree/PointTreeNodeTest.java | 2 +-
.../sis/internal/coverage/j2d/ColorizerTest.java | 4 +-
.../coverage/j2d/SampleModelFactoryTest.java | 2 +-
.../apache/sis/internal/feature/jts/JTSTest.java | 16 ++--
.../internal/processing/isoline/IsolinesTest.java | 14 ++--
.../sis/internal/jaxb/AdapterReplacement.java | 6 +-
.../sis/internal/jaxb/ModifiableIdentifierMap.java | 4 +-
.../sis/internal/jaxb/PrimitiveTypeProperties.java | 6 +-
.../sis/internal/jaxb/SpecializedIdentifier.java | 2 +-
.../apache/sis/internal/jaxb/cat/CodeListUID.java | 2 +-
.../apache/sis/internal/jaxb/gco/GO_DateTime.java | 2 +-
.../sis/internal/jaxb/gco/GO_GenericName.java | 2 +-
.../sis/internal/jaxb/gco/ObjectReference.java | 2 +-
.../apache/sis/internal/jaxb/gco/PropertyType.java | 18 ++---
.../org/apache/sis/internal/jaxb/gcx/Anchor.java | 2 +-
.../sis/internal/jaxb/geometry/package-info.java | 2 +-
.../org/apache/sis/internal/jaxb/gml/Measure.java | 4 +-
.../apache/sis/internal/jaxb/gml/MeasureList.java | 2 +-
.../apache/sis/internal/jaxb/gml/package-info.java | 2 +-
.../org/apache/sis/internal/jaxb/lan/Country.java | 2 +-
.../apache/sis/internal/jaxb/lan/LanguageCode.java | 2 +-
.../sis/internal/jaxb/lan/LocaleAndCharset.java | 4 +-
.../apache/sis/internal/jaxb/lan/TextGroup.java | 2 +-
.../sis/internal/jaxb/metadata/package-info.java | 2 +-
.../internal/jaxb/metadata/replace/Parameter.java | 2 +-
.../jaxb/metadata/replace/QualityParameter.java | 2 +-
.../jaxb/metadata/replace/ServiceParameter.java | 2 +-
.../jaxb/metadata/replace/package-info.java | 2 +-
.../apache/sis/internal/metadata/AxisNames.java | 4 +-
.../apache/sis/internal/metadata/ExcludedSet.java | 2 +-
.../apache/sis/internal/metadata/Identifiers.java | 2 +-
.../org/apache/sis/internal/metadata/Merger.java | 4 +-
.../apache/sis/internal/metadata/NameMeaning.java | 2 +-
.../sis/internal/metadata/ReferencingServices.java | 2 +-
.../apache/sis/internal/metadata/Resources.java | 2 +-
.../apache/sis/internal/metadata/SensorType.java | 2 +-
.../metadata/legacy/LegacyPropertyAdapter.java | 4 +-
.../apache/sis/internal/metadata/sql/Dialect.java | 4 +-
.../sis/internal/metadata/sql/Initializer.java | 4 +-
.../sis/internal/metadata/sql/LocalDataSource.java | 2 +-
.../sis/internal/metadata/sql/ScriptRunner.java | 2 +-
.../apache/sis/internal/simple/SimpleCitation.java | 2 +-
.../org/apache/sis/internal/xml/XmlUtilities.java | 4 +-
.../org/apache/sis/metadata/AbstractMetadata.java | 6 +-
.../org/apache/sis/metadata/MetadataCopier.java | 4 +-
.../org/apache/sis/metadata/MetadataStandard.java | 10 +--
.../apache/sis/metadata/ModifiableMetadata.java | 8 +-
.../org/apache/sis/metadata/PropertyAccessor.java | 6 +-
.../apache/sis/metadata/PropertyComparator.java | 6 +-
.../sis/metadata/StandardImplementation.java | 11 +--
.../org/apache/sis/metadata/TitleProperty.java | 2 +-
.../java/org/apache/sis/metadata/TreeNode.java | 22 +++---
.../org/apache/sis/metadata/TreeNodeChildren.java | 2 +-
.../apache/sis/metadata/iso/DefaultMetadata.java | 2 +-
.../org/apache/sis/metadata/iso/ISOMetadata.java | 2 +-
.../sis/metadata/iso/acquisition/package-info.java | 2 +-
.../sis/metadata/iso/citation/Citations.java | 4 +-
.../metadata/iso/citation/DefaultTelephone.java | 4 +-
.../sis/metadata/iso/citation/package-info.java | 2 +-
.../sis/metadata/iso/constraint/package-info.java | 2 +-
.../sis/metadata/iso/content/package-info.java | 2 +-
.../metadata/iso/distribution/DefaultFormat.java | 4 +-
.../metadata/iso/distribution/package-info.java | 2 +-
.../iso/extent/DefaultGeographicBoundingBox.java | 8 +-
.../iso/extent/DefaultSpatialTemporalExtent.java | 2 +-
.../metadata/iso/extent/DefaultTemporalExtent.java | 2 +-
.../metadata/iso/extent/DefaultVerticalExtent.java | 4 +-
.../apache/sis/metadata/iso/extent/Extents.java | 2 +-
.../sis/metadata/iso/extent/package-info.java | 6 +-
.../identification/DefaultOperationMetadata.java | 4 +
.../metadata/iso/identification/OperationName.java | 2 +-
.../metadata/iso/identification/package-info.java | 2 +-
.../sis/metadata/iso/lineage/package-info.java | 2 +-
.../sis/metadata/iso/maintenance/package-info.java | 2 +-
.../org/apache/sis/metadata/iso/package-info.java | 2 +-
.../sis/metadata/iso/quality/DefaultMeasure.java | 4 +
.../sis/metadata/iso/quality/package-info.java | 2 +-
.../sis/metadata/iso/spatial/package-info.java | 2 +-
.../java/org/apache/sis/metadata/package-info.java | 4 +-
.../apache/sis/metadata/sql/CachedStatement.java | 6 +-
.../org/apache/sis/metadata/sql/Dispatcher.java | 2 +-
.../org/apache/sis/metadata/sql/LookupInfo.java | 2 +-
.../apache/sis/metadata/sql/MetadataFallback.java | 2 +-
.../apache/sis/metadata/sql/MetadataSource.java | 24 +++---
.../apache/sis/metadata/sql/MetadataWriter.java | 6 +-
.../apache/sis/metadata/sql/TableHierarchy.java | 2 +-
.../java/org/apache/sis/util/iso/AbstractName.java | 2 +-
.../org/apache/sis/util/iso/DefaultLocalName.java | 4 +-
.../org/apache/sis/util/iso/DefaultMemberName.java | 2 +-
.../apache/sis/util/iso/DefaultNameFactory.java | 2 +-
.../org/apache/sis/util/iso/DefaultNameSpace.java | 2 +-
.../org/apache/sis/util/iso/DefaultRecord.java | 4 +-
.../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/DefaultTypeName.java | 8 +-
.../main/java/org/apache/sis/util/iso/Names.java | 4 +-
.../org/apache/sis/util/iso/RecordDefinition.java | 2 +-
.../java/org/apache/sis/xml/IdentifierSpace.java | 2 +-
.../main/java/org/apache/sis/xml/InputFactory.java | 12 +--
.../java/org/apache/sis/xml/MarshallerPool.java | 4 +-
.../main/java/org/apache/sis/xml/Namespaces.java | 6 +-
.../org/apache/sis/xml/NilInternationalString.java | 2 +-
.../main/java/org/apache/sis/xml/NilObject.java | 2 +-
.../main/java/org/apache/sis/xml/NilReason.java | 10 +--
.../java/org/apache/sis/xml/OutputFactory.java | 12 +--
.../java/org/apache/sis/xml/ReferenceResolver.java | 6 +-
.../java/org/apache/sis/xml/TransformedEvent.java | 6 +-
.../main/java/org/apache/sis/xml/Transformer.java | 2 +-
.../org/apache/sis/xml/TransformingNamespaces.java | 2 +-
.../java/org/apache/sis/xml/ValueConverter.java | 16 ++--
.../src/main/java/org/apache/sis/xml/XLink.java | 6 +-
.../src/main/java/org/apache/sis/xml/XML.java | 8 +-
.../src/main/java/org/apache/sis/xml/XPointer.java | 2 +-
.../org/apache/sis/metadata/sql/Citations.sql | 2 +-
.../internal/jaxb/lan/FreeTextMarshallingTest.java | 6 +-
.../sis/internal/jaxb/lan/OtherLocalesTest.java | 2 +-
.../apache/sis/internal/xml/XmlUtilitiesTest.java | 2 +-
.../apache/sis/metadata/AbstractMetadataTest.java | 2 +-
.../java/org/apache/sis/metadata/HashCodeTest.java | 2 +-
.../apache/sis/metadata/MetadataStandardTest.java | 4 +-
.../apache/sis/metadata/PropertyAccessorTest.java | 14 ++--
.../sis/metadata/PropertyConsistencyCheck.java | 6 +-
.../java/org/apache/sis/metadata/PrunerTest.java | 2 +-
.../java/org/apache/sis/metadata/TreeNodeTest.java | 2 +-
.../org/apache/sis/metadata/TreeTableViewTest.java | 2 +-
.../metadata/iso/citation/DefaultContactTest.java | 4 +-
.../sis/metadata/iso/extent/ExtentsTest.java | 2 +-
.../metadata/iso/quality/AbstractElementTest.java | 4 +-
.../sis/test/xml/AnnotationConsistencyCheck.java | 2 +-
.../apache/sis/test/xml/DocumentComparator.java | 10 +--
.../apache/sis/util/iso/NameMarshallingTest.java | 6 +-
.../java/org/apache/sis/util/iso/NamesTest.java | 2 +-
.../apache/sis/xml/NilReasonMarshallingTest.java | 2 +-
.../java/org/apache/sis/xml/NilReasonTest.java | 6 +-
.../test/java/org/apache/sis/xml/XLinkTest.java | 22 +++---
.../coverage/MultiResolutionCoverageLoader.java | 6 +-
.../sis/internal/map/coverage/RenderingData.java | 6 +-
.../main/java/org/apache/sis/portrayal/Canvas.java | 24 +++---
.../org/apache/sis/portrayal/CanvasExtent.java | 4 +-
.../org/apache/sis/portrayal/CanvasFollower.java | 6 +-
.../java/org/apache/sis/portrayal/Observable.java | 2 +-
.../apache/sis/portrayal/TransformChangeEvent.java | 2 +-
.../apache/sis/internal/gazetteer/Resources.java | 4 +-
.../sis/internal/gazetteer/Resources.properties | 4 +-
.../referencing/gazetteer/GazetteerException.java | 2 +-
.../referencing/gazetteer/GazetteerFactory.java | 4 +-
.../gazetteer/GeohashReferenceSystem.java | 6 +-
.../gazetteer/MilitaryGridReferenceSystem.java | 12 +--
.../gazetteer/ModifiableLocationType.java | 2 +-
.../gazetteer/GazetteerFactoryTest.java | 2 +-
.../sis/referencing/gazetteer/LocationViewer.java | 6 +-
.../gazetteer/MilitaryGridReferenceSystemTest.java | 2 +-
.../sis/geometry/AbstractDirectPosition.java | 2 +-
.../org/apache/sis/geometry/AbstractEnvelope.java | 2 +-
.../org/apache/sis/geometry/ArrayEnvelope.java | 2 +-
.../org/apache/sis/geometry/CoordinateFormat.java | 12 +--
.../org/apache/sis/geometry/CurveExtremum.java | 2 +-
.../org/apache/sis/geometry/DirectPosition1D.java | 2 +-
.../org/apache/sis/geometry/DirectPosition2D.java | 2 +-
.../java/org/apache/sis/geometry/Envelope2D.java | 16 ++--
.../org/apache/sis/geometry/EnvelopeReducer.java | 2 +-
.../java/org/apache/sis/geometry/Envelopes.java | 20 ++---
.../apache/sis/geometry/GeneralDirectPosition.java | 2 +-
.../org/apache/sis/geometry/GeneralEnvelope.java | 12 +--
.../org/apache/sis/geometry/ImmutableEnvelope.java | 4 +-
.../java/org/apache/sis/geometry/Shapes2D.java | 2 +-
.../apache/sis/geometry/WraparoundAdjustment.java | 4 +-
.../referencing/CC_GeneralOperationParameter.java | 4 +-
.../jaxb/referencing/CC_GeneralParameterValue.java | 2 +-
.../jaxb/referencing/CC_OperationMethod.java | 4 +-
.../referencing/CC_OperationParameterGroup.java | 6 +-
.../apache/sis/internal/jaxb/referencing/Code.java | 6 +-
.../jaxb/referencing/SecondDefiningParameter.java | 2 +-
.../internal/jaxb/referencing/package-info.java | 2 +-
.../sis/internal/referencing/AxesMapper.java | 2 +-
.../sis/internal/referencing/AxisDirections.java | 10 +--
.../internal/referencing/CoordinateOperations.java | 2 +-
.../internal/referencing/DefinitionVerifier.java | 2 +-
.../apache/sis/internal/referencing/Formulas.java | 2 +-
.../referencing/GeodeticObjectBuilder.java | 16 ++--
.../referencing/MathTransformsOrFactory.java | 8 +-
.../sis/internal/referencing/MergedProperties.java | 14 ++--
.../internal/referencing/PositionTransformer.java | 2 +-
.../referencing/ReferencingFactoryContainer.java | 8 +-
.../internal/referencing/ReferencingUtilities.java | 2 +-
.../apache/sis/internal/referencing/Resources.java | 56 +++++++-------
.../sis/internal/referencing/Resources.properties | 56 +++++++-------
.../internal/referencing/ServicesForMetadata.java | 6 +-
.../internal/referencing/VerticalDatumTypes.java | 6 +-
.../sis/internal/referencing/WKTKeywords.java | 2 +-
.../sis/internal/referencing/WKTUtilities.java | 6 +-
.../internal/referencing/WraparoundApplicator.java | 6 +-
.../referencing/j2d/AffineTransform2D.java | 2 +-
.../sis/internal/referencing/j2d/Bezier.java | 14 ++--
.../referencing/j2d/ImmutableAffineTransform.java | 2 +-
.../referencing/j2d/IntervalRectangle.java | 2 +-
.../referencing/j2d/LinearTransform2D.java | 2 +-
.../apache/sis/internal/referencing/j2d/Tile.java | 4 +-
.../internal/referencing/j2d/TileOrganizer.java | 4 +-
.../referencing/provider/AbridgedMolodensky.java | 2 +-
.../referencing/provider/AbstractProvider.java | 2 +-
.../provider/DatumShiftGridCompressed.java | 2 +-
.../referencing/provider/DatumShiftGridGroup.java | 2 +-
.../referencing/provider/DatumShiftGridLoader.java | 2 +-
.../referencing/provider/Equirectangular.java | 2 +-
.../provider/FranceGeocentricInterpolation.java | 4 +-
.../referencing/provider/GeocentricAffine.java | 6 +-
.../GeocentricAffineBetweenGeographic.java | 2 +-
.../referencing/provider/GeodeticOperation.java | 4 +-
.../provider/GeographicAndVerticalOffsets.java | 2 +-
.../referencing/provider/LambertConformal2SP.java | 2 +-
.../referencing/provider/MapProjection.java | 2 +-
.../internal/referencing/provider/Mercator2SP.java | 4 +-
.../internal/referencing/provider/Molodensky.java | 4 +-
.../sis/internal/referencing/provider/NTv2.java | 2 +-
.../referencing/provider/NorthPoleRotation.java | 2 +-
.../referencing/provider/PolarStereographicB.java | 2 +-
.../referencing/provider/PseudoSinusoidal.java | 2 +-
.../referencing/provider/SouthPoleRotation.java | 2 +-
.../internal/referencing/provider/Wraparound.java | 2 +-
.../provider/ZonedTransverseMercator.java | 2 +-
.../java/org/apache/sis/io/wkt/AbstractParser.java | 12 +--
.../java/org/apache/sis/io/wkt/Convention.java | 2 +-
.../main/java/org/apache/sis/io/wkt/Element.java | 8 +-
.../org/apache/sis/io/wkt/FormattableObject.java | 14 ++--
.../main/java/org/apache/sis/io/wkt/Formatter.java | 14 ++--
.../apache/sis/io/wkt/GeodeticObjectParser.java | 78 +++++++++----------
.../org/apache/sis/io/wkt/MathTransformParser.java | 24 +++---
.../org/apache/sis/io/wkt/SingletonElement.java | 2 +-
.../java/org/apache/sis/io/wkt/StoredTree.java | 2 +-
.../main/java/org/apache/sis/io/wkt/Symbols.java | 4 +-
.../java/org/apache/sis/io/wkt/Transliterator.java | 4 +-
.../sis/io/wkt/UnformattableObjectException.java | 6 +-
.../sis/io/wkt/UnparsableObjectException.java | 6 +-
.../java/org/apache/sis/io/wkt/VerticalInfo.java | 6 +-
.../java/org/apache/sis/io/wkt/WKTDictionary.java | 8 +-
.../main/java/org/apache/sis/io/wkt/WKTFormat.java | 8 +-
.../main/java/org/apache/sis/io/wkt/Warnings.java | 4 +-
.../sis/parameter/AbstractParameterDescriptor.java | 2 +-
.../sis/parameter/DefaultParameterDescriptor.java | 8 +-
.../parameter/DefaultParameterDescriptorGroup.java | 2 +-
.../sis/parameter/DefaultParameterValue.java | 8 +-
.../sis/parameter/DefaultParameterValueGroup.java | 2 +-
.../sis/parameter/MapProjectionParameters.java | 4 +-
.../org/apache/sis/parameter/ParameterBuilder.java | 8 +-
.../org/apache/sis/parameter/ParameterFormat.java | 6 +-
.../apache/sis/parameter/ParameterValueList.java | 4 +-
.../java/org/apache/sis/parameter/Parameters.java | 11 +--
.../org/apache/sis/parameter/TensorParameters.java | 6 +-
.../sis/parameter/UnmodifiableParameterValue.java | 2 +-
.../parameter/UnmodifiableParameterValueGroup.java | 2 +-
.../java/org/apache/sis/parameter/Verifier.java | 2 +-
.../org/apache/sis/parameter/package-info.java | 2 +-
.../sis/referencing/AbstractIdentifiedObject.java | 14 ++--
.../sis/referencing/AbstractReferenceSystem.java | 2 +-
.../java/org/apache/sis/referencing/Builder.java | 14 ++--
.../main/java/org/apache/sis/referencing/CRS.java | 16 ++--
.../java/org/apache/sis/referencing/CommonCRS.java | 2 +-
.../sis/referencing/EPSGFactoryFallback.java | 4 +-
.../referencing/EllipsoidalHeightSeparator.java | 8 +-
.../sis/referencing/GeodesicsOnEllipsoid.java | 6 +-
.../apache/sis/referencing/GeodeticCalculator.java | 38 ++++-----
.../apache/sis/referencing/GeodeticException.java | 2 +-
.../apache/sis/referencing/IdentifiedObjects.java | 8 +-
.../sis/referencing/ImmutableIdentifier.java | 6 +-
.../org/apache/sis/referencing/NameIterator.java | 2 +-
.../apache/sis/referencing/NamedIdentifier.java | 6 +-
.../sis/referencing/StandardDefinitions.java | 4 +-
.../apache/sis/referencing/crs/AbstractCRS.java | 4 +-
.../sis/referencing/crs/AbstractDerivedCRS.java | 4 +-
.../apache/sis/referencing/crs/ConversionKeys.java | 6 +-
.../sis/referencing/crs/DefaultCompoundCRS.java | 2 +-
.../sis/referencing/crs/DefaultDerivedCRS.java | 6 +-
.../sis/referencing/crs/DefaultEngineeringCRS.java | 2 +-
.../sis/referencing/crs/DefaultGeocentricCRS.java | 2 +-
.../sis/referencing/crs/DefaultGeodeticCRS.java | 6 +-
.../sis/referencing/crs/DefaultGeographicCRS.java | 2 +-
.../sis/referencing/crs/DefaultImageCRS.java | 2 +-
.../sis/referencing/crs/DefaultParametricCRS.java | 2 +-
.../sis/referencing/crs/DefaultProjectedCRS.java | 2 +-
.../sis/referencing/crs/DefaultTemporalCRS.java | 6 +-
.../sis/referencing/crs/DefaultVerticalCRS.java | 2 +-
.../org/apache/sis/referencing/cs/AbstractCS.java | 4 +-
.../java/org/apache/sis/referencing/cs/Codes.java | 2 +-
.../sis/referencing/cs/CoordinateSystems.java | 4 +-
.../apache/sis/referencing/cs/DefaultAffineCS.java | 2 +-
.../sis/referencing/cs/DefaultCartesianCS.java | 2 +-
.../sis/referencing/cs/DefaultCompoundCS.java | 2 +-
.../cs/DefaultCoordinateSystemAxis.java | 8 +-
.../sis/referencing/cs/DefaultCylindricalCS.java | 2 +-
.../sis/referencing/cs/DefaultEllipsoidalCS.java | 2 +-
.../apache/sis/referencing/cs/DefaultLinearCS.java | 2 +-
.../sis/referencing/cs/DefaultParametricCS.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/DefaultUserDefinedCS.java | 2 +-
.../sis/referencing/cs/DefaultVerticalCS.java | 2 +-
.../org/apache/sis/referencing/cs/Normalizer.java | 2 +-
.../sis/referencing/datum/AbstractDatum.java | 2 +-
.../sis/referencing/datum/BursaWolfParameters.java | 2 +-
.../sis/referencing/datum/DatumShiftGrid.java | 4 +-
.../sis/referencing/datum/DefaultEllipsoid.java | 6 +-
.../referencing/datum/DefaultEngineeringDatum.java | 2 +-
.../referencing/datum/DefaultGeodeticDatum.java | 8 +-
.../sis/referencing/datum/DefaultImageDatum.java | 2 +-
.../referencing/datum/DefaultParametricDatum.java | 2 +-
.../referencing/datum/DefaultPrimeMeridian.java | 4 +-
.../referencing/datum/DefaultTemporalDatum.java | 2 +-
.../referencing/datum/DefaultVerticalDatum.java | 4 +-
.../referencing/factory/AuthorityFactoryProxy.java | 4 +-
.../factory/CommonAuthorityFactory.java | 6 +-
.../factory/ConcurrentAuthorityFactory.java | 14 ++--
.../factory/GeodeticAuthorityFactory.java | 82 ++++++++++----------
.../referencing/factory/GeodeticObjectFactory.java | 6 +-
.../factory/IdentifiedObjectFinder.java | 4 +-
.../referencing/factory/IdentifiedObjectSet.java | 2 +-
.../factory/MissingFactoryResourceException.java | 4 +-
.../factory/MultiAuthoritiesFactory.java | 6 +-
.../factory/UnavailableFactoryException.java | 6 +-
.../sis/referencing/factory/package-info.java | 2 +-
.../referencing/factory/sql/AuthorityCodes.java | 2 +-
.../sis/referencing/factory/sql/BursaWolfInfo.java | 2 +-
.../factory/sql/CoordinateOperationSet.java | 2 +-
.../referencing/factory/sql/EPSGDataAccess.java | 20 ++---
.../sis/referencing/factory/sql/EPSGFactory.java | 6 +-
.../sis/referencing/factory/sql/EPSGInstaller.java | 2 +-
.../sis/referencing/factory/sql/SQLTranslator.java | 4 +-
.../operation/AbstractCoordinateOperation.java | 8 +-
.../operation/AbstractSingleOperation.java | 20 ++---
.../operation/CoordinateOperationContext.java | 4 +-
.../operation/CoordinateOperationFinder.java | 32 ++++----
.../operation/CoordinateOperationRegistry.java | 24 +++---
.../operation/DefaultConcatenatedOperation.java | 10 +--
.../referencing/operation/DefaultConversion.java | 6 +-
.../DefaultCoordinateOperationFactory.java | 6 +-
.../operation/DefaultOperationMethod.java | 14 ++--
.../operation/DefaultTransformation.java | 2 +-
.../operation/InverseOperationMethod.java | 2 +-
.../referencing/operation/SubOperationInfo.java | 6 +-
.../operation/builder/LinearTransformBuilder.java | 24 +++---
.../referencing/operation/builder/Linearizer.java | 4 +-
.../operation/builder/LocalizationGridBuilder.java | 12 +--
.../builder/LocalizationGridException.java | 4 +-
.../operation/builder/ProjectedTransformTry.java | 4 +-
.../operation/builder/ResidualGrid.java | 4 +-
.../operation/builder/TransformBuilder.java | 4 +-
.../operation/matrix/AffineTransforms2D.java | 6 +-
.../operation/matrix/GeneralMatrix.java | 8 +-
.../sis/referencing/operation/matrix/Matrices.java | 10 +--
.../sis/referencing/operation/matrix/Matrix1.java | 2 +-
.../sis/referencing/operation/matrix/Matrix2.java | 2 +-
.../sis/referencing/operation/matrix/Matrix3.java | 2 +-
.../sis/referencing/operation/matrix/Matrix4.java | 2 +-
.../referencing/operation/matrix/MatrixSIS.java | 2 +-
.../matrix/MismatchedMatrixSizeException.java | 2 +-
.../matrix/NoninvertibleMatrixException.java | 2 +-
.../sis/referencing/operation/matrix/Solver.java | 2 +-
.../sis/referencing/operation/package-info.java | 2 +-
.../operation/projection/AlbersEqualArea.java | 4 +-
.../operation/projection/AuthalicConversion.java | 2 +-
.../operation/projection/AuthalicMercator.java | 4 +-
.../operation/projection/AzimuthalEquidistant.java | 4 +-
.../operation/projection/CassiniSoldner.java | 4 +-
.../operation/projection/ConformalProjection.java | 2 +-
.../operation/projection/CylindricalEqualArea.java | 6 +-
.../operation/projection/Initializer.java | 6 +-
.../projection/LambertAzimuthalEqualArea.java | 6 +-
.../projection/LambertConicConformal.java | 8 +-
.../operation/projection/LongitudeWraparound.java | 4 +-
.../referencing/operation/projection/Mercator.java | 10 +--
.../operation/projection/MeridianArcBased.java | 2 +-
.../projection/ModifiedAzimuthalEquidistant.java | 2 +-
.../operation/projection/Mollweide.java | 2 +-
.../operation/projection/NormalizedProjection.java | 12 +--
.../operation/projection/ObliqueMercator.java | 4 +-
.../operation/projection/ObliqueStereographic.java | 12 +--
.../operation/projection/Orthographic.java | 2 +-
.../operation/projection/PolarStereographic.java | 4 +-
.../operation/projection/Polyconic.java | 4 +-
.../operation/projection/ProjectionException.java | 2 +-
.../operation/projection/SatelliteTracking.java | 8 +-
.../operation/projection/Sinusoidal.java | 2 +-
.../operation/projection/TransverseMercator.java | 14 ++--
.../operation/projection/ZonedGridSystem.java | 4 +-
.../operation/transform/AbstractMathTransform.java | 28 +++----
.../transform/AbstractMathTransform1D.java | 8 +-
.../transform/AbstractMathTransform2D.java | 8 +-
.../operation/transform/ConcatenatedTransform.java | 6 +-
.../operation/transform/ContextualParameters.java | 4 +-
.../operation/transform/DatumShiftTransform.java | 2 +-
.../transform/DefaultMathTransformFactory.java | 18 ++---
.../operation/transform/DomainDefinition.java | 10 +--
.../transform/EllipsoidToCentricTransform.java | 6 +-
.../transform/InterpolatedGeocentricTransform.java | 6 +-
.../transform/InterpolatedMolodenskyTransform.java | 12 +--
.../operation/transform/InterpolatedTransform.java | 24 +++---
.../operation/transform/LinearTransform.java | 4 +-
.../operation/transform/MathTransformProvider.java | 2 +-
.../operation/transform/MathTransforms.java | 6 +-
.../operation/transform/MolodenskyFormula.java | 2 +-
.../operation/transform/MolodenskyTransform.java | 4 +-
.../operation/transform/PassThroughTransform.java | 6 +-
.../operation/transform/PoleRotation.java | 2 +-
.../operation/transform/TransferFunction.java | 2 +-
.../operation/transform/TransformSeparator.java | 8 +-
.../operation/transform/WraparoundTransform.java | 4 +-
.../org/apache/sis/referencing/package-info.java | 2 +-
.../sis/referencing/factory/sql/EPSG_Finish.sql | 2 +-
.../org/apache/sis/geometry/EnvelopesTest.java | 2 +-
.../apache/sis/geometry/GeneralEnvelopeTest.java | 4 +-
.../java/org/apache/sis/geometry/Shapes2DTest.java | 2 +-
.../org/apache/sis/geometry/TransformTestCase.java | 2 +-
.../referencing/EllipsoidalHeightCombinerTest.java | 4 +-
.../sis/internal/referencing/WKTKeywordsTest.java | 2 +-
.../internal/referencing/provider/AffineTest.java | 2 +-
.../referencing/provider/DatumShiftTestCase.java | 6 +-
.../FranceGeocentricInterpolationTest.java | 6 +-
.../internal/referencing/provider/NADCONTest.java | 2 +-
.../internal/referencing/provider/NTv2Test.java | 2 +-
.../org/apache/sis/io/wkt/ComparisonWithEPSG.java | 2 +-
.../java/org/apache/sis/io/wkt/ElementTest.java | 6 +-
.../sis/io/wkt/GeodeticObjectParserTest.java | 2 +-
.../org/apache/sis/io/wkt/WKTDictionaryTest.java | 6 +-
.../java/org/apache/sis/io/wkt/WKTFormatTest.java | 2 +-
.../java/org/apache/sis/io/wkt/package-info.txt | 2 +-
.../parameter/DefaultParameterDescriptorTest.java | 6 +-
.../parameter/DefaultParameterValueGroupTest.java | 2 +-
.../sis/parameter/DefaultParameterValueTest.java | 4 +-
.../org/apache/sis/parameter/ParametersTest.java | 2 +-
.../parameter/UnmodifiableParameterValueTest.java | 2 +-
.../sis/referencing/AuthorityFactoriesTest.java | 2 +-
.../java/org/apache/sis/referencing/CRSTest.java | 8 +-
.../sis/referencing/EPSGFactoryFallbackTest.java | 16 ++--
.../sis/referencing/GeodeticCalculatorTest.java | 4 +-
.../sis/referencing/ImmutableIdentifierTest.java | 6 +-
.../referencing/crs/DefaultCompoundCRSTest.java | 2 +-
.../referencing/crs/DefaultGeographicCRSTest.java | 2 +-
.../cs/DefaultCoordinateSystemAxisTest.java | 2 +-
.../referencing/cs/DefaultCylindricalCSTest.java | 2 +-
.../sis/referencing/cs/DefaultPolarCSTest.java | 2 +-
.../apache/sis/referencing/cs/HardCodedAxes.java | 2 +-
.../apache/sis/referencing/cs/NormalizerTest.java | 2 +-
.../referencing/datum/BursaWolfParametersTest.java | 2 +-
.../datum/DefaultPrimeMeridianTest.java | 2 +-
.../datum/DefaultVerticalDatumTest.java | 2 +-
.../factory/ConcurrentAuthorityFactoryTest.java | 2 +-
.../referencing/factory/sql/EPSGFactoryTest.java | 4 +-
.../factory/sql/epsg/DataScriptFormatter.java | 2 +-
.../sis/referencing/factory/sql/epsg/package.html | 2 +-
.../operation/CoordinateOperationFinderTest.java | 56 +++++++-------
.../operation/CoordinateOperationRegistryTest.java | 20 ++---
.../DefaultCoordinateOperationFactoryTest.java | 16 ++--
.../builder/LinearTransformBuilderTest.java | 20 ++---
.../operation/matrix/GeneralMatrixTest.java | 2 +-
.../operation/matrix/MatrixTestCase.java | 10 +--
.../operation/matrix/NonSquareMatrixTest.java | 12 +--
.../referencing/operation/matrix/SolverTest.java | 2 +-
.../operation/projection/AlbersEqualAreaTest.java | 2 +-
.../projection/LambertAzimuthalEqualAreaTest.java | 2 +-
.../projection/LambertConicConformalTest.java | 2 +-
.../projection/MapProjectionTestCase.java | 4 +-
.../operation/projection/MercatorTest.java | 4 +-
.../operation/projection/MeridianArcTest.java | 2 +-
.../transform/AbstractMathTransformTest.java | 4 +-
.../operation/transform/CartesianToPolarTest.java | 24 +++---
.../transform/CartesianToSphericalTest.java | 12 +--
.../transform/ConcatenatedTransformTest.java | 8 +-
.../transform/MathTransformFactoryMock.java | 2 +-
.../operation/transform/MathTransformWrapper.java | 4 +-
.../transform/OperationMethodSetTest.java | 2 +-
.../transform/PassThroughTransformTest.java | 2 +-
.../operation/transform/PolarToCartesianTest.java | 24 +++---
.../operation/transform/PoleRotationTest.java | 20 ++---
.../transform/ProjectiveTransformTest.java | 4 +-
.../operation/transform/PseudoTransform.java | 4 +-
.../transform/SphericalToCartesianTest.java | 12 +--
.../transform/TransformSeparatorTest.java | 4 +-
.../transform/WraparoundTransformTest.java | 6 +-
.../sis/referencing/report/HTMLGenerator.java | 2 +-
.../sis/test/integration/ConsistencyTest.java | 10 +--
.../apache/sis/test/integration/MetadataTest.java | 4 +-
.../apache/sis/test/widget/SwingAssertions.java | 2 +-
.../sis/internal/converter/ArrayConverter.java | 4 +-
.../internal/converter/CharSequenceConverter.java | 2 +-
.../sis/internal/converter/ConverterRegistry.java | 12 +--
.../sis/internal/converter/FallbackConverter.java | 8 +-
.../sis/internal/converter/NumberConverter.java | 2 +-
.../sis/internal/converter/ObjectToString.java | 2 +-
.../sis/internal/converter/SystemConverter.java | 8 +-
.../sis/internal/converter/SystemRegistry.java | 2 +-
.../apache/sis/internal/system/DaemonThread.java | 2 +-
.../apache/sis/internal/system/OSGiActivator.java | 2 +-
.../org/apache/sis/internal/system/Shutdown.java | 2 +-
.../apache/sis/internal/system/SystemListener.java | 2 +-
.../org/apache/sis/internal/system/Threads.java | 2 +-
.../org/apache/sis/internal/util/AbstractMap.java | 10 +--
.../java/org/apache/sis/internal/util/Bag.java | 2 +-
.../apache/sis/internal/util/CheckedArrayList.java | 2 +-
.../apache/sis/internal/util/CheckedHashSet.java | 2 +-
.../java/org/apache/sis/internal/util/Cloner.java | 10 +--
.../apache/sis/internal/util/CollectionsExt.java | 6 +-
.../apache/sis/internal/util/DefinitionURI.java | 2 +-
.../org/apache/sis/internal/util/DoubleDouble.java | 30 ++++----
.../apache/sis/internal/util/FinalFieldSetter.java | 4 +-
.../sis/internal/util/LocalizedParseException.java | 6 +-
.../apache/sis/internal/util/PropertyFormat.java | 2 +-
.../apache/sis/internal/util/SetOfUnknownSize.java | 6 +-
.../sis/internal/util/StandardDateFormat.java | 6 +-
.../java/org/apache/sis/io/AppendableWriter.java | 2 +-
.../main/java/org/apache/sis/io/ClassFormat.java | 2 +-
.../java/org/apache/sis/io/CompoundFormat.java | 2 +-
.../org/apache/sis/io/IdentifiedObjectFormat.java | 2 +-
.../org/apache/sis/io/InvalidSeekException.java | 2 +-
.../main/java/org/apache/sis/io/LineAppender.java | 2 +-
.../main/java/org/apache/sis/io/TableAppender.java | 2 +-
.../main/java/org/apache/sis/io/TabularFormat.java | 2 +-
.../main/java/org/apache/sis/math/ArrayVector.java | 8 +-
.../java/org/apache/sis/math/DecimalFunctions.java | 18 ++---
.../main/java/org/apache/sis/math/Fraction.java | 20 ++---
.../java/org/apache/sis/math/FunctionProperty.java | 4 +-
.../java/org/apache/sis/math/MathFunctions.java | 8 +-
.../java/org/apache/sis/math/PackedVector.java | 2 +-
.../java/org/apache/sis/math/RepeatedVector.java | 2 +-
.../java/org/apache/sis/math/SequenceVector.java | 2 +-
.../main/java/org/apache/sis/math/Statistics.java | 6 +-
.../src/main/java/org/apache/sis/math/Vector.java | 32 ++++----
.../java/org/apache/sis/measure/AbstractUnit.java | 4 +-
.../main/java/org/apache/sis/measure/Angle.java | 2 +-
.../java/org/apache/sis/measure/AngleFormat.java | 14 ++--
.../org/apache/sis/measure/ConventionalUnit.java | 4 +-
.../java/org/apache/sis/measure/FormatField.java | 2 +-
.../org/apache/sis/measure/LinearConverter.java | 2 +-
.../org/apache/sis/measure/MeasurementRange.java | 6 +-
.../java/org/apache/sis/measure/NumberRange.java | 18 ++---
.../java/org/apache/sis/measure/Quantities.java | 4 +-
.../main/java/org/apache/sis/measure/Range.java | 4 +-
.../java/org/apache/sis/measure/RangeFormat.java | 12 +--
.../java/org/apache/sis/measure/ScalarFactory.java | 2 +-
.../apache/sis/measure/SexagesimalConverter.java | 6 +-
.../java/org/apache/sis/measure/SystemUnit.java | 10 +--
.../java/org/apache/sis/measure/UnitFormat.java | 8 +-
.../java/org/apache/sis/measure/UnitServices.java | 2 +-
.../main/java/org/apache/sis/measure/Units.java | 22 +++---
.../java/org/apache/sis/measure/ValueRange.java | 2 +-
.../src/main/java/org/apache/sis/setup/About.java | 2 +-
.../java/org/apache/sis/setup/Configuration.java | 2 +-
.../main/java/org/apache/sis/setup/OptionKey.java | 2 +-
.../apache/sis/setup/OptionalInstallations.java | 2 +-
.../java/org/apache/sis/util/ArgumentChecks.java | 2 +-
.../main/java/org/apache/sis/util/ArraysExt.java | 22 +++---
.../java/org/apache/sis/util/CharSequences.java | 26 +++----
.../main/java/org/apache/sis/util/Characters.java | 8 +-
.../src/main/java/org/apache/sis/util/Classes.java | 18 ++---
.../java/org/apache/sis/util/ComparisonMode.java | 2 +-
.../apache/sis/util/CorruptedObjectException.java | 2 +-
.../sis/util/DefaultInternationalString.java | 10 +--
.../main/java/org/apache/sis/util/Disposable.java | 2 +-
.../org/apache/sis/util/LocalizedException.java | 2 +-
.../src/main/java/org/apache/sis/util/Numbers.java | 12 +--
.../java/org/apache/sis/util/ObjectConverter.java | 8 +-
.../java/org/apache/sis/util/ObjectConverters.java | 2 +-
.../sis/util/ResourceInternationalString.java | 8 +-
.../sis/util/UnconvertibleObjectException.java | 2 +-
.../org/apache/sis/util/UnknownNameException.java | 2 +-
.../util/UnsupportedImplementationException.java | 2 +-
.../main/java/org/apache/sis/util/Utilities.java | 2 +-
.../src/main/java/org/apache/sis/util/Version.java | 4 +-
.../main/java/org/apache/sis/util/Workaround.java | 2 +-
.../java/org/apache/sis/util/collection/Cache.java | 4 +-
.../apache/sis/util/collection/CodeListSet.java | 4 +-
.../org/apache/sis/util/collection/Containers.java | 14 ++--
.../sis/util/collection/DefaultTreeTable.java | 18 ++---
.../sis/util/collection/DerivedIterator.java | 2 +-
.../org/apache/sis/util/collection/DerivedMap.java | 2 +-
.../org/apache/sis/util/collection/DerivedSet.java | 2 +-
.../sis/util/collection/FrequencySortedSet.java | 4 +-
.../apache/sis/util/collection/TableColumn.java | 4 +-
.../apache/sis/util/collection/TreeNodeList.java | 12 +--
.../org/apache/sis/util/collection/TreeTable.java | 10 +--
.../sis/util/collection/TreeTableFormat.java | 8 +-
.../org/apache/sis/util/collection/TreeTables.java | 4 +-
.../org/apache/sis/util/collection/WeakEntry.java | 2 +-
.../apache/sis/util/collection/WeakHashSet.java | 2 +-
.../sis/util/collection/WeakValueHashMap.java | 10 +--
.../apache/sis/util/collection/package-info.java | 4 +-
.../java/org/apache/sis/util/logging/Logging.java | 2 +-
.../apache/sis/util/logging/MonolineFormatter.java | 4 +-
.../java/org/apache/sis/util/resources/Errors.java | 90 +++++++++++-----------
.../apache/sis/util/resources/Errors.properties | 84 ++++++++++----------
.../sis/util/resources/IndexedResourceBundle.java | 4 +-
.../org/apache/sis/util/resources/Messages.java | 8 +-
.../apache/sis/util/resources/Messages.properties | 8 +-
.../resources/ResourceInternationalString.java | 2 +-
.../org/apache/sis/util/resources/Vocabulary.java | 2 +-
.../internal/converter/NumberConverterTest.java | 2 +-
.../sis/internal/util/CheckedArrayListTest.java | 10 +--
.../internal/util/LocalizedParseExceptionTest.java | 2 +-
.../java/org/apache/sis/io/EchoAppendable.java | 2 +-
.../java/org/apache/sis/io/TableAppenderTest.java | 2 +-
.../org/apache/sis/math/DecimalFunctionsTest.java | 2 +-
.../org/apache/sis/measure/AngleFormatTest.java | 2 +-
.../java/org/apache/sis/measure/PrefixesTest.java | 4 +-
.../sis/measure/SexagesimalConverterTest.java | 4 +-
.../org/apache/sis/measure/SystemUnitTest.java | 6 +-
.../org/apache/sis/measure/UnitFormatTest.java | 2 +-
.../java/org/apache/sis/measure/UnitsTest.java | 4 +-
.../java/org/apache/sis/setup/OptionKeyTest.java | 2 +-
.../src/test/java/org/apache/sis/test/Assert.java | 2 +-
.../test/java/org/apache/sis/test/DependsOn.java | 2 +-
.../java/org/apache/sis/test/DependsOnMethod.java | 4 +-
.../test/java/org/apache/sis/test/TestCase.java | 2 +-
.../test/java/org/apache/sis/test/TestSuite.java | 2 +-
.../java/org/apache/sis/test/TestUtilities.java | 2 +-
.../test/foreigner/SerializableTableColumn.java | 2 +-
.../java/org/apache/sis/test/package-info.java | 2 +-
.../java/org/apache/sis/util/CharactersTest.java | 2 +-
.../java/org/apache/sis/util/ExceptionsTest.java | 8 +-
.../org/apache/sis/util/collection/CacheTest.java | 4 +-
.../sis/util/collection/CodeListSetTest.java | 4 +-
.../sis/util/collection/DefaultTreeTableTest.java | 2 +-
.../sis/util/collection/WeakHashSetTest.java | 2 +-
.../sis/util/collection/WeakValueHashMapTest.java | 4 +-
ide-project/NetBeans/build.xml | 4 +-
ide-project/NetBeans/nbproject/project.properties | 4 +-
non-free/README | 2 +-
pom.xml | 8 +-
.../profile/fra/DirectReferenceSystemTest.java | 2 +-
.../apache/sis/internal/earth/netcdf/GCOM_C.java | 4 +-
.../apache/sis/internal/earth/netcdf/GCOM_W.java | 4 +-
.../apache/sis/storage/landsat/LandsatStore.java | 2 +-
.../apache/sis/storage/landsat/MetadataReader.java | 6 +-
.../storage/landsat/doc-files/MetadataMapping.html | 2 +-
.../apache/sis/internal/geotiff/Compression.java | 2 +-
.../org/apache/sis/internal/geotiff/Resources.java | 6 +-
.../sis/internal/geotiff/Resources.properties | 4 +-
.../sis/internal/storage/inflater/CCITTRLE.java | 4 +-
.../storage/inflater/CompressionChannel.java | 2 +-
.../storage/inflater/HorizontalPredictor.java | 4 +-
.../sis/internal/storage/inflater/Inflater.java | 4 +-
.../apache/sis/internal/storage/inflater/LZW.java | 10 +--
.../sis/internal/storage/inflater/PackBits.java | 4 +-
.../internal/storage/inflater/PixelChannel.java | 2 +-
.../storage/inflater/PredictorChannel.java | 2 +-
.../apache/sis/internal/storage/inflater/ZIP.java | 4 +-
.../org/apache/sis/storage/geotiff/CRSBuilder.java | 32 ++++----
.../org/apache/sis/storage/geotiff/DataSubset.java | 6 +-
.../apache/sis/storage/geotiff/GeoKeysLoader.java | 2 +-
.../apache/sis/storage/geotiff/GeoTiffStore.java | 6 +-
.../sis/storage/geotiff/GridGeometryBuilder.java | 6 +-
.../sis/storage/geotiff/ImageFileDirectory.java | 14 ++--
.../apache/sis/storage/geotiff/Localization.java | 2 +-
.../apache/sis/storage/geotiff/NativeMetadata.java | 2 +-
.../org/apache/sis/storage/geotiff/Reader.java | 8 +-
.../java/org/apache/sis/storage/geotiff/Type.java | 26 +++----
.../java/org/apache/sis/internal/netcdf/Axis.java | 20 ++---
.../org/apache/sis/internal/netcdf/CRSBuilder.java | 12 +--
.../org/apache/sis/internal/netcdf/Convention.java | 6 +-
.../org/apache/sis/internal/netcdf/DataType.java | 2 +-
.../org/apache/sis/internal/netcdf/Decoder.java | 8 +-
.../org/apache/sis/internal/netcdf/Dimension.java | 2 +-
.../sis/internal/netcdf/DiscreteSampling.java | 2 +-
.../org/apache/sis/internal/netcdf/FeatureSet.java | 8 +-
.../java/org/apache/sis/internal/netcdf/Grid.java | 8 +-
.../apache/sis/internal/netcdf/GridMapping.java | 6 +-
.../org/apache/sis/internal/netcdf/Linearizer.java | 8 +-
.../apache/sis/internal/netcdf/RasterResource.java | 6 +-
.../org/apache/sis/internal/netcdf/Resources.java | 26 +++----
.../sis/internal/netcdf/Resources.properties | 20 ++---
.../org/apache/sis/internal/netcdf/Variable.java | 16 ++--
.../sis/internal/netcdf/impl/DimensionInfo.java | 2 +-
.../sis/internal/netcdf/impl/VariableInfo.java | 6 +-
.../sis/internal/netcdf/ucar/DecoderWrapper.java | 2 +-
.../sis/internal/netcdf/ucar/GridWrapper.java | 6 +-
.../sis/internal/netcdf/ucar/VariableWrapper.java | 6 +-
.../apache/sis/storage/netcdf/AttributeNames.java | 2 +-
.../apache/sis/storage/netcdf/MetadataReader.java | 6 +-
.../org/apache/sis/storage/netcdf/NetcdfStore.java | 4 +-
.../sis/storage/netcdf/NetcdfStoreProvider.java | 4 +-
.../apache/sis/storage/netcdf/package-info.java | 2 +-
.../apache/sis/internal/sql/feature/Column.java | 4 +-
.../apache/sis/internal/sql/feature/Database.java | 12 +--
.../sis/internal/sql/feature/FeatureAdapter.java | 4 +-
.../sis/internal/sql/feature/FeatureAnalyzer.java | 2 +-
.../sis/internal/sql/feature/FeatureIterator.java | 6 +-
.../sis/internal/sql/feature/FeatureStream.java | 8 +-
.../sis/internal/sql/feature/GeometryGetter.java | 2 +-
.../sis/internal/sql/feature/InfoStatements.java | 16 ++--
.../sis/internal/sql/feature/QueryAnalyzer.java | 2 +-
.../apache/sis/internal/sql/feature/Relation.java | 2 +-
.../apache/sis/internal/sql/feature/Resources.java | 6 +-
.../sis/internal/sql/feature/Resources.properties | 4 +-
.../sis/internal/sql/feature/SelectionClause.java | 4 +-
.../sql/feature/SelectionClauseWriter.java | 4 +-
.../sis/internal/sql/feature/TableReference.java | 2 +-
.../sis/internal/sql/feature/ValueGetter.java | 2 +-
.../apache/sis/internal/sql/postgis/Postgres.java | 2 +-
.../sis/internal/sql/postgis/RasterGetter.java | 2 +-
.../apache/sis/internal/stream/DeferredStream.java | 2 +-
.../apache/sis/internal/stream/StreamWrapper.java | 2 +-
.../org/apache/sis/storage/sql/package-info.java | 2 +-
.../internal/sql/feature/GeometryGetterTest.java | 2 +-
.../org/apache/sis/storage/sql/SQLStoreTest.java | 4 +-
.../apache/sis/internal/storage/Capability.java | 2 +-
.../org/apache/sis/internal/storage/CodeType.java | 6 +-
.../sis/internal/storage/GridResourceWrapper.java | 8 +-
.../sis/internal/storage/MemoryGridResource.java | 2 +-
.../sis/internal/storage/MetadataBuilder.java | 2 +-
.../apache/sis/internal/storage/PRJDataStore.java | 10 +--
.../apache/sis/internal/storage/RangeArgument.java | 6 +-
.../org/apache/sis/internal/storage/Resources.java | 42 +++++-----
.../sis/internal/storage/Resources.properties | 40 +++++-----
.../apache/sis/internal/storage/StoreMetadata.java | 2 +-
.../sis/internal/storage/StoreUtilities.java | 8 +-
.../sis/internal/storage/TiledGridCoverage.java | 10 +--
.../apache/sis/internal/storage/URIDataStore.java | 8 +-
.../internal/storage/WritableResourceSupport.java | 8 +-
.../org/apache/sis/internal/storage/csv/Store.java | 2 +-
.../sis/internal/storage/esri/AsciiGridStore.java | 8 +-
.../sis/internal/storage/esri/CharactersView.java | 4 +-
.../sis/internal/storage/esri/RasterStore.java | 6 +-
.../sis/internal/storage/esri/RawRasterReader.java | 2 +-
.../sis/internal/storage/esri/RawRasterStore.java | 6 +-
.../sis/internal/storage/esri/WritableStore.java | 4 +-
.../apache/sis/internal/storage/folder/Store.java | 4 +-
.../sis/internal/storage/folder/StoreProvider.java | 2 +-
.../storage/folder/UnstructuredAggregate.java | 2 +-
.../sis/internal/storage/folder/WritableStore.java | 6 +-
.../sis/internal/storage/folder/package-info.java | 2 +-
.../sis/internal/storage/image/WorldFileStore.java | 24 +++---
.../sis/internal/storage/image/WritableStore.java | 6 +-
.../sis/internal/storage/io/ChannelData.java | 10 +--
.../sis/internal/storage/io/ChannelDataInput.java | 16 ++--
.../sis/internal/storage/io/ChannelDataOutput.java | 10 +--
.../sis/internal/storage/io/ChannelFactory.java | 14 ++--
.../sis/internal/storage/io/DataTransfer.java | 2 +-
.../sis/internal/storage/io/IOUtilities.java | 34 ++++----
.../internal/storage/io/InputStreamAdapter.java | 8 +-
.../apache/sis/internal/storage/io/Markable.java | 8 +-
.../internal/storage/io/OutputStreamAdapter.java | 6 +-
.../internal/storage/io/RewindableLineReader.java | 12 +--
.../sis/internal/storage/wkt/StoreFormat.java | 4 +-
.../sis/internal/storage/xml/AbstractProvider.java | 2 +-
.../sis/internal/storage/xml/MimeTypeDetector.java | 4 +-
.../sis/storage/AbstractGridCoverageResource.java | 2 +-
.../org/apache/sis/storage/AbstractResource.java | 8 +-
.../apache/sis/storage/CanNotProbeException.java | 4 +-
.../sis/storage/ConcurrentReadException.java | 4 +-
.../sis/storage/ConcurrentWriteException.java | 4 +-
.../java/org/apache/sis/storage/CoverageQuery.java | 2 +-
.../org/apache/sis/storage/CoverageSubset.java | 4 +-
.../main/java/org/apache/sis/storage/DataSet.java | 2 +-
.../java/org/apache/sis/storage/DataStore.java | 8 +-
.../sis/storage/DataStoreContentException.java | 8 +-
.../org/apache/sis/storage/DataStoreException.java | 14 ++--
.../org/apache/sis/storage/DataStoreProvider.java | 10 +--
.../sis/storage/DataStoreReferencingException.java | 2 +-
.../org/apache/sis/storage/DataStoreRegistry.java | 2 +-
.../java/org/apache/sis/storage/FeatureNaming.java | 6 +-
.../java/org/apache/sis/storage/FeatureQuery.java | 6 +-
.../java/org/apache/sis/storage/FeatureSet.java | 2 +-
.../java/org/apache/sis/storage/FeatureSubset.java | 2 +-
.../sis/storage/IllegalFeatureTypeException.java | 4 +-
.../sis/storage/IllegalOpenParameterException.java | 2 +-
.../sis/storage/IncompatibleResourceException.java | 2 +-
.../org/apache/sis/storage/ProbeInputStream.java | 2 +-
.../java/org/apache/sis/storage/ProbeResult.java | 8 +-
.../main/java/org/apache/sis/storage/Query.java | 2 +-
.../sis/storage/ReadOnlyStorageException.java | 2 +-
.../main/java/org/apache/sis/storage/Resource.java | 6 +-
.../storage/ResourceAlreadyExistsException.java | 2 +-
.../org/apache/sis/storage/StorageConnector.java | 16 ++--
.../sis/storage/UnsupportedQueryException.java | 2 +-
.../sis/storage/UnsupportedStorageException.java | 2 +-
.../org/apache/sis/storage/WritableAggregate.java | 2 +-
.../org/apache/sis/storage/WritableFeatureSet.java | 2 +-
.../sis/storage/WritableGridCoverageResource.java | 4 +-
.../storage/aggregate/ConcatenatedFeatureSet.java | 2 +-
.../aggregate/ConcatenatedGridCoverage.java | 2 +-
.../aggregate/ConcatenatedGridResource.java | 2 +-
.../sis/storage/aggregate/CoverageAggregator.java | 14 ++--
.../sis/storage/aggregate/DimensionSelector.java | 2 +-
.../sis/storage/aggregate/GridSliceLocator.java | 2 +-
.../sis/storage/aggregate/GroupAggregate.java | 4 +-
.../apache/sis/storage/aggregate/GroupByCRS.java | 4 +-
.../sis/storage/aggregate/GroupBySample.java | 6 +-
.../sis/storage/aggregate/JoinFeatureSet.java | 6 +-
.../sis/storage/aggregate/MergeStrategy.java | 2 +-
.../apache/sis/storage/event/StoreListeners.java | 12 +--
.../org/apache/sis/storage/tiling/TileStatus.java | 2 +-
.../internal/storage/esri/WritableStoreTest.java | 4 +-
.../sis/internal/storage/folder/StoreTest.java | 4 +-
.../sis/internal/storage/io/IOUtilitiesTest.java | 32 ++++----
.../storage/io/ImageInputStreamComparator.java | 2 +-
.../apache/sis/storage/DataStoreProviderTest.java | 4 +-
.../org/apache/sis/storage/FeatureQueryTest.java | 2 +-
.../org/apache/sis/storage/ProbeResultTest.java | 2 +-
.../apache/sis/storage/StorageConnectorTest.java | 2 +-
.../sis/test/storage/CoverageReadConsistency.java | 6 +-
.../apache/sis/test/storage/SubsampledImage.java | 6 +-
.../apache/sis/internal/storage/gpx/Metadata.java | 2 +-
.../apache/sis/internal/storage/gpx/Reader.java | 6 +-
.../apache/sis/internal/storage/gpx/Writer.java | 2 +-
.../internal/storage/xml/stream/OutputType.java | 2 +-
.../internal/storage/xml/stream/StaxDataStore.java | 10 +--
.../internal/storage/xml/stream/StaxStreamIO.java | 2 +-
.../storage/xml/stream/StaxStreamReader.java | 28 +++----
.../storage/xml/stream/StaxStreamWriter.java | 2 +-
1002 files changed, 2995 insertions(+), 2985 deletions(-)
diff --cc core/sis-feature/src/main/java/org/apache/sis/coverage/grid/FractionalGridCoordinates.java
index 1001b77c57,8928acb5fc..0607f54a0f
--- a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/FractionalGridCoordinates.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/FractionalGridCoordinates.java
@@@ -163,9 -167,10 +163,9 @@@ public class FractionalGridCoordinates
* @param value the new value.
* @throws IndexOutOfBoundsException if the given index is negative or is
* equal or greater than the {@linkplain #getDimension grid dimension}.
- * @throws ArithmeticException if this method can not store the given grid coordinate
+ * @throws ArithmeticException if this method cannot store the given grid coordinate
* without precision lost.
*/
- @Override
public void setCoordinateValue(final int dimension, final long value) {
if ((coordinates[dimension] = value) != value) {
throw new ArithmeticException(Resources.format(Resources.Keys.UnconvertibleGridCoordinate_2, "double", value));
diff --cc core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridCoverage.java
index 769f480759,78d3f2499e..ec98c25528
--- a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridCoverage.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridCoverage.java
@@@ -479,9 -481,9 +479,9 @@@ public abstract class GridCoverage exte
* @throws MismatchedDimensionException if the given extent does not have the same number of dimensions than this coverage.
* @throws SubspaceNotSpecifiedException if the given argument is not sufficient for reducing the grid to a two-dimensional slice.
* @throws DisjointExtentException if the given extent does not intersect this grid coverage.
- * @throws CannotEvaluateException if this method can not produce the rendered image for another reason.
+ * @throws CannotEvaluateException if this method cannot produce the rendered image for another reason.
*/
- public abstract RenderedImage render(GridExtent sliceExtent) throws CannotEvaluateException;
+ public abstract RenderedImage render(GridExtent sliceExtent);
/**
* Returns a string representation of this grid coverage for debugging purpose.
diff --cc core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java
index 3dbd0e579c,1698f837e0..663203a45a
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java
@@@ -188,13 -198,10 +188,13 @@@ public abstract class AbstractFeature i
* Implementers are encouraged to override this method if they can provide a better implementation.
* Note that this is already the case when using implementations created by {@link DefaultFeatureType#newInstance()}.</div>
*
+ * <div class="warning"><b>Warning:</b> In a future SIS version, the argument may be changed
+ * to {@code org.opengis.feature.Property}. This change is pending GeoAPI revision.</div>
+ *
* @param property the property to set.
- * @throws PropertyNotFoundException if the name of the given property is not a property name of this feature.
- * @throws InvalidPropertyValueException if the value of the given property is not valid.
+ * @throws IllegalArgumentException if the name of the given property is not a property name of this feature.
+ * @throws IllegalArgumentException if the value of the given property is not valid.
- * @throws IllegalArgumentException if the property can not be set for another reason.
+ * @throws IllegalArgumentException if the property cannot be set for another reason.
*
* @see #setPropertyValue(String, Object)
*/
@@@ -499,10 -510,10 +499,10 @@@
} while ((element = it.next()) == null || base.isInstance(element));
// Found an illegal value. Exeption is thrown below.
}
- throw new ClassCastException(illegalValueClass(pt, base, element)); // `element` can not be null here.
+ throw new ClassCastException(illegalValueClass(pt, base, element)); // `element` cannot be null here.
}
}
- ((Attribute) attribute).setValue(value);
+ ((AbstractAttribute) attribute).setValue(value);
}
/**
@@@ -707,8 -718,8 +707,8 @@@
/**
* Returns the exception message for a property type which is neither an attribute or an association.
- * This method is invoked after a {@code PropertyType} has been found for the user-supplied name,
- * but that property can not be stored in or extracted from a {@link Property} instance.
- * This method is invoked after a {@link PropertyType} has been found for the user supplied name,
++ * This method is invoked after a {@code PropertyType} has been found for the user supplied name,
+ * but that property cannot be stored in or extracted from a {@link Property} instance.
*/
static String unsupportedPropertyType(final GenericName name) {
return Resources.format(Resources.Keys.CanNotInstantiateProperty_1, name);
diff --cc core/sis-feature/src/main/java/org/apache/sis/feature/CharacteristicTypeMap.java
index ae2080a4e1,74b5159106..7c2049a398
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/CharacteristicTypeMap.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/CharacteristicTypeMap.java
@@@ -63,10 -66,10 +63,10 @@@ final class CharacteristicTypeMap exten
*/
/**
- * Characteristics of an other attribute type (the {@code source} attribute given to the constructor).
+ * Characteristics of another attribute type (the {@code source} attribute given to the constructor).
* This array shall not be modified.
*/
- final AttributeType<?>[] characterizedBy;
+ final DefaultAttributeType<?>[] characterizedBy;
/**
* The names of attribute types listed in the {@link #characterizedBy} array,
diff --cc core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAssociationRole.java
index 4fdc3e3ff2,80acca8f8f..62d5ccf417
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAssociationRole.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAssociationRole.java
@@@ -337,13 -351,10 +337,13 @@@ public class DefaultAssociationRole ext
/**
* Returns the type of feature values.
*
- * <p>This method can not be invoked if {@link #isResolved()} returns {@code false}.
+ * <p>This method cannot be invoked if {@link #isResolved()} returns {@code false}.
- * However it is still possible to {@linkplain Features#getValueTypeName(PropertyType)
+ * However it is still possible to {@linkplain Features#getValueTypeName
* get the associated feature type name}.</p>
*
+ * <div class="warning"><b>Warning:</b> In a future SIS version, the return type may be changed
+ * to {@code org.opengis.feature.FeatureType}. This change is pending GeoAPI revision.</div>
+ *
* @return the type of feature values.
* @throws IllegalStateException if the feature type has been specified
* {@linkplain #DefaultAssociationRole(Map, GenericName, int, int) only by its name}
diff --cc core/sis-feature/src/main/java/org/apache/sis/feature/DenseFeature.java
index 43841fdb7f,71576f36fd..b7eb32a466
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/DenseFeature.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/DenseFeature.java
@@@ -127,13 -133,13 +127,13 @@@ final class DenseFeature extends Abstra
*
* @param property the property to set.
* @throws IllegalArgumentException if the type of the given property is not one of the types
- * known to this feature, or if the property can not be set or another reason.
+ * known to this feature, or if the property cannot be set or another reason.
*/
@Override
- public void setProperty(final Property property) throws IllegalArgumentException {
+ public void setProperty(final Object property) throws IllegalArgumentException {
ArgumentChecks.ensureNonNull("property", property);
- final String name = property.getName().toString();
- verifyPropertyType(name, property);
+ final String name = ((Property) property).getName().toString();
+ verifyPropertyType(name, (Property) property);
if (!(properties instanceof Property[])) {
wrapValuesInProperties();
}
diff --cc core/sis-feature/src/main/java/org/apache/sis/feature/EnvelopeOperation.java
index 7cf2b8b3d0,dbcf83a5b7..bf850e1f90
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/EnvelopeOperation.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/EnvelopeOperation.java
@@@ -154,10 -162,10 +154,10 @@@ final class EnvelopeOperation extends A
CoordinateReferenceSystem attributeCRS = null;
/*
* Set `characterizedByCRS` to true if we find at least one attribute which may have the
- * "CRS" characteristic. Note that we can not rely on `attributeCRS` being non-null
+ * "CRS" characteristic. Note that we cannot rely on `attributeCRS` being non-null
* because an attribute may be characterized by a CRS without providing default CRS.
*/
- final AttributeType<?> ct = at.get().characteristics().get(AttributeConvention.CRS);
+ final DefaultAttributeType<?> ct = at.get().characteristics().get(AttributeConvention.CRS);
if (ct != null && CoordinateReferenceSystem.class.isAssignableFrom(ct.getValueClass())) {
attributeCRS = (CoordinateReferenceSystem) ct.getDefaultValue(); // May still null.
if (targetCRS == null && isDefault) {
diff --cc core/sis-feature/src/main/java/org/apache/sis/feature/FeatureOperations.java
index 261c8ef0b5,932f84b002..745b876c4f
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureOperations.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureOperations.java
@@@ -27,9 -27,14 +27,9 @@@ import org.apache.sis.util.Unconvertibl
import org.apache.sis.util.collection.WeakHashSet;
import org.apache.sis.util.resources.Errors;
-// Branch-dependent imports
-import org.opengis.feature.Operation;
-import org.opengis.feature.PropertyType;
-import org.opengis.feature.FeatureAssociationRole;
-
/**
- * A set of pre-defined operations expecting a {@code Feature} as input and producing an {@code Attribute} as output.
+ * A set of predefined operations expecting a {@code Feature} as input and producing an {@code Attribute} as output.
* Those operations can be used for creating <cite>dynamic properties</cite> which compute their value on-the-fly
* from the values of other properties.
*
@@@ -261,10 -254,10 +261,10 @@@ public final class FeatureOperations ex
* @param geometryAttributes the operation or attribute type from which to get geometry values.
* Any element which is {@code null} or has a non-geometric value class will be ignored.
* @return an operation which will compute the envelope encompassing all geometries in the given attributes.
- * @throws FactoryException if a coordinate operation to the target CRS can not be created.
+ * @throws FactoryException if a coordinate operation to the target CRS cannot be created.
*/
- public static Operation envelope(final Map<String,?> identification, final CoordinateReferenceSystem crs,
- final PropertyType... geometryAttributes) throws FactoryException
+ public static AbstractOperation envelope(final Map<String,?> identification, final CoordinateReferenceSystem crs,
+ final AbstractIdentifiedType... geometryAttributes) throws FactoryException
{
ArgumentChecks.ensureNonNull("geometryAttributes", geometryAttributes);
return POOL.unique(new EnvelopeOperation(identification, crs, geometryAttributes));
diff --cc core/sis-feature/src/main/java/org/apache/sis/feature/MultiValuedAssociation.java
index c6867da398,f93b2df691..c08093e2ff
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/MultiValuedAssociation.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/MultiValuedAssociation.java
@@@ -21,9 -21,15 +21,9 @@@ import org.apache.sis.internal.util.Che
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.internal.feature.Resources;
-// Branch-dependent imports
-import org.opengis.feature.Feature;
-import org.opengis.feature.FeatureType;
-import org.opengis.feature.FeatureAssociationRole;
-import org.opengis.feature.MultiValuedPropertyException;
-
/**
- * An instance of an {@linkplain DefaultAssociationRole association role} containing an arbitrary amount of values.
+ * An instance of an {@linkplain DefaultAssociationRole association role} containing an arbitrary number of values.
*
* <div class="note"><b>Note:</b> in the common case where the {@linkplain DefaultAssociationRole association role}
* restricts the cardinality to [0 … 1], the {@link SingletonAssociation} implementation consumes less memory.</div>
diff --cc core/sis-feature/src/main/java/org/apache/sis/feature/MultiValuedAttribute.java
index 6d34b5e748,68e7afba7f..5501288813
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/MultiValuedAttribute.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/MultiValuedAttribute.java
@@@ -23,9 -23,13 +23,9 @@@ import org.apache.sis.util.ArgumentChec
import org.apache.sis.util.resources.Errors;
import org.apache.sis.internal.feature.Resources;
-// Branch-dependent imports
-import org.opengis.feature.AttributeType;
-import org.opengis.feature.MultiValuedPropertyException;
-
/**
- * An instance of an {@linkplain DefaultAttributeType attribute type} containing an arbitrary amount of values.
+ * An instance of an {@linkplain DefaultAttributeType attribute type} containing an arbitrary number of values.
*
* <div class="note"><b>Note:</b> in the common case where the {@linkplain DefaultAttributeType attribute type}
* restricts the cardinality to [0 … 1], the {@link SingletonAttribute} implementation consumes less memory.</div>
diff --cc core/sis-feature/src/main/java/org/apache/sis/feature/PropertyView.java
index bffabc37c7,32bccd56cc..04e191eba5
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/PropertyView.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/PropertyView.java
@@@ -113,10 -150,11 +113,10 @@@ final class PropertyView
/**
* Returns the values as a collection. This method tries to verify that the collection
* contains elements of the expected type, but this verification is not always possible.
- * Consequently this method may, sometime, be actually unsafe.
+ * Consequently this method may, sometimes, be actually unsafe.
*/
- @Override
@SuppressWarnings("unchecked") // Actually not 100% safe, but we have done our best.
- public Collection<V> getValues() {
+ static <V> Collection<V> getValues(final AbstractFeature feature, final String name, final Class<V> expected) {
final Object values = feature.getPropertyValue(name);
if (values instanceof Collection<?>) {
if (values instanceof CheckedContainer<?>) {
diff --cc core/sis-feature/src/main/java/org/apache/sis/feature/SparseFeature.java
index 2426dee648,e8b779345c..0a634f3e05
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/SparseFeature.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/SparseFeature.java
@@@ -198,13 -204,13 +198,13 @@@ final class SparseFeature extends Abstr
*
* @param property the property to set.
* @throws IllegalArgumentException if the type of the given property is not one of the types
- * known to this feature, or if the property can not be set for another reason.
+ * known to this feature, or if the property cannot be set for another reason.
*/
@Override
- public void setProperty(final Property property) throws IllegalArgumentException {
+ public void setProperty(final Object property) throws IllegalArgumentException {
ArgumentChecks.ensureNonNull("property", property);
- final String name = property.getName().toString();
- verifyPropertyType(name, property);
+ final String name = ((Property) property).getName().toString();
+ verifyPropertyType(name, (Property) property);
requireMapOfProperties();
/*
* Following index should never be OPERATION_INDEX (a negative value) because the call
diff --cc core/sis-feature/src/main/java/org/apache/sis/feature/StringJoinOperation.java
index 194f3df91a,e2ea21cfd6..389972463a
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/StringJoinOperation.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/StringJoinOperation.java
@@@ -377,10 -389,10 +377,10 @@@ final class StringJoinOperation extend
* parsed, then this method does not store any property value ("all or nothing" behavior).
*
* @param value the concatenated string.
- * @throws IllegalArgumentException if one of the attribute values can not be parsed to the expected type.
- * @throws InvalidPropertyValueException if one of the attribute values cannot be parsed to the expected type.
++ * @throws IllegalArgumentException if one of the attribute values cannot be parsed to the expected type.
*/
@Override
- public void setValue(final String value) throws InvalidPropertyValueException {
+ public void setValue(final String value) throws IllegalArgumentException {
final int endAt = value.length() - suffix.length();
final boolean prefixMatches = value.startsWith(prefix);
if (!prefixMatches || !value.endsWith(suffix)) {
diff --cc core/sis-feature/src/main/java/org/apache/sis/feature/builder/FeatureTypeBuilder.java
index 41bc198859,3061acf27f..0025bebc01
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/builder/FeatureTypeBuilder.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/builder/FeatureTypeBuilder.java
@@@ -674,11 -669,11 +674,11 @@@ public class FeatureTypeBuilder extend
* builder.addAttribute(String.class).setName("City").setDefaultValue("Metropolis");
* }
*
- * The value class can not be {@code Feature.class} since features shall be handled
+ * The value class cannot be {@code Feature.class} since features shall be handled
- * as {@linkplain #addAssociation(FeatureType) associations} instead of attributes.
+ * as {@linkplain #addAssociation(DefaultFeatureType) associations} instead of attributes.
*
* @param <V> the compile-time value of {@code valueClass} argument.
- * @param valueClass the class of attribute values (can not be {@code Feature.class}).
+ * @param valueClass the class of attribute values (cannot be {@code Feature.class}).
* @return a builder for an {@code AttributeType}.
*
* @see #properties()
diff --cc core/sis-feature/src/main/java/org/apache/sis/filter/AssociationValue.java
index 30c1a7a5c4,ee0beeb2e0..ae65d82973
--- a/core/sis-feature/src/main/java/org/apache/sis/filter/AssociationValue.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/filter/AssociationValue.java
@@@ -193,16 -188,16 +193,16 @@@ walk: if (specifiedType != null) try
*
* @param valueType the type of features to be evaluated by the given expression.
* @param addTo where to add the type of properties evaluated by the given expression.
- * @return builder of the added property, or {@code null} if this method can not add a property.
- * @throws IllegalArgumentException if this method can not determine the property type for the given feature type.
+ * @return builder of the added property, or {@code null} if this method cannot add a property.
+ * @throws IllegalArgumentException if this method cannot determine the property type for the given feature type.
*/
@Override
- public PropertyTypeBuilder expectedType(FeatureType valueType, final FeatureTypeBuilder addTo) {
+ public PropertyTypeBuilder expectedType(DefaultFeatureType valueType, final FeatureTypeBuilder addTo) {
for (final String p : path) {
- final PropertyType type;
+ final AbstractIdentifiedType type;
try {
type = valueType.getProperty(p);
- } catch (PropertyNotFoundException e) {
+ } catch (IllegalArgumentException e) {
if (accessor.isVirtual) {
// The association does not exist but may be defined on a yet unknown child type.
return accessor.expectedType(addTo);
diff --cc core/sis-feature/src/main/java/org/apache/sis/filter/ConvertFunction.java
index 948f813abd,cfa70b8dc2..d09eb6263f
--- a/core/sis-feature/src/main/java/org/apache/sis/filter/ConvertFunction.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/filter/ConvertFunction.java
@@@ -157,10 -158,10 +157,10 @@@ final class ConvertFunction<R,S,V> exte
/**
* Provides the type of values produced by this expression when a feature of the given type is evaluated.
- * May return {@code null} if the type can not be determined.
+ * May return {@code null} if the type cannot be determined.
*/
@Override
- public PropertyTypeBuilder expectedType(final FeatureType valueType, final FeatureTypeBuilder addTo) {
+ public PropertyTypeBuilder expectedType(final DefaultFeatureType valueType, final FeatureTypeBuilder addTo) {
final FeatureExpression<?,?> fex = FeatureExpression.castOrCopy(expression);
if (fex == null) {
return null;
diff --cc core/sis-feature/src/main/java/org/apache/sis/filter/DefaultFilterFactory.java
index b8e567822e,d7796ca63a..4d3ad8eed4
--- a/core/sis-feature/src/main/java/org/apache/sis/filter/DefaultFilterFactory.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/filter/DefaultFilterFactory.java
@@@ -391,8 -416,8 +391,8 @@@ public abstract class DefaultFilterFact
/**
* An operator that tests if an expression's value is nil.
- * The difference with {@link NullOperator} is that a value should exist
+ * The difference with {@code NullOperator} is that a value should exist
- * but can not be provided for the reason given by {@code nilReason}.
+ * but cannot be provided for the reason given by {@code nilReason}.
* Possible reasons are:
*
* <ul>
diff --cc core/sis-feature/src/main/java/org/apache/sis/filter/PropertyValue.java
index b70ac7460c,bcc5716021..a81934c034
--- a/core/sis-feature/src/main/java/org/apache/sis/filter/PropertyValue.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/filter/PropertyValue.java
@@@ -366,15 -358,15 +366,15 @@@ split: if (path != null)
*
* @param valueType the type of features to be evaluated by the given expression.
* @param addTo where to add the type of properties evaluated by the given expression.
- * @return builder of the added property, or {@code null} if this method can not add a property.
- * @throws IllegalArgumentException if this method can not determine the property type for the given feature type.
+ * @return builder of the added property, or {@code null} if this method cannot add a property.
+ * @throws IllegalArgumentException if this method cannot determine the property type for the given feature type.
*/
@Override
- public PropertyTypeBuilder expectedType(final FeatureType valueType, final FeatureTypeBuilder addTo) {
- PropertyType type;
+ public PropertyTypeBuilder expectedType(final DefaultFeatureType valueType, final FeatureTypeBuilder addTo) {
+ AbstractIdentifiedType type;
try {
type = valueType.getProperty(name);
- } catch (PropertyNotFoundException e) {
+ } catch (IllegalArgumentException e) {
if (isVirtual) {
// The property does not exist but may be defined on a yet unknown child type.
return expectedType(addTo);
diff --cc core/sis-feature/src/main/java/org/apache/sis/filter/UnaryFunction.java
index ee48cc4750,438cf27f14..fcf3f88e9a
--- a/core/sis-feature/src/main/java/org/apache/sis/filter/UnaryFunction.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/filter/UnaryFunction.java
@@@ -131,10 -130,10 +131,10 @@@ class UnaryFunction<R,V> extends Node
/**
* Filter operator that checks if an expression's value is nil.
* The difference with {@link IsNull} is that a value should exist but
- * can not be provided for the reason given by {@link #getNilReason()}.
+ * cannot be provided for the reason given by {@link #getNilReason()}.
*/
static final class IsNil<R> extends UnaryFunction<R,Object>
- implements NilOperator<R>, Optimization.OnFilter<R>
+ implements Filter<R>, Optimization.OnFilter<R>
{
/** For cross-version compatibility. */
private static final long serialVersionUID = -7540765433296725888L;
diff --cc core/sis-feature/src/main/java/org/apache/sis/internal/feature/GeometryWrapper.java
index 29a2e09d58,98bceb8341..66921e8d49
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/GeometryWrapper.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/GeometryWrapper.java
@@@ -111,8 -116,9 +111,8 @@@ public abstract class GeometryWrapper<G
* the CRS is stored only in this {@code GeometryWrapper} instance.
*
* @return the geometry CRS, or {@code null} if unknown.
- * @throws BackingStoreException if the CRS is defined by a SRID code and that code can not be used.
+ * @throws BackingStoreException if the CRS is defined by a SRID code and that code cannot be used.
*/
- @Override
public abstract CoordinateReferenceSystem getCoordinateReferenceSystem();
/**
@@@ -192,8 -200,8 +192,8 @@@
* @param distance the buffer distance around the geometry of the second expression.
* @param context the preferred CRS and other context to use if geometry transformations are needed.
* @return result of applying the specified predicate.
- * @throws UnsupportedOperationException if the operation can not be performed with current implementation.
+ * @throws UnsupportedOperationException if the operation cannot be performed with current implementation.
- * @throws InvalidFilterValueException if an error occurred while executing the operation on given geometries.
+ * @throws IllegalArgumentException if an error occurred while executing the operation on given geometries.
*/
public final boolean predicate(final DistanceOperatorName type, final GeometryWrapper<G> other,
final Quantity<Length> distance, final SpatialOperationContext context)
@@@ -230,8 -238,8 +230,8 @@@
* @param other the other geometry to test with this geometry.
* @param context the preferred CRS and other context to use if geometry transformations are needed.
* @return result of applying the specified predicate.
- * @throws UnsupportedOperationException if the operation can not be performed with current implementation.
+ * @throws UnsupportedOperationException if the operation cannot be performed with current implementation.
- * @throws InvalidFilterValueException if an error occurred while executing the operation on given geometries.
+ * @throws IllegalArgumentException if an error occurred while executing the operation on given geometries.
*/
public final boolean predicate(final SpatialOperatorName type, final GeometryWrapper<G> other,
final SpatialOperationContext context)
diff --cc core/sis-feature/src/main/java/org/apache/sis/internal/feature/MovingFeatures.java
index df960c129c,a99154d976..511efe4ae8
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/MovingFeatures.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/MovingFeatures.java
@@@ -47,10 -48,10 +47,10 @@@ public class MovingFeatures
* Definition of characteristics containing a list of instants, without duplicates.
* Should be in chronological order, but this is not verified.
*/
- public static final AttributeType<Instant> TIME_AS_INSTANTS;
+ public static final DefaultAttributeType<Instant> TIME_AS_INSTANTS;
/**
- * An alternative to {@link #TIME_AS_INSTANTS} used when times can not be mapped to calendar dates.
+ * An alternative to {@link #TIME_AS_INSTANTS} used when times cannot be mapped to calendar dates.
* This characteristic uses the same name than {@code TIME_AS_INSTANTS}. Consequently at most one
* of {@code TIME_AS_INSTANTS} and {@code TIME_AS_NUMBERS} can be used on the same property.
*/
diff --cc core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_Transform.java
index 194e740016,f60c689127..26704232c7
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_Transform.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/ST_Transform.java
@@@ -77,7 -78,7 +77,7 @@@ final class ST_Transform<R,G> extends F
* Creates a new function with the given parameters. It is caller's responsibility to ensure
* that the given array is non-null and does not contain null elements.
*
- * @throws IllegalArgumentException if CRS can not be constructed from the second expression.
- * @throws InvalidFilterValueException if CRS cannot be constructed from the second expression.
++ * @throws IllegalArgumentException if CRS cannot be constructed from the second expression.
*/
ST_Transform(final Expression<? super R, ?>[] parameters, final Geometries<G> library) {
super(SQLMM.ST_Transform, parameters, PRESENT);
diff --cc core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/SpatialFunction.java
index b9af211ca4,5c08e49ba9..246e0f68d1
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/SpatialFunction.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/SpatialFunction.java
@@@ -201,8 -202,8 +201,8 @@@ abstract class SpatialFunction<R> exten
* @param valueType the type of features on which to apply this expression.
* @param addTo where to add the type of properties evaluated by this expression.
* @return builder of type resulting from expression evaluation (never null).
- * @throws InvalidFilterValueException if the given feature type does not contain the expected properties,
+ * @throws IllegalArgumentException if the given feature type does not contain the expected properties,
- * or if this method can not determine the result type of the expression.
+ * or if this method cannot determine the result type of the expression.
* It may be because that expression is backed by an unsupported implementation.
*/
@Override
diff --cc core/sis-feature/src/test/java/org/apache/sis/feature/DefaultAssociationRoleTest.java
index ab4c8a1166,e6032abb79..9cb66a9ce6
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultAssociationRoleTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultAssociationRoleTest.java
@@@ -137,8 -141,8 +137,8 @@@ public final strictfp class DefaultAsso
}
/**
- * Tests {@link DefaultFeatureType#isAssignableFrom(FeatureType)} and {@link DefaultFeatureType#equals(Object)}
+ * Tests {@code DefaultFeatureType.isAssignableFrom(FeatureType)} and {@code DefaultFeatureType.equals(Object)}
- * on a feature type having a bidirectional association to an other feature. This test will fall in an infinite
+ * on a feature type having a bidirectional association to another feature. This test will fall in an infinite
* loop if the implementation does not have proper guard against infinite recursivity.
*/
@Test
diff --cc core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/QualityParameter.java
index 1c22dba88d,d13030d98b..7a05e64bf3
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/QualityParameter.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/QualityParameter.java
@@@ -162,9 -176,20 +162,9 @@@ public final class QualityParameter ext
return name;
}
- /**
- * Returns a narrative explanation of the role of the parameter.
- *
- * @return a narrative explanation of the role of the parameter, or {@code null} if none.
- */
- @Override
- public InternationalString getDescription() {
- final Description description = this.description;
- return (description != null) ? description.getTextDescription() : null;
- }
-
/**
* Infers the value class from the type name.
- * This method is the reason why we can not parameterize this {@code QualityParameter} class
+ * This method is the reason why we cannot parameterize this {@code QualityParameter} class
* (see <cite>Note about raw-type usage</cite> in class javadoc), because there is no way we
* can ensure that the class inferred from {@link #valueType} is really for type {@code <T>}.
*
diff --cc core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/Identifiers.java
index 303c8e2259,b7a6a4e98d..83be664222
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/Identifiers.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/Identifiers.java
@@@ -243,10 -239,10 +243,10 @@@ public final class Identifiers extends
* @param id1 the first collection of identifiers, or {@code null}.
* @param id2 the second collection of identifiers, or {@code null}.
* @return {@code TRUE} or {@code FALSE} on match or mismatch respectively, or {@code null} if this method
- * can not determine if there is a match or mismatch.
+ * cannot determine if there is a match or mismatch.
*/
- public static Boolean hasCommonIdentifier(final Iterable<? extends Identifier> id1,
- final Iterable<? extends Identifier> id2)
+ public static Boolean hasCommonIdentifier(final Iterable<? extends ReferenceIdentifier> id1,
+ final Iterable<? extends ReferenceIdentifier> id2)
{
if (id1 != null && id2 != null) {
boolean hasFound = false;
diff --cc core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultOperationMetadata.java
index 39b99eefd3,67bb7c7d63..9f8b3eae59
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultOperationMetadata.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultOperationMetadata.java
@@@ -300,11 -292,15 +300,15 @@@ public class DefaultOperationMetadata e
/**
* Returns the parameters that are required for this interface.
*
+ * <h4>Unified parameter API</h4>
+ * In GeoAPI, the {@code SV_Parameter} type defined by ISO 19115 is replaced by {@code ParameterDescriptor}
+ * in order to provide a single parameter API. See {@link org.opengis.parameter} for more information.
+ *
* @return the parameters that are required for this interface, or an empty collection if none.
*/
- @Override
@XmlElement(name = "parameter")
@SuppressWarnings({"unchecked", "rawtypes"})
+ @UML(identifier="parameters", obligation=OPTIONAL, specification=ISO_19115)
public Collection<ParameterDescriptor<?>> getParameters() {
return parameters = nonNullCollection(parameters, (Class) ParameterDescriptor.class);
}
diff --cc core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/OperationName.java
index 0bcb09f220,1d7424f4d3..36de8ad661
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/OperationName.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/OperationName.java
@@@ -23,7 -29,7 +23,7 @@@ import org.apache.sis.internal.util.Str
/**
- * An {@code OperationMetadata} placeholder to be replaced later by a reference to an other {@code OperationMetadata}.
- * An {@code OperationMetadata} placeholder to be replaced later by a reference to another {@link OperationMetadata}.
++ * An {@code OperationMetadata} placeholder to be replaced later by a reference to another {@code OperationMetadata}.
* This temporary place holder is used when the operation name is unmarshalled before the actual operation definition.
*
* @author Martin Desruisseaux (Geomatys)
diff --cc core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultMeasure.java
index 9c31f20c21,dc39fc82f1..f327189568
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultMeasure.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultMeasure.java
@@@ -376,11 -428,15 +376,15 @@@ public class DefaultMeasure extends ISO
* Returns auxiliary variable(s) used by the data quality measure.
* It shall include its name, definition and value type.
*
+ * <h4>Unified parameter API</h4>
+ * In GeoAPI, the {@code DQM_Parameter} type defined by ISO 19157 is replaced by {@link ParameterDescriptor}
+ * in order to provide a single parameter API. See {@link org.opengis.parameter} for more information.
+ *
* @return auxiliary variable(s) used by data quality measure.
*/
- @Override
@XmlElement(name = "parameter")
@SuppressWarnings({"unchecked", "rawtypes"})
+ @UML(identifier="parameter", obligation=CONDITIONAL, specification=UNSPECIFIED)
public Collection<ParameterDescriptor<?>> getParameters() {
return parameters = nonNullCollection(parameters, (Class) ParameterDescriptor.class);
}
diff --cc core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/MetadataWriter.java
index 2b0b649489,42bb4bf4da..b75e97fea0
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/MetadataWriter.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/MetadataWriter.java
@@@ -321,10 -320,10 +321,10 @@@ public class MetadataWriter extends Met
*/
int maxLength = maximumValueLength;
Class<?> rt = colTypes.get(column);
- final boolean isCodeList = ControlledVocabulary.class.isAssignableFrom(rt); // Accept also some enums.
+ final boolean isCodeList = CodeList.class.isAssignableFrom(rt);
if (isCodeList || standard.isMetadata(rt)) {
/*
- * Found a reference to an other metadata. Remind that column for creating a foreign key
+ * Found a reference to another metadata. Remind that column for creating a foreign key
* constraint later, except if the return type is an abstract CodeList or Enum (in which
* case the reference could be to any CodeList or Enum table). Abstract CodeList or Enum
* may happen when the concrete class is not yet available in the GeoAPI version that we
diff --cc core/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataStandardTest.java
index 319fd131bd,9a597ed21a..2c7540df8c
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataStandardTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataStandardTest.java
@@@ -322,8 -324,41 +322,8 @@@ public final strictfp class MetadataSta
assertEquals(code, standard.hashCode(createCyclicMetadata()));
}
- /**
- * Tests the {@link MetadataStandard#ISO_19123} constant. Getters shall
- * be accessible even if there is no implementation on the classpath.
- */
- @Test
- @DependsOnMethod("testGetAccessor")
- public void testWithoutImplementation() {
- standard = MetadataStandard.ISO_19123;
- assertFalse("isMetadata(String)", isMetadata(String.class));
- assertTrue ("isMetadata(Citation)", isMetadata(Citation.class)); // Transitive dependency
- assertTrue ("isMetadata(DefaultCitation)", isMetadata(DefaultCitation.class)); // Transitive dependency
- assertTrue ("isMetadata(RectifiedGrid)", isMetadata(RectifiedGrid.class));
- /*
- * Ensure that the getters have been found.
- */
- final Map<String,String> names = standard.asNameMap(RectifiedGrid.class, KeyNamePolicy.UML_IDENTIFIER, KeyNamePolicy.JAVABEANS_PROPERTY);
- assertFalse("Getters should have been found even if there is no implementation.", names.isEmpty());
- assertEquals("dimension", names.get("dimension"));
- assertEquals("cells", names.get("cell"));
- /*
- * Ensure that the type are recognized, especially RectifiedGrid.getOffsetVectors()
- * which is of type List<double[]>.
- */
- Map<String,Class<?>> types;
- types = standard.asTypeMap(RectifiedGrid.class, KeyNamePolicy.UML_IDENTIFIER, TypeValuePolicy.PROPERTY_TYPE);
- assertEquals("The return type is the int primitive type.", Integer.TYPE, types.get("dimension"));
- assertEquals("The offset vectors are stored in a List.", List.class, types.get("offsetVectors"));
-
- types = standard.asTypeMap(RectifiedGrid.class, KeyNamePolicy.UML_IDENTIFIER, TypeValuePolicy.ELEMENT_TYPE);
- assertEquals("As elements in a list of dimensions.", Integer.class, types.get("dimension"));
- assertEquals("As elements in the list of offset vectors.", double[].class, types.get("offsetVectors"));
- }
-
/**
- * Tests serialization of pre-defined constants.
+ * Tests serialization of predefined constants.
*/
@Test
public void testSerialization() {
diff --cc core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/LocationViewer.java
index 3f030add66,27ad43f7de..7055b06a54
--- a/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/LocationViewer.java
+++ b/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/LocationViewer.java
@@@ -209,10 -212,10 +209,10 @@@ public final class LocationViewer exten
*
* @param label a label that identify the location to add.
* @param location the location to add to the list of locations shown by this widget.
- * @throws FactoryException if a transformation to the display CRS can not be obtained.
+ * @throws FactoryException if a transformation to the display CRS cannot be obtained.
* @throws TransformException if an error occurred while transforming an envelope.
*/
- public void addLocation(final String label, final Location location) throws FactoryException, TransformException {
+ public void addLocation(final String label, final AbstractLocation location) throws FactoryException, TransformException {
final Envelope envelope = location.getEnvelope();
final MathTransform2D tr = (MathTransform2D) CRS.findOperation(
envelope.getCoordinateReferenceSystem(), displayCRS, null).getMathTransform();
diff --cc core/sis-referencing/src/main/java/org/apache/sis/io/wkt/GeodeticObjectParser.java
index 4f258bd584,810b443729..d77b1c46b0
--- a/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/GeodeticObjectParser.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/GeodeticObjectParser.java
@@@ -1507,10 -1503,10 +1507,10 @@@ class GeodeticObjectParser extends Math
*
* @param mode {@link #FIRST}, {@link #OPTIONAL} or {@link #MANDATORY}.
* @param parent the parent element.
- * @return the {@code "ParametricDatum"} element as a {@link ParametricDatum} object.
+ * @return the {@code "ParametricDatum"} element as a {@code ParametricDatum} object.
- * @throws ParseException if the {@code "ParametricDatum"} element can not be parsed.
+ * @throws ParseException if the {@code "ParametricDatum"} element cannot be parsed.
*/
- private ParametricDatum parseParametricDatum(final int mode, final Element parent) throws ParseException {
+ private Datum parseParametricDatum(final int mode, final Element parent) throws ParseException {
final Element element = parent.pullElement(mode, WKTKeywords.ParametricDatum, WKTKeywords.PDatum);
if (element == null) {
return null;
diff --cc core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterDescriptor.java
index dd93e21fee,e3005a2139..00071c5e41
--- a/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterDescriptor.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterDescriptor.java
@@@ -558,9 -553,9 +558,9 @@@ public class DefaultParameterDescriptor
/**
- * Constructs a new object in which every attributes are set to a null value.
+ * Constructs a new object in which attributes may be set to a null value.
* <strong>This is not a valid object.</strong> This constructor is strictly
- * reserved to JAXB, which will assign values to the fields using reflexion.
+ * reserved to JAXB, which will assign values to the fields using reflection.
*
* <p>This constructor fetches the value class and the unit of measurement from the enclosing
* {@link DefaultParameterValue}, if presents, because those information are not presents in GML.
diff --cc core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java
index c48774d173,7d78cbb3ad..29ce2bc1f5
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java
@@@ -407,11 -402,8 +407,11 @@@ public abstract class GeodeticAuthority
*
* <h4>Default implementation</h4>
* The default implementation delegates to {@link #createCoordinateReferenceSystem(String)} and casts the result.
- * If the result can not be casted, then a {@link NoSuchAuthorityCodeException} is thrown.
+ * If the result cannot be casted, then a {@link NoSuchAuthorityCodeException} is thrown.
*
+ * <div class="warning"><b>Warning:</b> in a future SIS version, the return type may be changed
+ * to {@code org.opengis.referencing.crs.ParametricCRS}. This change is pending GeoAPI revision.</div>
+ *
* @param code value allocated by authority.
* @return the coordinate reference system for the given code.
* @throws NoSuchAuthorityCodeException if the specified {@code code} was not found.
@@@ -650,11 -642,8 +650,11 @@@
*
* <h4>Default implementation</h4>
* The default implementation delegates to {@link #createDatum(String)} and casts the result.
- * If the result can not be casted, then a {@link NoSuchAuthorityCodeException} is thrown.
+ * If the result cannot be casted, then a {@link NoSuchAuthorityCodeException} is thrown.
*
+ * <div class="warning"><b>Warning:</b> in a future SIS version, the return type may be changed
+ * to {@code org.opengis.referencing.datum.ParametricDatum}. This change is pending GeoAPI revision.</div>
+ *
* @param code value allocated by authority.
* @return the datum for the given code.
* @throws NoSuchAuthorityCodeException if the specified {@code code} was not found.
@@@ -939,11 -928,8 +939,11 @@@
*
* <h4>Default implementation</h4>
* The default implementation delegates to {@link #createCoordinateSystem(String)} and casts the result.
- * If the result can not be casted, then a {@link NoSuchAuthorityCodeException} is thrown.
+ * If the result cannot be casted, then a {@link NoSuchAuthorityCodeException} is thrown.
*
+ * <div class="warning"><b>Warning:</b> in a future SIS version, the return type may be changed
+ * to {@code org.opengis.referencing.cs.ParametricCS}. This change is pending GeoAPI revision.</div>
+ *
* @param code value allocated by authority.
* @return the coordinate system for the given code.
* @throws NoSuchAuthorityCodeException if the specified {@code code} was not found.
diff --cc core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataTest.java
index c96c83d551,cb61856819..cb8bcd6482
--- a/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataTest.java
@@@ -405,9 -391,8 +405,9 @@@ public final strictfp class MetadataTes
"<gmx:Anchor xlink:href=\"SDN:L231:3:CDI\">Pseudo Common Data Index record</gmx:Anchor>");
replace(xml, "<gcol:CharacterString>4326</gcol:CharacterString>",
"<gmx:Anchor xlink:href=\"SDN:L101:2:4326\">4326</gmx:Anchor>");
+ replace(xml, "License", "Licence");
/*
- * The <gmd:EX_TemporalExtent> block can not be marshalled es expected yet (need a "sis-temporal" module).
+ * The <gmd:EX_TemporalExtent> block cannot be marshalled es expected yet (need a "sis-temporal" module).
* We need to instruct the XML comparator to ignore this block during the comparison. We also ignore for
* now the "gml:id" attribute since SIS generates different values than the ones in our test XML file,
* and those values may change in future SIS version.
diff --cc ide-project/NetBeans/nbproject/project.properties
index 32deb00d5c,74e2c6555c..6100269205
--- a/ide-project/NetBeans/nbproject/project.properties
+++ b/ide-project/NetBeans/nbproject/project.properties
@@@ -91,10 -92,10 +91,10 @@@ test.jpn-profile.dir = ${project.root}/
# Those dependencies must exist in the local Maven repository.
# Those numbers should match the ones declared in the pom.xml files.
#
-geoapi.version = 3.1-SNAPSHOT
+geoapi.version = 3.0.1
jsr363.version = 1.0
jaxb.version = 2.3.3
- jaxb.runtime = 2.3.6
+ jaxb.runtime = 2.3.7
istack.version = 3.0.12
activation.version = 1.2.2
jama.version = 1.0.3
diff --cc pom.xml
index 1f871bac4c,a2f331893b..6bd74fe699
--- a/pom.xml
+++ b/pom.xml
@@@ -557,8 -557,8 +557,8 @@@
<maven.compiler.target>8</maven.compiler.target>
<sis.plugin.version>${project.version}</sis.plugin.version>
<sis.non-free.version>1.2</sis.non-free.version> <!-- Used only if "non-free" profile is activated. -->
- <javafx.version>18.0.1</javafx.version> <!-- Used only if "javafx" profile is activated. -->
+ <javafx.version>19</javafx.version> <!-- Used only if "javafx" profile is activated. -->
- <geoapi.version>3.1-SNAPSHOT</geoapi.version>
+ <geoapi.version>3.0.1</geoapi.version>
</properties>
<profiles>
diff --cc storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/FeatureSet.java
index 761386b35a,ab457dade6..a039ce9379
--- a/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/FeatureSet.java
+++ b/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/FeatureSet.java
@@@ -923,10 -923,10 +923,10 @@@ makeGeom: if (!isEmpty)
}
/**
- * Current implementation can not split this iterator.
+ * Current implementation cannot split this iterator.
*/
@Override
- public Spliterator<Feature> trySplit() {
+ public Spliterator<AbstractFeature> trySplit() {
return null;
}
diff --cc storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java
index a2618b050a,ceeeb95924..490e44c99c
--- a/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java
+++ b/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java
@@@ -467,18 -468,19 +467,18 @@@ split: while ((start = CharSequences.s
}
/*
* Verify if we can share the existing `pointOfContact` instance. This is often the case in practice.
- * If we can not share the whole existing instance, we usually can share parts of it like the address.
+ * If we cannot share the whole existing instance, we usually can share parts of it like the address.
*/
ResponsibleParty responsibility = pointOfContact;
- Contact contact = null;
- Address address = null;
- OnlineResource resource = null;
+ Contact contact = null;
+ Address address = null;
+ OnlineResource resource = null;
if (responsibility != null) {
- final Party party = first(responsibility.getParties());
- if (party != null) {
- contact = first(party.getContactInfo());
+ { // Additional indentation for having the same level than SIS branches for GeoAPI snapshots (makes merges easier).
+ contact = responsibility.getContactInfo();
if (contact != null) {
- address = first(contact.getAddresses());
- resource = first(contact.getOnlineResources());
+ address = contact.getAddress();
+ resource = contact.getOnlineResource();
}
if (!canShare(resource, url)) {
resource = null;
diff --cc storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/InfoStatements.java
index 5ab1f1ca35,074fc2462f..f257490953
--- a/storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/InfoStatements.java
+++ b/storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/InfoStatements.java
@@@ -476,10 -476,10 +476,10 @@@ public class InfoStatements implements
for (;;) {
/*
* First, iterate over the identifiers declared in the CRS object.
- * If we can not find an identifier that we can map to a SRID, then this loop may be
+ * If we cannot find an identifier that we can map to a SRID, then this loop may be
* executed more times with CRS from EPSG database that are equal, ignore axis order.
*/
- for (final Identifier id : candidate.getIdentifiers()) {
+ for (final ReferenceIdentifier id : candidate.getIdentifiers()) {
final String authority = id.getCodeSpace();
if (authority == null) continue;
final String code = id.getCode();
diff --cc storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/SelectionClauseWriter.java
index 0e7c4c7cd9,16eaec34d1..f683ceee67
--- a/storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/SelectionClauseWriter.java
+++ b/storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/SelectionClauseWriter.java
@@@ -295,10 -296,10 +295,10 @@@ public class SelectionClauseWriter exte
/**
* Handler for converting an {@code AND}, {@code OR} or {@code NOT} filter into SQL clauses.
- * The filter can contain an arbitrary amount of operands, all separated by the same keyword.
+ * The filter can contain an arbitrary number of operands, all separated by the same keyword.
* All operands are grouped between parenthesis.
*/
- private final class Logic implements BiConsumer<Filter<Feature>, SelectionClause> {
+ private final class Logic implements BiConsumer<Filter<AbstractFeature>, SelectionClause> {
/**
* The {@code AND}, {@code OR} or {@code NOT} keyword.
* Shall contain a trailing space and eventually a leading space.
@@@ -393,10 -394,10 +393,10 @@@
/**
* Appends a function name with an arbitrary number of parameters (potentially zero).
- * This method stops immediately if a parameter can not be expressed in SQL, leaving
+ * This method stops immediately if a parameter cannot be expressed in SQL, leaving
* the trailing part of the SQL in an invalid state.
*/
- private final class Function implements BiConsumer<Filter<Feature>, SelectionClause> {
+ private final class Function implements BiConsumer<Filter<AbstractFeature>, SelectionClause> {
/** Name the function. */
final String name;
diff --cc storage/sis-storage/src/main/java/org/apache/sis/storage/FeatureNaming.java
index b601e0d524,d452ccdf3f..1ad48c7a86
--- a/storage/sis-storage/src/main/java/org/apache/sis/storage/FeatureNaming.java
+++ b/storage/sis-storage/src/main/java/org/apache/sis/storage/FeatureNaming.java
@@@ -31,8 -31,8 +31,8 @@@ import org.apache.sis.internal.storage.
/**
* Helper class for mapping {@link GenericName} instances and their shortened names to features.
- * The features are typically represented by instances of {@link org.opengis.feature.FeatureType}
- * or {@link org.opengis.coverage.Coverage} (sometimes seen as a kind of features), but this class
+ * The features are typically represented by instances of {@code FeatureType}
- * or {@code Coverage} (sometime seen as a kind of features), but this class
++ * or {@code Coverage} (sometimes seen as a kind of features), but this class
* actually puts no restriction on the kind of object associated to {@code GenericName}s;
* {@link DataStore} implementations are free to choose their internal object.
* Those objects can be stored and fetched using the {@code String} representation of their name
diff --cc storage/sis-storage/src/main/java/org/apache/sis/storage/FeatureQuery.java
index ab541b9fc4,edb261c238..f30cf01ea2
--- a/storage/sis-storage/src/main/java/org/apache/sis/storage/FeatureQuery.java
+++ b/storage/sis-storage/src/main/java/org/apache/sis/storage/FeatureQuery.java
@@@ -583,10 -579,10 +583,10 @@@ public class FeatureQuery extends Quer
* @return type resulting from expressions evaluation (never null).
* @throws IllegalArgumentException if this method can operate only on some feature types
* and the given type is not one of them.
- * @throws IllegalArgumentException if this method can not determine the result type of an expression
- * @throws InvalidFilterValueException if this method cannot determine the result type of an expression
++ * @throws IllegalArgumentException if this method cannot determine the result type of an expression
* in this query. It may be because that expression is backed by an unsupported implementation.
*/
- final FeatureType expectedType(final FeatureType valueType) {
+ final DefaultFeatureType expectedType(final DefaultFeatureType valueType) {
if (projection == null) {
return valueType; // All columns included: result is of the same type.
}
diff --cc storage/sis-storage/src/main/java/org/apache/sis/storage/IllegalFeatureTypeException.java
index c2571ed6a8,809f6b2e79..c21b8510fc
--- a/storage/sis-storage/src/main/java/org/apache/sis/storage/IllegalFeatureTypeException.java
+++ b/storage/sis-storage/src/main/java/org/apache/sis/storage/IllegalFeatureTypeException.java
@@@ -22,8 -22,8 +22,8 @@@ import org.opengis.util.GenericName
/**
- * Thrown when a store can not write the given feature because its type is not one of the supported types.
+ * Thrown when a store cannot write the given feature because its type is not one of the supported types.
- * The {@link org.opengis.feature.FeatureType} is given by {@link org.opengis.feature.Feature#getType()},
+ * The {@code FeatureType} is given by {@code Feature.getType()},
* and the type expected by the data store is given by {@link FeatureSet#getType()}. Those two values must
* match, except when the type of the feature set is {@linkplain WritableFeatureSet#updateType updated}.
*
diff --cc storage/sis-storage/src/main/java/org/apache/sis/storage/aggregate/JoinFeatureSet.java
index 144082d7da,287bdf51f6..590fb9ba69
--- a/storage/sis-storage/src/main/java/org/apache/sis/storage/aggregate/JoinFeatureSet.java
+++ b/storage/sis-storage/src/main/java/org/apache/sis/storage/aggregate/JoinFeatureSet.java
@@@ -309,11 -311,11 +309,11 @@@ public class JoinFeatureSet extends Agg
/**
* Creates a new features containing an association to the two given features.
- * The {@code main} feature can not be null (this is not verified).
+ * The {@code main} feature cannot be null (this is not verified).
*/
- private Feature join(Feature main, Feature filtered) {
+ private AbstractFeature join(AbstractFeature main, AbstractFeature filtered) {
if (swapSides) {
- final Feature t = main;
+ final AbstractFeature t = main;
main = filtered;
filtered = t;
}
@@@ -393,11 -395,11 +393,11 @@@
/**
* If this iterator can be partitioned, returns a spliterator covering a prefix of the feature set.
* Upon return from this method, this iterator will cover a suffix of the feature set.
- * Returns {@code null} if this iterator can not be partitioned.
+ * Returns {@code null} if this iterator cannot be partitioned.
*/
@Override
- public Spliterator<Feature> trySplit() {
- final Spliterator<Feature> s = mainIterator.trySplit();
+ public Spliterator<AbstractFeature> trySplit() {
+ final Spliterator<AbstractFeature> s = mainIterator.trySplit();
if (s == null) {
return null;
}
diff --cc storage/sis-storage/src/test/java/org/apache/sis/storage/FeatureQueryTest.java
index 490c6e93fc,dd92892ffc..ebb614e674
--- a/storage/sis-storage/src/test/java/org/apache/sis/storage/FeatureQueryTest.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/storage/FeatureQueryTest.java
@@@ -48,9 -53,9 +48,9 @@@ import org.apache.sis.feature.DefaultAt
*/
public final strictfp class FeatureQueryTest extends TestCase {
/**
- * An arbitrary amount of features, all of the same type.
+ * An arbitrary number of features, all of the same type.
*/
- private final Feature[] features;
+ private final AbstractFeature[] features;
/**
* The {@link #features} array wrapped in a in-memory feature set.