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 2019/08/30 17:44:20 UTC
[sis] 01/01: Merge branch 'geoapi-3.1'
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 cd5fecb40762e62c516ab484e3d750193a5d4833
Merge: 309aad8 83846c5
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Fri Aug 30 19:43:49 2019 +0200
Merge branch 'geoapi-3.1'
.../org/apache/sis/feature/AbstractFeature.java | 8 +-
.../sis/internal/metadata/sql/ScriptRunner.java | 63 ++++------
.../org/apache/sis/metadata/AbstractMetadata.java | 4 +-
.../apache/sis/metadata/ModifiableMetadata.java | 4 +-
.../org/apache/sis/metadata/iso/ISOMetadata.java | 2 +-
.../org/apache/sis/util/iso/AbstractFactory.java | 2 +-
.../java/org/apache/sis/util/iso/AbstractName.java | 2 +-
.../java/org/apache/sis/test/sql/TestDatabase.java | 11 +-
.../org/apache/sis/geometry/AbstractEnvelope.java | 2 +-
.../java/org/apache/sis/io/wkt/Convention.java | 2 +-
.../org/apache/sis/io/wkt/MathTransformParser.java | 23 ++--
.../java/org/apache/sis/io/wkt/package-info.java | 2 +-
.../sis/parameter/DefaultParameterDescriptor.java | 4 +-
.../parameter/DefaultParameterDescriptorGroup.java | 4 +-
.../org/apache/sis/parameter/ParameterBuilder.java | 4 +-
.../org/apache/sis/parameter/Parameterized.java | 2 +-
.../java/org/apache/sis/parameter/Parameters.java | 6 +-
.../org/apache/sis/parameter/package-info.java | 4 +-
.../java/org/apache/sis/referencing/Builder.java | 4 +-
.../sis/referencing/crs/DefaultCompoundCRS.java | 4 +-
.../sis/referencing/crs/DefaultDerivedCRS.java | 4 +-
.../sis/referencing/crs/DefaultEngineeringCRS.java | 4 +-
.../sis/referencing/crs/DefaultGeocentricCRS.java | 4 +-
.../sis/referencing/crs/DefaultGeographicCRS.java | 4 +-
.../sis/referencing/crs/DefaultImageCRS.java | 4 +-
.../sis/referencing/crs/DefaultProjectedCRS.java | 4 +-
.../sis/referencing/crs/DefaultTemporalCRS.java | 4 +-
.../sis/referencing/crs/DefaultVerticalCRS.java | 4 +-
.../org/apache/sis/referencing/cs/AbstractCS.java | 2 +-
.../org/apache/sis/referencing/cs/AxisFilter.java | 2 +-
.../sis/referencing/cs/DefaultCartesianCS.java | 4 +-
.../cs/DefaultCoordinateSystemAxis.java | 6 +-
.../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/datum/DefaultEllipsoid.java | 4 +-
.../referencing/datum/DefaultEngineeringDatum.java | 4 +-
.../referencing/datum/DefaultGeodeticDatum.java | 4 +-
.../sis/referencing/datum/DefaultImageDatum.java | 4 +-
.../referencing/datum/DefaultPrimeMeridian.java | 4 +-
.../referencing/datum/DefaultTemporalDatum.java | 4 +-
.../referencing/datum/DefaultVerticalDatum.java | 4 +-
.../referencing/factory/IdentifiedObjectSet.java | 2 +-
.../factory/sql/InstallationScriptProvider.java | 4 +-
.../operation/CoordinateOperationRegistry.java | 2 +-
.../operation/DefaultConcatenatedOperation.java | 4 +-
.../operation/DefaultOperationMethod.java | 4 +-
.../operation/DefaultPassThroughOperation.java | 4 +-
.../operation/DefaultTransformation.java | 4 +-
.../operation/projection/NormalizedProjection.java | 2 +-
.../operation/projection/package-info.java | 2 +-
.../transform/AbstractLinearTransform.java | 2 +-
.../operation/transform/AbstractMathTransform.java | 4 +-
.../operation/transform/ContextualParameters.java | 2 +-
.../apache/sis/io/wkt/MathTransformParserTest.java | 21 +++-
.../referencing/factory/sql/EPSGInstallerTest.java | 13 +-
.../factory/sql/epsg/DataScriptFormatter.java | 10 +-
.../epsg/{MethodDimensions.sql => DebugTools.sql} | 8 +-
.../sis/referencing/factory/sql/epsg/package.html | 132 +++++++++++++--------
.../sis/test/integration/ConsistencyTest.java | 2 +-
.../java/org/apache/sis/io/CompoundFormat.java | 2 +-
.../java/org/apache/sis/math/DecimalFunctions.java | 4 +-
.../java/org/apache/sis/math/MathFunctions.java | 2 +-
.../org/apache/sis/measure/MeasurementRange.java | 2 +-
.../java/org/apache/sis/measure/NumberRange.java | 2 +-
.../main/java/org/apache/sis/measure/Range.java | 2 +-
.../src/main/java/org/apache/sis/setup/About.java | 21 ++--
.../main/java/org/apache/sis/setup/OptionKey.java | 4 +-
.../org/apache/sis/util/LenientComparable.java | 2 +-
.../src/main/java/org/apache/sis/util/Version.java | 4 +-
.../sis/util/iso/ResourceInternationalString.java | 2 +-
.../sis/util/iso/SimpleInternationalString.java | 2 +-
.../java/org/apache/sis/util/logging/Logging.java | 2 +-
ide-project/NetBeans/nbproject/project.properties | 8 +-
pom.xml | 18 +--
.../org/apache/sis/storage/DataStoreProvider.java | 12 +-
.../org/apache/sis/storage/DataStoreRegistry.java | 2 +-
.../org/apache/sis/storage/StorageConnector.java | 2 +-
83 files changed, 318 insertions(+), 260 deletions(-)
diff --cc core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java
index 48ccc8e,26a33ba..701b597
--- 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
@@@ -132,15 -144,12 +132,15 @@@ public abstract class AbstractFeature i
* a new {@code Property} instance is created every time that this {@code getProperty(String)} method is invoked,
* and the returned {@code Property} implementation is not very efficient
* since it has to perform multiple lookups and type checks.
- * Implementors are encouraged to override this method if they can provide a more efficient implementation.
+ * 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>
*
+ * <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)
@@@ -177,15 -187,12 +177,15 @@@
* customized <code>AbstractFacture</code> implementations, but has drawbacks:
* the given {@code Property} instance is not stored (only its {@linkplain AbstractAttribute#getValue() value}
* is stored), and it can not have custom {@linkplain AbstractAttribute#characteristics() characteristics}.
- * Implementors are encouraged to override this method if they can provide a better implementation.
+ * 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.
*
* @see #setPropertyValue(String, Object)