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 b8b49e9bc23a69c2f35e915e4cc77ff78cc7c40e
Merge: 9048ae55d3 dca5af8fc9
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Tue Mar 12 18:58:07 2024 +0100
Merge branch 'geoapi-4.0' into geoapi-3.1.
.../metadata/iso/distribution/DefaultMedium.java | 2 +-
.../apache/sis/metadata/sql/MetadataFallback.java | 9 +-
.../apache/sis/metadata/sql/MetadataSource.java | 14 ++-
.../main/org/apache/sis/util/iso/Types.java | 78 +++++++++++++--
.../apache/sis/xml/bind/cat/CodeListAdapter.java | 10 +-
.../sis/xml/bind/gco/GO_CharacterString.java | 24 +++--
.../apache/sis/xml/bind/gml/CodeListAdapter.java | 11 ++-
.../apache/sis/xml/bind/gml/SC_VerticalCRS.java | 2 +-
.../sis/xml/bind/metadata/replace/SensorType.java | 49 ++--------
.../apache/sis/metadata/TreeNodeChildrenTest.java | 18 ++--
.../metadata/iso/citation/DefaultContactTest.java | 2 +-
.../test/org/apache/sis/util/iso/TypesTest.java | 22 ++---
.../apache/sis/io/wkt/GeodeticObjectParser.java | 4 +-
.../sis/referencing/cs/DirectionAlongMeridian.java | 2 +-
.../referencing/internal/VerticalDatumTypes.java | 7 +-
.../apache/sis/storage/netcdf/MetadataReader.java | 12 ++-
.../org/apache/sis/storage/netcdf/base/Axis.java | 4 +-
.../org/apache/sis/converter/StringConverter.java | 10 +-
.../apache/sis/util/collection/CodeListSet.java | 5 +-
.../main/org/apache/sis/util/privy/CodeLists.java | 106 ++++++++++++---------
.../sis/util/collection/CodeListSetTest.java | 2 +-
.../apache/sis/util/collection/LargeCodeList.java | 31 +++---
geoapi/snapshot | 2 +-
.../apache/sis/map/service/GraphicsPortrayer.java | 37 ++++++-
.../apache/sis/map/service/RenderingException.java | 2 +-
.../main/org/apache/sis/map/service/Scene2D.java | 54 ++++++++++-
.../org/apache/sis/map/service/StylePainter.java | 40 +++++++-
.../org/apache/sis/map/service/se1/SEPainter.java | 15 ++-
.../sis/map/service/GraphicsPortrayerTest.java | 45 ++++++++-
.../gui/referencing/PositionableProjection.java | 48 +++-------
.../apache/sis/gui/referencing/package-info.java | 2 +-
31 files changed, 450 insertions(+), 219 deletions(-)
diff --cc
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultMedium.java
index e3c2ed9667,faf89f0a1c..4b41ed32eb
---
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultMedium.java
+++
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultMedium.java
@@@ -434,12 -422,7 +434,12 @@@ public class DefaultMedium extends ISOM
/**
* Sets the name of the medium on which the resource can be received.
*/
- private void setLegacyName(final MediumName newValue) {
- name = newValue;
+ private void setNewName(final Citation newValue) {
+ if (newValue != null) {
+ final InternationalString title = newValue.getTitle();
+ if (title != null) {
- name = CodeLists.forName(MediumName.class, title.toString(),
false);
++ name = CodeLists.forCodeName(MediumName.class,
title.toString());
+ }
+ }
}
}
diff --cc
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/cat/CodeListAdapter.java
index 97a095e51f,9adc3ef22a..4de8e1f5e3
---
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/cat/CodeListAdapter.java
+++
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/cat/CodeListAdapter.java
@@@ -18,9 -18,9 +18,10 @@@ package org.apache.sis.xml.bind.cat
import jakarta.xml.bind.annotation.adapters.XmlAdapter;
import org.opengis.util.CodeList;
- import org.apache.sis.util.iso.Types;
+ import org.apache.sis.util.privy.CodeLists;
import org.apache.sis.xml.bind.Context;
import org.apache.sis.xml.bind.FilterByVersion;
++import org.apache.sis.util.iso.Types;
/**
diff --cc geoapi/snapshot
index 3d58e2c44d,b2c419d046..bd981a850c
--- a/geoapi/snapshot
+++ b/geoapi/snapshot
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 3d58e2c44d64d0b84df243363f1ee1e571b081fd
-Subproject commit b2c419d046315ef580eb8eb746bb20361df79f7d
++Subproject commit bd981a850cb1c23962d8db960580a31348a24347
