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 2023/04/19 14:02:20 UTC
[sis] 01/01: Merge branch 'geoapi-3.1'. This is almost only javadoc.
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 62c8552cf88595c4c25ed7aaa114b8ae6fc45eb4
Merge: 0865c08dfb 8f68fc28fa
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Wed Apr 19 16:01:52 2023 +0200
Merge branch 'geoapi-3.1'.
This is almost only javadoc.
.../org/apache/sis/gui/coverage/GridRowSkin.java | 9 +-
.../java/org/apache/sis/gui/coverage/GridView.java | 25 +--
.../sis/gui/coverage/ImagePropertyExplorer.java | 8 +-
.../org/apache/sis/gui/dataset/ExpandableList.java | 5 +-
.../org/apache/sis/gui/map/GestureFollower.java | 4 +-
.../java/org/apache/sis/gui/map/MapCanvas.java | 2 +-
.../java/org/apache/sis/gui/map/StatusBar.java | 12 +-
.../gui/referencing/RecentReferenceSystems.java | 19 ++-
.../org/apache/sis/internal/setup/Inflater.java | 6 +-
.../org/apache/sis/coverage/BandedCoverage.java | 5 +-
.../apache/sis/coverage/grid/DomainLinearizer.java | 6 +-
.../apache/sis/coverage/grid/GridCoverage2D.java | 5 +-
.../sis/coverage/grid/GridCoverageBuilder.java | 14 +-
.../apache/sis/coverage/grid/GridDerivation.java | 33 ++--
.../org/apache/sis/coverage/grid/GridExtent.java | 14 +-
.../org/apache/sis/coverage/grid/GridGeometry.java | 39 ++++-
.../apache/sis/coverage/grid/GridRoundingMode.java | 8 +-
.../apache/sis/coverage/grid/PixelTranslation.java | 24 +--
.../sis/coverage/grid/ResampledGridCoverage.java | 6 +-
.../org/apache/sis/feature/AbstractAttribute.java | 4 +-
.../org/apache/sis/feature/AbstractFeature.java | 12 +-
.../apache/sis/feature/AbstractIdentifiedType.java | 5 +-
.../apache/sis/feature/DefaultAttributeType.java | 15 +-
.../org/apache/sis/feature/DefaultFeatureType.java | 8 +-
.../sis/feature/FoliationRepresentation.java | 10 +-
.../java/org/apache/sis/feature/Validator.java | 6 +-
.../sis/feature/builder/FeatureTypeBuilder.java | 12 +-
.../apache/sis/feature/builder/TypeBuilder.java | 6 +-
.../java/org/apache/sis/filter/DistanceFilter.java | 6 +-
.../java/org/apache/sis/filter/Optimization.java | 5 +-
.../java/org/apache/sis/image/ComputedImage.java | 2 +-
.../java/org/apache/sis/image/ImageProcessor.java | 11 +-
.../org/apache/sis/image/LanczosInterpolation.java | 5 +-
.../java/org/apache/sis/image/PixelIterator.java | 21 ++-
.../java/org/apache/sis/image/PlanarImage.java | 6 +-
.../java/org/apache/sis/image/TransferType.java | 6 +-
.../main/java/org/apache/sis/image/Transferer.java | 6 +-
.../java/org/apache/sis/image/Visualization.java | 2 +-
.../internal/coverage/j2d/ScaledColorModel.java | 6 +-
.../sis/internal/feature/GeometryWithCRS.java | 2 +-
.../sis/internal/feature/j2d/PointWrapper.java | 4 +-
.../sis/internal/feature/j2d/ShapeWrapper.java | 12 +-
.../apache/sis/internal/feature/j2d/Wrapper.java | 6 +-
.../sis/internal/feature/jts/FilteringContext.java | 2 +-
.../org/apache/sis/internal/feature/jts/JTS.java | 4 +-
.../java/org/apache/sis/internal/filter/Node.java | 6 +-
.../org/apache/sis/internal/filter/Visitor.java | 4 +-
.../sis/coverage/grid/GridDerivationTest.java | 6 +-
.../apache/sis/coverage/grid/GridGeometryTest.java | 5 +
.../org/apache/sis/feature/FeatureTestCase.java | 7 +-
.../sis/internal/jaxb/gco/GO_CharacterString.java | 10 +-
.../apache/sis/internal/jaxb/gco/PropertyType.java | 4 +-
.../org/apache/sis/internal/jaxb/gcx/FileName.java | 4 +-
.../apache/sis/internal/jaxb/gcx/MimeFileType.java | 4 +-
.../apache/sis/internal/jaxb/gml/GMLAdapter.java | 4 +-
.../org/apache/sis/internal/jaxb/gml/Measure.java | 4 +-
.../apache/sis/internal/metadata/AxisNames.java | 4 +-
.../org/apache/sis/internal/metadata/Merger.java | 6 +-
.../sis/internal/metadata/sql/Initializer.java | 4 +-
.../sis/internal/metadata/sql/LocalDataSource.java | 4 +-
.../sis/internal/metadata/sql/SQLUtilities.java | 5 +-
.../sis/internal/metadata/sql/ScriptRunner.java | 6 +-
.../apache/sis/internal/simple/SimpleCitation.java | 6 +-
.../org/apache/sis/metadata/MetadataStandard.java | 5 +-
.../apache/sis/metadata/ModifiableMetadata.java | 6 +-
.../java/org/apache/sis/metadata/TreeNode.java | 6 +-
.../org/apache/sis/metadata/TreeNodeChildren.java | 8 +-
.../iso/DefaultExtendedElementInformation.java | 3 +-
.../apache/sis/metadata/iso/DefaultIdentifier.java | 12 +-
.../apache/sis/metadata/iso/DefaultMetadata.java | 4 +-
.../acquisition/DefaultEnvironmentalRecord.java | 3 +-
.../metadata/iso/acquisition/DefaultObjective.java | 4 +-
.../sis/metadata/iso/citation/AbstractParty.java | 4 +-
.../sis/metadata/iso/citation/Citations.java | 36 ++--
.../sis/metadata/iso/citation/DefaultCitation.java | 13 +-
.../iso/citation/DefaultOnlineResource.java | 3 +-
.../sis/metadata/iso/content/DefaultBand.java | 3 +-
.../iso/content/DefaultFeatureTypeInfo.java | 3 +-
.../iso/content/DefaultImageDescription.java | 3 +-
.../iso/content/DefaultSampleDimension.java | 11 +-
.../DefaultDigitalTransferOptions.java | 3 +-
.../metadata/iso/distribution/DefaultMedium.java | 3 +-
.../iso/extent/DefaultGeographicBoundingBox.java | 6 +-
.../iso/extent/DefaultGeographicDescription.java | 15 +-
.../metadata/iso/extent/DefaultVerticalExtent.java | 6 +-
.../apache/sis/metadata/iso/extent/Extents.java | 14 +-
.../iso/identification/DefaultBrowseGraphic.java | 3 +-
.../DefaultRepresentativeFraction.java | 15 +-
.../iso/identification/DefaultResolution.java | 3 +-
.../DefaultServiceIdentification.java | 3 +-
.../iso/lineage/DefaultNominalResolution.java | 3 +-
.../iso/maintenance/DefaultScopeDescription.java | 17 +-
.../sis/metadata/iso/spatial/DefaultDimension.java | 7 +-
.../iso/spatial/DefaultGeometricObjects.java | 3 +-
.../spatial/DefaultGridSpatialRepresentation.java | 3 +-
.../org/apache/sis/metadata/sql/Dispatcher.java | 6 +-
.../java/org/apache/sis/util/iso/AbstractName.java | 8 +-
.../apache/sis/util/iso/DefaultNameFactory.java | 8 +-
.../org/apache/sis/util/iso/DefaultNameSpace.java | 5 +-
.../main/java/org/apache/sis/util/iso/Names.java | 34 ++--
.../main/java/org/apache/sis/util/iso/Types.java | 23 ++-
.../java/org/apache/sis/xml/TransformedEvent.java | 8 +-
.../org/apache/sis/xml/TransformingNamespaces.java | 6 +-
.../org/apache/sis/xml/TransformingWriter.java | 21 +--
.../src/main/java/org/apache/sis/xml/XML.java | 16 +-
.../apache/sis/metadata/PropertyAccessorTest.java | 6 +-
.../apache/sis/test/xml/DocumentComparator.java | 5 +-
.../java/org/apache/sis/test/xml/TestCase.java | 3 +-
.../main/java/org/apache/sis/portrayal/Canvas.java | 13 +-
.../apache/sis/portrayal/TransformChangeEvent.java | 2 +-
.../referencing/gazetteer/AbstractLocation.java | 11 +-
.../referencing/gazetteer/FinalLocationType.java | 16 +-
.../gazetteer/MilitaryGridReferenceSystem.java | 12 +-
.../gazetteer/ModifiableLocationType.java | 33 ++--
.../org/apache/sis/geometry/AbstractEnvelope.java | 40 +++--
.../java/org/apache/sis/geometry/Envelope2D.java | 8 +-
.../java/org/apache/sis/geometry/Envelopes.java | 18 +-
.../org/apache/sis/geometry/GeneralEnvelope.java | 9 +-
.../apache/sis/geometry/WraparoundAdjustment.java | 6 +-
.../referencing/CC_GeneralOperationParameter.java | 5 +-
.../jaxb/referencing/CC_OperationMethod.java | 12 +-
.../referencing/CC_OperationParameterGroup.java | 6 +-
.../sis/internal/jaxb/referencing/SC_CRS.java | 6 +-
.../internal/jaxb/referencing/SC_SingleCRS.java | 6 +-
.../sis/internal/referencing/MergedProperties.java | 4 +-
.../internal/referencing/NilReferencingObject.java | 6 +-
.../apache/sis/internal/referencing/RTreeNode.java | 12 +-
.../internal/referencing/ReferencingUtilities.java | 5 +-
.../apache/sis/internal/referencing/Resources.java | 4 +-
.../referencing/j2d/IntervalRectangle.java | 6 +-
.../apache/sis/internal/referencing/j2d/Tile.java | 8 +-
.../referencing/provider/Equirectangular.java | 4 +-
.../referencing/provider/GeodeticOperation.java | 6 +-
.../referencing/provider/Geographic3Dto2D.java | 4 +-
.../referencing/provider/RegionalMercator.java | 3 +-
.../referencing/provider/VerticalOffset.java | 2 +-
.../java/org/apache/sis/io/wkt/Convention.java | 4 +-
.../main/java/org/apache/sis/io/wkt/Element.java | 6 +-
.../org/apache/sis/io/wkt/FormattableObject.java | 9 +-
.../main/java/org/apache/sis/io/wkt/Formatter.java | 34 ++--
.../java/org/apache/sis/io/wkt/KeywordCase.java | 5 +-
.../java/org/apache/sis/io/wkt/KeywordStyle.java | 18 +-
.../org/apache/sis/io/wkt/MathTransformParser.java | 6 +-
.../main/java/org/apache/sis/io/wkt/Parser.java | 6 +-
.../main/java/org/apache/sis/io/wkt/Symbols.java | 4 +-
.../java/org/apache/sis/io/wkt/Transliterator.java | 15 +-
.../sis/io/wkt/UnformattableObjectException.java | 10 +-
.../java/org/apache/sis/io/wkt/WKTDictionary.java | 6 +-
.../main/java/org/apache/sis/io/wkt/WKTFormat.java | 9 +-
.../main/java/org/apache/sis/io/wkt/Warnings.java | 9 +-
.../sis/parameter/DefaultParameterDescriptor.java | 12 +-
.../parameter/DefaultParameterDescriptorGroup.java | 10 +-
.../sis/parameter/DefaultParameterValue.java | 11 +-
.../sis/parameter/DefaultParameterValueGroup.java | 4 +-
.../org/apache/sis/parameter/ParameterBuilder.java | 11 +-
.../java/org/apache/sis/parameter/Parameters.java | 20 +--
.../org/apache/sis/parameter/TensorParameters.java | 5 +-
.../sis/parameter/UnmodifiableParameterValue.java | 11 +-
.../sis/referencing/AbstractIdentifiedObject.java | 3 +-
.../main/java/org/apache/sis/referencing/CRS.java | 13 +-
.../java/org/apache/sis/referencing/CommonCRS.java | 9 +-
.../apache/sis/referencing/GeodeticCalculator.java | 12 +-
.../apache/sis/referencing/IdentifiedObjects.java | 11 +-
.../sis/referencing/ImmutableIdentifier.java | 12 +-
.../apache/sis/referencing/NamedIdentifier.java | 4 +-
.../apache/sis/referencing/crs/AbstractCRS.java | 5 +-
.../sis/referencing/crs/DefaultCompoundCRS.java | 4 +-
.../sis/referencing/crs/DefaultDerivedCRS.java | 10 +-
.../sis/referencing/crs/DefaultEngineeringCRS.java | 4 +-
.../sis/referencing/crs/DefaultGeocentricCRS.java | 4 +-
.../sis/referencing/crs/DefaultGeographicCRS.java | 4 +-
.../sis/referencing/crs/DefaultImageCRS.java | 9 +-
.../sis/referencing/crs/DefaultParametricCRS.java | 5 +-
.../sis/referencing/crs/DefaultProjectedCRS.java | 4 +-
.../sis/referencing/crs/DefaultTemporalCRS.java | 14 +-
.../sis/referencing/crs/DefaultVerticalCRS.java | 4 +-
.../apache/sis/referencing/cs/AxesConvention.java | 14 +-
.../sis/referencing/cs/CoordinateSystems.java | 21 ++-
.../sis/referencing/cs/DefaultCartesianCS.java | 4 +-
.../cs/DefaultCoordinateSystemAxis.java | 4 +-
.../sis/referencing/cs/DefaultCylindricalCS.java | 4 +-
.../sis/referencing/cs/DefaultEllipsoidalCS.java | 4 +-
.../apache/sis/referencing/cs/DefaultLinearCS.java | 4 +-
.../apache/sis/referencing/cs/DefaultPolarCS.java | 4 +-
.../sis/referencing/cs/DefaultSphericalCS.java | 4 +-
.../apache/sis/referencing/cs/DefaultTimeCS.java | 4 +-
.../sis/referencing/cs/DefaultUserDefinedCS.java | 4 +-
.../sis/referencing/cs/DefaultVerticalCS.java | 4 +-
.../sis/referencing/cs/DirectionAlongMeridian.java | 8 +-
.../sis/referencing/datum/BursaWolfParameters.java | 19 +--
.../sis/referencing/datum/DatumShiftGrid.java | 32 ++--
.../sis/referencing/datum/DefaultEllipsoid.java | 23 ++-
.../referencing/datum/DefaultEngineeringDatum.java | 4 +-
.../referencing/datum/DefaultGeodeticDatum.java | 9 +-
.../sis/referencing/datum/DefaultImageDatum.java | 8 +-
.../referencing/datum/DefaultParametricDatum.java | 4 +-
.../referencing/datum/DefaultPrimeMeridian.java | 4 +-
.../referencing/datum/DefaultTemporalDatum.java | 8 +-
.../referencing/datum/DefaultVerticalDatum.java | 14 +-
.../factory/AuthorityFactoryIdentifier.java | 8 +-
.../referencing/factory/FactoryDataException.java | 4 +-
.../factory/GeodeticAuthorityFactory.java | 143 ++++++++--------
.../referencing/factory/GeodeticObjectFactory.java | 150 ++++++++---------
.../factory/IdentifiedObjectFinder.java | 22 ++-
.../referencing/factory/IdentifiedObjectSet.java | 6 +-
.../factory/InvalidGeodeticParameterException.java | 5 +-
.../factory/MultiAuthoritiesFactory.java | 12 +-
.../factory/UnavailableFactoryException.java | 4 +-
.../referencing/factory/sql/EPSGDataAccess.java | 80 +++++----
.../sis/referencing/factory/sql/SQLTranslator.java | 5 +-
.../operation/AbstractCoordinateOperation.java | 15 +-
.../operation/CoordinateOperationContext.java | 14 +-
.../operation/CoordinateOperationRegistry.java | 24 +--
.../operation/DefaultConcatenatedOperation.java | 10 +-
.../referencing/operation/DefaultConversion.java | 14 +-
.../sis/referencing/operation/DefaultFormula.java | 4 +-
.../operation/DefaultOperationMethod.java | 27 +--
.../operation/DefaultTransformation.java | 4 +-
.../operation/InverseOperationMethod.java | 13 +-
.../operation/MismatchedDatumException.java | 4 +-
.../referencing/operation/SubOperationInfo.java | 7 +-
.../operation/builder/LinearTransformBuilder.java | 23 ++-
.../operation/builder/ResidualGrid.java | 5 +-
.../operation/matrix/GeneralMatrix.java | 5 +-
.../sis/referencing/operation/matrix/Matrices.java | 4 +-
.../matrix/MismatchedMatrixSizeException.java | 4 +-
.../matrix/NoninvertibleMatrixException.java | 4 +-
.../operation/projection/AuthalicConversion.java | 6 +-
.../operation/projection/AzimuthalEquidistant.java | 6 +-
.../operation/projection/ConformalProjection.java | 4 +-
.../operation/projection/CylindricalEqualArea.java | 6 +-
.../referencing/operation/projection/Mercator.java | 8 +-
.../operation/projection/NormalizedProjection.java | 11 +-
.../operation/projection/ObliqueStereographic.java | 6 +-
.../operation/projection/TransverseMercator.java | 12 +-
.../operation/transform/AbstractMathTransform.java | 28 ++--
.../transform/AbstractMathTransform2D.java | 6 +-
.../operation/transform/CartesianToPolar.java | 4 +-
.../operation/transform/ConcatenatedTransform.java | 9 +-
.../operation/transform/ContextualParameters.java | 4 +-
.../operation/transform/CopyTransform.java | 5 +-
.../operation/transform/DatumShiftTransform.java | 25 ++-
.../transform/DefaultMathTransformFactory.java | 31 ++--
.../transform/EllipsoidToCentricTransform.java | 18 +-
.../transform/ExponentialTransform1D.java | 9 +-
.../transform/InterpolatedGeocentricTransform.java | 5 +-
.../transform/InterpolatedMolodenskyTransform.java | 6 +-
.../operation/transform/InterpolatedTransform.java | 3 +-
.../operation/transform/LinearInterpolator1D.java | 6 +-
.../operation/transform/LinearTransform.java | 4 +-
.../transform/LogarithmicTransform1D.java | 5 +-
.../operation/transform/MolodenskyFormula.java | 6 +-
.../operation/transform/MolodenskyTransform.java | 6 +-
.../operation/transform/PassThroughTransform.java | 4 +-
.../operation/transform/PolarToCartesian.java | 4 +-
.../operation/transform/ScaleTransform.java | 5 +-
.../transform/SpecializableTransform.java | 6 +-
.../operation/transform/SphericalToCartesian.java | 4 +-
.../operation/transform/TranslationTransform.java | 5 +-
.../operation/transform/WraparoundTransform.java | 27 ++-
.../apache/sis/parameter/ParameterFormatTest.java | 16 +-
.../sis/referencing/GeodeticCalculatorTest.java | 2 +-
.../sis/referencing/crs/DefaultDerivedCRSTest.java | 6 +-
.../operation/DefaultConversionTest.java | 14 +-
.../referencing/operation/matrix/MatricesTest.java | 18 +-
.../sis/internal/system/DelayedExecutor.java | 4 +-
.../sis/internal/system/DelayedRunnable.java | 11 +-
.../internal/system/ReferenceQueueConsumer.java | 4 +-
.../apache/sis/internal/util/CollectionsExt.java | 4 +-
.../apache/sis/internal/util/DefinitionURI.java | 55 +++---
.../sis/internal/util/StandardDateFormat.java | 6 +-
.../sis/internal/util/TreeFormatCustomization.java | 4 +-
.../java/org/apache/sis/io/CompoundFormat.java | 29 ++--
.../main/java/org/apache/sis/io/TabularFormat.java | 3 +-
.../java/org/apache/sis/math/DecimalFunctions.java | 30 ++--
.../main/java/org/apache/sis/math/Fraction.java | 16 +-
.../java/org/apache/sis/math/FunctionProperty.java | 22 +--
.../src/main/java/org/apache/sis/math/Line.java | 4 +-
.../java/org/apache/sis/math/MathFunctions.java | 39 +++--
.../src/main/java/org/apache/sis/math/Plane.java | 5 +-
.../src/main/java/org/apache/sis/math/Vector.java | 28 ++--
.../java/org/apache/sis/measure/AbstractUnit.java | 4 +-
.../java/org/apache/sis/measure/AngleFormat.java | 6 +-
.../java/org/apache/sis/measure/NumberRange.java | 5 +-
.../main/java/org/apache/sis/measure/Units.java | 184 +++++++--------------
.../apache/sis/setup/InstallationResources.java | 6 +-
.../apache/sis/setup/OptionalInstallations.java | 6 +-
.../main/java/org/apache/sis/util/ArraysExt.java | 20 +--
.../java/org/apache/sis/util/CharSequences.java | 33 ++--
.../java/org/apache/sis/util/ComparisonMode.java | 11 +-
.../main/java/org/apache/sis/util/Deprecable.java | 6 +-
.../src/main/java/org/apache/sis/util/Locales.java | 4 +-
.../org/apache/sis/util/LocalizedException.java | 6 +-
.../java/org/apache/sis/util/ObjectConverter.java | 11 +-
.../main/java/org/apache/sis/util/Workaround.java | 4 +-
.../org/apache/sis/util/collection/RangeSet.java | 8 +-
.../org/apache/sis/util/collection/TreeTable.java | 10 +-
.../java/org/apache/sis/util/logging/Logging.java | 23 ++-
.../apache/sis/util/logging/MonolineFormatter.java | 5 +-
.../java/org/apache/sis/util/resources/Errors.java | 4 +-
.../sis/util/resources/IndexedResourceBundle.java | 10 +-
.../org/apache/sis/util/resources/Messages.java | 4 +-
.../org/apache/sis/util/resources/Vocabulary.java | 4 +-
.../test/java/org/apache/sis/test/TestRunner.java | 5 +-
.../internal/storage/inflater/CopyFromBytes.java | 12 +-
.../apache/sis/internal/storage/inflater/LZW.java | 12 +-
.../apache/sis/storage/geotiff/GeoTiffStore.java | 14 +-
.../sis/storage/geotiff/GridGeometryBuilder.java | 14 +-
.../sis/storage/geotiff/ImageFileDirectory.java | 4 +-
.../sis/storage/geotiff/ImageMetadataBuilder.java | 6 +-
.../java/org/apache/sis/storage/geotiff/Tags.java | 2 +-
.../org/apache/sis/internal/netcdf/Convention.java | 32 ++--
.../org/apache/sis/internal/netcdf/Decoder.java | 6 +-
.../apache/sis/internal/netcdf/GridMapping.java | 5 +-
.../org/apache/sis/internal/netcdf/Linearizer.java | 6 +-
.../org/apache/sis/internal/netcdf/Variable.java | 24 +--
.../apache/sis/storage/netcdf/AttributeNames.java | 24 +--
.../apache/sis/storage/netcdf/MetadataReader.java | 3 +-
.../sis/internal/sql/feature/TableAnalyzer.java | 5 +-
.../apache/sis/internal/stream/DeferredStream.java | 6 +-
.../sis/internal/storage/MemoryGridResource.java | 16 +-
.../sis/internal/storage/MetadataBuilder.java | 18 +-
.../sis/internal/storage/ResourceOnFileSystem.java | 14 +-
.../apache/sis/internal/storage/StoreMetadata.java | 18 +-
.../sis/internal/storage/TiledGridCoverage.java | 6 +-
.../storage/image/WritableSingleImageStore.java | 2 +-
.../apache/sis/internal/storage/io/Markable.java | 10 +-
.../org/apache/sis/internal/storage/io/Region.java | 12 +-
.../internal/storage/io/RewindableLineReader.java | 5 +-
.../org/apache/sis/internal/storage/wkt/Store.java | 4 +-
.../java/org/apache/sis/storage/CoverageQuery.java | 3 +-
.../main/java/org/apache/sis/storage/DataSet.java | 6 +-
.../sis/storage/DataStoreContentException.java | 4 +-
.../org/apache/sis/storage/DataStoreProvider.java | 21 +--
.../org/apache/sis/storage/DataStoreRegistry.java | 6 +-
.../main/java/org/apache/sis/storage/Resource.java | 5 +-
.../org/apache/sis/storage/StorageConnector.java | 4 +-
.../org/apache/sis/storage/WritableAggregate.java | 5 +-
.../org/apache/sis/storage/WritableFeatureSet.java | 6 +-
.../storage/aggregate/AggregatedFeatureSet.java | 9 +-
.../aggregate/BandAggregateGridResource.java | 2 +-
.../sis/storage/aggregate/CoverageAggregator.java | 23 ++-
.../apache/sis/storage/aggregate/GridSlice.java | 15 --
.../apache/sis/storage/event/StoreListeners.java | 11 +-
.../internal/storage/MemoryGridResourceTest.java | 2 +-
.../org/apache/sis/storage/CoverageSubsetTest.java | 2 +-
.../aggregate/BandAggregateGridResourceTest.java | 2 +-
.../storage/gpx/GroupAsPolylineOperation.java | 3 +-
.../storage/xml/stream/FormattedWriter.java | 6 +-
.../storage/xml/stream/StaxStreamReader.java | 12 +-
350 files changed, 1815 insertions(+), 1957 deletions(-)
diff --cc core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java
index ac9375af7b,3d823e76e7..fb74497a08
--- 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
@@@ -140,14 -153,11 +140,14 @@@ public abstract class AbstractFeature i
* and the returned {@code Property} implementation is not very efficient
* since it has to perform multiple lookups and type checks.
* Implementers are encouraged to override this method if they can provide a more efficient implementation.
- * Note that this is already the case when using implementations created by {@link DefaultFeatureType#newInstance()}.</div>
+ * Note that this is already the case when using implementations created by {@link DefaultFeatureType#newInstance()}.
*
+ * <div class="warning"><b>Warning:</b> In a future SIS version, the return type may be changed
+ * to {@code org.opengis.feature.Property}. This change is pending GeoAPI revision.</div>
+ *
* @param name the property name.
* @return the property of the given name (never {@code null}).
- * @throws PropertyNotFoundException if the given argument is not a property name of this feature.
+ * @throws IllegalArgumentException if the given argument is not a property name of this feature.
*
* @see #getPropertyValue(String)
* @see DefaultFeatureType#getProperty(String)
@@@ -185,14 -196,11 +185,14 @@@
* the given {@code Property} instance is not stored (only its {@linkplain AbstractAttribute#getValue() value}
* is stored), and it cannot have custom {@linkplain AbstractAttribute#characteristics() characteristics}.
* 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>
+ * Note that this is already the case when using implementations created by {@link DefaultFeatureType#newInstance()}.
*
+ * <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 cannot be set for another reason.
*
* @see #setPropertyValue(String, Object)
diff --cc core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeatureType.java
index dbc9f39489,6b79167dfd..066f4db63a
--- 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
@@@ -133,9 -139,9 +133,9 @@@ public class DefaultFeatureType extend
* any unresolved name (i.e. a {@link DefaultAssociationRole#valueType} specified only be the
* 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>
+ * <h4>Implementation note</h4>
* Strictly speaking, this field should be declared {@code volatile} since the names could
* be resolved late after construction, after the {@code DefaultFeatureType} instance became
* used by different threads. However, this is not the intended usage of deferred associations.
@@@ -819,15 -827,10 +818,14 @@@
* if we compare {@code FeatureType} to {@link Class} in the Java language, then this method is equivalent
* to {@link Class#getSuperclass()} except that feature types allow multi-inheritance.</div>
*
+ * <div class="warning"><b>Warning:</b>
+ * The type of list elements will be changed to {@code FeatureType} if and when such interface
+ * will be defined in GeoAPI.</div>
+ *
- * <div class="note"><b>Note for subclasses:</b>
- * this method is final because it is invoked (indirectly) by constructors, and invoking a user-overrideable
+ * <h4>API note</h4>
+ * This method is final because it is invoked (indirectly) by constructors, and invoking a user-overrideable
* method at construction time is not recommended. Furthermore, many Apache SIS methods need guarantees about
* the stability of this collection.
- * </div>
*
* @return the parents of this feature type, or an empty set if none.
*/
diff --cc core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureTypeInfo.java
index db416d41e9,f30f722fd7..770b8e3625
--- 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
@@@ -111,11 -97,12 +111,10 @@@ public class DefaultFeatureTypeInfo ext
* unexpected negative values). This is because invalid metadata exist in practice, and verifying their
* validity in this copy constructor is often too late. Note that this is not the only hole, as invalid
* metadata instances can also be obtained by unmarshalling an invalid XML document.
- * </div>
*
* @param object the metadata to copy values from, or {@code null} if none.
- *
- * @see #castOrCopy(FeatureTypeInfo)
*/
- public DefaultFeatureTypeInfo(final FeatureTypeInfo object) {
+ public DefaultFeatureTypeInfo(final DefaultFeatureTypeInfo object) {
super(object);
if (object != null) {
featureTypeName = object.getFeatureTypeName();
diff --cc core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultSampleDimension.java
index d98f2f3cac,3b450d94cf..d0acc5d931
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultSampleDimension.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultSampleDimension.java
@@@ -205,14 -191,27 +205,13 @@@ public class DefaultSampleDimension ext
* unexpected negative values). This is because invalid metadata exist in practice, and verifying their
* validity in this copy constructor is often too late. Note that this is not the only hole, as invalid
* metadata instances can also be obtained by unmarshalling an invalid XML document.
- * </div>
*
* @param object the metadata to copy values from, or {@code null} if none.
- *
- * @see #castOrCopy(SampleDimension)
*/
- public DefaultSampleDimension(final SampleDimension object) {
+ public DefaultSampleDimension(final DefaultSampleDimension object) {
super(object);
if (object != null) {
- minValue = object.getMinValue();
- maxValue = object.getMaxValue();
- meanValue = object.getMeanValue();
- numberOfValues = object.getNumberOfValues();
- standardDeviation = object.getStandardDeviation();
- units = object.getUnits();
- scaleFactor = object.getScaleFactor();
- offset = object.getOffset();
- transferFunctionType = object.getTransferFunctionType();
- bitsPerValue = object.getBitsPerValue();
- nominalSpatialResolution = object.getNominalSpatialResolution();
- otherPropertyType = object.getOtherPropertyType();
- otherProperty = object.getOtherProperty();
+ init(object);
}
}
diff --cc core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/AbstractLocation.java
index 8d409667a8,098d9d637a..6f6075aeb3
--- a/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/AbstractLocation.java
+++ b/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/AbstractLocation.java
@@@ -132,6 -114,11 +126,11 @@@ public abstract class AbstractLocation
* the geographic identifier may need to include an identifier of an instance of a parent location type,
* for example “Paris, Texas”.
*
+ * <h4>Examples</h4>
- * If {@link LocationType#getIdentifications()} contain “name”, then geographic identifiers may be country
++ * If {@code LocationType.getIdentifications()} contain “name”, then geographic identifiers may be country
+ * names like “Japan” or “France”, or places like “Eiffel Tower”. If location type identifications contain
+ * “code”, then geographic identifiers may be “SW1P 3AD” postcode.
+ *
* @return unique identifier for the location instance.
*
* @see ModifiableLocationType#getIdentifications()
diff --cc core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultParametricDatum.java
index 462ff5002d,3c4ca0e130..ae0d3935be
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultParametricDatum.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultParametricDatum.java
@@@ -141,10 -143,41 +141,10 @@@ public class DefaultParametricDatum ext
}
/**
- * Returns a SIS datum implementation with the same values than the given arbitrary implementation.
- * If the given object is {@code null}, then this method returns {@code null}.
- * Otherwise if the given object is already a SIS implementation, then the given object is returned unchanged.
- * Otherwise a new SIS implementation is created and initialized to the attribute values of the given object.
- *
- * @param object the object to get as a SIS implementation, or {@code null} if none.
- * @return a SIS implementation containing the values of the given object (may be the
- * given object itself), or {@code null} if the argument was null.
- */
- public static DefaultParametricDatum castOrCopy(final ParametricDatum object) {
- return (object == null) || (object instanceof DefaultParametricDatum) ?
- (DefaultParametricDatum) object : new DefaultParametricDatum(object);
- }
-
- /**
- * Returns the GeoAPI interface implemented by this class.
- * The SIS implementation returns {@code ParametricDatum.class}.
- *
- * <h4>Note for implementers</h4>
- * Subclasses usually do not need to override this method since GeoAPI does not define {@code TemporalDatum}
- * sub-interface. Overriding possibility is left mostly for implementers who wish to extend GeoAPI with their
- * own set of interfaces.
- *
- * @return {@code ParametricDatum.class} or a user-defined sub-interface.
- */
- @Override
- public Class<? extends ParametricDatum> getInterface() {
- return ParametricDatum.class;
- }
-
- /**
* Formats this datum as a <cite>Well Known Text</cite> {@code ParametricDatum[…]} element.
*
- * <div class="note"><b>Compatibility note:</b>
- * {@code ParametricDatum} is defined in the WKT 2 specification only.</div>
+ * <h4>Compatibility note</h4>
+ * {@code ParametricDatum} is defined in the WKT 2 specification only.
*
* @return {@code "ParametricDatum"}.
*
diff --cc storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/AttributeNames.java
index 1eca61bb93,34a9e1dfad..c1c157011d
--- a/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/AttributeNames.java
+++ b/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/AttributeNames.java
@@@ -349,14 -349,14 +349,14 @@@ public class AttributeNames
* This is a character array with a line for each invocation of a program that has modified the dataset.
*
* <p><b>Path in ISO 19115:</b></p> <ul><li>{@link Metadata} /
- * {@link Metadata#getResourceLineages() resourceLineage} /
+ * {@link org.apache.sis.metadata.iso.DefaultMetadata#getResourceLineages() resourceLineage} /
* {@link Lineage#getStatement() statement}</li></ul>
*
- * <div class="note"><b>Note:</b>
- * located in "{@link Metadata#getDataQualityInfo() dataQualityInfo} /
+ * <h4>Departure from convention</h4>
+ * Located in "{@link Metadata#getDataQualityInfo() dataQualityInfo} /
* {@link org.opengis.metadata.quality.DataQuality#getLineage() lineage}" instead of "{@code resourceLineage}"
* in {@code UnidataDD2MI.xsl} file (retrieved in 2017).
- * See <a href="https://issues.apache.org/jira/browse/SIS-361">SIS-361</a>.</div>
+ * See <a href="https://issues.apache.org/jira/browse/SIS-361">SIS-361</a>.
*
* @see <a href="http://wiki.esipfed.org/index.php/Attribute_Convention_for_Data_Discovery#history">ESIP reference</a>
*/