This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch geoapi-4.0 in repository https://gitbox.apache.org/repos/asf/sis.git
commit f83c833020601517d36e42afb330ede853016e87 Author: Martin Desruisseaux <martin.desruisse...@geomatys.com> AuthorDate: Tue Dec 13 15:28:56 2022 +0100 Post-merge cleanup. --- .../src/main/java/org/apache/sis/gui/dataset/ExpandedFeature.java | 2 ++ .../src/main/java/org/apache/sis/metadata/PropertyInformation.java | 7 +++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/ExpandedFeature.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/ExpandedFeature.java index 26a78bc4ea..7b2a5c078c 100644 --- a/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/ExpandedFeature.java +++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/ExpandedFeature.java @@ -20,6 +20,8 @@ import java.util.Arrays; import java.util.Map; import java.util.Collection; import java.util.List; + +// Branch-dependent imports import org.opengis.feature.Feature; import org.opengis.feature.FeatureType; import org.opengis.feature.Property; diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyInformation.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyInformation.java index ab15076f17..dfb2593c6b 100644 --- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyInformation.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyInformation.java @@ -17,8 +17,8 @@ package org.apache.sis.metadata; import java.util.Locale; -import java.util.Set; import java.util.Collection; +import java.util.Collections; import java.lang.reflect.Method; import org.opengis.annotation.UML; import org.opengis.annotation.Obligation; @@ -64,7 +64,6 @@ import static java.util.logging.Logger.getLogger; * * @see InformationMap * @see MetadataStandard#asInformationMap(Class, KeyNamePolicy) - * @see <a href="https://issues.apache.org/jira/browse/SIS-80">SIS-80</a> * * @since 0.3 * @module @@ -134,7 +133,7 @@ final class PropertyInformation<E> extends SimpleIdentifier // Impleme */ @SuppressWarnings({"unchecked","rawtypes"}) PropertyInformation(final Citation standard, final String property, final Method getter, - final Class<E> elementType, final ValueRange range) + final Class<E> elementType, final ValueRange range) { super(standard, property, getter.isAnnotationPresent(Deprecated.class)); parent = getter.getDeclaringClass(); @@ -292,7 +291,7 @@ final class PropertyInformation<E> extends SimpleIdentifier // Impleme */ @Override public Collection<String> getParentEntity() { - return Set.of(getCodeSpace()); + return Collections.singleton(getCodeSpace()); } /**