svn commit: r1799452 [7/7] - in /sis/branches/JDK7: ./ core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/ core/sis-feature/src/main/java/org/apache/sis/feature/ core/sis-feature/src/test/java/org/apache/sis/feature/ core/sis-feature/sr...

[de...@apache.org]

Modified: sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/Store.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/Store.java?rev=1799452&r1=1799451&r2=1799452&view=diff
==============================================================================
--- sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/Store.java [UTF-8] (original)
+++ sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/Store.java [UTF-8] Wed Jun 21 14:11:39 2017
@@ -492,8 +492,8 @@ public final class Store extends Feature
             } catch (MetadataStoreException e) {
                 listeners.warning(null, e);
             }
-            builder.add(encoding, MetadataBuilder.Scope.ALL);
-            builder.add(ScopeCode.DATASET);
+            builder.addEncoding(encoding, MetadataBuilder.Scope.ALL);
+            builder.addResourceScope(ScopeCode.DATASET, null);
             try {
                 builder.addExtent(envelope);
             } catch (TransformException e) {
@@ -505,7 +505,7 @@ public final class Store extends Feature
                  */
                 listeners.warning(null, e);
             }
-            builder.add(featureType, null);
+            builder.addFeatureType(featureType, null);
             metadata = builder.build(true);
         }
         return metadata;
@@ -724,7 +724,7 @@ public final class Store extends Feature
      * @param line      the line to parse.
      * @param elements  an initially empty list where to add elements.
      */
-    static void split(final String line, final List<? super String> elements) {
+    private static void split(final String line, final List<? super String> elements) {
         int startAt = 0;
         boolean isQuoting = false;        // If a quote has been opened and not yet closed.
         boolean hasQuotes = false;        // If the value contains at least one quote (not used for quoting the value).

Modified: sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/HyperRectangleReader.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/HyperRectangleReader.java?rev=1799452&r1=1799451&r2=1799452&view=diff
==============================================================================
--- sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/HyperRectangleReader.java [UTF-8] (original)
+++ sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/HyperRectangleReader.java [UTF-8] Wed Jun 21 14:11:39 2017
@@ -45,8 +45,11 @@ public final class HyperRectangleReader
 
     /**
      * The {@code input} position of the first sample (ignoring sub-area and sub-sampling).
+     * This is the {@code origin} argument given to the constructor, copied verbatim.
+     * This field is public for callers wanting to order {@code HyperRectangleReader} instances
+     * in increasing file offset order, for more sequential reading (less seek operations).
      */
-    private final long origin;
+    public final long origin;
 
     /**
      * Creates a new reader for the given input and source region.