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 9adef8be22a3a8e0e18a93e85da5fb132b532577
Merge: 99f667e72b 0b7455bf80
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Sat Feb 10 14:07:13 2024 +0100
Merge branch 'geoapi-4.0' into geoapi-3.1.
.../apache/sis/referencing/operation/DefaultFormula.java | 2 +-
.../operation/builder/LinearTransformBuilder.java | 2 +-
.../main/org/apache/sis/storage/base/LegalSymbols.java | 14 ++++++++++----
.../main/org/apache/sis/gui/map/MapCanvas.java | 2 +-
4 files changed, 13 insertions(+), 7 deletions(-)
diff --cc
endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/LegalSymbols.java
index 8f6675256b,ffd3155d80..385e6ea2e5
---
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/LegalSymbols.java
+++
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/LegalSymbols.java
@@@ -19,13 -19,19 +19,19 @@@ package org.apache.sis.storage.base
import java.time.LocalDate;
import java.util.Date;
import java.util.Collections;
- import org.opengis.metadata.citation.*;
- import org.opengis.metadata.constraint.*;
+ import org.opengis.metadata.citation.Role;
+ import org.opengis.metadata.citation.DateType;
+ import org.opengis.metadata.constraint.Restriction;
import org.apache.sis.util.CharSequences;
- import org.apache.sis.metadata.iso.citation.*;
- import org.apache.sis.metadata.iso.constraint.*;
+ import org.apache.sis.metadata.iso.citation.AbstractParty;
+ import org.apache.sis.metadata.iso.citation.DefaultCitation;
+ import org.apache.sis.metadata.iso.citation.DefaultCitationDate;
+ import org.apache.sis.metadata.iso.constraint.DefaultLegalConstraints;
import static
org.apache.sis.util.internal.StandardDateFormat.MILLISECONDS_PER_DAY;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.apache.sis.metadata.iso.citation.DefaultResponsibility;
++// Specific to the geoapi-3.1 and master branches:
++import org.apache.sis.metadata.iso.citation.DefaultResponsibleParty;
+
/**
* Elements to omit in the legal notice to be parsed by {@link
MetadataBuilder#parseLegalNotice(String)}.
