[sis] branch geoapi-3.1 updated (a6c548a -> c468aad)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch geoapi-3.1 in repository https://gitbox.apache.org/repos/asf/sis.git. from a6c548a Merge branch 'geoapi-4.0' into geoapi-3.1 except the change of `LocalName` into `GenericName` in the `featureTypes` property. The old type is kept on this branch for preserving backward compatibility. add 1c04921 Update for change in GeoAPI. https://github.com/opengeospatial/geoapi/issues/31 add 7adeb94 Change serialVersionUID on AbstractIdentification in geoapi-3.1/4.0 branches but not on master. The change of serialVersionUID has been done on development branches for SIS 0.5 but has been accidentally propagated to master in the SIS 0.5 release. It is too late for changing serialVersionUID on master, so we have to change it again on geoapi-3.1/4.à branches even if the current serialVersionUID on those branches is the "right" one. We want a different serialVersionUID be [...] new c468aad Merge branch 'geoapi-4.0' into geoapi-3.1. Removal of `MathTransformFactory.fromXML(String)` since that method is still part of GeoAPI 3.x. The 1 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: .../iso/identification/AbstractIdentification.java |2 +- .../internal/referencing/VerticalDatumTypes.java | 22 +- .../org/apache/sis/internal/util/CodeLists.java| 28 +- ide-project/NetBeans/nbproject/build-impl.xml~ | 2128 4 files changed, 15 insertions(+), 2165 deletions(-) delete mode 100644 ide-project/NetBeans/nbproject/build-impl.xml~
[sis] 01/01: Merge branch 'geoapi-3.1', without changing the way to create CodeList since the new API is not available in GeoAPI 3.0.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 c8bf60535d1d41870ef012bffaf6682ad468c41a
Merge: d2003d3 c468aad
Author: Martin Desruisseaux
AuthorDate: Mon Jul 1 20:21:51 2019 +0200
Merge branch 'geoapi-3.1', without changing the way to create CodeList
since the new API is not available in GeoAPI 3.0.1.
.../org/apache/sis/internal/util/CodeLists.java|4 +
ide-project/NetBeans/nbproject/build-impl.xml~ | 2128
2 files changed, 4 insertions(+), 2128 deletions(-)
diff --cc
core/sis-utility/src/main/java/org/apache/sis/internal/util/CodeLists.java
index 092a548,ee9d73d..02d119a
--- a/core/sis-utility/src/main/java/org/apache/sis/internal/util/CodeLists.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/internal/util/CodeLists.java
@@@ -48,31 -51,19 +48,35 @@@ public final class CodeLists implement
private final String codename;
/**
+ * {@code true} if {@link CodeList#valueOf} is allowed to create new code
lists.
+ */
+private final boolean canCreate;
+
+/**
* Creates a new filter for the specified code name.
*/
-private CodeLists(final String codename) {
+private CodeLists(final String codename, final boolean canCreate) {
this.codename = codename;
+this.canCreate = canCreate;
+}
+
+/**
+ * Returns the name of the code to create, or {@code null} if no new code
list shall be created.
++ *
++ * @return the name specified at construction time.
+ */
+@Override
+public String codename() {
+return canCreate ? codename : null;
}
/**
* Returns {@code true} if the given code matches the name we are looking
for.
+ *
+ * @param code the code list candidate.
*/
@Override
-public boolean test(final CodeList code) {
+public boolean accept(final CodeList code) {
for (final String candidate : code.names()) {
if (accept(candidate, codename)) {
return true;
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1. Removal of `MathTransformFactory.fromXML(String)` since that method is still part of GeoAPI 3.x.
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 c468aadc89b13790ae2b32269461a3c0f32753a7 Merge: a6c548a 7adeb94 Author: Martin Desruisseaux AuthorDate: Mon Jul 1 20:15:21 2019 +0200 Merge branch 'geoapi-4.0' into geoapi-3.1. Removal of `MathTransformFactory.fromXML(String)` since that method is still part of GeoAPI 3.x. .../iso/identification/AbstractIdentification.java |2 +- .../internal/referencing/VerticalDatumTypes.java | 22 +- .../org/apache/sis/internal/util/CodeLists.java| 28 +- ide-project/NetBeans/nbproject/build-impl.xml~ | 2128 4 files changed, 15 insertions(+), 2165 deletions(-)
[sis] branch master updated (d2003d3 -> c8bf605)
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 d2003d3 Merge branch 'geoapi-3.1'. add 1c04921 Update for change in GeoAPI. https://github.com/opengeospatial/geoapi/issues/31 add 7adeb94 Change serialVersionUID on AbstractIdentification in geoapi-3.1/4.0 branches but not on master. The change of serialVersionUID has been done on development branches for SIS 0.5 but has been accidentally propagated to master in the SIS 0.5 release. It is too late for changing serialVersionUID on master, so we have to change it again on geoapi-3.1/4.à branches even if the current serialVersionUID on those branches is the "right" one. We want a different serialVersionUID be [...] add c468aad Merge branch 'geoapi-4.0' into geoapi-3.1. Removal of `MathTransformFactory.fromXML(String)` since that method is still part of GeoAPI 3.x. new c8bf605 Merge branch 'geoapi-3.1', without changing the way to create CodeList since the new API is not available in GeoAPI 3.0.1. The 1 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: .../org/apache/sis/internal/util/CodeLists.java|4 + ide-project/NetBeans/nbproject/build-impl.xml~ | 2128 2 files changed, 4 insertions(+), 2128 deletions(-) delete mode 100644 ide-project/NetBeans/nbproject/build-impl.xml~
