sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1799476 - in /sis/branches/JDK8: core/sis-feature/src/main/java/org/apache/sis/feature/ storage/sis-storage/src/main/java/org/apache/sis/internal/storage/
Date Wed, 21 Jun 2017 16:03:04 GMT
Author: desruisseaux
Date: Wed Jun 21 16:03:04 2017
New Revision: 1799476

URL: http://svn.apache.org/viewvc?rev=1799476&view=rev
Log:
Post-merge cleanup.

Modified:
    sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAssociationRole.java
    sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeatureType.java
    sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java
    sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/MetadataBuilder.java

Modified: sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAssociationRole.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAssociationRole.java?rev=1799476&r1=1799475&r2=1799476&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAssociationRole.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAssociationRole.java
[UTF-8] Wed Jun 21 16:03:04 2017
@@ -424,7 +424,7 @@ public class DefaultAssociationRole exte
                 final Class<?> valueClass = pt.getValueClass();
                 if (CharSequence.class.isAssignableFrom(valueClass) ||
                     GenericName .class.isAssignableFrom(valueClass) ||
-                    Identifier.class.isAssignableFrom(valueClass))
+                    Identifier  .class.isAssignableFrom(valueClass))
                 {
                     final String name = pt.getName().toString();
                     if (pt.getMaximumOccurs() != 0) {

Modified: sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeatureType.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeatureType.java?rev=1799476&r1=1799475&r2=1799476&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeatureType.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeatureType.java
[UTF-8] Wed Jun 21 16:03:04 2017
@@ -805,11 +805,7 @@ public class DefaultFeatureType extends
                             return false;
                         }
                     }
-                    if (r0 instanceof Operation) {
-                        if (!(r1 instanceof Operation) || !isAssignableIgnoreName((Operation)
r0, (Operation) r1)) {
-                            return false;
-                        }
-                    }
+                    // No need for explicit AttributeType or Operation checks because they
are PropertyType.
                 }
             }
         }

Modified: sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java?rev=1799476&r1=1799475&r2=1799476&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java
[UTF-8] Wed Jun 21 16:03:04 2017
@@ -385,8 +385,8 @@ public class FeatureFormat extends Tabul
                 }
                 value = feature.getPropertyValue(propertyType.getName().toString());
                 if (value == null) {
-                    if (propertyType instanceof AttributeType
-                            && ((AttributeType) propertyType).getMinimumOccurs()
== 0)
+                    if (propertyType instanceof AttributeType<?>
+                            && ((AttributeType<?>) propertyType).getMinimumOccurs()
== 0)
                     {
                         continue;                           // If optional and no value,
skip the full row.
                     }

Modified: sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/MetadataBuilder.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/MetadataBuilder.java?rev=1799476&r1=1799475&r2=1799476&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/MetadataBuilder.java
[UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/MetadataBuilder.java
[UTF-8] Wed Jun 21 16:03:04 2017
@@ -34,7 +34,6 @@ import org.opengis.metadata.citation.Rol
 import org.opengis.metadata.citation.DateType;
 import org.opengis.metadata.citation.Citation;
 import org.opengis.metadata.citation.CitationDate;
-import org.opengis.metadata.citation.Responsibility;
 import org.opengis.metadata.spatial.Dimension;
 import org.opengis.metadata.spatial.DimensionNameType;
 import org.opengis.metadata.spatial.CellGeometry;
@@ -106,6 +105,7 @@ import static org.apache.sis.internal.ut
 // Branch-dependent imports
 import java.time.LocalDate;
 import org.opengis.feature.FeatureType;
+import org.opengis.metadata.citation.Responsibility;
 
 
 /**
@@ -1224,7 +1224,7 @@ public class MetadataBuilder {
     }
 
     /**
-     * Adds s role, name, contact and position information for an individual or organization
that is responsible
+     * Adds role, name, contact and position information for an individual or organization
that is responsible
      * for the resource. This method can be used as an alternative to {@link #addAuthor(CharSequence)}
when the
      * caller needs to create the responsibly party itself.
      *



Mime
View raw message