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 3b93ac60887249b44584517c5f9a4fa82223ea3f
Merge: 700b457 f0b9441
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Tue Sep 14 11:59:25 2021 +0200
Merge branch 'geoapi-3.1'.
NOTICE | 2 +-
README | 2 +-
application/sis-console/src/main/artifact/README | 2 +-
.../apache/sis/console/FormattedOutputCommand.java | 4 ++--
.../org/apache/sis/console/MimeTypeCommand.java | 2 +-
.../org/apache/sis/console/CRSCommandTest.java | 2 +-
application/sis-javafx/src/main/artifact/README | 2 +-
.../src/main/java/org/apache/sis/gui/Widget.java | 2 +-
.../apache/sis/gui/coverage/CoverageCanvas.java | 2 +-
.../java/org/apache/sis/gui/coverage/GridView.java | 6 +++---
.../org/apache/sis/gui/coverage/GridViewSkin.java | 2 +-
.../sis/gui/coverage/ImagePropertyExplorer.java | 2 +-
.../org/apache/sis/gui/coverage/RenderingData.java | 2 +-
.../org/apache/sis/gui/dataset/ExpandableList.java | 2 +-
.../apache/sis/gui/dataset/ResourceExplorer.java | 4 ++--
.../org/apache/sis/gui/dataset/ResourceTree.java | 4 ++--
.../org/apache/sis/gui/dataset/SelectedData.java | 2 +-
.../java/org/apache/sis/gui/map/StatusBar.java | 2 +-
.../org/apache/sis/gui/map/ValuesUnderCursor.java | 4 ++--
.../org/apache/sis/gui/metadata/MetadataTree.java | 2 +-
.../apache/sis/gui/referencing/AuthorityCodes.java | 2 +-
.../org/apache/sis/gui/referencing/MenuSync.java | 2 +-
.../gui/referencing/RecentReferenceSystems.java | 4 ++--
.../sis/internal/gui/control/FormatTableCell.java | 4 ++--
.../org/apache/sis/internal/setup/FXFinder.java | 2 +-
.../org/apache/sis/internal/setup/WizardPage.java | 2 +-
.../org/apache/sis/openoffice/Registration.java | 2 +-
.../org/apache/sis/internal/book/Assembler.java | 2 +-
.../org/apache/sis/internal/maven/Assembler.java | 2 +-
.../org/apache/sis/internal/maven/Filenames.java | 4 ++--
.../apache/sis/internal/maven/JarCollector.java | 2 +-
.../apache/sis/internal/maven/package-info.java | 2 +-
.../org/apache/sis/coverage/BandedCoverage.java | 8 ++++----
.../java/org/apache/sis/coverage/Category.java | 4 ++--
.../org/apache/sis/coverage/SampleRangeFormat.java | 2 +-
.../main/java/org/apache/sis/coverage/ToNaN.java | 2 +-
.../sis/coverage/grid/BufferedGridCoverage.java | 2 +-
.../apache/sis/coverage/grid/GridCoverage2D.java | 2 +-
.../sis/coverage/grid/GridCoverageBuilder.java | 2 +-
.../apache/sis/coverage/grid/GridDerivation.java | 2 +-
.../apache/sis/coverage/grid/GridEvaluator.java | 8 ++++----
.../org/apache/sis/coverage/grid/GridExtent.java | 6 +++---
.../org/apache/sis/coverage/grid/GridGeometry.java | 4 ++--
.../sis/coverage/grid/ResampledGridCoverage.java | 2 +-
.../apache/sis/coverage/grid/SliceGeometry.java | 2 +-
.../apache/sis/feature/DefaultAssociationRole.java | 2 +-
.../org/apache/sis/feature/DefaultFeatureType.java | 4 ++--
.../org/apache/sis/feature/EnvelopeOperation.java | 6 +++---
.../java/org/apache/sis/feature/FeatureFormat.java | 8 ++++----
.../sis/feature/FeatureOperationException.java | 2 +-
.../org/apache/sis/feature/FeatureOperations.java | 2 +-
.../java/org/apache/sis/feature/SparseFeature.java | 4 ++--
.../apache/sis/feature/StringJoinOperation.java | 6 +++---
.../sis/feature/builder/FeatureTypeBuilder.java | 6 +++---
.../org/apache/sis/filter/ComparisonFilter.java | 6 +++---
.../java/org/apache/sis/filter/FilterNode.java | 2 +-
.../java/org/apache/sis/filter/package-info.java | 2 +-
.../java/org/apache/sis/image/AnnotatedImage.java | 2 +-
.../java/org/apache/sis/image/BandedIterator.java | 2 +-
.../apache/sis/image/BandedSampleConverter.java | 2 +-
.../java/org/apache/sis/image/ComputedImage.java | 4 ++--
.../java/org/apache/sis/image/ErrorAction.java | 2 +-
.../java/org/apache/sis/image/ErrorHandler.java | 2 +-
.../java/org/apache/sis/image/ImageProcessor.java | 4 ++--
.../java/org/apache/sis/image/PixelIterator.java | 6 +++---
.../main/java/org/apache/sis/image/Transferer.java | 2 +-
.../java/org/apache/sis/index/tree/PointTree.java | 2 +-
.../org/apache/sis/index/tree/PointTreeNode.java | 2 +-
.../org/apache/sis/index/tree/QuadTreeNode.java | 2 +-
.../sis/internal/coverage/j2d/Colorizer.java | 2 +-
.../coverage/j2d/MultiBandsIndexColorModel.java | 4 ++--
.../internal/coverage/j2d/TileErrorHandler.java | 2 +-
.../sis/internal/coverage/j2d/TileOpExecutor.java | 2 +-
.../sis/internal/feature/AttributeConvention.java | 2 +-
.../apache/sis/internal/feature/Geometries.java | 4 ++--
.../sis/internal/feature/GeometryWrapper.java | 2 +-
.../apache/sis/internal/feature/esri/Factory.java | 2 +-
.../apache/sis/internal/feature/j2d/Factory.java | 2 +-
.../sis/internal/feature/j2d/ShapeProperties.java | 8 ++++----
.../apache/sis/internal/feature/jts/Factory.java | 2 +-
.../org/apache/sis/internal/filter/Visitor.java | 2 +-
.../internal/processing/image/IsolineTracer.java | 8 ++++----
.../sis/coverage/grid/GridDerivationTest.java | 2 +-
.../apache/sis/coverage/grid/GridGeometryTest.java | 4 ++--
.../coverage/grid/ResampledGridCoverageTest.java | 7 ++++---
.../feature/builder/AttributeTypeBuilderTest.java | 2 +-
.../builder/CharacteristicTypeBuilderTest.java | 2 +-
.../feature/builder/FeatureTypeBuilderTest.java | 2 +-
.../org/apache/sis/image/PixelIteratorTest.java | 18 ++++++++--------
.../org/apache/sis/image/ResampledImageTest.java | 2 +-
.../apache/sis/internal/jaxb/FilterByVersion.java | 2 +-
.../org/apache/sis/internal/jaxb/gco/GO_Real.java | 2 +-
.../apache/sis/internal/jaxb/gco/NameValue.java | 2 +-
.../org/apache/sis/internal/jaxb/lan/Country.java | 2 +-
.../apache/sis/internal/jaxb/lan/LanguageCode.java | 2 +-
.../apache/sis/internal/jaxb/lan/OtherLocales.java | 6 +++---
.../apache/sis/internal/jaxb/lan/PT_FreeText.java | 8 ++++----
.../apache/sis/internal/metadata/Identifiers.java | 3 ++-
.../org/apache/sis/internal/metadata/Merger.java | 4 ++--
.../sis/internal/metadata/NameToIdentifier.java | 6 +++---
.../sis/internal/metadata/ReferencingServices.java | 2 +-
.../sis/internal/metadata/sql/LocalDataSource.java | 2 +-
.../sis/internal/metadata/sql/ScriptRunner.java | 4 ++--
.../apache/sis/internal/simple/SimpleMetadata.java | 4 ++--
.../org/apache/sis/metadata/MetadataCopier.java | 2 +-
.../org/apache/sis/metadata/MetadataVisitor.java | 2 +-
.../apache/sis/metadata/ModifiableMetadata.java | 6 +++---
.../org/apache/sis/metadata/PropertyAccessor.java | 7 ++++---
.../java/org/apache/sis/metadata/TreeNode.java | 6 +++---
.../org/apache/sis/metadata/TreeNodeChildren.java | 4 ++--
.../org/apache/sis/metadata/TreeTableView.java | 2 +-
.../org/apache/sis/metadata/TypeValuePolicy.java | 4 ++--
.../apache/sis/metadata/ValueExistencePolicy.java | 4 ++--
.../iso/DefaultApplicationSchemaInformation.java | 2 +-
.../iso/DefaultExtendedElementInformation.java | 2 +-
.../iso/DefaultMetadataExtensionInformation.java | 2 +-
.../sis/metadata/iso/DefaultMetadataScope.java | 2 +-
.../iso/DefaultPortrayalCatalogueReference.java | 2 +-
.../org/apache/sis/metadata/iso/ISOMetadata.java | 2 +-
.../acquisition/DefaultAcquisitionInformation.java | 2 +-
.../acquisition/DefaultEnvironmentalRecord.java | 2 +-
.../sis/metadata/iso/acquisition/DefaultEvent.java | 2 +-
.../iso/acquisition/DefaultInstrument.java | 2 +-
.../metadata/iso/acquisition/DefaultObjective.java | 2 +-
.../metadata/iso/acquisition/DefaultOperation.java | 2 +-
.../sis/metadata/iso/acquisition/DefaultPlan.java | 2 +-
.../metadata/iso/acquisition/DefaultPlatform.java | 2 +-
.../iso/acquisition/DefaultPlatformPass.java | 2 +-
.../iso/acquisition/DefaultRequestedDate.java | 2 +-
.../iso/acquisition/DefaultRequirement.java | 2 +-
.../sis/metadata/iso/citation/AbstractParty.java | 2 +-
.../sis/metadata/iso/citation/DefaultAddress.java | 2 +-
.../metadata/iso/citation/DefaultCitationDate.java | 2 +-
.../sis/metadata/iso/citation/DefaultContact.java | 2 +-
.../metadata/iso/citation/DefaultIndividual.java | 2 +-
.../iso/citation/DefaultOnlineResource.java | 2 +-
.../metadata/iso/citation/DefaultOrganisation.java | 2 +-
.../iso/citation/DefaultResponsibility.java | 2 +-
.../iso/citation/DefaultResponsibleParty.java | 4 ++--
.../sis/metadata/iso/citation/DefaultSeries.java | 2 +-
.../iso/constraint/DefaultConstraints.java | 2 +-
.../iso/constraint/DefaultReleasability.java | 2 +-
.../iso/constraint/DefaultSecurityConstraints.java | 2 +-
.../iso/content/AbstractContentInformation.java | 2 +-
.../iso/content/DefaultAttributeGroup.java | 2 +-
.../sis/metadata/iso/content/DefaultBand.java | 2 +-
.../iso/content/DefaultCoverageDescription.java | 2 +-
.../DefaultFeatureCatalogueDescription.java | 2 +-
.../iso/content/DefaultFeatureTypeInfo.java | 2 +-
.../iso/content/DefaultImageDescription.java | 2 +-
.../iso/content/DefaultRangeDimension.java | 2 +-
.../content/DefaultRangeElementDescription.java | 2 +-
.../metadata/iso/distribution/DefaultDataFile.java | 2 +-
.../DefaultDigitalTransferOptions.java | 2 +-
.../iso/distribution/DefaultDistribution.java | 2 +-
.../iso/distribution/DefaultDistributor.java | 2 +-
.../metadata/iso/distribution/DefaultFormat.java | 2 +-
.../metadata/iso/distribution/DefaultMedium.java | 2 +-
.../distribution/DefaultStandardOrderProcess.java | 2 +-
.../iso/extent/AbstractGeographicExtent.java | 2 +-
.../iso/extent/DefaultBoundingPolygon.java | 2 +-
.../iso/extent/DefaultGeographicBoundingBox.java | 2 +-
.../iso/extent/DefaultGeographicDescription.java | 9 ++++----
.../iso/extent/DefaultSpatialTemporalExtent.java | 2 +-
.../iso/identification/AbstractIdentification.java | 2 +-
.../iso/identification/DefaultBrowseGraphic.java | 2 +-
.../iso/identification/DefaultCoupledResource.java | 2 +-
.../identification/DefaultDataIdentification.java | 2 +-
.../iso/identification/DefaultKeywordClass.java | 2 +-
.../iso/identification/DefaultKeywords.java | 2 +-
.../DefaultOperationChainMetadata.java | 2 +-
.../identification/DefaultOperationMetadata.java | 2 +-
.../DefaultServiceIdentification.java | 2 +-
.../metadata/iso/identification/DefaultUsage.java | 2 +-
.../sis/metadata/iso/lineage/DefaultAlgorithm.java | 2 +-
.../iso/lineage/DefaultNominalResolution.java | 2 +-
.../metadata/iso/lineage/DefaultProcessStep.java | 2 +-
.../iso/lineage/DefaultProcessStepReport.java | 2 +-
.../metadata/iso/lineage/DefaultProcessing.java | 2 +-
.../maintenance/DefaultMaintenanceInformation.java | 2 +-
.../sis/metadata/iso/maintenance/DefaultScope.java | 2 +-
.../metadata/iso/quality/AbstractCompleteness.java | 2 +-
.../sis/metadata/iso/quality/AbstractElement.java | 2 +-
.../iso/quality/AbstractLogicalConsistency.java | 2 +-
.../iso/quality/AbstractPositionalAccuracy.java | 2 +-
.../sis/metadata/iso/quality/AbstractResult.java | 2 +-
.../iso/quality/AbstractTemporalAccuracy.java | 2 +-
.../iso/quality/AbstractThematicAccuracy.java | 2 +-
.../DefaultAbsoluteExternalPositionalAccuracy.java | 2 +-
.../quality/DefaultAccuracyOfATimeMeasurement.java | 2 +-
.../iso/quality/DefaultCompletenessCommission.java | 2 +-
.../iso/quality/DefaultCompletenessOmission.java | 2 +-
.../iso/quality/DefaultConceptualConsistency.java | 2 +-
.../iso/quality/DefaultConformanceResult.java | 2 +-
.../iso/quality/DefaultCoverageResult.java | 2 +-
.../iso/quality/DefaultDomainConsistency.java | 2 +-
.../iso/quality/DefaultFormatConsistency.java | 2 +-
.../DefaultGriddedDataPositionalAccuracy.java | 2 +-
.../DefaultNonQuantitativeAttributeAccuracy.java | 2 +-
.../DefaultQuantitativeAttributeAccuracy.java | 2 +-
.../iso/quality/DefaultQuantitativeResult.java | 2 +-
.../DefaultRelativeInternalPositionalAccuracy.java | 2 +-
.../sis/metadata/iso/quality/DefaultScope.java | 2 +-
.../iso/quality/DefaultTemporalConsistency.java | 2 +-
.../iso/quality/DefaultTemporalValidity.java | 2 +-
.../DefaultThematicClassificationCorrectness.java | 2 +-
.../iso/quality/DefaultTopologicalConsistency.java | 2 +-
.../sis/metadata/iso/quality/DefaultUsability.java | 2 +-
.../spatial/AbstractGeolocationInformation.java | 2 +-
.../iso/spatial/AbstractSpatialRepresentation.java | 2 +-
.../sis/metadata/iso/spatial/DefaultDimension.java | 2 +-
.../sis/metadata/iso/spatial/DefaultGCP.java | 2 +-
.../metadata/iso/spatial/DefaultGCPCollection.java | 2 +-
.../iso/spatial/DefaultGeometricObjects.java | 2 +-
.../iso/spatial/DefaultGeoreferenceable.java | 2 +-
.../spatial/DefaultGridSpatialRepresentation.java | 2 +-
.../DefaultVectorSpatialRepresentation.java | 2 +-
.../java/org/apache/sis/metadata/package-info.java | 2 +-
.../org/apache/sis/metadata/sql/Dispatcher.java | 2 +-
.../org/apache/sis/util/iso/DefaultLocalName.java | 2 +-
.../org/apache/sis/util/iso/DefaultTypeName.java | 4 ++--
.../main/java/org/apache/sis/util/iso/Types.java | 2 +-
.../java/org/apache/sis/xml/MarshalContext.java | 2 +-
.../main/java/org/apache/sis/xml/NilReason.java | 4 ++--
.../org/apache/sis/xml/PooledUnmarshaller.java | 2 +-
.../java/org/apache/sis/xml/ReferenceResolver.java | 14 ++++++-------
.../org/apache/sis/xml/TransformingWriter.java | 2 +-
.../apache/sis/metadata/PropertyAccessorTest.java | 2 +-
.../org/apache/sis/metadata/SpecialCasesTest.java | 2 +-
.../metadata/iso/citation/HardCodedCitations.java | 2 +-
.../sis/metadata/iso/extent/ExtentsTest.java | 2 +-
.../java/org/apache/sis/test/sql/TestDatabase.java | 2 +-
.../org/apache/sis/util/iso/DefaultRecordTest.java | 2 +-
.../java/org/apache/sis/xml/NamespacesTest.java | 2 +-
.../main/java/org/apache/sis/portrayal/Canvas.java | 4 ++--
.../sis/referencing/gazetteer/LocationFormat.java | 4 ++--
.../gazetteer/MilitaryGridReferenceSystem.java | 4 ++--
.../gazetteer/ReferencingByIdentifiers.java | 2 +-
.../org/apache/sis/geometry/AbstractEnvelope.java | 2 +-
.../org/apache/sis/geometry/ArrayEnvelope.java | 4 ++--
.../org/apache/sis/geometry/CoordinateFormat.java | 4 ++--
.../java/org/apache/sis/geometry/Shapes2D.java | 2 +-
.../jaxb/referencing/CC_GeneralParameterValue.java | 2 +-
.../jaxb/referencing/CC_OperationMethod.java | 6 +++---
.../referencing/CC_OperationParameterGroup.java | 4 ++--
.../internal/jaxb/referencing/RS_Identifier.java | 2 +-
.../sis/internal/referencing/AxisDirections.java | 2 +-
.../referencing/EllipsoidalHeightCombiner.java | 2 +-
.../referencing/GeodeticObjectBuilder.java | 6 +++---
.../apache/sis/internal/referencing/RTreeNode.java | 2 +-
.../internal/referencing/ReferencingUtilities.java | 2 +-
.../internal/referencing/ServicesForMetadata.java | 4 ++--
.../internal/referencing/WraparoundAdjustment.java | 2 +-
.../referencing/j2d/IntervalRectangle.java | 2 +-
.../referencing/j2d/ParameterizedAffine.java | 2 +-
.../referencing/provider/AbstractProvider.java | 4 ++--
.../sis/internal/referencing/provider/Affine.java | 2 +-
.../referencing/provider/DatumShiftGridFile.java | 4 ++--
.../referencing/provider/DatumShiftMethod.java | 2 +-
.../referencing/provider/Equirectangular.java | 2 +-
.../provider/FranceGeocentricInterpolation.java | 2 +-
.../referencing/provider/Geographic3Dto2D.java | 2 +-
.../provider/GeographicToGeocentric.java | 2 +-
.../referencing/provider/MillerCylindrical.java | 2 +-
.../provider/MolodenskyInterpolation.java | 2 +-
.../provider/ObliqueMercatorTwoPointsCenter.java | 2 +-
.../java/org/apache/sis/io/wkt/Convention.java | 12 +++++------
.../main/java/org/apache/sis/io/wkt/Element.java | 2 +-
.../main/java/org/apache/sis/io/wkt/Formatter.java | 2 +-
.../apache/sis/io/wkt/GeodeticObjectParser.java | 18 ++++++++--------
.../main/java/org/apache/sis/io/wkt/Symbols.java | 2 +-
.../java/org/apache/sis/io/wkt/Transliterator.java | 2 +-
.../java/org/apache/sis/io/wkt/WKTDictionary.java | 2 +-
.../main/java/org/apache/sis/io/wkt/WKTFormat.java | 4 ++--
.../main/java/org/apache/sis/io/wkt/Warnings.java | 2 +-
.../sis/parameter/DefaultParameterValue.java | 14 ++++++-------
.../sis/parameter/DefaultParameterValueGroup.java | 9 ++++----
.../org/apache/sis/parameter/ParameterFormat.java | 2 +-
.../java/org/apache/sis/parameter/Parameters.java | 4 ++--
.../java/org/apache/sis/parameter/Verifier.java | 2 +-
.../sis/referencing/AbstractIdentifiedObject.java | 8 ++++----
.../main/java/org/apache/sis/referencing/CRS.java | 2 +-
.../java/org/apache/sis/referencing/CommonCRS.java | 2 +-
.../sis/referencing/GeodesicsOnEllipsoid.java | 6 +++---
.../apache/sis/referencing/GeodeticCalculator.java | 6 +++---
.../sis/referencing/StandardDefinitions.java | 2 +-
.../apache/sis/referencing/crs/AbstractCRS.java | 2 +-
.../sis/referencing/crs/DefaultCompoundCRS.java | 2 +-
.../sis/referencing/crs/DefaultGeodeticCRS.java | 4 ++--
.../sis/referencing/crs/DefaultImageCRS.java | 2 +-
.../sis/referencing/crs/DefaultTemporalCRS.java | 4 ++--
.../apache/sis/referencing/datum/package-info.java | 2 +-
.../factory/CommonAuthorityFactory.java | 2 +-
.../factory/ConcurrentAuthorityFactory.java | 4 ++--
.../referencing/factory/GeodeticObjectFactory.java | 6 +++---
.../factory/IdentifiedObjectFinder.java | 2 +-
.../factory/InvalidGeodeticParameterException.java | 2 +-
.../factory/MultiAuthoritiesFactory.java | 2 +-
.../referencing/factory/sql/EPSGCodeFinder.java | 2 +-
.../referencing/factory/sql/EPSGDataAccess.java | 12 +++++------
.../sis/referencing/factory/sql/EPSGFactory.java | 6 +++---
.../sis/referencing/factory/sql/SQLTranslator.java | 4 ++--
.../operation/CoordinateOperationFinder.java | 8 ++++----
.../operation/CoordinateOperationRegistry.java | 8 ++++----
.../operation/DefaultConcatenatedOperation.java | 2 +-
.../referencing/operation/DefaultConversion.java | 2 +-
.../operation/builder/LinearTransformBuilder.java | 2 +-
.../operation/builder/LocalizationGridBuilder.java | 2 +-
.../operation/builder/ResidualGrid.java | 2 +-
.../sis/referencing/operation/builder/readme.html | 4 ++--
.../operation/matrix/GeneralMatrix.java | 4 ++--
.../sis/referencing/operation/matrix/Matrices.java | 2 +-
.../sis/referencing/operation/matrix/Solver.java | 4 ++--
.../operation/projection/ConformalProjection.java | 4 ++--
.../operation/projection/EqualAreaProjection.java | 2 +-
.../operation/projection/Initializer.java | 4 ++--
.../referencing/operation/projection/Mercator.java | 2 +-
.../operation/projection/NormalizedProjection.java | 6 +++---
.../operation/projection/ObliqueMercator.java | 6 +++---
.../operation/projection/Polyconic.java | 2 +-
.../operation/transform/AbstractMathTransform.java | 2 +-
.../operation/transform/ConcatenatedTransform.java | 2 +-
.../operation/transform/ContextualParameters.java | 10 ++++-----
.../operation/transform/CopyTransform.java | 2 +-
.../operation/transform/DatumShiftTransform.java | 2 +-
.../transform/DefaultMathTransformFactory.java | 12 +++++------
.../transform/EllipsoidToCentricTransform.java | 6 +++---
.../transform/ExponentialTransform1D.java | 2 +-
.../operation/transform/LinearInterpolator1D.java | 4 ++--
.../operation/transform/LinearTransform1D.java | 2 +-
.../transform/LogarithmicTransform1D.java | 2 +-
.../operation/transform/MathTransforms.java | 8 +++++---
.../operation/transform/OperationMethodSet.java | 4 ++--
.../operation/transform/PassThroughTransform.java | 2 +-
.../operation/transform/ProjectiveTransform.java | 2 +-
.../transform/SpecializableTransform.java | 2 +-
.../operation/transform/SphericalToCartesian.java | 2 +-
.../operation/transform/TransformSeparator.java | 2 +-
.../org/apache/sis/geometry/SubEnvelopeTest.java | 2 +-
.../sis/internal/jaxb/referencing/CodeTest.java | 4 ++--
.../referencing/provider/DatumShiftTestCase.java | 2 +-
.../sis/io/wkt/GeodeticObjectParserTest.java | 4 ++--
.../sis/referencing/GeodesicsOnEllipsoidTest.java | 2 +-
.../sis/referencing/GeodeticCalculatorTest.java | 6 +++---
.../referencing/cs/DefaultCylindricalCSTest.java | 2 +-
.../sis/referencing/cs/DefaultPolarCSTest.java | 2 +-
.../sis/referencing/factory/TestFactorySource.java | 4 ++--
.../referencing/factory/sql/EPSGFactoryTest.java | 4 ++--
.../operation/CoordinateOperationFinderTest.java | 2 +-
.../operation/CoordinateOperationRegistryTest.java | 2 +-
.../DefaultCoordinateOperationFactoryTest.java | 2 +-
.../operation/projection/Benchmark.java | 5 +++--
.../projection/CylindricalEqualAreaTest.java | 2 +-
.../operation/projection/EquirectangularTest.java | 4 ++--
.../operation/projection/MercatorTest.java | 2 +-
.../transform/EllipsoidToCentricTransformTest.java | 2 +-
.../InterpolatedMolodenskyTransformTest.java | 2 +-
.../transform/InterpolatedTransformTest.java | 4 ++--
.../transform/MolodenskyTransformTest.java | 2 +-
.../apache/sis/parameter/ParameterValueGroup.xml | 2 +-
.../sis/internal/converter/ConverterRegistry.java | 2 +-
.../sis/internal/converter/IdentityConverter.java | 2 +-
.../sis/internal/converter/ObjectToString.java | 4 ++--
.../sis/internal/system/DelayedRunnable.java | 2 +-
.../org/apache/sis/internal/util/AbstractMap.java | 2 +-
.../apache/sis/internal/util/CheckedArrayList.java | 5 +++--
.../sis/internal/util/ListOfUnknownSize.java | 2 +-
.../sis/internal/util/StandardDateFormat.java | 2 +-
.../sis/internal/util/UnmodifiableArrayList.java | 4 ++--
.../java/org/apache/sis/internal/util/X364.java | 2 +-
.../java/org/apache/sis/internal/util/XPaths.java | 2 +-
.../src/main/java/org/apache/sis/io/Appender.java | 2 +-
.../java/org/apache/sis/io/CompoundFormat.java | 4 ++--
.../java/org/apache/sis/math/DecimalFunctions.java | 2 +-
.../java/org/apache/sis/math/MathFunctions.java | 2 +-
.../main/java/org/apache/sis/math/Statistics.java | 2 +-
.../java/org/apache/sis/math/StatisticsFormat.java | 2 +-
.../src/main/java/org/apache/sis/math/Vector.java | 2 +-
.../main/java/org/apache/sis/measure/Angle.java | 8 ++++----
.../java/org/apache/sis/measure/AngleFormat.java | 10 ++++-----
.../org/apache/sis/measure/IdentityConverter.java | 2 +-
.../main/java/org/apache/sis/measure/Latitude.java | 2 +-
.../java/org/apache/sis/measure/Longitude.java | 2 +-
.../org/apache/sis/measure/MeasurementRange.java | 4 ++--
.../java/org/apache/sis/measure/NumberRange.java | 2 +-
.../main/java/org/apache/sis/measure/Prefixes.java | 2 +-
.../main/java/org/apache/sis/measure/Range.java | 4 ++--
.../java/org/apache/sis/measure/RangeFormat.java | 4 ++--
.../main/java/org/apache/sis/measure/Scalar.java | 2 +-
.../java/org/apache/sis/measure/SystemUnit.java | 8 ++++----
.../java/org/apache/sis/measure/UnitFormat.java | 4 ++--
.../java/org/apache/sis/setup/Configuration.java | 2 +-
.../apache/sis/setup/InstallationResources.java | 2 +-
.../main/java/org/apache/sis/util/ArraysExt.java | 2 +-
.../java/org/apache/sis/util/CharSequences.java | 16 +++++++--------
.../src/main/java/org/apache/sis/util/Classes.java | 2 +-
.../java/org/apache/sis/util/ComparisonMode.java | 2 +-
.../main/java/org/apache/sis/util/Exceptions.java | 2 +-
.../main/java/org/apache/sis/util/Localized.java | 2 +-
.../java/org/apache/sis/util/StringBuilders.java | 6 +++---
.../sis/util/collection/CheckedContainer.java | 6 +++---
.../org/apache/sis/util/collection/Containers.java | 4 ++--
.../sis/util/collection/DefaultTreeTable.java | 2 +-
.../org/apache/sis/util/collection/DerivedMap.java | 6 +++---
.../org/apache/sis/util/collection/DerivedSet.java | 4 ++--
.../apache/sis/util/collection/TableColumn.java | 2 +-
.../org/apache/sis/util/collection/TreeTable.java | 4 ++--
.../sis/util/collection/TreeTableFormat.java | 6 +++---
.../org/apache/sis/util/collection/TreeTables.java | 2 +-
.../sis/util/collection/WeakValueHashMap.java | 2 +-
.../sis/util/iso/AbstractInternationalString.java | 2 +-
.../sis/util/iso/DefaultInternationalString.java | 2 +-
.../java/org/apache/sis/util/logging/Logging.java | 2 +-
.../org/apache/sis/util/logging/package-info.java | 2 +-
.../internal/converter/NumberConverterTest.java | 2 +-
.../apache/sis/measure/LinearConverterTest.java | 2 +-
.../org/apache/sis/measure/SystemUnitTest.java | 2 +-
.../org/apache/sis/measure/UnitDimensionTest.java | 2 +-
.../org/apache/sis/test/ProjectDirectories.java | 2 +-
.../test/java/org/apache/sis/test/TestStep.java | 2 +-
ide-project/NetBeans/nbproject/build-impl.xml | 22 ++++++--------------
ide-project/NetBeans/nbproject/genfiles.properties | 4 ++--
ide-project/NetBeans/nbproject/project.properties | 1 -
ide-project/NetBeans/nbproject/project.xml | 2 --
.../earthobservation/LandsatStoreProvider.java | 2 +-
.../java/org/apache/sis/storage/gdal/Proj4.java | 2 +-
.../org/apache/sis/storage/geotiff/DataSubset.java | 2 +-
.../org/apache/sis/storage/geotiff/GeoCodes.java | 2 +-
.../apache/sis/storage/geotiff/GeoTiffStore.java | 4 ++--
.../sis/storage/geotiff/GridGeometryBuilder.java | 2 +-
.../java/org/apache/sis/internal/netcdf/Axis.java | 6 +++---
.../org/apache/sis/internal/netcdf/CRSBuilder.java | 2 +-
.../org/apache/sis/internal/netcdf/Convention.java | 4 ++--
.../org/apache/sis/internal/netcdf/FeatureSet.java | 6 +++---
.../java/org/apache/sis/internal/netcdf/Grid.java | 4 ++--
.../apache/sis/internal/netcdf/GridMapping.java | 4 ++--
.../org/apache/sis/internal/netcdf/Linearizer.java | 2 +-
.../apache/sis/internal/netcdf/RasterResource.java | 10 ++++-----
.../org/apache/sis/internal/netcdf/Variable.java | 2 +-
.../sis/internal/netcdf/impl/package-info.java | 4 ++--
.../sis/internal/netcdf/ucar/VariableWrapper.java | 4 ++--
.../apache/sis/storage/netcdf/AttributeNames.java | 2 +-
.../apache/sis/internal/sql/feature/Analyzer.java | 4 ++--
.../sis/internal/sql/feature/FeatureStream.java | 4 ++--
.../sis/internal/sql/feature/SelectionClause.java | 2 +-
.../sql/feature/SelectionClauseWriter.java | 2 +-
.../sis/internal/storage/AbstractGridResource.java | 18 ++++++++--------
.../org/apache/sis/internal/storage/CodeType.java | 4 ++--
.../sis/internal/storage/JoinFeatureSet.java | 6 +++---
.../sis/internal/storage/MetadataBuilder.java | 8 ++++----
.../sis/internal/storage/TiledGridCoverage.java | 2 +-
.../sis/internal/storage/csv/FeatureIterator.java | 4 ++--
.../apache/sis/internal/storage/folder/Store.java | 2 +-
.../sis/internal/storage/folder/WritableStore.java | 2 +-
.../sis/internal/storage/io/ChannelFactory.java | 4 ++--
.../org/apache/sis/internal/storage/io/Region.java | 22 ++++++++++----------
.../java/org/apache/sis/storage/CoverageQuery.java | 2 +-
.../java/org/apache/sis/storage/DataStore.java | 2 +-
.../org/apache/sis/storage/DataStoreProvider.java | 2 +-
.../java/org/apache/sis/storage/FeatureNaming.java | 2 +-
.../java/org/apache/sis/storage/ProbeResult.java | 4 ++--
.../sis/test/storage/CoverageReadConsistency.java | 24 +++++++++++-----------
.../internal/storage/xml/stream/StaxDataStore.java | 4 ++--
.../sis/internal/storage/gpx/ReaderTest.java | 6 +++---
464 files changed, 752 insertions(+), 756 deletions(-)
diff --cc
core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAssociationRole.java
index 12690bc,23e90e6..4ba06be
---
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
@@@ -225,10 -235,10 +225,10 @@@ public class DefaultAssociationRole ext
} else {
/*
* The feature that we need to resolve is not the one we
just created. Maybe we can find
- * this desired feature in an association of the
'creating' feature, instead than beeing
+ * this desired feature in an association of the
'creating' feature, instead of beeing
* the 'creating' feature itself. This is a little bit
unusual, but not illegal.
*/
- final List<FeatureType> deferred = new ArrayList<>();
+ final List<DefaultFeatureType> deferred = new
ArrayList<>();
resolved = search(creating, properties, name, deferred);
if (resolved == null) {
/*
diff --cc
core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeatureType.java
index f72e4c0,8990704..fcc86ee
---
a/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeatureType.java
+++
b/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeatureType.java
@@@ -132,9 -138,9 +132,9 @@@ public class DefaultFeatureType extend
/**
* {@code true} if we determined that this feature type does not have,
directly or indirectly,
* any unresolved name (i.e. a {@link DefaultAssociationRole#valueType}
specified only be the
- * feature type name instead than its actual instance). A value of {@code
true} means that all
+ * feature type name instead of its actual instance). A value of {@code
true} means that all
* names have been resolved. However a value of {@code false} only means
that we are not sure,
- * and that {@link #resolve(FeatureType, Map)} should check again.
+ * and that {@code resolve(FeatureType, Map)} should check again.
*
* <div class="note"><b>Note:</b>
* Strictly speaking, this field should be declared {@code volatile}
since the names could
diff --cc
core/sis-feature/src/main/java/org/apache/sis/feature/EnvelopeOperation.java
index 7964bc6,d5e5526..7cf2b8b
---
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
@@@ -99,9 -107,9 +99,9 @@@ final class EnvelopeOperation extends A
* identity operation, and may also be {@code null} if the property at
index <var>i</var> does not declare
* a default CRS.
*
- * <p><b>Performance note:</b>
- * if this array is {@code null}, then {@link
AbstractFeature#getProperty(String)} does not need to be invoked at all.
+ * <h4>Performance note</h4>
- * If this array is {@code null}, then {@link
Feature#getProperty(String)} does not need to be invoked at all.
- * A null array is a signal that invoking only the cheaper {@link
Feature#getPropertyValue(String)} method is
++ * If this array is {@code null}, then {@link
AbstractFeature#getProperty(String)} does not need to be invoked at all.
+ * A null array is a signal that invoking only the cheaper {@link
AbstractFeature#getPropertyValue(String)} method is
* sufficient. However this array become non-null as soon as there is at
least one CRS characteristic to check.
* We do not distinguish which particular property may have a CRS
characteristic because as of Apache SIS 1.0,
* implementations of {@link DenseFeature} and {@link SparseFeature} have
a "all of nothing" behavior anyway.
diff --cc
core/sis-feature/src/main/java/org/apache/sis/feature/builder/FeatureTypeBuilder.java
index 5748734,55457bc..de92b37
---
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
@@@ -675,7 -670,7 +675,7 @@@ public class FeatureTypeBuilder extend
* }
*
* The value class can not be {@code Feature.class} since features shall
be handled
- * as {@linkplain #addAssociation(DefaultFeatureType) associations}
instead than attributes.
- * 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}).
@@@ -685,8 -680,8 +685,8 @@@
*/
public <V> AttributeTypeBuilder<V> addAttribute(final Class<V>
valueClass) {
ensureNonNull("valueClass", valueClass);
- if (Feature.class.isAssignableFrom(valueClass)) {
+ if (AbstractFeature.class.isAssignableFrom(valueClass)) {
- // We disallow Feature.class because that type shall be handled
as association instead than attribute.
+ // We disallow Feature.class because that type shall be handled
as association instead of attribute.
throw new
IllegalArgumentException(errors().getString(Errors.Keys.IllegalArgumentValue_2,
"valueClass", valueClass));
}
final AttributeTypeBuilder<V> property = new
AttributeTypeBuilder<>(this, Numbers.primitiveToWrapper(valueClass));
diff --cc
core/sis-feature/src/main/java/org/apache/sis/internal/feature/AttributeConvention.java
index 46ba0a2,47a6267..50b461a
---
a/core/sis-feature/src/main/java/org/apache/sis/internal/feature/AttributeConvention.java
+++
b/core/sis-feature/src/main/java/org/apache/sis/internal/feature/AttributeConvention.java
@@@ -342,8 -346,8 +342,8 @@@ public final class AttributeConvention
* @param type the operation or attribute type for which to get the
maximal length, or {@code null}.
* @return {@code true} if a characteristic for maximal length has been
found.
*/
- public static boolean characterizedByMaximalLength(final IdentifiedType
type) {
+ public static boolean characterizedByMaximalLength(final
AbstractIdentifiedType type) {
- return hasCharacteristic(type,
MAXIMAL_LENGTH_CHARACTERISTIC.toString(), Integer.class);
+ return hasCharacteristic(type, MAXIMAL_LENGTH, Integer.class);
}
/**
diff --cc
core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadataScope.java
index 02b0455,55d169e..88ef371
---
a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadataScope.java
+++
b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadataScope.java
@@@ -37,15 -32,7 +37,15 @@@ import static org.opengis.annotation.Sp
* <div class="preformat">{@code MD_MetadataScope}
* {@code └─resourceScope……} Resource scope</div>
*
+ * <div class="warning"><b>Note on International Standard versions</b><br>
+ * This class is derived from a new type defined in the ISO 19115
international standard published in 2014,
+ * while GeoAPI 3.0 is based on the version published in 2003. Consequently
this implementation class does
+ * not yet implement a GeoAPI interface, but is expected to do so after the
next GeoAPI releases.
+ * When the interface will become available, all references to this
implementation class in Apache SIS will
+ * be replaced be references to the {@code MetadataScope} interface.
+ * </div>
+ *
- * <p><b>Limitations:</b></p>
+ * <h2>Limitations</h2>
* <ul>
* <li>Instances of this class are not synchronized for multi-threading.
* Synchronization, if needed, is caller's responsibility.</li>
diff --cc
core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/AbstractParty.java
index c086f1b,f779b92..a9c5e27
---
a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/AbstractParty.java
+++
b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/AbstractParty.java
@@@ -42,15 -39,7 +42,15 @@@ import static org.opengis.annotation.Sp
* <div class="preformat">{@code CI_Party}
* {@code └─name……} Name of the party.</div>
*
+ * <div class="warning"><b>Note on International Standard versions</b><br>
+ * This class is derived from a new type defined in the ISO 19115
international standard published in 2014,
+ * while GeoAPI 3.0 is based on the version published in 2003. Consequently
this implementation class does
+ * not yet implement a GeoAPI interface, but is expected to do so after the
next GeoAPI releases.
+ * When the interface will become available, all references to this
implementation class in Apache SIS will
+ * be replaced be references to the {@code Party} interface.
+ * </div>
+ *
- * <p><b>Limitations:</b></p>
+ * <h2>Limitations</h2>
* <ul>
* <li>Instances of this class are not synchronized for multi-threading.
* Synchronization, if needed, is caller's responsibility.</li>
diff --cc
core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultIndividual.java
index bbe4498,a38c9c3..d3e5ef3
---
a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultIndividual.java
+++
b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultIndividual.java
@@@ -32,15 -28,7 +32,15 @@@ import static org.opengis.annotation.Sp
/**
* Information about the party if the party is an individual.
*
+ * <div class="warning"><b>Note on International Standard versions</b><br>
+ * This class is derived from a new type defined in the ISO 19115
international standard published in 2014,
+ * while GeoAPI 3.0 is based on the version published in 2003. Consequently
this implementation class does
+ * not yet implement a GeoAPI interface, but is expected to do so after the
next GeoAPI releases.
+ * When the interface will become available, all references to this
implementation class in Apache SIS will
+ * be replaced be references to the {@code Individual} interface.
+ * </div>
+ *
- * <p><b>Limitations:</b></p>
+ * <h2>Limitations</h2>
* <ul>
* <li>Instances of this class are not synchronized for multi-threading.
* Synchronization, if needed, is caller's responsibility.</li>
diff --cc
core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultOrganisation.java
index 0a70123,c8f65694..479685a
---
a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultOrganisation.java
+++
b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultOrganisation.java
@@@ -33,15 -29,7 +33,15 @@@ import static org.opengis.annotation.Sp
/**
* Information about the party if the party is an organization.
*
+ * <div class="warning"><b>Note on International Standard versions</b><br>
+ * This class is derived from a new type defined in the ISO 19115
international standard published in 2014,
+ * while GeoAPI 3.0 is based on the version published in 2003. Consequently
this implementation class does
+ * not yet implement a GeoAPI interface, but is expected to do so after the
next GeoAPI releases.
+ * When the interface will become available, all references to this
implementation class in Apache SIS will
+ * be replaced be references to the {@code Organisation} interface.
+ * </div>
+ *
- * <p><b>Limitations:</b></p>
+ * <h2>Limitations</h2>
* <ul>
* <li>Instances of this class are not synchronized for multi-threading.
* Synchronization, if needed, is caller's responsibility.</li>
diff --cc
core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultResponsibility.java
index 4aeccb2,d680244..df1e9b5
---
a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultResponsibility.java
+++
b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultResponsibility.java
@@@ -46,15 -43,7 +46,15 @@@ import static org.opengis.annotation.Sp
* {@code │ └─name……………} Name of the party.
* {@code └─role………………………} Function performed by the responsible
party.</div>
*
+ * <div class="warning"><b>Note on International Standard versions</b><br>
+ * This class is derived from a new type defined in the ISO 19115
international standard published in 2014,
+ * while GeoAPI 3.0 is based on the version published in 2003. Consequently
this implementation class does
+ * not yet implement a GeoAPI interface, but is expected to do so after the
next GeoAPI releases.
+ * When the interface will become available, all references to this
implementation class in Apache SIS will
+ * be replaced be references to the {@code Responsibility} interface.
+ * </div>
+ *
- * <p><b>Limitations:</b></p>
+ * <h2>Limitations</h2>
* <ul>
* <li>Instances of this class are not synchronized for multi-threading.
* Synchronization, if needed, is caller's responsibility.</li>
diff --cc
core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultReleasability.java
index 1fb424d,e18747d..410cbb2
---
a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultReleasability.java
+++
b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultReleasability.java
@@@ -34,15 -30,7 +34,15 @@@ import static org.opengis.annotation.Sp
/**
* Information about resource release constraints.
*
+ * <div class="warning"><b>Note on International Standard versions</b><br>
+ * This class is derived from a new type defined in the ISO 19115
international standard published in 2014,
+ * while GeoAPI 3.0 is based on the version published in 2003. Consequently
this implementation class does
+ * not yet implement a GeoAPI interface, but is expected to do so after the
next GeoAPI releases.
+ * When the interface will become available, all references to this
implementation class in Apache SIS will
+ * be replaced be references to the {@code Releasability} interface.
+ * </div>
+ *
- * <p><b>Limitations:</b></p>
+ * <h2>Limitations</h2>
* <ul>
* <li>Instances of this class are not synchronized for multi-threading.
* Synchronization, if needed, is caller's responsibility.</li>
diff --cc
core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultAttributeGroup.java
index 665b5dc,8e4def7..afcff86
---
a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultAttributeGroup.java
+++
b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultAttributeGroup.java
@@@ -39,15 -34,7 +39,15 @@@ import static org.opengis.annotation.Sp
* <div class="preformat">{@code MD_AttributeGroup}
* {@code └─contentType……} Content type</div>
*
+ * <div class="warning"><b>Note on International Standard versions</b><br>
+ * This class is derived from a new type defined in the ISO 19115
international standard published in 2014,
+ * while GeoAPI 3.0 is based on the version published in 2003. Consequently
this implementation class does
+ * not yet implement a GeoAPI interface, but is expected to do so after the
next GeoAPI releases.
+ * When the interface will become available, all references to this
implementation class in Apache SIS will
+ * be replaced be references to the {@code AttributeGroup} interface.
+ * </div>
+ *
- * <p><b>Limitations:</b></p>
+ * <h2>Limitations</h2>
* <ul>
* <li>Instances of this class are not synchronized for multi-threading.
* Synchronization, if needed, is caller's responsibility.</li>
diff --cc
core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureTypeInfo.java
index 62da14a,b91babb..6ba9464
---
a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureTypeInfo.java
+++
b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureTypeInfo.java
@@@ -36,15 -31,7 +36,15 @@@ import static org.opengis.annotation.Sp
/**
* Information about the occurring feature type.
*
+ * <div class="warning"><b>Note on International Standard versions</b><br>
+ * This class is derived from a new type defined in the ISO 19115
international standard published in 2014,
+ * while GeoAPI 3.0 is based on the version published in 2003. Consequently
this implementation class does
+ * not yet implement a GeoAPI interface, but is expected to do so after the
next GeoAPI releases.
+ * When the interface will become available, all references to this
implementation class in Apache SIS will
+ * be replaced be references to the {@code FeatureTypeInfo} interface.
+ * </div>
+ *
- * <p><b>Limitations:</b></p>
+ * <h2>Limitations</h2>
* <ul>
* <li>Instances of this class are not synchronized for multi-threading.
* Synchronization, if needed, is caller's responsibility.</li>
diff --cc
core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultCoupledResource.java
index f80411f,bda39dc..7e646ea
---
a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultCoupledResource.java
+++
b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultCoupledResource.java
@@@ -43,15 -40,7 +43,15 @@@ import static org.opengis.annotation.Sp
/**
* Links a given operation name with a resource identified by an "identifier".
*
+ * <div class="warning"><b>Note on International Standard versions</b><br>
+ * This class is derived from a new type defined in the ISO 19115
international standard published in 2014,
+ * while GeoAPI 3.0 is based on the version published in 2003. Consequently
this implementation class does
+ * not yet implement a GeoAPI interface, but is expected to do so after the
next GeoAPI releases.
+ * When the interface will become available, all references to this
implementation class in Apache SIS will
+ * be replaced be references to the {@code CoupledResource} interface.
+ * </div>
+ *
- * <p><b>Limitations:</b></p>
+ * <h2>Limitations</h2>
* <ul>
* <li>Instances of this class are not synchronized for multi-threading.
* Synchronization, if needed, is caller's responsibility.</li>
diff --cc
core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultKeywordClass.java
index 880438a,ae8f1bc..ba54d53
---
a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultKeywordClass.java
+++
b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultKeywordClass.java
@@@ -38,15 -39,7 +38,15 @@@ import org.apache.sis.util.iso.Types
* {@code ├─title………………………} Name by which the cited resource is known.
* {@code └─date…………………………} Reference date for the cited resource.</div>
*
+ * <div class="warning"><b>Note on International Standard versions</b><br>
+ * This class is derived from a new type defined in the ISO 19115
international standard published in 2014,
+ * while GeoAPI 3.0 is based on the version published in 2003. Consequently
this implementation class does
+ * not yet implement a GeoAPI interface, but is expected to do so after the
next GeoAPI releases.
+ * When the interface will become available, all references to this
implementation class in Apache SIS will
+ * be replaced be references to the {@code KeywordClass} interface.
+ * </div>
+ *
- * <p><b>Limitations:</b></p>
+ * <h2>Limitations</h2>
* <ul>
* <li>Instances of this class are not synchronized for multi-threading.
* Synchronization, if needed, is caller's responsibility.</li>
diff --cc
core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultOperationChainMetadata.java
index 58726a6,d36a6f6..d6130a9
---
a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultOperationChainMetadata.java
+++
b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultOperationChainMetadata.java
@@@ -45,15 -41,7 +45,15 @@@ import static org.opengis.annotation.Sp
* {@code └─connectPoint………………………………………………} Handle for accessing the
service interface.
* {@code └─linkage…………………………………………………} Location for on-line access
using a URL address or similar addressing scheme.</div>
*
+ * <div class="warning"><b>Note on International Standard versions</b><br>
+ * This class is derived from a new type defined in the ISO 19115
international standard published in 2014,
+ * while GeoAPI 3.0 is based on the version published in 2003. Consequently
this implementation class does
+ * not yet implement a GeoAPI interface, but is expected to do so after the
next GeoAPI releases.
+ * When the interface will become available, all references to this
implementation class in Apache SIS will
+ * be replaced be references to the {@code OperationChainMetadata} interface.
+ * </div>
+ *
- * <p><b>Limitations:</b></p>
+ * <h2>Limitations</h2>
* <ul>
* <li>Instances of this class are not synchronized for multi-threading.
* Synchronization, if needed, is caller's responsibility.</li>
diff --cc
core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultOperationMetadata.java
index 1adbd29,36b7fc1..e099dbf
---
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
@@@ -48,15 -41,7 +48,15 @@@ import static org.opengis.annotation.Sp
* {@code └─connectPoint………………………………………………} Handle for accessing the
service interface.
* {@code └─linkage…………………………………………………} Location for on-line access
using a URL address or similar addressing scheme.</div>
*
+ * <div class="warning"><b>Note on International Standard versions</b><br>
+ * This class is derived from a new type defined in the ISO 19115
international standard published in 2014,
+ * while GeoAPI 3.0 is based on the version published in 2003. Consequently
this implementation class does
+ * not yet implement a GeoAPI interface, but is expected to do so after the
next GeoAPI releases.
+ * When the interface will become available, all references to this
implementation class in Apache SIS will
+ * be replaced be references to the {@code OperationMetadata} interface.
+ * </div>
+ *
- * <p><b>Limitations:</b></p>
+ * <h2>Limitations</h2>
* <ul>
* <li>Instances of this class are not synchronized for multi-threading.
* Synchronization, if needed, is caller's responsibility.</li>
diff --cc
core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/referencing/CodeTest.java
index a6b93f9,fc998b3..e6f7e8b
---
a/core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/referencing/CodeTest.java
+++
b/core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/referencing/CodeTest.java
@@@ -41,10 -41,10 +41,10 @@@ import static org.junit.Assert.*
*/
public final strictfp class CodeTest extends TestCase {
/**
- * Tests the {@link Code#Code(Identifier)} constructor with {@code
"EPSG:4326"} identifier.
+ * Tests the {@link Code#Code(ReferenceIdentifier)} constructor with
{@code "EPSG:4326"} identifier.
- * This test intentionally uses an identifier with the {@code IOGP}
authority instead than
+ * This test intentionally uses an identifier with the {@code IOGP}
authority instead of
* EPSG in order to make sure that the {@code codeSpace} attribute is set
from
- * {@link Identifier#getCodeSpace()}, not from {@link
Identifier#getAuthority()}.
+ * {@code Identifier.getCodeSpace()}, not from {@code
Identifier.getAuthority()}.
*/
@Test
public void testSimple() {
@@@ -65,8 -65,8 +65,8 @@@
}
/**
- * Tests the {@link Code#Code(Identifier)} constructor with {@code
"EPSG:8.3:4326"} identifier.
+ * Tests the {@link Code#Code(ReferenceIdentifier)} constructor with
{@code "EPSG:8.3:4326"} identifier.
- * This test intentionally uses an identifier with the {@code IOGP}
authority instead than EPSG
+ * This test intentionally uses an identifier with the {@code IOGP}
authority instead of EPSG
* for the same reason than {@link #testSimple()}.
*/
@Test
diff --cc
core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedMolodenskyTransformTest.java
index 2ab9472,1920a64..3f59003
---
a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedMolodenskyTransformTest.java
+++
b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedMolodenskyTransformTest.java
@@@ -30,11 -30,11 +30,11 @@@ import org.junit.Test
/**
* Tests {@link InterpolatedMolodenskyTransform}. The accuracy of using the
Molodensky approximation
- * instead than the real geocentric translation is verified by the following
tests:
+ * instead of the real geocentric translation is verified by the following
tests:
*
* <ul>
- * <li>{@link
GeocentricTranslationTest#testFranceGeocentricInterpolationPoint()}</li>
- * <li>{@link
MolodenskyTransformTest#testFranceGeocentricInterpolationPoint()}</li>
+ * <li>{@code
GeocentricTranslationTest.testFranceGeocentricInterpolationPoint()}</li>
+ * <li>{@code
MolodenskyTransformTest.testFranceGeocentricInterpolationPoint()}</li>
* </ul>
*
* @author Martin Desruisseaux (Geomatys)
diff --cc
core/sis-utility/src/main/java/org/apache/sis/measure/MeasurementRange.java
index 722c69f,a42be30..fab2a63
---
a/core/sis-utility/src/main/java/org/apache/sis/measure/MeasurementRange.java
+++
b/core/sis-utility/src/main/java/org/apache/sis/measure/MeasurementRange.java
@@@ -255,9 -255,16 +255,9 @@@ public class MeasurementRange<E extend
/**
* Returns the unit of measurement, or {@code null} if unknown.
* In principle the unit should never be null, otherwise a {@link
NumberRange} should have been used
- * instead than {@code MeasurementRange}. Nevertheless this method may
return {@code null} if a unit
+ * instead of {@code MeasurementRange}. Nevertheless this method may
return {@code null} if a unit
* <em>should</em> exist but for some reason is unavailable.
*
- * <div class="note"><b>Example:</b>
- * ISO 19115-1 {@code SampleDimension} specifies that its
- * {@linkplain org.opengis.metadata.content.SampleDimension#getUnits()
unit} property is mandatory if the
- * {@linkplain org.opengis.metadata.content.SampleDimension#getMinValue()
minimum value} or
- * {@linkplain org.opengis.metadata.content.SampleDimension#getMaxValue()
maximum value} are provided.
- * Nevertheless it happens sometime that this information is missing in
metadata.</div>
- *
* @return the unit of measurement, or {@code null}.
*/
@Override
diff --cc ide-project/NetBeans/nbproject/genfiles.properties
index 2cb7276,b42ffb1..dc6bbbd
--- a/ide-project/NetBeans/nbproject/genfiles.properties
+++ b/ide-project/NetBeans/nbproject/genfiles.properties
@@@ -3,6 -3,6 +3,6 @@@
build.xml.data.CRC32=58e6b21c
build.xml.script.CRC32=462eaba0
build.xml.stylesheet.CRC32=28e38971@1.53.1.46
- nbproject/build-impl.xml.data.CRC32=8056fb5b
- nbproject/build-impl.xml.script.CRC32=451e2bfa
-nbproject/build-impl.xml.data.CRC32=88e7e15b
-nbproject/build-impl.xml.script.CRC32=3f8b1d20
++nbproject/build-impl.xml.data.CRC32=c06fcc9a
++nbproject/build-impl.xml.script.CRC32=4df30129
nbproject/build-impl.xml.stylesheet.CRC32=d549e5cc@1.99.0.48
diff --cc
storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/SelectionClause.java
index 34c41b6,3ee21c5..85dd31f
---
a/storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/SelectionClause.java
+++
b/storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/SelectionClause.java
@@@ -25,10 -26,9 +26,9 @@@ import org.apache.sis.internal.feature.
import org.apache.sis.internal.metadata.sql.SQLBuilder;
// Branch-dependent imports
-import org.opengis.feature.Feature;
-import org.opengis.filter.Filter;
-import org.opengis.filter.ValueReference;
+import org.apache.sis.feature.AbstractFeature;
+import org.apache.sis.filter.Filter;
+import org.apache.sis.internal.geoapi.filter.ValueReference;
- import org.opengis.metadata.extent.GeographicBoundingBox;
/**
diff --cc
storage/sis-storage/src/main/java/org/apache/sis/internal/storage/JoinFeatureSet.java
index 792bc6e,5906016..e27e27d
---
a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/JoinFeatureSet.java
+++
b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/JoinFeatureSet.java
@@@ -202,7 -204,7 +202,7 @@@ public class JoinFeatureSet extends Agg
* @param rightAlias name of the associations to the {@code right}
features, or {@code null} for a default name.
* @param joinType whether values on both sides are required (inner
join), or only one side (outer join).
* @param condition join condition as <var>property from left
feature</var> = <var>property from right feature</var>.
- * @param featureInfo information about the {@code FeatureType} of this
- * @param featureInfo information about the {@link FeatureType} of this
feature set.
++ * @param featureInfo information about the {@code FeatureType} of this
feature set.
* @throws DataStoreException if an error occurred while creating the
feature set.
*/
public JoinFeatureSet(final StoreListeners parent,
diff --cc
storage/sis-storage/src/test/java/org/apache/sis/test/storage/CoverageReadConsistency.java
index 2a0a8a0,6c2fe68..1dd17b1
---
a/storage/sis-storage/src/test/java/org/apache/sis/test/storage/CoverageReadConsistency.java
+++
b/storage/sis-storage/src/test/java/org/apache/sis/test/storage/CoverageReadConsistency.java
@@@ -366,16 -366,11 +366,16 @@@ public strictfp class CoverageReadConsi
* two-dimensional image, the following loop will be executed
only once. If reading a 3D
* or 4D image, the loop is executed for all possible
two-dimensional slices in the cube.
*/
- final long[] sliceMin = actualReadExtent.getLow()
.getCoordinateValues();
- final long[] sliceMax =
actualReadExtent.getHigh().getCoordinateValues();
+ final int sd = actualReadExtent.getDimension();
+ final long[] sliceMin = new long[sd];
+ final long[] sliceMax = new long[sd];
+ for (int i=0; i<sd; i++) {
+ sliceMin[i] = actualReadExtent.getLow(i);
+ sliceMax[i] = actualReadExtent.getHigh(i);
+ }
nextSlice: for (;;) {
System.arraycopy(sliceMin, BIDIMENSIONAL, sliceMax,
BIDIMENSIONAL, dimension - BIDIMENSIONAL);
- final PixelIterator itr = iterator(full, sliceMin,
sliceMax, subsampling, subOffsets, allowSubsamplings);
+ final PixelIterator itr = iterator(full, sliceMin,
sliceMax, subsampling, subOffsets, allowSubsampling);
final PixelIterator itc = iterator(subset, sliceMin,
sliceMax, subsampling, subOffsets, false);
if (itr != null) {
assertEquals(itr.getDomain().getSize(),
itc.getDomain().getSize());
