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 2022/11/19 16:35:56 UTC
[sis] branch master updated (34813b658c -> 884973020b)
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git
from 34813b658c Merge branch 'geoapi-3.1'. This is mostly spelling fixes and dependency upgrades.
new a07b4869f9 Make `MetadataStandard` class more similar to the version on other branches, for making merges easier.
add ec0eaa68d9 Bug fixes related to unmarshalling of GML documents. Those bugs were identified by OGC TestBed 18 D025 scenario. This is a port of 3 commits on `master` branch.
add 2afe9dfcf6 Merge branch 'geoapi-4.0' into geoapi-3.1. Contains bug fix in parsing of GML documents.
new 884973020b Merge branch 'geoapi-3.1'. The commits in this merge were already present on `master` branch. This merge is for making sure that `master` and `geoapi-4.0` are synchronized.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../main/java/org/apache/sis/metadata/MetadataStandard.java | 7 +++----
.../java/org/apache/sis/metadata/StandardImplementation.java | 10 ++++------
.../sis/referencing/operation/DefaultPassThroughOperation.java | 2 +-
3 files changed, 8 insertions(+), 11 deletions(-)
[sis] 02/02: Merge branch 'geoapi-3.1'. The commits in this merge were already present on `master` branch. This merge is for making sure that `master` and `geoapi-4.0` are synchronized.
Posted by de...@apache.org.
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 884973020bc349ed7aa62e581cd6eb2287dcf501
Merge: a07b4869f9 2afe9dfcf6
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Sat Nov 19 17:35:03 2022 +0100
Merge branch 'geoapi-3.1'.
The commits in this merge were already present on `master` branch.
This merge is for making sure that `master` and `geoapi-4.0` are synchronized.
.../apache/sis/referencing/operation/DefaultPassThroughOperation.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --cc core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultPassThroughOperation.java
index 60749dbaa6,7499f5c35f..5b358aefee
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultPassThroughOperation.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultPassThroughOperation.java
@@@ -23,9 -23,10 +23,10 @@@ import javax.xml.bind.Unmarshaller
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
-import org.opengis.parameter.ParameterValueGroup;
import org.opengis.util.FactoryException;
+import org.opengis.parameter.ParameterValueGroup;
import org.opengis.referencing.operation.MathTransform;
+ import org.opengis.referencing.operation.Conversion;
import org.opengis.referencing.operation.CoordinateOperation;
import org.opengis.referencing.operation.PassThroughOperation;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
@@@ -44,9 -45,7 +45,8 @@@ import org.apache.sis.io.wkt.Formatter
import org.apache.sis.referencing.CRS;
import static org.apache.sis.util.Utilities.deepEquals;
- import org.opengis.referencing.operation.Conversion;
+// Branch-dependent imports
import org.opengis.referencing.operation.OperationMethod;
import org.opengis.referencing.operation.SingleOperation;
[sis] 01/02: Make `MetadataStandard` class more similar to the version on other branches, for making merges easier.
Posted by de...@apache.org.
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 a07b4869f901860874118e546f8b50dcea647ed8
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Sat Nov 19 16:43:47 2022 +0100
Make `MetadataStandard` class more similar to the version on other branches, for making merges easier.
---
.../main/java/org/apache/sis/metadata/MetadataStandard.java | 7 +++----
.../java/org/apache/sis/metadata/StandardImplementation.java | 10 ++++------
2 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java
index 7f3e53e8ff..e2d1f6d626 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java
@@ -152,12 +152,11 @@ public class MetadataStandard implements Serializable {
*/
public static final MetadataStandard ISO_19123;
static {
- final String[] prefix = {"Default", "Abstract"};
final String[] acronyms = {"CoordinateSystem", "CS", "CoordinateReferenceSystem", "CRS"};
- ISO_19115 = new StandardImplementation("ISO 19115", "org.opengis.metadata.", "org.apache.sis.metadata.iso.", prefix, null, (MetadataStandard[]) null);
- ISO_19157 = new StandardImplementation("ISO 19157", "org.opengis.metadata.quality.", "org.apache.sis.metadata.iso.quality.", prefix, null, ISO_19115);
- ISO_19111 = new StandardImplementation("ISO 19111", "org.opengis.referencing.", "org.apache.sis.referencing.", prefix, acronyms, ISO_19157, ISO_19115);
+ ISO_19115 = new StandardImplementation("ISO 19115", "org.opengis.metadata.", "org.apache.sis.metadata.iso.", null, (MetadataStandard[]) null);
+ ISO_19157 = new StandardImplementation("ISO 19157", "org.opengis.metadata.quality.", "org.apache.sis.metadata.iso.quality.", null, ISO_19115);
+ ISO_19111 = new StandardImplementation("ISO 19111", "org.opengis.referencing.", "org.apache.sis.referencing.", acronyms, ISO_19157, ISO_19115);
ISO_19123 = new MetadataStandard ("ISO 19123", "org.opengis.coverage.", ISO_19111);
INSTANCES = new MetadataStandard[] {
ISO_19157, // Need to be declared before ISO 19115.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/StandardImplementation.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/StandardImplementation.java
index ecef84d0d9..214101680e 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/StandardImplementation.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/StandardImplementation.java
@@ -49,9 +49,9 @@ final class StandardImplementation extends MetadataStandard {
/**
* The prefixes that implementation classes may have.
- * The most common prefixes should be first, since the prefixes will be tried in that order.
+ * The most common prefixes should be first, because the prefixes will be tried in that order.
*/
- private final String[] prefix;
+ private static final String[] IMPL_PREFIXES = {"Default", "Abstract"};
/**
* The acronyms that implementation classes may have, or {@code null} if none. If non-null,
@@ -81,16 +81,14 @@ final class StandardImplementation extends MetadataStandard {
* @param citation the title of the standard.
* @param interfacePackage the root package for metadata interfaces, with a trailing {@code '.'}.
* @param implementationPackage the root package for metadata implementations. with a trailing {@code '.'}.
- * @param prefix the prefix of implementation class. This array is not cloned.
* @param acronyms an array of (full text, acronyms) pairs. This array is not cloned.
* @param dependencies the dependencies to other metadata standards, or {@code null} if none.
*/
StandardImplementation(final String citation, final String interfacePackage, final String implementationPackage,
- final String[] prefix, final String[] acronyms, final MetadataStandard... dependencies)
+ final String[] acronyms, final MetadataStandard... dependencies)
{
super(citation, interfacePackage, dependencies);
this.implementationPackage = implementationPackage;
- this.prefix = prefix;
this.acronyms = acronyms;
this.implementations = new IdentityHashMap<>();
}
@@ -149,7 +147,7 @@ final class StandardImplementation extends MetadataStandard {
*/
final int prefixPosition = buffer.lastIndexOf(".") + 1;
int length = 0;
- for (final String p : prefix) {
+ for (final String p : IMPL_PREFIXES) {
classname = buffer.replace(prefixPosition, prefixPosition + length, p).toString();
try {
candidate = Class.forName(classname);