sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1813522 - in /sis/branches/JDK7/storage: sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/ sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/ sis-storage/src/main/java/org/apache/sis/internal/storage/csv/ sis-storage...
Date Fri, 27 Oct 2017 12:37:32 GMT
Author: desruisseaux
Date: Fri Oct 27 12:37:31 2017
New Revision: 1813522

URL: http://svn.apache.org/viewvc?rev=1813522&view=rev
Log:
Comment out FeatureSet.features(boolean) on the JDK7 branch since we do not have the JDK8
java.util.stream package.

Modified:
    sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/FeaturesInfo.java
    sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/FeaturesWrapper.java
    sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/Store.java
    sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/storage/FeatureSet.java
    sis/branches/JDK7/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Store.java

Modified: sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/FeaturesInfo.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/FeaturesInfo.java?rev=1813522&r1=1813521&r2=1813522&view=diff
==============================================================================
--- sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/FeaturesInfo.java
[UTF-8] (original)
+++ sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/FeaturesInfo.java
[UTF-8] Fri Oct 27 12:37:31 2017
@@ -298,7 +298,6 @@ search: for (final VariableInfo counts :
      *
      * @param  parallel  ignored, since current version does not support parallelism.
      */
-    @Override
     public Stream<Feature> features(boolean parallel) {
         return StreamSupport.stream(new Iter(), false);
     }

Modified: sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/FeaturesWrapper.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/FeaturesWrapper.java?rev=1813522&r1=1813521&r2=1813522&view=diff
==============================================================================
--- sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/FeaturesWrapper.java
[UTF-8] (original)
+++ sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/FeaturesWrapper.java
[UTF-8] Fri Oct 27 12:37:31 2017
@@ -62,7 +62,6 @@ final class FeaturesWrapper extends Disc
     /**
      * Returns the stream of features.
      */
-    @Override
     public Stream<Feature> features(boolean parallel) {
         throw new UnsupportedOperationException();      // TODO
     }

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=1813522&r1=1813521&r2=1813522&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] Fri Oct 27 12:37:31 2017
@@ -688,7 +688,6 @@ final class Store extends URIDataStore i
      * @todo Need to reset the position when doing another pass on the features. See {@link
#rewind()}.
      * @todo If sequential order, publish Feature as soon as identifier changed.
      */
-    @Override
     public final synchronized Stream<Feature> features(final boolean parallel) throws
DataStoreException {
         /*
          * If the user asks for one feature instance per line, then we can return a FeatureIter
instance directly.

Modified: sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/storage/FeatureSet.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/storage/FeatureSet.java?rev=1813522&r1=1813521&r2=1813522&view=diff
==============================================================================
--- sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/storage/FeatureSet.java
[UTF-8] (original)
+++ sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/storage/FeatureSet.java
[UTF-8] Fri Oct 27 12:37:31 2017
@@ -17,8 +17,6 @@
 package org.apache.sis.storage;
 
 // Branch-dependent imports
-import org.apache.sis.internal.jdk8.Stream;
-import org.opengis.feature.Feature;
 import org.opengis.feature.FeatureType;
 
 
@@ -46,7 +44,7 @@ public interface FeatureSet extends Data
      *   <li>{@linkplain org.opengis.referencing.crs.CoordinateReferenceSystem Coordinate
Reference System}.</li>
      * </ul>
      *
-     * All features returned by {@link #features(boolean)} will be either of that type, or
a sub-type of it.
+     * All features returned by {@code features(boolean)} will be either of that type, or
a sub-type of it.
      *
      * <div class="note"><b>Relationship with metadata:</b>
      * if subtypes exist, their list may be obtained from the {@linkplain #getMetadata()
metadata} like below
@@ -100,5 +98,5 @@ public interface FeatureSet extends Data
      * @return all features contained in this dataset.
      * @throws DataStoreException if an error occurred while creating the stream.
      */
-    Stream<Feature> features(boolean parallel) throws DataStoreException;
+//  Stream<Feature> features(boolean parallel) throws DataStoreException;
 }

Modified: sis/branches/JDK7/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Store.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Store.java?rev=1813522&r1=1813521&r2=1813522&view=diff
==============================================================================
--- sis/branches/JDK7/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Store.java
[UTF-8] (original)
+++ sis/branches/JDK7/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Store.java
[UTF-8] Fri Oct 27 12:37:31 2017
@@ -213,7 +213,6 @@ public final class Store extends StaxDat
      * @return a stream over all features in the XML file.
      * @throws DataStoreException if an error occurred while creating the feature stream.
      */
-    @Override
     public final synchronized Stream<Feature> features(boolean parallel) throws DataStoreException
{
         Reader r = reader;
         reader = null;



Mime
View raw message