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/09 15:40:19 UTC
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-3.1
in repository https://gitbox.apache.org/repos/asf/sis.git
commit cbe6d78b98871771cecc5362b07dc8e631d304ce
Merge: 5db8d26 414235b
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Mon Sep 9 17:39:58 2019 +0200
Merge branch 'geoapi-4.0' into geoapi-3.1
.../java/org/apache/sis/console/package-info.java | 2 +-
.../java/org/apache/sis/image/PixelIterator.java | 7 +
.../apache/sis/image/WritablePixelIterator.java | 9 +-
.../apache/sis/internal/metadata/Resources.java | 27 ++
.../sis/internal/metadata/Resources.properties | 2 +
.../sis/internal/metadata/Resources_fr.properties | 2 +
.../sis/internal/metadata/ServicesForUtility.java | 28 ++
.../sis/internal/metadata/sql/Initializer.java | 22 +-
.../org/apache/sis/metadata/AbstractMetadata.java | 1 -
.../org/apache/sis/metadata/MetadataCopier.java | 41 +-
.../apache/sis/metadata/iso/DefaultIdentifier.java | 7 +-
.../sis/metadata/iso/citation/Citations.java | 20 +-
.../java/org/apache/sis/xml/ReferenceResolver.java | 2 +-
.../apache/sis/metadata/MetadataCopierTest.java | 33 +-
.../apache/sis/internal/jaxb/referencing/Code.java | 4 +-
.../sis/internal/referencing/DeprecatedCode.java | 2 +-
.../sis/internal/referencing/WKTKeywords.java | 2 +-
.../internal/referencing/provider/EPSGName.java | 2 +-
.../referencing/provider/MapProjection.java | 2 +-
.../java/org/apache/sis/io/wkt/ElementKind.java | 2 +-
.../main/java/org/apache/sis/io/wkt/Formatter.java | 2 +-
.../apache/sis/io/wkt/GeodeticObjectParser.java | 2 +-
.../main/java/org/apache/sis/io/wkt/WKTFormat.java | 43 +-
.../sis/metadata/iso/ImmutableIdentifier.java | 449 +--------------------
.../java/org/apache/sis/parameter/Parameters.java | 4 +-
.../sis/referencing/AbstractIdentifiedObject.java | 5 +-
.../java/org/apache/sis/referencing/Builder.java | 1 -
.../apache/sis/referencing/IdentifiedObjects.java | 4 +-
.../iso => referencing}/ImmutableIdentifier.java | 38 +-
.../apache/sis/referencing/NamedIdentifier.java | 1 -
.../sis/referencing/crs/DefaultGeographicCRS.java | 2 +-
.../referencing/factory/sql/EPSGDataAccess.java | 2 +-
.../operation/InverseOperationMethod.java | 2 +-
.../transform/CoordinateSystemTransform.java | 2 +-
.../transform/EllipsoidToCentricTransform.java | 2 +-
.../sis/internal/jaxb/referencing/CodeTest.java | 2 +-
.../parameter/DefaultParameterDescriptorTest.java | 2 +-
.../referencing/AbstractIdentifiedObjectTest.java | 5 +-
.../referencing/AbstractReferenceSystemTest.java | 1 -
.../org/apache/sis/referencing/BuilderTest.java | 1 -
.../ImmutableIdentifierTest.java | 2 +-
.../apache/sis/referencing/cs/NormalizerTest.java | 2 +-
.../datum/DefaultTemporalDatumTest.java | 2 +-
.../operation/DefaultOperationMethodTest.java | 2 +-
.../apache/sis/test/integration/MetadataTest.java | 4 +-
.../sis/test/suite/ReferencingTestSuite.java | 2 +-
.../org/apache/sis/internal/system/Supervisor.java | 2 -
.../apache/sis/internal/util/MetadataServices.java | 25 ++
.../sis/internal/util/TemporalUtilities.java | 2 -
.../java/org/apache/sis/setup/Configuration.java | 102 +++++
.../java/org/apache/sis/util/CharSequences.java | 4 +-
.../java/org/apache/sis/util/Configuration.java | 8 +-
pom.xml | 21 +-
.../org/apache/sis/storage/gdal/Proj4Factory.java | 2 +-
.../apache/sis/storage/sql/SQLStoreProvider.java | 6 +-
.../org/apache/sis/internal/storage/Resources.java | 5 +
.../sis/internal/storage/Resources.properties | 1 +
.../sis/internal/storage/Resources_fr.properties | 1 +
.../storage/folder/FolderStoreProvider.java | 3 +-
.../org/apache/sis/storage/DataStoreProvider.java | 19 +-
.../org/apache/sis/storage/StorageConnector.java | 11 +-
61 files changed, 418 insertions(+), 595 deletions(-)
diff --cc core/sis-referencing/src/main/java/org/apache/sis/referencing/ImmutableIdentifier.java
index d9b4db0,72d2ac5..f79eac6
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/ImmutableIdentifier.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/ImmutableIdentifier.java
@@@ -22,8 -22,7 +22,8 @@@ import java.util.Objects
import java.io.Serializable;
import org.opengis.metadata.Identifier;
import org.opengis.metadata.citation.Citation;
- import org.opengis.parameter.ParameterValue;
+import org.opengis.referencing.ReferenceIdentifier;
+ import org.opengis.parameter.ParameterValue;
import org.opengis.util.InternationalString;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.iso.Types;
diff --cc core/sis-referencing/src/test/java/org/apache/sis/referencing/AbstractIdentifiedObjectTest.java
index 094df04,ad448a4..8061c26
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/AbstractIdentifiedObjectTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/AbstractIdentifiedObjectTest.java
@@@ -23,8 -23,7 +23,7 @@@ import java.util.LinkedHashSet
import java.util.Locale;
import java.util.Collections;
import org.opengis.test.Validators;
-import org.opengis.metadata.Identifier;
+import org.opengis.referencing.ReferenceIdentifier;
- import org.apache.sis.metadata.iso.ImmutableIdentifier;
import org.apache.sis.referencing.datum.AbstractDatum;
import org.apache.sis.internal.jaxb.referencing.Code;
import org.apache.sis.internal.jaxb.Context;
@@@ -235,9 -234,9 +234,9 @@@ public final strictfp class AbstractIde
@Test
@DependsOnMethod("testWithoutIdentifier")
public void testSerialization() {
- final Set<Identifier> identifiers = Collections.emptySet();
+ final Set<ReferenceIdentifier> identifiers = Collections.emptySet();
- final AbstractIdentifiedObject object = new AbstractIdentifiedObject(properties(identifiers));
- final AbstractIdentifiedObject actual = assertSerializedEquals(object);
+ final AbstractIdentifiedObject object = new AbstractIdentifiedObject(properties(identifiers));
+ final AbstractIdentifiedObject actual = assertSerializedEquals(object);
assertNotSame(object, actual);
assertNull("gmlId", validate(actual, identifiers, "GRS1980"));
}