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 947dfd9042e46e5bc3fe9c4f580451cb76616da2
Merge: 1beb63780c 943bd0e036
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Mon Aug 15 20:59:57 2022 +0200
Merge fixes from branch 'geoapi-4.0' into geoapi-3.1;
* GML and WKT parsing fixes.
* https://issues.apache.org/jira/browse/SIS-555
* https://issues.apache.org/jira/browse/SIS-166 partially reverted.
.../apache/sis/gui/coverage/CoverageCanvas.java | 2 +-
.../apache/sis/gui/coverage/IsolineRenderer.java | 2 +-
.../sis/gui/coverage/StyledRenderingData.java | 2 +-
.../java/org/apache/sis/image/ImageProcessor.java | 2 +-
.../sis/internal/feature/j2d/MultiPolylines.java | 13 +-
.../sis/internal/feature/j2d/PathBuilder.java | 13 +-
.../apache/sis/internal/feature/j2d/Polyline.java | 13 +-
.../sis/internal/feature/j2d/package-info.java | 2 +-
.../internal/processing/image/IsolineTracer.java | 1261 --------------------
.../internal/processing/image/TiledProcess.java | 6 +-
.../internal/processing/image/package-info.java | 2 +-
.../sis/internal/processing/isoline/Fragments.java | 274 +++++
.../processing/{image => isoline}/Isolines.java | 246 ++--
.../sis/internal/processing/isoline/Joiner.java | 168 +++
.../internal/processing/isoline/Parallelized.java | 112 ++
.../processing/isoline/PolylineBuffer.java | 210 ++++
.../internal/processing/isoline/PolylineStage.java | 116 ++
.../sis/internal/processing/isoline/Result.java | 101 ++
.../sis/internal/processing/isoline/Tracer.java | 739 ++++++++++++
.../{image => isoline}/package-info.java | 6 +-
.../org/apache/sis/image/ImageProcessorTest.java | 4 +-
.../{image => isoline}/IsolinesTest.java | 2 +-
.../internal/processing/isoline/StepsViewer.java | 426 +++++++
.../apache/sis/test/suite/FeatureTestSuite.java | 2 +-
.../apache/sis/metadata/iso/DefaultMetadata.java | 5 +-
.../sis/referencing/AbstractIdentifiedObject.java | 4 +
.../sis/referencing/AbstractReferenceSystem.java | 2 +
.../apache/sis/referencing/crs/AbstractCRS.java | 3 +-
.../sis/referencing/crs/DefaultEngineeringCRS.java | 109 +-
.../sis/referencing/crs/DefaultGeodeticCRS.java | 6 +-
.../sis/referencing/crs/DefaultImageCRS.java | 5 +-
.../org/apache/sis/referencing/cs/AbstractCS.java | 1 +
.../referencing/crs/DefaultEngineeringCRSTest.java | 100 +-
33 files changed, 2434 insertions(+), 1525 deletions(-)
diff --cc
core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java
index 92341bf37b,449d24bbe7..4fd2a6fa4b
---
a/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java
+++
b/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java
@@@ -181,7 -178,8 +181,8 @@@ public class AbstractIdentifiedObject e
* @see #getName()
* @see #getNames()
*/
+ @SuppressWarnings("serial") // Not statically typed as
Serializable.
- private Identifier name;
+ private ReferenceIdentifier name;
/**
* An alternative name by which this object is identified, or {@code
null} if none.
@@@ -189,8 -187,9 +190,9 @@@
* we may get both on unmarshalling.
*
* <p><b>Consider this field as final!</b>
- * This field is modified only at unmarshalling time by {@link
Names#add(Identifier)}.</p>
+ * This field is modified only at unmarshalling time by {@code
Names.add(Identifier)}.</p>
*/
+ @SuppressWarnings("serial") // Not statically typed as
Serializable.
private Collection<GenericName> alias;
/**
@@@ -203,7 -202,8 +205,8 @@@
* @see #getIdentifiers()
* @see #getIdentifier()
*/
+ @SuppressWarnings("serial") // Not statically typed as
Serializable.
- private Set<Identifier> identifiers;
+ private Set<ReferenceIdentifier> identifiers;
/**
* Comments on or information about this object, or {@code null} if none.
