sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jso...@apache.org
Subject [sis] branch geoapi-4.0 updated: Feature : do not skip attributes with characteristics in toString formating
Date Tue, 16 Jul 2019 10:15:09 GMT
This is an automated email from the ASF dual-hosted git repository.

jsorel pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git


The following commit(s) were added to refs/heads/geoapi-4.0 by this push:
     new cc7b369  Feature : do not skip attributes with characteristics in toString formating
cc7b369 is described below

commit cc7b369ff24d8155523bb5ccb109b7a834fb2a55
Author: jsorel <johann.sorel@geomatys.com>
AuthorDate: Tue Jul 16 12:14:44 2019 +0200

    Feature : do not skip attributes with characteristics in toString formating
---
 .../src/main/java/org/apache/sis/feature/FeatureFormat.java          | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java b/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java
index 05d460d..d1ce168 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java
@@ -412,9 +412,10 @@ public class FeatureFormat extends TabularFormat<Object> {
                 value = feature.getPropertyValue(propertyType.getName().toString());
                 if (value == null) {
                     if (propertyType instanceof AttributeType<?>
-                            && ((AttributeType<?>) propertyType).getMinimumOccurs()
== 0)
+                            && ((AttributeType<?>) propertyType).getMinimumOccurs()
== 0
+                            && ((AttributeType<?>) propertyType).characteristics().isEmpty())
                     {
-                        continue;                           // If optional and no value,
skip the full row.
+                        continue;                           // If optional, no value and
no characteristics, skip the full row.
                     }
                     if (propertyType instanceof FeatureAssociationRole
                             && ((FeatureAssociationRole) propertyType).getMinimumOccurs()
== 0)


Mime
View raw message