sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1773526 - in /sis/branches/JDK8: application/sis-console/ ide-project/NetBeans/nbproject/ storage/sis-geotiff/src/main/java/org/apache/sis/internal/geotiff/ storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/ storage/sis-geot...
Date Sat, 10 Dec 2016 17:24:04 GMT
Author: desruisseaux
Date: Sat Dec 10 17:24:03 2016
New Revision: 1773526

URL: http://svn.apache.org/viewvc?rev=1773526&view=rev
Log:
Add GeoTiffStoreProvider.

Added:
    sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GeoTiffStoreProvider.java
  (with props)
    sis/branches/JDK8/storage/sis-geotiff/src/main/resources/
    sis/branches/JDK8/storage/sis-geotiff/src/main/resources/META-INF/
    sis/branches/JDK8/storage/sis-geotiff/src/main/resources/META-INF/services/
    sis/branches/JDK8/storage/sis-geotiff/src/main/resources/META-INF/services/org.apache.sis.storage.DataStoreProvider
  (with props)
Modified:
    sis/branches/JDK8/application/sis-console/pom.xml
    sis/branches/JDK8/ide-project/NetBeans/nbproject/cfg_hints.xml
    sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/internal/geotiff/Resources.java
    sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/internal/geotiff/Resources.properties
    sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/internal/geotiff/Resources_fr.properties
    sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/CRSBuilder.java
    sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GeoTIFF.java
    sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/Reader.java
    sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/NetcdfStoreProvider.java

Modified: sis/branches/JDK8/application/sis-console/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/application/sis-console/pom.xml?rev=1773526&r1=1773525&r2=1773526&view=diff
==============================================================================
--- sis/branches/JDK8/application/sis-console/pom.xml (original)
+++ sis/branches/JDK8/application/sis-console/pom.xml Sat Dec 10 17:24:03 2016
@@ -111,6 +111,18 @@ Console application.
       <version>${project.version}</version>
       <scope>runtime</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.sis.storage</groupId>
+      <artifactId>sis-geotiff</artifactId>
+      <version>${project.version}</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.sis.storage</groupId>
+      <artifactId>sis-earth-observation</artifactId>
+      <version>${project.version}</version>
+      <scope>runtime</scope>
+    </dependency>
 
     <!-- Test dependencies -->
     <dependency>

Modified: sis/branches/JDK8/ide-project/NetBeans/nbproject/cfg_hints.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/ide-project/NetBeans/nbproject/cfg_hints.xml?rev=1773526&r1=1773525&r2=1773526&view=diff
==============================================================================
--- sis/branches/JDK8/ide-project/NetBeans/nbproject/cfg_hints.xml (original)
+++ sis/branches/JDK8/ide-project/NetBeans/nbproject/cfg_hints.xml Sat Dec 10 17:24:03 2016
@@ -30,7 +30,7 @@
             <attribute name="enabled" value="true"/>
         </node>
         <node name="org.netbeans.modules.java.hints.AssignmentIssues.assignmentToForLoopParam">
-            <attribute name="enabled" value="true"/>
+            <attribute name="enabled" value="false"/>
         </node>
         <node name="org.netbeans.modules.java.hints.SystemOut">
             <attribute name="enabled" value="true"/>
@@ -131,5 +131,16 @@
         <node name="org.netbeans.modules.java.hints.MissingHashCode">
             <attribute name="enabled" value="false"/>
         </node>
+        <node name="Wrong_String_Comparison">
+            <attribute name="string-literals-first" value="true"/>
+            <attribute name="ternary-null-check" value="true"/>
+            <attribute name="enabled" value="false"/>
+        </node>
+        <node name="org.netbeans.modules.java.hints.jdk.mapreduce.ForLoopToFunctionalHint">
+            <attribute name="enabled" value="false"/>
+        </node>
+        <node name="org.netbeans.modules.java.hints.jdk.ThrowableInitCause">
+            <attribute name="strict" value="false"/>
+        </node>
     </tool>
 </configuration>

Modified: sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/internal/geotiff/Resources.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/internal/geotiff/Resources.java?rev=1773526&r1=1773525&r2=1773526&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/internal/geotiff/Resources.java
[UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/internal/geotiff/Resources.java
[UTF-8] Sat Dec 10 17:24:03 2016
@@ -129,8 +129,8 @@ public final class Resources extends Ind
         public static final short MissingValue_2 = 7;
 
         /**
-         * The file defines “{2}” with a value of {3}{4}, but that value should be {1}{4}
for
-         * consistency with {0}.
+         * The file defines “{2}” with a value of {3}{4}, but that value should be {1}{4}
according
+         * parent definition ({0}).
          */
         public static final short NotTheEpsgValue_5 = 17;
 

Modified: sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/internal/geotiff/Resources.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/internal/geotiff/Resources.properties?rev=1773526&r1=1773525&r2=1773526&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/internal/geotiff/Resources.properties
[ISO-8859-1] (original)
+++ sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/internal/geotiff/Resources.properties
[ISO-8859-1] Sat Dec 10 17:24:03 2016
@@ -32,7 +32,7 @@ ListTooShort_3                    = TIFF
 MismatchedLength_4                = TIFF tags \u201c{0}\u201d and \u201c{1}\u201d have values
of different lengths. Found \u201c{2}\u201d and \u201c{3}\u201d elements respectively.
 MissingGeoValue_1                 = No value has been found for the \u201c{0}\u201d GeoTIFF
key.
 MissingValue_2                    = Can not read TIFF image from \u201c{0}\u201d because
the \u201c{1}\u201d tag is missing.
-NotTheEpsgValue_5                 = The file defines \u201c{2}\u201d with a value of {3}{4},
but that value should be {1}{4} for consistency with {0}.
+NotTheEpsgValue_5                 = The file defines \u201c{2}\u201d with a value of {3}{4},
but that value should be {1}{4} according parent definition ({0}).
 RandomizedProcessApplied          = A randomized process such as error diffusion has been
applied to the image data.
 UnexpectedListOfValues_2          = A single value was expected for the \u201c{0}\u201d key
but {1} values have been found.
 UnexpectedTileCount_3             = Found {2} tiles or strips in the \u201c{0}\u201d file
while {1} were expected.

Modified: sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/internal/geotiff/Resources_fr.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/internal/geotiff/Resources_fr.properties?rev=1773526&r1=1773525&r2=1773526&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/internal/geotiff/Resources_fr.properties
[ISO-8859-1] (original)
+++ sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/internal/geotiff/Resources_fr.properties
[ISO-8859-1] Sat Dec 10 17:24:03 2016
@@ -37,7 +37,7 @@ ListTooShort_3                    = Le t
 MismatchedLength_4                = Les tags TIFF \u00ab\u202f{0}\u202f\u00bb et \u00ab\u202f{1}\u202f\u00bb
contiennent des valeurs de longueurs diff\u00e9rentes. On a trouv\u00e9 {2} et {3} \u00e9l\u00e9ments
respectivement.
 MissingGeoValue_1                 = Aucune valeur n\u2019a \u00e9t\u00e9 trouv\u00e9e pour
la cl\u00e9 GeoTIFF \u00ab\u202f{0}\u202f\u00bb.
 MissingValue_2                    = Ne peut pas lire l\u2019image TIFF provenant de \u00ab\u202f{0}\u202f\u00bb
car le tag \u00ab\u202f{1}\u202f\u00bb est manquant.
-NotTheEpsgValue_5                 = Le fichier d\u00e9finit \u00ab\u202f{2}\u202f\u00bb avec
la valeur {3}{4}, mais cette valeur devrait \u00eatre {1}{4} pour \u00eatre coh\u00e9rent
avec {0}.
+NotTheEpsgValue_5                 = Le fichier d\u00e9finit \u00ab\u202f{2}\u202f\u00bb avec
la valeur {3}{4}, mais cette valeur devrait \u00eatre {1}{4} pour \u00eatre en accord avec
la d\u00e9finition du parent {0}.
 RandomizedProcessApplied          = Un processus randomis\u00e9 comme la diffusion d\u2019erreur
a \u00e9t\u00e9 appliqu\u00e9.
 UnexpectedListOfValues_2          = Une seule valeur \u00e9tait attendue pour la cl\u00e9
\u00ab\u202f{0}\u202f\u00bb, mais on en a trouv\u00e9es {1}.
 UnexpectedTileCount_3             = {2} tuiles ont \u00e9t\u00e9 trouv\u00e9es dans le fichier
\u00ab\u202f{0}\u202f\u00bb alors qu\u2019on en attendait {1}.

Modified: sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/CRSBuilder.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/CRSBuilder.java?rev=1773526&r1=1773525&r2=1773526&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/CRSBuilder.java
[UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/CRSBuilder.java
[UTF-8] Sat Dec 10 17:24:03 2016
@@ -80,6 +80,7 @@ import org.apache.sis.util.Characters;
 import org.apache.sis.util.Debug;
 
 import static org.apache.sis.util.Utilities.equalsIgnoreMetadata;
+import org.apache.sis.util.iso.DefaultNameSpace;
 
 
 /**
@@ -482,8 +483,12 @@ final class CRSBuilder {
                     symbol = ' ' + symbol;    // Add a space before "m" but not before "°".
                 }
             }
+            /*
+             * Use Double.toString(…) instead of NumberFormat because the later does not
show
+             * enough significant digits for parameters like inverse flattening.
+             */
             warning(Resources.Keys.NotTheEpsgValue_5, IdentifiedObjects.getIdentifierOrName(epsg),
-                    expected, GeoKeys.name(key), actual, symbol);
+                    String.valueOf(expected), GeoKeys.name(key), String.valueOf(actual),
symbol);
         }
     }
 
@@ -493,10 +498,11 @@ final class CRSBuilder {
      * there is no need to specify the EPSG codes of the components, but the file still supply
      * those EPSG codes. If the values do not match, a warning is reported.
      *
-     * @param  epsg  the EPSG object.
-     * @param  key   the GeoTIFF key for the EPSG code of the given {@code epsg} object.
+     * @param  parent  the parent which contains the {@code epsg} object
+     * @param  epsg    the object created from the EPSG geodetic dataset.
+     * @param  key     the GeoTIFF key for the EPSG code of the given {@code epsg} object.
      */
-    private void verifyIdentifier(final IdentifiedObject epsg, final short key) {
+    private void verifyIdentifier(final IdentifiedObject parent, final IdentifiedObject epsg,
final short key) {
         final int code = getAsInteger(key);
         if (code > GeoCodes.undefined && code < GeoCodes.userDefined) {
             final Identifier id = IdentifiedObjects.getIdentifier(epsg, Citations.EPSG);
@@ -509,8 +515,9 @@ final class CRSBuilder {
                     return;
                 }
                 if (code != expected) {
-                    warning(Resources.Keys.NotTheEpsgValue_5, IdentifiedObjects.getIdentifierOrName(epsg),
-                            expected, GeoKeys.name(key), code, "");
+                    warning(Resources.Keys.NotTheEpsgValue_5, IdentifiedObjects.getIdentifierOrName(parent),
+                            Constants.EPSG + DefaultNameSpace.DEFAULT_SEPARATOR + expected,
GeoKeys.name(key),
+                            Constants.EPSG + DefaultNameSpace.DEFAULT_SEPARATOR + code, "");
                 }
             }
         }
@@ -1049,10 +1056,10 @@ final class CRSBuilder {
      */
     private void verify(final GeodeticDatum datum, final Unit<Angle> angularUnit, final
Unit<Length> linearUnit) {
         final PrimeMeridian pm = datum.getPrimeMeridian();
-        verifyIdentifier(pm, GeoKeys.PrimeMeridian);
+        verifyIdentifier(datum, pm, GeoKeys.PrimeMeridian);
         verify(pm, angularUnit);
         final Ellipsoid ellipsoid = datum.getEllipsoid();
-        verifyIdentifier(ellipsoid, GeoKeys.Ellipsoid);
+        verifyIdentifier(datum, ellipsoid, GeoKeys.Ellipsoid);
         verify(ellipsoid, linearUnit);
     }
 
@@ -1205,7 +1212,7 @@ final class CRSBuilder {
          */
         final Unit<Length> linearUnit = createUnit(GeoKeys.GeogLinearUnits, GeoKeys.GeogLinearUnitSize,
Length.class, Units.METRE);
         final GeodeticDatum datum = crs.getDatum();
-        verifyIdentifier(datum, GeoKeys.GeodeticDatum);
+        verifyIdentifier(crs, datum, GeoKeys.GeodeticDatum);
         verify(datum, angularUnit, linearUnit);
     }
 
@@ -1289,10 +1296,10 @@ final class CRSBuilder {
         final Unit<Length> linearUnit  = createUnit(GeoKeys.LinearUnits,  GeoKeys.LinearUnitSize,
Length.class, Units.METRE);
         final Unit<Angle>  angularUnit = createUnit(GeoKeys.AngularUnits, GeoKeys.AngularUnitSize,
Angle.class, Units.DEGREE);
         final GeographicCRS baseCRS = crs.getBaseCRS();
-        verifyIdentifier(baseCRS, GeoKeys.GeographicType);
+        verifyIdentifier(crs, baseCRS, GeoKeys.GeographicType);
         verify(baseCRS, angularUnit);
         final Conversion projection = crs.getConversionFromBase();
-        verifyIdentifier(projection, GeoKeys.Projection);
+        verifyIdentifier(crs, projection, GeoKeys.Projection);
         verify(projection, angularUnit, linearUnit);
     }
 

Modified: sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GeoTIFF.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GeoTIFF.java?rev=1773526&r1=1773525&r2=1773526&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GeoTIFF.java
[UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GeoTIFF.java
[UTF-8] Sat Dec 10 17:24:03 2016
@@ -52,6 +52,16 @@ abstract class GeoTIFF implements Closea
     static final Locale LOCALE = Locale.US;
 
     /**
+     * The magic number for big-endian TIFF files or little-endian TIFF files.
+     */
+    static final short BIG_ENDIAN = 0x4D4D, LITTLE_ENDIAN = 0x4949;
+
+    /**
+     * The magic number for classic (32 bits) or big TIFF files.
+     */
+    static final short CLASSIC = 42, BIG_TIFF= 43;
+
+    /**
      * The store which created this reader or writer.
      */
     final GeoTiffStore owner;

Added: sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GeoTiffStoreProvider.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GeoTiffStoreProvider.java?rev=1773526&view=auto
==============================================================================
--- sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GeoTiffStoreProvider.java
(added)
+++ sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GeoTiffStoreProvider.java
[UTF-8] Sat Dec 10 17:24:03 2016
@@ -0,0 +1,102 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.sis.storage.geotiff;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import org.apache.sis.storage.DataStore;
+import org.apache.sis.storage.DataStoreException;
+import org.apache.sis.storage.DataStoreProvider;
+import org.apache.sis.storage.ProbeResult;
+import org.apache.sis.storage.StorageConnector;
+
+
+/**
+ * The provider of {@link GeoTiffStore} instances. Given a {@link StorageConnector} input,
+ * this class tries to instantiate a {@code GeoTiffStore}.
+ *
+ * <div class="section">Thread safety</div>
+ * The same {@code GeoTiffStoreProvider} instance can be safely used by many threads without
synchronization on
+ * the part of the caller. However the {@link GeoTiffStore} instances created by this factory
are not thread-safe.
+ *
+ * @author  Martin Desruisseaux (Geomatys)
+ * @since   0.8
+ * @version 0.8
+ * @module
+ *
+ * @see GeoTiffStore
+ */
+public class GeoTiffStoreProvider extends DataStoreProvider {
+    /**
+     * The MIME type for GeoTIFF files.
+     */
+    private static final String MIME_TYPE = "image/tiff";
+
+    /**
+     * Creates a new provider.
+     */
+    public GeoTiffStoreProvider() {
+    }
+
+    /**
+     * Returns {@link ProbeResult#SUPPORTED} if the given storage appears to be supported
by {@link GeoTiffStore}.
+     * Returning {@code SUPPORTED} from this method does not guarantee that reading or writing
will succeed,
+     * only that there appears to be a reasonable chance of success based on a brief inspection
of the
+     * {@linkplain StorageConnector#getStorage() storage object} or contents.
+     *
+     * @param  connector  information about the storage (URL, stream, <i>etc</i>).
+     * @return {@code SUPPORTED} if the given storage seems to be usable by {@code GeoTiffStore}
instances.
+     * @throws DataStoreException if an I/O error occurred.
+     */
+    @Override
+    public ProbeResult probeContent(StorageConnector connector) throws DataStoreException
{
+        final ByteBuffer buffer = connector.getStorageAs(ByteBuffer.class);
+        if (buffer != null) {
+            if (buffer.remaining() < 2 * Short.BYTES) {
+                return ProbeResult.INSUFFICIENT_BYTES;
+            }
+            final int p = buffer.position();
+            final short order = buffer.getShort(p);
+            final boolean isBigEndian = (order == GeoTIFF.BIG_ENDIAN);
+            if (isBigEndian || order == GeoTIFF.LITTLE_ENDIAN) {
+                final ByteOrder old = buffer.order();
+                try {
+                    buffer.order(isBigEndian ? ByteOrder.BIG_ENDIAN : ByteOrder.LITTLE_ENDIAN);
+                    switch (buffer.getShort(p + Short.BYTES)) {
+                        case GeoTIFF.CLASSIC:
+                        case GeoTIFF.BIG_TIFF: return new ProbeResult(true, MIME_TYPE, null);
+                    }
+                } finally {
+                    buffer.order(old);
+                }
+            }
+        }
+        return ProbeResult.UNSUPPORTED_STORAGE;
+    }
+
+    /**
+     * Returns a {@link GeoTiffStore} implementation associated with this provider.
+     *
+     * @param  connector  information about the storage (URL, stream, <i>etc</i>).
+     * @return a data store implementation associated with this provider for the given storage.
+     * @throws DataStoreException if an error occurred while creating the data store instance.
+     */
+    @Override
+    public DataStore open(final StorageConnector connector) throws DataStoreException {
+        return new GeoTiffStore(connector);
+    }
+}

Propchange: sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GeoTiffStoreProvider.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GeoTiffStoreProvider.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain;charset=UTF-8

Modified: sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/Reader.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/Reader.java?rev=1773526&r1=1773525&r2=1773526&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/Reader.java
[UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/Reader.java
[UTF-8] Sat Dec 10 17:24:03 2016
@@ -142,8 +142,8 @@ final class Reader extends GeoTIFF {
          * about the byte order for this flag since the two bytes shall have the same value.
          */
         final short order = input.readShort();
-        final boolean isBigEndian = (order == 0x4D4D);
-        if (isBigEndian || order == 0x4949) {
+        final boolean isBigEndian = (order == BIG_ENDIAN);
+        if (isBigEndian || order == LITTLE_ENDIAN) {
             input.buffer.order(isBigEndian ? ByteOrder.BIG_ENDIAN : ByteOrder.LITTLE_ENDIAN);
             /*
              * Magic number of TIFF file is 42, followed by nothing else.
@@ -154,12 +154,12 @@ final class Reader extends GeoTIFF {
              * but a future BigTIFF version may allow 16 bytes wide pointers.
              */
             switch (input.readShort()) {
-                case 42: {                                          // Magic number of classical
format.
+                case CLASSIC: {                                     // Magic number of classical
format.
                     intSizeExpansion = 0;
                     readNextImageOffset();
                     return;
                 }
-                case 43: {                                          // Magic number of BigTIFF
format.
+                case BIG_TIFF: {                                    // Magic number of BigTIFF
format.
                     final int numBits  = input.readUnsignedShort();
                     final int powerOf2 = Integer.numberOfTrailingZeros(numBits);    // In
the [0 … 32] range.
                     if (numBits == (1L << powerOf2) && input.readShort() ==
0) {

Added: sis/branches/JDK8/storage/sis-geotiff/src/main/resources/META-INF/services/org.apache.sis.storage.DataStoreProvider
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-geotiff/src/main/resources/META-INF/services/org.apache.sis.storage.DataStoreProvider?rev=1773526&view=auto
==============================================================================
--- sis/branches/JDK8/storage/sis-geotiff/src/main/resources/META-INF/services/org.apache.sis.storage.DataStoreProvider
(added)
+++ sis/branches/JDK8/storage/sis-geotiff/src/main/resources/META-INF/services/org.apache.sis.storage.DataStoreProvider
[UTF-8] Sat Dec 10 17:24:03 2016
@@ -0,0 +1 @@
+org.apache.sis.storage.geotiff.GeoTiffStoreProvider

Propchange: sis/branches/JDK8/storage/sis-geotiff/src/main/resources/META-INF/services/org.apache.sis.storage.DataStoreProvider
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/branches/JDK8/storage/sis-geotiff/src/main/resources/META-INF/services/org.apache.sis.storage.DataStoreProvider
------------------------------------------------------------------------------
    svn:mime-type = text/plain;charset=UTF-8

Modified: sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/NetcdfStoreProvider.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/NetcdfStoreProvider.java?rev=1773526&r1=1773525&r2=1773526&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/NetcdfStoreProvider.java
[UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/NetcdfStoreProvider.java
[UTF-8] Sat Dec 10 17:24:03 2016
@@ -19,6 +19,7 @@ package org.apache.sis.storage.netcdf;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.nio.ByteBuffer;
+import java.nio.file.NoSuchFileException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
@@ -38,9 +39,6 @@ import org.apache.sis.util.logging.Warni
 import org.apache.sis.util.logging.Logging;
 import org.apache.sis.util.Version;
 
-// Branch-specific import
-import java.nio.file.NoSuchFileException;
-
 
 /**
  * The provider of {@link NetcdfStore} instances. Given a {@link StorageConnector} input,
@@ -121,7 +119,7 @@ public class NetcdfStoreProvider extends
      * {@linkplain StorageConnector#getStorage() storage object} or contents.
      *
      * @param  connector  information about the storage (URL, stream, {@link ucar.nc2.NetcdfFile}
instance, <i>etc</i>).
-     * @return {@code SUPPORTED} if the given storage seems to be usable by the {@code NetcdfStore}
instances.
+     * @return {@code SUPPORTED} if the given storage seems to be usable by {@code NetcdfStore}
instances.
      * @throws DataStoreException if an I/O error occurred.
      */
     @Override



Mime
View raw message