Author: desruisseaux
Date: Fri Jan 26 11:59:08 2018
New Revision: 1822278
URL: http://svn.apache.org/viewvc?rev=1822278&view=rev
Log:
Merge imports cleanup from JDK8 branch.
Modified:
sis/trunk/ (props changed)
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractOperation.java
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/internal/feature/DateList.java
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/internal/feature/MovingFeature.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/ScriptRunner.java
sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java
sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/ModifiableLocationType.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/CoordinateFormat.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/SQLTranslator.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationContext.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationRegistry.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CoordinateSystemTransformTest.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/CollectionsExt.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/io/CompoundFormat.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/math/Statistics.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/Exceptions.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/ObjectConverter.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/collection/Cache.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/collection/IntegerList.java
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/util/CollectionsExtTest.java
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/util/StandardDateFormatTest.java
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/Assert.java
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/collection/IntegerListTest.java
sis/trunk/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatReader.java
sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/ChannelDecoder.java
sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/FeaturesInfo.java
sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/FeaturesWrapper.java
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/MetadataBuilder.java
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/FeatureIterator.java
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/MovingFeatureIterator.java
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/Store.java
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/TimeEncoding.java
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/folder/Store.java
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/InputStreamAdapter.java
sis/trunk/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/csv/StoreTest.java
sis/trunk/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Reader.java
sis/trunk/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Store.java
sis/trunk/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Types.java
sis/trunk/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/xml/stream/StaxStreamReader.java
sis/trunk/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/xml/stream/StaxStreamWriter.java
sis/trunk/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/storage/gpx/ReaderTest.java
sis/trunk/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/storage/gpx/WriterTest.java
Propchange: sis/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 26 11:59:08 2018
@@ -1,5 +1,5 @@
/sis/branches/Android:1430670-1480699
/sis/branches/JDK6:1394364-1758914
/sis/branches/JDK7:1394913-1822221
-/sis/branches/JDK8:1584960-1822220
+/sis/branches/JDK8:1584960-1822277
/sis/branches/JDK9:1773327-1803064
Modified:
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractOperation.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractOperation.java?rev=1822278&r1=1822277&r2=1822278&view=diff
==============================================================================
---
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractOperation.java
[UTF-8] (original)
+++
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractOperation.java
[UTF-8] Fri Jan 26 11:59:08 2018
@@ -21,7 +21,9 @@ import java.util.Set;
import java.util.Objects;
import java.util.Collections;
import java.util.HashMap;
+import java.util.function.BiFunction;
import java.io.IOException;
+import java.io.UncheckedIOException;
import org.opengis.util.GenericName;
import org.opengis.metadata.Identifier;
import org.opengis.parameter.GeneralParameterDescriptor;
@@ -31,8 +33,6 @@ import org.apache.sis.util.Classes;
import org.apache.sis.util.Debug;
// Branch-dependent imports
-import java.util.function.BiFunction;
-import java.io.UncheckedIOException;
/**
Modified:
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java?rev=1822278&r1=1822277&r2=1822278&view=diff
==============================================================================
---
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java
[UTF-8] (original)
+++
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java
[UTF-8] Fri Jan 26 11:59:08 2018
@@ -25,6 +25,7 @@ import java.util.Collection;
import java.util.Locale;
import java.util.TimeZone;
import java.io.IOException;
+import java.io.UncheckedIOException;
import java.text.Format;
import java.text.FieldPosition;
import java.text.ParsePosition;
@@ -49,7 +50,6 @@ import org.apache.sis.referencing.Identi
import org.apache.sis.math.MathFunctions;
// Branch-dependent imports
-import java.io.UncheckedIOException;
/**
Modified:
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/internal/feature/DateList.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/internal/feature/DateList.java?rev=1822278&r1=1822277&r2=1822278&view=diff
==============================================================================
---
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/internal/feature/DateList.java
[UTF-8] (original)
+++
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/internal/feature/DateList.java
[UTF-8] Fri Jan 26 11:59:08 2018
@@ -16,13 +16,11 @@
*/
package org.apache.sis.internal.feature;
+import java.time.Instant;
import java.util.AbstractList;
import org.apache.sis.math.Vector;
import org.apache.sis.util.collection.CheckedContainer;
-// Branch-dependent imports
-import java.time.Instant;
-
/**
* Unmodifiable lists of instants.
Modified:
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/internal/feature/MovingFeature.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/internal/feature/MovingFeature.java?rev=1822278&r1=1822277&r2=1822278&view=diff
==============================================================================
---
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/internal/feature/MovingFeature.java
[UTF-8] (original)
+++
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/internal/feature/MovingFeature.java
[UTF-8] Fri Jan 26 11:59:08 2018
@@ -22,7 +22,9 @@ import java.util.Date;
import java.util.Objects;
import java.util.logging.Level;
import java.util.logging.LogRecord;
+import java.util.function.Consumer;
import java.lang.reflect.Array;
+import java.time.Instant;
import org.opengis.util.LocalName;
import org.apache.sis.math.Vector;
import org.apache.sis.util.iso.Names;
@@ -30,8 +32,6 @@ import org.apache.sis.util.CorruptedObje
import org.apache.sis.internal.util.UnmodifiableArrayList;
// Branch-dependent imports
-import java.time.Instant;
-import java.util.function.Consumer;
import org.apache.sis.feature.AbstractFeature;
import org.apache.sis.feature.AbstractAttribute;
import org.apache.sis.feature.DefaultAttributeType;
Modified:
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/ScriptRunner.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/ScriptRunner.java?rev=1822278&r1=1822277&r2=1822278&view=diff
==============================================================================
---
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/ScriptRunner.java
[UTF-8] (original)
+++
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/ScriptRunner.java
[UTF-8] Fri Jan 26 11:59:08 2018
@@ -21,6 +21,7 @@ import java.util.HashMap;
import java.util.Locale;
import java.util.regex.Pattern;
import java.util.regex.Matcher;
+import java.util.function.BiFunction;
import java.io.EOFException;
import java.io.IOException;
import java.io.BufferedReader;
@@ -36,9 +37,6 @@ import org.apache.sis.util.ArgumentCheck
import org.apache.sis.util.CharSequences;
import org.apache.sis.util.resources.Errors;
-// Branch-specific imports
-import java.util.function.BiFunction;
-
/**
* Run SQL scripts. The script is expected to use a standardized syntax, where
the {@value #QUOTE} character
Modified:
sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java?rev=1822278&r1=1822277&r2=1822278&view=diff
==============================================================================
---
sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java
[UTF-8] (original)
+++
sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java
[UTF-8] Fri Jan 26 11:59:08 2018
@@ -21,6 +21,11 @@ import java.util.Map;
import java.util.IdentityHashMap;
import java.util.ConcurrentModificationException;
import java.util.Iterator;
+import java.util.Spliterator;
+import java.util.Spliterators;
+import java.util.stream.Stream;
+import java.util.function.Consumer;
+import java.util.stream.StreamSupport;
import java.awt.geom.Rectangle2D;
import javax.xml.bind.annotation.XmlTransient;
import org.opengis.util.FactoryException;
@@ -62,11 +67,6 @@ import org.apache.sis.measure.Longitude;
import org.apache.sis.measure.Latitude;
// Branch-dependent imports
-import java.util.Spliterator;
-import java.util.Spliterators;
-import java.util.stream.Stream;
-import java.util.function.Consumer;
-import java.util.stream.StreamSupport;
import org.apache.sis.metadata.iso.citation.AbstractParty;
Modified:
sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/ModifiableLocationType.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/ModifiableLocationType.java?rev=1822278&r1=1822277&r2=1822278&view=diff
==============================================================================
---
sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/ModifiableLocationType.java
[UTF-8] (original)
+++
sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/ModifiableLocationType.java
[UTF-8] Fri Jan 26 11:59:08 2018
@@ -21,6 +21,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.ConcurrentModificationException;
+import java.util.function.Function;
import org.opengis.util.InternationalString;
import org.opengis.metadata.extent.GeographicExtent;
import org.apache.sis.metadata.iso.extent.DefaultGeographicDescription;
@@ -32,7 +33,6 @@ import org.apache.sis.util.ArgumentCheck
import org.apache.sis.util.iso.Types;
// Branch-dependent imports
-import java.util.function.Function;
import org.apache.sis.metadata.iso.citation.AbstractParty;
Modified:
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/CoordinateFormat.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/CoordinateFormat.java?rev=1822278&r1=1822277&r2=1822278&view=diff
==============================================================================
---
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/CoordinateFormat.java
[UTF-8] (original)
+++
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/CoordinateFormat.java
[UTF-8] Fri Jan 26 11:59:08 2018
@@ -29,6 +29,7 @@ import java.util.Date;
import java.util.Locale;
import java.util.TimeZone;
import java.io.IOException;
+import java.io.UncheckedIOException;
import javax.measure.Unit;
import javax.measure.UnitConverter;
import javax.measure.quantity.Time;
@@ -52,9 +53,6 @@ import org.apache.sis.measure.Units;
import org.apache.sis.referencing.CRS;
import org.apache.sis.io.CompoundFormat;
-// Branch-dependent imports
-import java.io.UncheckedIOException;
-
/**
* Formats spatiotemporal coordinates using number, angle and date formats
inferred from the coordinate system.
Modified:
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/SQLTranslator.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/SQLTranslator.java?rev=1822278&r1=1822277&r2=1822278&view=diff
==============================================================================
---
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/SQLTranslator.java
[UTF-8] (original)
+++
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/SQLTranslator.java
[UTF-8] Fri Jan 26 11:59:08 2018
@@ -19,6 +19,7 @@ package org.apache.sis.referencing.facto
import java.util.Map;
import java.util.HashMap;
import java.util.Locale;
+import java.util.function.Function;
import java.sql.DatabaseMetaData;
import java.sql.ResultSet;
import java.sql.SQLException;
@@ -28,9 +29,6 @@ import org.apache.sis.util.ArgumentCheck
import org.apache.sis.util.resources.Errors;
import org.apache.sis.internal.util.Constants;
-// Branch-dependent imports
-import java.util.function.Function;
-
/**
* Converts the SQL statements from MS-Access dialect to standard SQL. The
{@link #apply(String)} method
Modified:
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationContext.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationContext.java?rev=1822278&r1=1822277&r2=1822278&view=diff
==============================================================================
---
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationContext.java
[UTF-8] (original)
+++
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationContext.java
[UTF-8] Fri Jan 26 11:59:08 2018
@@ -17,6 +17,7 @@
package org.apache.sis.referencing.operation;
import java.io.Serializable;
+import java.util.function.Predicate;
import org.opengis.metadata.extent.Extent;
import org.opengis.metadata.extent.GeographicBoundingBox;
import org.opengis.referencing.operation.CoordinateOperation;
@@ -25,9 +26,6 @@ import org.apache.sis.metadata.iso.exten
import org.apache.sis.internal.util.CollectionsExt;
import org.apache.sis.util.ArgumentChecks;
-// Branch-dependent imports
-import java.util.function.Predicate;
-
/**
* Optional information about the context in which a requested coordinate
operation will be used.
Modified:
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationRegistry.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationRegistry.java?rev=1822278&r1=1822277&r2=1822278&view=diff
==============================================================================
---
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationRegistry.java
[UTF-8] (original)
+++
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationRegistry.java
[UTF-8] Fri Jan 26 11:59:08 2018
@@ -26,6 +26,7 @@ import java.util.Iterator;
import java.util.Objects;
import java.util.logging.Level;
import java.util.logging.LogRecord;
+import java.util.function.Predicate;
import javax.measure.IncommensurableException;
import org.opengis.util.FactoryException;
@@ -78,9 +79,6 @@ import org.apache.sis.util.collection.Co
import org.apache.sis.util.collection.BackingStoreException;
import org.apache.sis.util.resources.Vocabulary;
-// Branch-dependent imports
-import java.util.function.Predicate;
-
/**
* Base class of code that search for coordinate operation, either by looking
in a registry maintained by an authority
Modified:
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CoordinateSystemTransformTest.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CoordinateSystemTransformTest.java?rev=1822278&r1=1822277&r2=1822278&view=diff
==============================================================================
---
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CoordinateSystemTransformTest.java
[UTF-8] (original)
+++
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CoordinateSystemTransformTest.java
[UTF-8] Fri Jan 26 11:59:08 2018
@@ -37,7 +37,6 @@ import org.junit.AfterClass;
import org.junit.Test;
-
/**
* Tests the {@link CoordinateSystemTransform} static factory method.
*
Modified:
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/CollectionsExt.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/CollectionsExt.java?rev=1822278&r1=1822277&r2=1822278&view=diff
==============================================================================
---
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/CollectionsExt.java
[UTF-8] (original)
+++
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/CollectionsExt.java
[UTF-8] Fri Jan 26 11:59:08 2018
@@ -18,6 +18,7 @@ package org.apache.sis.internal.util;
import java.util.*;
import java.lang.reflect.Array;
+import java.util.function.Predicate;
import org.opengis.util.CodeList;
import org.apache.sis.util.Static;
import org.apache.sis.util.Numbers;
@@ -28,9 +29,6 @@ import org.opengis.parameter.InvalidPara
import static org.apache.sis.util.collection.Containers.hashMapCapacity;
-// Branch-dependent imports
-import java.util.function.Predicate;
-
/**
* Static methods working on {@link Collection} objects.
Modified:
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/io/CompoundFormat.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/io/CompoundFormat.java?rev=1822278&r1=1822277&r2=1822278&view=diff
==============================================================================
---
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/io/CompoundFormat.java
[UTF-8] (original)
+++
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/io/CompoundFormat.java
[UTF-8] Fri Jan 26 11:59:08 2018
@@ -22,6 +22,7 @@ import java.util.Locale;
import java.util.TimeZone;
import java.util.Date;
import java.io.IOException;
+import java.io.UncheckedIOException;
import java.text.Format;
import java.text.DateFormat;
import java.text.NumberFormat;
@@ -46,9 +47,6 @@ import org.apache.sis.internal.util.Loca
import static org.apache.sis.internal.util.StandardDateFormat.UTC;
-// Branch-dependent imports
-import java.io.UncheckedIOException;
-
/**
* Base class of {@link Format} implementations which delegate part of their
work to other
Modified:
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/math/Statistics.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/math/Statistics.java?rev=1822278&r1=1822277&r2=1822278&view=diff
==============================================================================
---
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/math/Statistics.java
[UTF-8] (original)
+++
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/math/Statistics.java
[UTF-8] Fri Jan 26 11:59:08 2018
@@ -18,6 +18,8 @@ package org.apache.sis.math;
import java.util.Objects;
import java.io.Serializable;
+import java.util.function.LongConsumer;
+import java.util.function.DoubleConsumer;
import org.opengis.util.InternationalString;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.iso.Types;
@@ -27,10 +29,6 @@ import static java.lang.Double.NaN;
import static java.lang.Double.isNaN;
import static java.lang.Double.doubleToLongBits;
-// Branch-dependent imports
-import java.util.function.LongConsumer;
-import java.util.function.DoubleConsumer;
-
/**
* Holds some statistics derived from a series of sample values.
Modified:
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/Exceptions.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/Exceptions.java?rev=1822278&r1=1822277&r2=1822278&view=diff
==============================================================================
---
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/Exceptions.java
[UTF-8] (original)
+++
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/Exceptions.java
[UTF-8] Fri Jan 26 11:59:08 2018
@@ -20,15 +20,13 @@ import java.util.List;
import java.util.ArrayList;
import java.util.Locale;
import java.sql.SQLException;
+import java.io.UncheckedIOException;
import java.nio.file.DirectoryIteratorException;
import java.lang.reflect.InvocationTargetException;
import org.opengis.util.InternationalString;
import org.apache.sis.util.resources.Vocabulary;
import org.apache.sis.util.collection.BackingStoreException;
-// Branch-dependent imports
-import java.io.UncheckedIOException;
-
/**
* Static methods working with {@link Exception} instances.
Modified:
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/ObjectConverter.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/ObjectConverter.java?rev=1822278&r1=1822277&r2=1822278&view=diff
==============================================================================
---
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/ObjectConverter.java
[UTF-8] (original)
+++
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/ObjectConverter.java
[UTF-8] Fri Jan 26 11:59:08 2018
@@ -17,10 +17,8 @@
package org.apache.sis.util;
import java.util.Set;
-import org.apache.sis.math.FunctionProperty;
-
-// Branch-dependent imports
import java.util.function.Function;
+import org.apache.sis.math.FunctionProperty;
/**
Modified:
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/collection/Cache.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/collection/Cache.java?rev=1822278&r1=1822277&r2=1822278&view=diff
==============================================================================
---
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/collection/Cache.java
[UTF-8] (original)
+++
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/collection/Cache.java
[UTF-8] Fri Jan 26 11:59:08 2018
@@ -21,6 +21,9 @@ import java.util.Set;
import java.util.Iterator;
import java.util.AbstractMap;
import java.util.LinkedHashMap;
+import java.util.function.Supplier;
+import java.util.function.Function;
+import java.util.function.BiFunction;
import java.util.concurrent.Callable;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.ConcurrentHashMap;
@@ -35,11 +38,6 @@ import org.apache.sis.internal.system.De
import org.apache.sis.internal.system.DelayedExecutor;
import org.apache.sis.internal.system.ReferenceQueueConsumer;
-// Branch-dependent imports
-import java.util.function.Supplier;
-import java.util.function.Function;
-import java.util.function.BiFunction;
-
/**
* A concurrent map capable to locks entries for which the value is in process
of being computed.
Modified:
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/collection/IntegerList.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/collection/IntegerList.java?rev=1822278&r1=1822277&r2=1822278&view=diff
==============================================================================
---
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/collection/IntegerList.java
[UTF-8] (original)
+++
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/collection/IntegerList.java
[UTF-8] Fri Jan 26 11:59:08 2018
@@ -19,22 +19,20 @@ package org.apache.sis.util.collection;
import java.util.Arrays;
import java.util.AbstractList;
import java.util.RandomAccess;
+import java.util.Spliterator;
+import java.util.PrimitiveIterator;
import java.util.NoSuchElementException;
import java.util.ConcurrentModificationException;
+import java.util.function.Consumer;
+import java.util.function.IntConsumer;
+import java.util.stream.IntStream;
+import java.util.stream.StreamSupport;
import java.io.IOException;
import java.io.Serializable;
import java.io.ObjectOutputStream;
import org.apache.sis.util.ArraysExt;
import org.apache.sis.util.ArgumentChecks;
-// Branch-dependent imports
-import java.util.Spliterator;
-import java.util.PrimitiveIterator;
-import java.util.function.Consumer;
-import java.util.function.IntConsumer;
-import java.util.stream.IntStream;
-import java.util.stream.StreamSupport;
-
/**
* A list of unsigned integer values. This class packs the values in the
minimal amount of bits
Modified:
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/util/CollectionsExtTest.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/util/CollectionsExtTest.java?rev=1822278&r1=1822277&r2=1822278&view=diff
==============================================================================
---
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/util/CollectionsExtTest.java
[UTF-8] (original)
+++
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/util/CollectionsExtTest.java
[UTF-8] Fri Jan 26 11:59:08 2018
@@ -30,15 +30,13 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
import java.util.Locale;
+import java.util.function.Predicate;
import org.apache.sis.util.collection.CodeListSet;
import org.apache.sis.test.TestCase;
import org.junit.Test;
import static org.apache.sis.test.Assert.*;
-// Branch-dependent imports
-import java.util.function.Predicate;
-
/**
* Tests the {@link CollectionsExt} class.
Modified:
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/util/StandardDateFormatTest.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/util/StandardDateFormatTest.java?rev=1822278&r1=1822277&r2=1822278&view=diff
==============================================================================
---
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/util/StandardDateFormatTest.java
[UTF-8] (original)
+++
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/util/StandardDateFormatTest.java
[UTF-8] Fri Jan 26 11:59:08 2018
@@ -16,6 +16,9 @@
*/
package org.apache.sis.internal.util;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
import java.util.Date;
import java.util.concurrent.TimeUnit;
import java.text.ParseException;
@@ -25,11 +28,6 @@ import org.junit.Test;
import static org.apache.sis.test.TestUtilities.date;
import static org.junit.Assert.*;
-// Branch-dependent imports
-import java.time.Instant;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-
/**
* Tests the {@link StandardDateFormat} class.
Modified:
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/Assert.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/Assert.java?rev=1822278&r1=1822277&r2=1822278&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/Assert.java
[UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/Assert.java
[UTF-8] Fri Jan 26 11:59:08 2018
@@ -24,6 +24,8 @@ import java.util.Collection;
import java.util.Enumeration;
import java.util.LinkedHashSet;
import java.util.LinkedHashMap;
+import java.util.stream.Stream;
+import java.util.function.Consumer;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.ConcurrentHashMap;
import java.io.IOException;
@@ -40,10 +42,6 @@ import org.apache.sis.util.ComparisonMod
import org.apache.sis.util.Exceptions;
import org.apache.sis.util.Classes;
-// Branch-dependent imports
-import java.util.stream.Stream;
-import java.util.function.Consumer;
-
/**
* Assertion methods used by the SIS project in addition of the JUnit and
GeoAPI assertions.
Modified:
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/collection/IntegerListTest.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/collection/IntegerListTest.java?rev=1822278&r1=1822277&r2=1822278&view=diff
==============================================================================
---
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/collection/IntegerListTest.java
[UTF-8] (original)
+++
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/collection/IntegerListTest.java
[UTF-8] Fri Jan 26 11:59:08 2018
@@ -24,6 +24,9 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.Random;
import java.util.ConcurrentModificationException;
+import java.util.function.IntConsumer;
+import java.util.PrimitiveIterator;
+import java.util.stream.IntStream;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.TestUtilities;
import org.junit.Test;
@@ -31,11 +34,6 @@ import org.junit.Test;
import static java.lang.StrictMath.*;
import static org.apache.sis.test.Assert.*;
-// Branch-dependent imports
-import java.util.function.IntConsumer;
-import java.util.PrimitiveIterator;
-import java.util.stream.IntStream;
-
/**
* Tests {@link IntegerList} implementations.
Modified:
sis/trunk/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatReader.java
URL:
http://svn.apache.org/viewvc/sis/trunk/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatReader.java?rev=1822278&r1=1822277&r2=1822278&view=diff
==============================================================================
---
sis/trunk/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatReader.java
[UTF-8] (original)
+++
sis/trunk/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatReader.java
[UTF-8] Fri Jan 26 11:59:08 2018
@@ -25,6 +25,11 @@ import java.util.Locale;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.io.LineNumberReader;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
+import java.time.OffsetTime;
+import java.time.DateTimeException;
+import java.time.temporal.Temporal;
import org.opengis.metadata.Metadata;
import org.opengis.metadata.citation.DateType;
@@ -68,13 +73,6 @@ import org.apache.sis.internal.util.Util
import static org.apache.sis.internal.util.CollectionsExt.singletonOrNull;
-// Branch-dependent imports
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.time.OffsetTime;
-import java.time.DateTimeException;
-import java.time.temporal.Temporal;
-
/**
* Parses Landsat metadata as {@linkplain DefaultMetadata ISO-19115 Metadata}
object.
Modified:
sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/ChannelDecoder.java
URL:
http://svn.apache.org/viewvc/sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/ChannelDecoder.java?rev=1822278&r1=1822277&r2=1822278&view=diff
==============================================================================
---
sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/ChannelDecoder.java
[UTF-8] (original)
+++
sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/ChannelDecoder.java
[UTF-8] Fri Jan 26 11:59:08 2018
@@ -30,6 +30,7 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.Locale;
import java.util.regex.Pattern;
+import java.time.DateTimeException;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.nio.charset.Charset;
@@ -61,9 +62,6 @@ import org.apache.sis.setup.GeometryLibr
import org.apache.sis.measure.Units;
import ucar.nc2.constants.CF;
-// Branch-dependent imports
-import java.time.DateTimeException;
-
/**
* Provides netCDF decoding services as a standalone library.
Modified:
sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/FeaturesInfo.java
URL:
http://svn.apache.org/viewvc/sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/FeaturesInfo.java?rev=1822278&r1=1822277&r2=1822278&view=diff
==============================================================================
---
sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/FeaturesInfo.java
[UTF-8] (original)
+++
sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/FeaturesInfo.java
[UTF-8] Fri Jan 26 11:59:08 2018
@@ -23,6 +23,10 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.LinkedHashMap;
+import java.util.Spliterator;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
+import java.util.function.Consumer;
import java.io.IOException;
import org.apache.sis.math.Vector;
import org.apache.sis.internal.netcdf.DataType;
@@ -37,10 +41,6 @@ import org.apache.sis.setup.GeometryLibr
import ucar.nc2.constants.CF;
// Branch-dependent imports
-import java.util.Spliterator;
-import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
-import java.util.function.Consumer;
import org.apache.sis.feature.AbstractFeature;
import org.apache.sis.feature.DefaultFeatureType;
import org.apache.sis.feature.DefaultAttributeType;
Modified:
sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/FeaturesWrapper.java
URL:
http://svn.apache.org/viewvc/sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/FeaturesWrapper.java?rev=1822278&r1=1822277&r2=1822278&view=diff
==============================================================================
---
sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/FeaturesWrapper.java
[UTF-8] (original)
+++
sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/FeaturesWrapper.java
[UTF-8] Fri Jan 26 11:59:08 2018
@@ -16,6 +16,7 @@
*/
package org.apache.sis.internal.netcdf.ucar;
+import java.util.stream.Stream;
import org.apache.sis.storage.DataStore;
import org.apache.sis.setup.GeometryLibrary;
import org.apache.sis.internal.netcdf.DiscreteSampling;
@@ -23,7 +24,6 @@ import org.apache.sis.util.logging.Warni
import ucar.nc2.ft.FeatureCollection;
// Branch-dependent imports
-import java.util.stream.Stream;
import org.apache.sis.feature.AbstractFeature;
import org.apache.sis.feature.DefaultFeatureType;
Modified:
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/MetadataBuilder.java
URL:
http://svn.apache.org/viewvc/sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/MetadataBuilder.java?rev=1822278&r1=1822277&r2=1822278&view=diff
==============================================================================
---
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/MetadataBuilder.java
[UTF-8] (original)
+++
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/MetadataBuilder.java
[UTF-8] Fri Jan 26 11:59:08 2018
@@ -16,6 +16,7 @@
*/
package org.apache.sis.internal.storage;
+import java.time.LocalDate;
import java.util.Date;
import java.util.Locale;
import java.util.Iterator;
@@ -116,7 +117,6 @@ import static java.util.Collections.sing
import static
org.apache.sis.internal.util.StandardDateFormat.MILLISECONDS_PER_DAY;
// Branch-dependent imports
-import java.time.LocalDate;
import org.opengis.metadata.citation.ResponsibleParty;
import org.opengis.metadata.identification.CharacterSet;
import org.apache.sis.feature.DefaultFeatureType;
Modified:
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/FeatureIterator.java
URL:
http://svn.apache.org/viewvc/sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/FeatureIterator.java?rev=1822278&r1=1822277&r2=1822278&view=diff
==============================================================================
---
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/FeatureIterator.java
[UTF-8] (original)
+++
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/FeatureIterator.java
[UTF-8] Fri Jan 26 11:59:08 2018
@@ -17,16 +17,16 @@
package org.apache.sis.internal.storage.csv;
import java.util.Collection;
+import java.util.Spliterator;
+import java.util.function.Consumer;
import java.util.concurrent.atomic.AtomicInteger;
+import java.time.DateTimeException;
import java.io.IOException;
import org.apache.sis.util.ObjectConverter;
import org.apache.sis.util.ObjectConverters;
import org.apache.sis.util.collection.BackingStoreException;
// Branch-dependent imports
-import java.util.Spliterator;
-import java.util.function.Consumer;
-import java.time.DateTimeException;
import org.apache.sis.feature.AbstractFeature;
import org.apache.sis.feature.AbstractIdentifiedType;
import org.apache.sis.feature.DefaultAttributeType;
Modified:
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/MovingFeatureIterator.java
URL:
http://svn.apache.org/viewvc/sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/MovingFeatureIterator.java?rev=1822278&r1=1822277&r2=1822278&view=diff
==============================================================================
---
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/MovingFeatureIterator.java
[UTF-8] (original)
+++
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/MovingFeatureIterator.java
[UTF-8] Fri Jan 26 11:59:08 2018
@@ -18,14 +18,14 @@ package org.apache.sis.internal.storage.
import java.util.Map;
import java.util.LinkedHashMap;
+import java.util.function.Consumer;
import java.util.logging.LogRecord;
+import java.time.Instant;
+import java.time.DateTimeException;
import java.io.IOException;
import org.apache.sis.internal.feature.MovingFeature;
// Branch-dependent imports
-import java.time.Instant;
-import java.time.DateTimeException;
-import java.util.function.Consumer;
import org.apache.sis.feature.AbstractAttribute;
import org.apache.sis.feature.AbstractFeature;
Modified:
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/Store.java
URL:
http://svn.apache.org/viewvc/sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/Store.java?rev=1822278&r1=1822277&r2=1822278&view=diff
==============================================================================
---
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/Store.java
[UTF-8] (original)
+++
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/Store.java
[UTF-8] Fri Jan 26 11:59:08 2018
@@ -21,8 +21,12 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.Locale;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
import java.util.logging.Level;
import java.util.logging.LogRecord;
+import java.time.Instant;
+import java.time.DateTimeException;
import java.io.Reader;
import java.io.BufferedReader;
import java.io.LineNumberReader;
@@ -71,10 +75,6 @@ import org.apache.sis.io.InvalidSeekExce
import org.apache.sis.measure.Units;
// Branch-dependent imports
-import java.time.Instant;
-import java.time.DateTimeException;
-import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
import org.apache.sis.feature.AbstractFeature;
import org.apache.sis.feature.AbstractIdentifiedType;
Modified:
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/TimeEncoding.java
URL:
http://svn.apache.org/viewvc/sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/TimeEncoding.java?rev=1822278&r1=1822277&r2=1822278&view=diff
==============================================================================
---
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/TimeEncoding.java
[UTF-8] (original)
+++
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/TimeEncoding.java
[UTF-8] Fri Jan 26 11:59:08 2018
@@ -16,6 +16,7 @@
*/
package org.apache.sis.internal.storage.csv;
+import java.time.Instant;
import javax.measure.Unit;
import javax.measure.quantity.Time;
import org.opengis.referencing.datum.TemporalDatum;
@@ -24,9 +25,6 @@ import org.apache.sis.internal.util.Stan
import org.apache.sis.referencing.CommonCRS;
import org.apache.sis.measure.Units;
-// Branch-dependent imports
-import java.time.Instant;
-
/**
* Specifies how time is encoded in the CSV file.
Modified:
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/folder/Store.java
URL:
http://svn.apache.org/viewvc/sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/folder/Store.java?rev=1822278&r1=1822277&r2=1822278&view=diff
==============================================================================
---
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/folder/Store.java
[UTF-8] (original)
+++
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/folder/Store.java
[UTF-8] Fri Jan 26 11:59:08 2018
@@ -28,6 +28,7 @@ import java.nio.file.Files;
import java.nio.file.DirectoryStream;
import java.nio.file.DirectoryIteratorException;
import java.io.IOException;
+import java.io.UncheckedIOException;
import java.util.logging.Level;
import java.util.concurrent.ConcurrentHashMap;
import org.opengis.metadata.Metadata;
@@ -47,9 +48,6 @@ import org.apache.sis.internal.util.Unmo
import org.apache.sis.internal.storage.MetadataBuilder;
import org.apache.sis.internal.storage.Resources;
-// Branch-dependent imports
-import java.io.UncheckedIOException;
-
/**
* A folder store acts as an aggregate of multiple files in a single store.
Modified:
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/InputStreamAdapter.java
URL:
http://svn.apache.org/viewvc/sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/InputStreamAdapter.java?rev=1822278&r1=1822277&r2=1822278&view=diff
==============================================================================
---
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/InputStreamAdapter.java
[UTF-8] (original)
+++
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/InputStreamAdapter.java
[UTF-8] Fri Jan 26 11:59:08 2018
@@ -18,10 +18,8 @@ package org.apache.sis.internal.storage.
import java.io.InputStream;
import java.io.IOException;
-import javax.imageio.stream.ImageInputStream;
-
-// Branch-dependent imports
import java.io.UncheckedIOException;
+import javax.imageio.stream.ImageInputStream;
/**
Modified:
sis/trunk/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/csv/StoreTest.java
URL:
http://svn.apache.org/viewvc/sis/trunk/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/csv/StoreTest.java?rev=1822278&r1=1822277&r2=1822278&view=diff
==============================================================================
---
sis/trunk/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/csv/StoreTest.java
[UTF-8] (original)
+++
sis/trunk/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/csv/StoreTest.java
[UTF-8] Fri Jan 26 11:59:08 2018
@@ -18,6 +18,7 @@ package org.apache.sis.internal.storage.
import java.util.Arrays;
import java.util.Iterator;
+import java.time.Instant;
import java.io.StringReader;
import org.opengis.metadata.Metadata;
import org.opengis.metadata.extent.Extent;
@@ -37,7 +38,6 @@ import static org.apache.sis.test.TestUt
import static org.apache.sis.test.TestUtilities.getSingleton;
// Branch-dependent imports
-import java.time.Instant;
import org.apache.sis.feature.AbstractFeature;
import org.apache.sis.feature.AbstractIdentifiedType;
import org.apache.sis.feature.DefaultAttributeType;
Modified:
sis/trunk/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Reader.java
URL:
http://svn.apache.org/viewvc/sis/trunk/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Reader.java?rev=1822278&r1=1822277&r2=1822278&view=diff
==============================================================================
---
sis/trunk/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Reader.java
[UTF-8] (original)
+++
sis/trunk/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Reader.java
[UTF-8] Fri Jan 26 11:59:08 2018
@@ -19,9 +19,11 @@ package org.apache.sis.internal.storage.
import java.util.List;
import java.util.ArrayList;
import java.util.Objects;
+import java.util.function.Consumer;
import java.io.IOException;
import java.io.EOFException;
import java.net.URISyntaxException;
+import java.time.format.DateTimeParseException;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import javax.xml.bind.JAXBException;
@@ -34,8 +36,6 @@ import org.apache.sis.util.resources.Err
import org.apache.sis.util.Version;
// Branch-dependent imports
-import java.util.function.Consumer;
-import java.time.format.DateTimeParseException;
import org.apache.sis.feature.AbstractFeature;
Modified:
sis/trunk/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Store.java
URL:
http://svn.apache.org/viewvc/sis/trunk/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Store.java?rev=1822278&r1=1822277&r2=1822278&view=diff
==============================================================================
---
sis/trunk/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Store.java
[UTF-8] (original)
+++
sis/trunk/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Store.java
[UTF-8] Fri Jan 26 11:59:08 2018
@@ -16,6 +16,9 @@
*/
package org.apache.sis.internal.storage.gpx;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
+import java.io.UncheckedIOException;
import java.net.URISyntaxException;
import org.opengis.util.NameFactory;
import org.opengis.util.FactoryException;
@@ -42,9 +45,6 @@ import org.apache.sis.metadata.iso.citat
import org.apache.sis.metadata.iso.distribution.DefaultFormat;
// Branch-dependent imports
-import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
-import java.io.UncheckedIOException;
import org.apache.sis.feature.AbstractFeature;
import org.apache.sis.feature.DefaultFeatureType;
Modified:
sis/trunk/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Types.java
URL:
http://svn.apache.org/viewvc/sis/trunk/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Types.java?rev=1822278&r1=1822277&r2=1822278&view=diff
==============================================================================
---
sis/trunk/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Types.java
[UTF-8] (original)
+++
sis/trunk/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Types.java
[UTF-8] Fri Jan 26 11:59:08 2018
@@ -21,6 +21,7 @@ import java.util.Collections;
import java.util.Locale;
import java.util.Map;
import java.util.HashMap;
+import java.time.temporal.Temporal;
import org.opengis.util.ScopedName;
import org.opengis.util.GenericName;
import org.opengis.util.NameFactory;
@@ -47,7 +48,6 @@ import org.apache.sis.util.iso.ResourceI
import org.apache.sis.util.iso.DefaultNameFactory;
// Branch-dependent imports
-import java.time.temporal.Temporal;
import org.apache.sis.feature.DefaultFeatureType;
import org.apache.sis.feature.DefaultAttributeType;
Modified:
sis/trunk/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/xml/stream/StaxStreamReader.java
URL:
http://svn.apache.org/viewvc/sis/trunk/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/xml/stream/StaxStreamReader.java?rev=1822278&r1=1822277&r2=1822278&view=diff
==============================================================================
---
sis/trunk/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/xml/stream/StaxStreamReader.java
[UTF-8] (original)
+++
sis/trunk/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/xml/stream/StaxStreamReader.java
[UTF-8] Fri Jan 26 11:59:08 2018
@@ -20,7 +20,12 @@ import java.util.Date;
import java.util.Map;
import java.util.List;
import java.util.Arrays;
+import java.util.Spliterator;
import java.util.NoSuchElementException;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+import java.time.temporal.Temporal;
+import java.time.format.DateTimeParseException;
import java.net.URI;
import java.io.IOException;
import java.io.EOFException;
@@ -43,11 +48,6 @@ import org.apache.sis.util.collection.Ba
import org.apache.sis.util.resources.Errors;
// Branch-dependent imports
-import java.util.Spliterator;
-import java.util.function.Consumer;
-import java.util.function.Predicate;
-import java.time.temporal.Temporal;
-import java.time.format.DateTimeParseException;
import org.apache.sis.feature.AbstractFeature;
Modified:
sis/trunk/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/xml/stream/StaxStreamWriter.java
URL:
http://svn.apache.org/viewvc/sis/trunk/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/xml/stream/StaxStreamWriter.java?rev=1822278&r1=1822277&r2=1822278&view=diff
==============================================================================
---
sis/trunk/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/xml/stream/StaxStreamWriter.java
[UTF-8] (original)
+++
sis/trunk/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/xml/stream/StaxStreamWriter.java
[UTF-8] Fri Jan 26 11:59:08 2018
@@ -18,7 +18,9 @@ package org.apache.sis.internal.storage.
import java.util.Map;
import java.util.Date;
+import java.util.function.Consumer;
import java.io.IOException;
+import java.io.UncheckedIOException;
import java.nio.charset.Charset;
import javax.xml.namespace.QName;
import javax.xml.bind.Marshaller;
@@ -32,8 +34,6 @@ import org.apache.sis.util.collection.Ba
import org.apache.sis.util.resources.Errors;
// Branch-dependent imports
-import java.io.UncheckedIOException;
-import java.util.function.Consumer;
import org.apache.sis.feature.AbstractFeature;
Modified:
sis/trunk/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/storage/gpx/ReaderTest.java
URL:
http://svn.apache.org/viewvc/sis/trunk/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/storage/gpx/ReaderTest.java?rev=1822278&r1=1822277&r2=1822278&view=diff
==============================================================================
---
sis/trunk/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/storage/gpx/ReaderTest.java
[UTF-8] (original)
+++
sis/trunk/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/storage/gpx/ReaderTest.java
[UTF-8] Fri Jan 26 11:59:08 2018
@@ -19,6 +19,8 @@ package org.apache.sis.internal.storage.
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
+import java.util.stream.Stream;
+import java.time.Instant;
import com.esri.core.geometry.Point;
import com.esri.core.geometry.Polyline;
import org.opengis.geometry.Envelope;
@@ -39,8 +41,6 @@ import static org.apache.sis.test.TestUt
import static org.apache.sis.test.TestUtilities.getSingleton;
// Branch-dependent imports
-import java.time.Instant;
-import java.util.stream.Stream;
import org.apache.sis.feature.AbstractFeature;
import org.opengis.util.GenericName;
Modified:
sis/trunk/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/storage/gpx/WriterTest.java
URL:
http://svn.apache.org/viewvc/sis/trunk/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/storage/gpx/WriterTest.java?rev=1822278&r1=1822277&r2=1822278&view=diff
==============================================================================
---
sis/trunk/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/storage/gpx/WriterTest.java
[UTF-8] (original)
+++
sis/trunk/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/storage/gpx/WriterTest.java
[UTF-8] Fri Jan 26 11:59:08 2018
@@ -18,6 +18,7 @@ package org.apache.sis.internal.storage.
import java.util.List;
import java.util.Arrays;
+import java.time.Instant;
import java.net.URI;
import java.io.ByteArrayOutputStream;
import java.io.UnsupportedEncodingException;
@@ -38,7 +39,6 @@ import org.junit.Test;
import static org.apache.sis.test.Assert.*;
// Branch-dependent imports
-import java.time.Instant;
import org.apache.sis.feature.AbstractFeature;
