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/09/14 11:50:12 UTC
[sis] 01/01: Merge branch 'geoapi-3.1': last-minute API changes
before 1.0 release.
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 ba0a5b3c331714910e1b99025e7aa124816d7506
Merge: 90b5999 6217d6d
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Sat Sep 14 13:49:25 2019 +0200
Merge branch 'geoapi-3.1': last-minute API changes before 1.0 release.
.../org/apache/sis/coverage/grid/GridGeometry.java | 2 +-
.../internal/metadata/TransformationAccuracy.java | 2 +-
.../apache/sis/metadata/ModifiableMetadata.java | 12 ++++----
.../java/org/apache/sis/metadata/StateChanger.java | 6 ++--
.../org/apache/sis/metadata/iso/ISOMetadata.java | 4 +--
.../apache/sis/metadata/iso/extent/Extents.java | 4 +--
.../DefaultRepresentativeFraction.java | 2 +-
.../org/apache/sis/metadata/sql/Dispatcher.java | 2 +-
.../apache/sis/metadata/sql/MetadataFallback.java | 2 +-
.../sis/metadata/ModifiableMetadataTest.java | 10 +++----
.../metadata/iso/citation/DefaultCitationTest.java | 6 ++--
.../metadata/iso/citation/HardCodedCitations.java | 8 +++---
.../DefaultRepresentativeFractionTest.java | 4 +--
.../referencing/gazetteer/FinalLocationType.java | 2 +-
.../referencing/PositionalAccuracyConstant.java | 2 +-
.../sis/referencing/ImmutableIdentifier.java | 4 +--
.../apache/sis/referencing/NamedIdentifier.java | 4 +--
.../referencing/factory/sql/EPSGDataAccess.java | 4 +--
.../storage/earthobservation/LandsatReader.java | 2 +-
.../sis/storage/earthobservation/LandsatStore.java | 31 ++++++++++++---------
.../org/apache/sis/storage/gdal/Proj4Factory.java | 2 +-
.../apache/sis/storage/geotiff/GeoTiffStore.java | 16 +++++------
.../apache/sis/storage/netcdf/MetadataReader.java | 2 +-
.../org/apache/sis/storage/netcdf/NetcdfStore.java | 10 +++----
.../java/org/apache/sis/storage/sql/SQLStore.java | 10 +++----
.../sis/internal/storage/AbstractResource.java | 4 +--
.../sis/internal/storage/MetadataBuilder.java | 2 +-
.../apache/sis/internal/storage/URIDataStore.java | 11 ++++----
.../apache/sis/internal/storage/folder/Store.java | 8 +++---
.../java/org/apache/sis/storage/DataStore.java | 32 ++++++++++++----------
.../org/apache/sis/storage/DataStoreProvider.java | 2 +-
.../main/java/org/apache/sis/storage/Resource.java | 10 +++----
.../apache/sis/storage/event/StoreListener.java | 4 +--
.../apache/sis/storage/event/StoreListeners.java | 16 +++++------
.../java/org/apache/sis/storage/DataStoreMock.java | 7 +++--
.../sis/storage/event/StoreListenersTest.java | 14 +++++-----
36 files changed, 137 insertions(+), 126 deletions(-)
diff --cc core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/FinalLocationType.java
index d2f1813,47be601..2f9508a
--- a/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/FinalLocationType.java
+++ b/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/FinalLocationType.java
@@@ -199,10 -201,12 +199,10 @@@ final class FinalLocationType extends A
* @param metadata the metadata object to eventually copy, or {@code null}.
* @return an unmodifiable copy of the given metadata object, or {@code null} if the given argument is {@code null}.
*/
- private static <T> T unmodifiable(final Class<T> type, T metadata) {
+ private static Object unmodifiable(Object metadata) {
if (metadata instanceof ModifiableMetadata) {
- metadata = MetadataCopier.forModifiable(((ModifiableMetadata) metadata).getStandard()).copy(type, metadata);
+ metadata = MetadataCopier.forModifiable(((ModifiableMetadata) metadata).getStandard()).copy(metadata);
- ((ModifiableMetadata) metadata).transition(ModifiableMetadata.State.FINAL);
+ ((ModifiableMetadata) metadata).transitionTo(ModifiableMetadata.State.FINAL);
}
return metadata;
}