sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1807787 [1/2] - in /sis/branches/JDK8: ./ application/sis-console/ application/sis-console/src/main/artifact/ application/sis-console/src/main/artifact/lib/ application/sis-console/src/test/java/org/apache/sis/console/ core/sis-metadata/sr...
Date Fri, 08 Sep 2017 17:16:09 GMT
Author: desruisseaux
Date: Fri Sep  8 17:16:08 2017
New Revision: 1807787

URL: http://svn.apache.org/viewvc?rev=1807787&view=rev
Log:
Naming convention: "netCDF" is lower-case "n", except at the beginning of sentence.

Modified:
    sis/branches/JDK8/application/sis-console/pom.xml
    sis/branches/JDK8/application/sis-console/src/main/artifact/README
    sis/branches/JDK8/application/sis-console/src/main/artifact/lib/README
    sis/branches/JDK8/application/sis-console/src/test/java/org/apache/sis/console/MetadataCommandTest.java
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultResponsibleParty.java
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGCP.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/MapProjectionDescriptor.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/MapProjectionParameters.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/Constants.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/measure/UnitFormat.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/measure/Units.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/CharSequences.java
    sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/measure/UnitsTest.java
    sis/branches/JDK8/pom.xml
    sis/branches/JDK8/storage/sis-netcdf/pom.xml
    sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Axis.java
    sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/DataType.java
    sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Decoder.java
    sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/DiscreteSampling.java
    sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/GridGeometry.java
    sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/NamedElement.java
    sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Resources.java
    sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Resources.properties
    sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Resources_fr.properties
    sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Variable.java
    sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/ChannelDecoder.java
    sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/Dimension.java
    sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/FeaturesInfo.java
    sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/GridGeometryInfo.java
    sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/VariableInfo.java
    sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/package-info.java
    sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/package-info.java
    sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/DecoderWrapper.java
    sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/GridGeometryWrapper.java
    sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/LogAdapter.java
    sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/VariableWrapper.java
    sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/package-info.java
    sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/AttributeNames.java
    sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java
    sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/NetcdfStore.java
    sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/NetcdfStoreProvider.java
    sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/package-info.java
    sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/DataTypeTest.java
    sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/TestCase.java
    sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/VariableTest.java
    sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/impl/ChannelDecoderTest.java
    sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/impl/GridGeometryInfoTest.java
    sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/impl/VariableInfoTest.java
    sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/ConformanceTest.java
    sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/MetadataReaderTest.java
    sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/NetcdfStoreProviderTest.java
    sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/NetcdfStoreTest.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=1807787&r1=1807786&r2=1807787&view=diff
==============================================================================
--- sis/branches/JDK8/application/sis-console/pom.xml (original)
+++ sis/branches/JDK8/application/sis-console/pom.xml Fri Sep  8 17:16:08 2017
@@ -132,7 +132,7 @@ Console application.
 
     <!-- Test dependencies -->
     <dependency>
-      <!-- For UCAR NetCDF -->
+      <!-- For UCAR netCDF -->
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-jdk14</artifactId>
       <scope>test</scope>

Modified: sis/branches/JDK8/application/sis-console/src/main/artifact/README
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/application/sis-console/src/main/artifact/README?rev=1807787&r1=1807786&r2=1807787&view=diff
==============================================================================
--- sis/branches/JDK8/application/sis-console/src/main/artifact/README [UTF-8] (original)
+++ sis/branches/JDK8/application/sis-console/src/main/artifact/README [UTF-8] Fri Sep  8 17:16:08 2017
@@ -44,7 +44,7 @@ encoding to UTF-8:
     export SIS_OPTS="--encoding UTF-8"
 
 Optional dependencies can be added to the 'lib' folder. For example adding the
-UCAR NetCDF library in the 'lib' folder will cause Apache SIS to decode a
+UCAR netCDF library in the 'lib' folder will cause Apache SIS to decode a
 wider range of file formats like NcML files.
 
 

Modified: sis/branches/JDK8/application/sis-console/src/main/artifact/lib/README
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/application/sis-console/src/main/artifact/lib/README?rev=1807787&r1=1807786&r2=1807787&view=diff
==============================================================================
--- sis/branches/JDK8/application/sis-console/src/main/artifact/lib/README [UTF-8] (original)
+++ sis/branches/JDK8/application/sis-console/src/main/artifact/lib/README [UTF-8] Fri Sep  8 17:16:08 2017
@@ -1,4 +1,4 @@
 This directory contains the sis.jar file together with optional dependencies.
 Recognized optional dependencies are:
 
-  - UCAR NetCDF library
+  - UCAR netCDF library

Modified: sis/branches/JDK8/application/sis-console/src/test/java/org/apache/sis/console/MetadataCommandTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/application/sis-console/src/test/java/org/apache/sis/console/MetadataCommandTest.java?rev=1807787&r1=1807786&r2=1807787&view=diff
==============================================================================
--- sis/branches/JDK8/application/sis-console/src/test/java/org/apache/sis/console/MetadataCommandTest.java [UTF-8] (original)
+++ sis/branches/JDK8/application/sis-console/src/test/java/org/apache/sis/console/MetadataCommandTest.java [UTF-8] Fri Sep  8 17:16:08 2017
@@ -37,7 +37,7 @@ import static org.junit.Assert.*;
 @DependsOn(CommandRunnerTest.class)
 public final strictfp class MetadataCommandTest extends TestCase {
     /**
-     * Tests the sub-command on a NetCDF file.
+     * Tests the sub-command on a netCDF file.
      *
      * @throws Exception if an error occurred while creating the command.
      */
@@ -51,7 +51,7 @@ public final strictfp class MetadataComm
     }
 
     /**
-     * Verifies the NetCDF metadata. The given string can be either a text format or XML format.
+     * Verifies the netCDF metadata. The given string can be either a text format or XML format.
      * This method will check only for some keyword - this is not an extensive check of the result.
      */
     private static void verifyNetCDF(final String expectedHeader, final String result) {

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java?rev=1807787&r1=1807786&r2=1807787&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java [UTF-8] Fri Sep  8 17:16:08 2017
@@ -308,14 +308,14 @@ public final class Citations extends Sta
      * <a href="http://www.unidata.ucar.edu/software/netcdf-java">NetCDF</a> specification.
      * The {@linkplain IdentifierSpace#getName() name} of this identifier space is fixed to {@code "NetCDF"}.
      * This citation is used as the authority for some map projection method and parameter names
-     * as used in NetCDF files.
+     * as used in netCDF files.
      *
      * <div class="note"><b>Example</b>
-     * the Mercator projection can be defined in a NetCDF file with the following parameters:
+     * the Mercator projection can be defined in a netCDF file with the following parameters:
      *
      * <table class="sis">
-     * <caption>Example of identifiers in NetCDF name space</caption>
-     * <tr><th>Name in NetCDF namespace</th>                           <th>Name in default namespace (EPSG)</th></tr>
+     * <caption>Example of identifiers in netCDF name space</caption>
+     * <tr><th>Name in netCDF namespace</th>                           <th>Name in default namespace (EPSG)</th></tr>
      * <tr><td>{@code "NetCDF:semi_major_axis"}</td>                   <td></td></tr>
      * <tr><td>{@code "NetCDF:semi_minor_axis"}</td>                   <td></td></tr>
      * <tr><td>{@code "NetCDF:latitude_of_projection_origin"}</td>     <td>Latitude of natural origin</td></tr>

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultResponsibleParty.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultResponsibleParty.java?rev=1807787&r1=1807786&r2=1807787&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultResponsibleParty.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultResponsibleParty.java [UTF-8] Fri Sep  8 17:16:08 2017
@@ -127,7 +127,7 @@ public class DefaultResponsibleParty ext
 
     /**
      * Returns the name or the position of the first individual. If no individual is found in the list of parties,
-     * then this method will search in the list of organization members. The later structure is used by our NetCDF
+     * then this method will search in the list of organization members. The later structure is used by our netCDF
      * reader.
      *
      * @param  position {@code true} for returning the position name instead than individual name.

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGCP.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGCP.java?rev=1807787&r1=1807786&r2=1807787&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGCP.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGCP.java [UTF-8] Fri Sep  8 17:16:08 2017
@@ -30,7 +30,7 @@ import org.apache.sis.xml.Namespaces;
 /**
  * Information on ground control point.
  * Ground control points (GCP) are large marked targets on the ground,
- * not to be confused with <cite>localization grid</cite> points embedded in some file formats like GeoTIFF or NetCDF.
+ * not to be confused with <cite>localization grid</cite> points embedded in some file formats like GeoTIFF or netCDF.
  * The following property is mandatory in a well-formed metadata according ISO 19115:
  *
  * <div class="preformat">{@code MI_GCP}

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/MapProjectionDescriptor.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/MapProjectionDescriptor.java?rev=1807787&r1=1807786&r2=1807787&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/MapProjectionDescriptor.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/MapProjectionDescriptor.java [UTF-8] Fri Sep  8 17:16:08 2017
@@ -43,7 +43,7 @@ import org.apache.sis.util.Workaround;
  *       {@code "standard_parallel_1"} and {@code "standard_parallel_2"}</li>
  * </ul>
  *
- * The main purpose of this class is to support transparently the NetCDF ways to express some parameter values.
+ * The main purpose of this class is to support transparently the netCDF ways to express some parameter values.
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.6

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/MapProjectionParameters.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/MapProjectionParameters.java?rev=1807787&r1=1807786&r2=1807787&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/MapProjectionParameters.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/MapProjectionParameters.java [UTF-8] Fri Sep  8 17:16:08 2017
@@ -164,7 +164,7 @@ final class MapProjectionParameters exte
 
         /**
          * All names known to Apache SIS for the Earth radius parameter.
-         * This is used in some NetCDF files instead of {@code SEMI_MAJOR} and {@code SEMI_MINOR}.
+         * This is used in some netCDF files instead of {@code SEMI_MAJOR} and {@code SEMI_MINOR}.
          * This is not a standard parameter.
          */
         static final ParameterDescriptor<Double> DESCRIPTOR = new DefaultParameterDescriptor<>(
@@ -249,7 +249,7 @@ final class MapProjectionParameters exte
 
         /**
          * All names known to Apache SIS for the inverse flattening parameter.
-         * This is used in some NetCDF files instead of {@code SEMI_MINOR}.
+         * This is used in some netCDF files instead of {@code SEMI_MINOR}.
          * This is not a standard parameter.
          */
         static final ParameterDescriptor<Double> DESCRIPTOR = new DefaultParameterDescriptor<>(
@@ -433,7 +433,7 @@ final class MapProjectionParameters exte
 
         /**
          * All names known to Apache SIS for the standard parallels parameter, as an array of 1 or 2 elements.
-         * This is used in some NetCDF files instead of {@value Constants#STANDARD_PARALLEL_1} and
+         * This is used in some netCDF files instead of {@value Constants#STANDARD_PARALLEL_1} and
          * {@value Constants#STANDARD_PARALLEL_2}. This is not a standard parameter.
          */
         static final ParameterDescriptor<double[]> DESCRIPTOR = new DefaultParameterDescriptor<>(

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java?rev=1807787&r1=1807786&r2=1807787&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java [UTF-8] Fri Sep  8 17:16:08 2017
@@ -128,7 +128,7 @@ import org.apache.sis.util.resources.Err
  * </ul>
  *
  * <p>The main purpose of those dynamic parameters is to support some less commonly used conventions
- * without duplicating the most commonly used conventions. The alternative ways are used in NetCDF
+ * without duplicating the most commonly used conventions. The alternative ways are used in netCDF
  * files for example, which often use spherical models instead than ellipsoidal ones.</p>
  *
  *

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/Constants.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/Constants.java?rev=1807787&r1=1807786&r2=1807787&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/Constants.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/Constants.java [UTF-8] Fri Sep  8 17:16:08 2017
@@ -107,7 +107,7 @@ public final class Constants extends Sta
     public static final byte CRS1 = 1;
 
     /**
-     * The NetCDF parameter name for the Earth radius.
+     * The netCDF parameter name for the Earth radius.
      */
     public static final String EARTH_RADIUS = "earth_radius";
 
@@ -118,7 +118,7 @@ public final class Constants extends Sta
                                SEMI_MINOR = "semi_minor";
 
     /**
-     * The NetCDF parameter name for inverse flattening, and whether that parameter is definitive.
+     * The netCDF parameter name for inverse flattening, and whether that parameter is definitive.
      * The later is specific to SIS.
      */
     public static final String INVERSE_FLATTENING = "inverse_flattening",
@@ -135,7 +135,7 @@ public final class Constants extends Sta
     public static final String LATITUDE_OF_ORIGIN = "latitude_of_origin";
 
     /**
-     * The NetCDF parameter name for the standard parallels.
+     * The netCDF parameter name for the standard parallels.
      */
     public static final String STANDARD_PARALLEL = "standard_parallel";
 

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/measure/UnitFormat.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/measure/UnitFormat.java?rev=1807787&r1=1807786&r2=1807787&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/measure/UnitFormat.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/measure/UnitFormat.java [UTF-8] Fri Sep  8 17:16:08 2017
@@ -58,11 +58,11 @@ import org.apache.sis.util.iso.DefaultNa
  * then {@code "####"} is parsed as an integer and forwarded to the {@link Units#valueOfEPSG(int)} method.
  *
  * <div class="section">NetCDF unit symbols</div>
- * The attributes in NetCDF files often merge the axis direction with the angular unit,
+ * The attributes in netCDF files often merge the axis direction with the angular unit,
  * as in {@code "degrees_east"}, {@code "degrees_north"} or {@code "Degrees North"}.
  * This class ignores those suffixes and unconditionally returns {@link Units#DEGREE} for all axis directions.
  * In particular, the units for {@code "degrees_west"} and {@code "degrees_east"} do <strong>not</strong> have
- * opposite sign. It is caller responsibility to handle the direction of axes associated to NetCDF units.
+ * opposite sign. It is caller responsibility to handle the direction of axes associated to netCDF units.
  *
  * <div class="section">Multi-threading</div>
  * {@code UnitFormat} is generally not thread-safe.

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/measure/Units.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/measure/Units.java?rev=1807787&r1=1807786&r2=1807787&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/measure/Units.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/measure/Units.java [UTF-8] Fri Sep  8 17:16:08 2017
@@ -1619,12 +1619,12 @@ public final class Units extends Static
      * is parsed as an integer and forwarded to the {@link #valueOfEPSG(int)} method.
      *
      * <div class="section">NetCDF unit symbols</div>
-     * The attributes in NetCDF files often merge the axis direction with the angular unit,
+     * The attributes in netCDF files often merge the axis direction with the angular unit,
      * as in {@code "degrees_east"} or {@code "degrees_north"}. This {@code valueOf} method
      * ignores those suffixes and unconditionally returns {@link #DEGREE} for all axis directions.
      * In particular, the units for {@code "degrees_west"} and {@code "degrees_east"}
      * do <strong>not</strong> have opposite sign.
-     * It is caller responsibility to handle the direction of axes associated to NetCDF units.
+     * It is caller responsibility to handle the direction of axes associated to netCDF units.
      *
      * @param  uom  the symbol to parse, or {@code null}.
      * @return the parsed symbol, or {@code null} if {@code uom} was null.

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/CharSequences.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/CharSequences.java?rev=1807787&r1=1807786&r2=1807787&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/CharSequences.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/CharSequences.java [UTF-8] Fri Sep  8 17:16:08 2017
@@ -1200,7 +1200,7 @@ searchWordBreak:    while (true) {
      *
      *   <li>Next replace all occurrence of {@code '_'} by spaces in order to take in account
      *     an other common naming convention, which uses {@code '_'} as a word separator. This
-     *     convention is used by NetCDF attributes like {@code "project_name"}.</li>
+     *     convention is used by netCDF attributes like {@code "project_name"}.</li>
      *
      *   <li>Finally ensure that the first character is upper-case.</li>
      * </ol>

Modified: sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/measure/UnitsTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/measure/UnitsTest.java?rev=1807787&r1=1807786&r2=1807787&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/measure/UnitsTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/measure/UnitsTest.java [UTF-8] Fri Sep  8 17:16:08 2017
@@ -276,7 +276,7 @@ public final strictfp class UnitsTest ex
 
     /**
      * Tests {@link Units#valueOf(String)} with more advanced units.
-     * Those units are found in NetCDF files among others.
+     * Those units are found in netCDF files among others.
      */
     @Test
     public void testAdvancedValueOf() {

Modified: sis/branches/JDK8/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/pom.xml?rev=1807787&r1=1807786&r2=1807787&view=diff
==============================================================================
--- sis/branches/JDK8/pom.xml (original)
+++ sis/branches/JDK8/pom.xml Fri Sep  8 17:16:08 2017
@@ -459,7 +459,7 @@ Apache SIS is a free software, Java lang
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-jdk14</artifactId>
-        <version>1.7.7</version>                <!-- Must matches the version used by NetCDF. -->
+        <version>1.7.7</version>                <!-- Must matches the version used by netCDF. -->
         <scope>runtime</scope>                  <!-- Should never be needed at compile time.  -->
       </dependency>
     </dependencies>

Modified: sis/branches/JDK8/storage/sis-netcdf/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-netcdf/pom.xml?rev=1807787&r1=1807786&r2=1807787&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-netcdf/pom.xml (original)
+++ sis/branches/JDK8/storage/sis-netcdf/pom.xml Fri Sep  8 17:16:08 2017
@@ -38,11 +38,11 @@
   <groupId>org.apache.sis.storage</groupId>
   <artifactId>sis-netcdf</artifactId>
   <packaging>bundle</packaging>
-  <name>Apache SIS NetCDF storage</name>
+  <name>Apache SIS netCDF storage</name>
   <description>
   <!-- Left alignment because this description will be copied in META-INF/MANIFEST.MF
        The leading space after the first line is necessary for proper formatting. -->
-Bridge between NetCDF Climate and Forecast (CF) convention and ISO 19115 metadata.
+Bridge between netCDF Climate and Forecast (CF) convention and ISO 19115 metadata.
   </description>
 
 
@@ -153,7 +153,7 @@ Bridge between NetCDF Climate and Foreca
     </dependency>
   </dependencies>
 
-  <!--  UCAR repository from which to download the NetCDF library. -->
+  <!--  UCAR repository from which to download the netCDF library. -->
   <repositories>
     <repository>
       <id>UCAR</id>

Modified: sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Axis.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Axis.java?rev=1807787&r1=1807786&r2=1807787&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Axis.java [UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Axis.java [UTF-8] Fri Sep  8 17:16:08 2017
@@ -23,9 +23,9 @@ import org.apache.sis.storage.DataStoreE
 
 
 /**
- * Information about a coordinate system axes. In NetCDF files, all axes can be related to 1 or more dimensions
+ * Information about a coordinate system axes. In netCDF files, all axes can be related to 1 or more dimensions
  * of the grid domain. Those grid domain dimensions are specified by the {@link #sourceDimensions} array.
- * Whether the array length is 1 or 2 depends on whether the wrapped NetCDF axis is an instance of
+ * Whether the array length is 1 or 2 depends on whether the wrapped netCDF axis is an instance of
  * {@link ucar.nc2.dataset.CoordinateAxis1D} or {@link ucar.nc2.dataset.CoordinateAxis2D} respectively.
  *
  * @author  Martin Desruisseaux (Geomatys)
@@ -44,7 +44,7 @@ public final class Axis {
 
     /**
      * The indices of the grid dimension associated to this axis. The length of this array is often 1.
-     * But if more than one grid dimension is associated to this axis (i.e. if the wrapped NetCDF axis
+     * But if more than one grid dimension is associated to this axis (i.e. if the wrapped netCDF axis
      * is an instance of {@link ucar.nc2.dataset.CoordinateAxis2D}),  then the first value is the grid
      * dimension which seems most closely oriented toward this axis direction. We do that for allowing
      * {@code MetadataReader.addSpatialRepresentationInfo(…)} method to get the most appropriate value

Modified: sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/DataType.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/DataType.java?rev=1807787&r1=1807786&r2=1807787&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/DataType.java [UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/DataType.java [UTF-8] Fri Sep  8 17:16:08 2017
@@ -21,17 +21,17 @@ import org.apache.sis.util.Numbers;
 
 
 /**
- * The NetCDF type of data. Number of bits and endianness are same as in the Java language
+ * The netCDF type of data. Number of bits and endianness are same as in the Java language
  * except {@link #CHAR}, which is defined as an unsigned 8-bits value. This enumeration is
- * related to the NetCDF standard as below:
+ * related to the netCDF standard as below:
  *
  * <ul>
- *   <li>The NetCDF numerical code is the {@link #ordinal()}.</li>
+ *   <li>The netCDF numerical code is the {@link #ordinal()}.</li>
  *   <li>The CDL reserved word is the {@link #name()} is lower case,
  *       except for {@link #UNKNOWN} which is not a valid CDL type.</li>
  * </ul>
  *
- * The unsigned data types are not defined in NetCDF classical version. However those data types
+ * The unsigned data types are not defined in netCDF classical version. However those data types
  * can be inferred from their signed counterpart if the later have a {@code "_Unsigned = true"}
  * attribute associated to the variable.
  *
@@ -43,82 +43,82 @@ import org.apache.sis.util.Numbers;
  */
 public enum DataType {
     /**
-     * The enumeration for unknown data type. This is not a valid NetCDF type.
+     * The enumeration for unknown data type. This is not a valid netCDF type.
      */
     UNKNOWN(Numbers.OTHER, false, false, (byte) 0, DataBuffer.TYPE_UNDEFINED),
 
     /**
-     * 8 bits signed integer (NetCDF type 1).
-     * Can be made unsigned by assigning the “_Unsigned” attribute to a NetCDF variable.
+     * 8 bits signed integer (netCDF type 1).
+     * Can be made unsigned by assigning the “_Unsigned” attribute to a netCDF variable.
      */
     BYTE(Numbers.BYTE, true, false, (byte) 7, DataBuffer.TYPE_BYTE),
 
     /**
-     * Character type as unsigned 8 bits (NetCDF type 2).
-     * Encoding can be specified by assigning the “_Encoding” attribute to a NetCDF variable.
+     * Character type as unsigned 8 bits (netCDF type 2).
+     * Encoding can be specified by assigning the “_Encoding” attribute to a netCDF variable.
      */
     CHAR(Numbers.BYTE, false, true, (byte) 2, DataBuffer.TYPE_UNDEFINED),        // NOT Numbers.CHARACTER
 
     /**
-     * 16 bits signed integer (NetCDF type 3).
+     * 16 bits signed integer (netCDF type 3).
      */
     SHORT(Numbers.SHORT, true, false, (byte) 8, DataBuffer.TYPE_SHORT),
 
     /**
-     * 32 bits signed integer (NetCDF type 4).
+     * 32 bits signed integer (netCDF type 4).
      * This is also called "long", but that name is deprecated.
      */
     INT(Numbers.INTEGER, true, false, (byte) 9, DataBuffer.TYPE_INT),
 
     /**
-     * 32 bits floating point number (NetCDF type 5)
+     * 32 bits floating point number (netCDF type 5)
      * This is also called "real".
      */
     FLOAT(Numbers.FLOAT, false, false, (byte) 5, DataBuffer.TYPE_FLOAT),
 
     /**
-     * 64 bits floating point number (NetCDF type 6).
+     * 64 bits floating point number (netCDF type 6).
      */
     DOUBLE(Numbers.DOUBLE, false, false, (byte) 6, DataBuffer.TYPE_DOUBLE),
 
     /**
-     * 8 bits unsigned integer (NetCDF type 7).
-     * Not available in NetCDF classic format.
+     * 8 bits unsigned integer (netCDF type 7).
+     * Not available in netCDF classic format.
      */
     UBYTE(Numbers.BYTE, true, true, (byte) 1, DataBuffer.TYPE_BYTE),
 
     /**
-     * 16 bits unsigned integer (NetCDF type 8).
-     * Not available in NetCDF classic format.
+     * 16 bits unsigned integer (netCDF type 8).
+     * Not available in netCDF classic format.
      */
     USHORT(Numbers.SHORT, true, true, (byte) 3, DataBuffer.TYPE_USHORT),
 
     /**
-     * 43 bits unsigned integer (NetCDF type 9).
-     * Not available in NetCDF classic format.
+     * 43 bits unsigned integer (netCDF type 9).
+     * Not available in netCDF classic format.
      */
     UINT(Numbers.INTEGER, true, true, (byte) 4, DataBuffer.TYPE_INT),
 
     /**
-     * 64 bits signed integer (NetCDF type 10).
-     * Not available in NetCDF classic format.
+     * 64 bits signed integer (netCDF type 10).
+     * Not available in netCDF classic format.
      */
     INT64(Numbers.LONG, true, false, (byte) 11, DataBuffer.TYPE_UNDEFINED),
 
     /**
-     * 64 bits unsigned integer (NetCDF type 11).
-     * Not available in NetCDF classic format.
+     * 64 bits unsigned integer (netCDF type 11).
+     * Not available in netCDF classic format.
      */
     UINT64(Numbers.LONG, true, true, (byte) 10, DataBuffer.TYPE_UNDEFINED),
 
     /**
-     * Character string (NetCDF type 12).
-     * Not available in NetCDF classic format.
+     * Character string (netCDF type 12).
+     * Not available in netCDF classic format.
      */
     STRING(Numbers.OTHER, false, false, (byte) 12, DataBuffer.TYPE_UNDEFINED);
 
     /**
-     * Mapping from the NetCDF data type to the enumeration used by our {@link Numbers} class.
+     * Mapping from the netCDF data type to the enumeration used by our {@link Numbers} class.
      */
     public final byte number;
 
@@ -129,14 +129,14 @@ public enum DataType {
 
     /**
      * {@code false} for signed data type (the default), or {@code true} for unsigned data type.
-     * The OGC NetCDF standard version 1.0 does not define unsigned data types. However some data
+     * The OGC netCDF standard version 1.0 does not define unsigned data types. However some data
      * providers attach an {@code "_Unsigned = true"} attribute to the variable.
      */
     public final boolean isUnsigned;
 
     /**
-     * The NetCDF code of the data type of opposite sign convention.
-     * For example for the {@link #BYTE} data type, this is the NetCDF code of {@link #UBYTE}.
+     * The netCDF code of the data type of opposite sign convention.
+     * For example for the {@link #BYTE} data type, this is the netCDF code of {@link #UBYTE}.
      */
     private final byte opposite;
 
@@ -173,16 +173,16 @@ public enum DataType {
     }
 
     /**
-     * An array of all supported NetCDF data types ordered in such a way that
-     * {@code VALUES[codeNetCDF - 1]} is the enumeration value for a given NetCDF code.
+     * An array of all supported netCDF data types ordered in such a way that
+     * {@code VALUES[codeNetCDF - 1]} is the enumeration value for a given netCDF code.
      */
     private static final DataType[] VALUES = values();
 
     /**
-     * Returns the enumeration value for the given NetCDF code, or {@link #UNKNOWN} if the given code is unknown.
+     * Returns the enumeration value for the given netCDF code, or {@link #UNKNOWN} if the given code is unknown.
      *
-     * @param  code  the NetCDF code.
-     * @return enumeration value for the give NetCDF code.
+     * @param  code  the netCDF code.
+     * @return enumeration value for the give netCDF code.
      */
     public static DataType valueOf(final int code) {
         return (code >= 0 && code < VALUES.length) ? VALUES[code] : UNKNOWN;

Modified: sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Decoder.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Decoder.java?rev=1807787&r1=1807786&r2=1807787&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Decoder.java [UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Decoder.java [UTF-8] Fri Sep  8 17:16:08 2017
@@ -31,7 +31,7 @@ import org.apache.sis.util.logging.Warni
 
 
 /**
- * The API used internally by Apache SIS for fetching variables and attribute values from a NetCDF file.
+ * The API used internally by Apache SIS for fetching variables and attribute values from a netCDF file.
  *
  * <p>This {@code Decoder} class and subclasses are <strong>not</strong> thread-safe.
  * Synchronizations are caller's responsibility.</p>
@@ -91,7 +91,7 @@ public abstract class Decoder implements
     /**
      * Returns the path which is currently set. The array returned by this method may be only
      * a subset of the array given to {@link #setSearchPath(String[])} since only the name of
-     * groups which have been found in the NetCDF file are returned by this method.
+     * groups which have been found in the netCDF file are returned by this method.
      *
      * @return the current search path.
      */
@@ -212,7 +212,7 @@ public abstract class Decoder implements
     }
 
     /**
-     * Returns all variables found in the NetCDF file.
+     * Returns all variables found in the netCDF file.
      * This method may return a direct reference to an internal array - do not modify.
      *
      * @return all variables, or an empty array if none.
@@ -231,7 +231,7 @@ public abstract class Decoder implements
     public abstract DiscreteSampling[] getDiscreteSampling() throws IOException, DataStoreException;
 
     /**
-     * Returns all grid geometries (related to coordinate systems) found in the NetCDF file.
+     * Returns all grid geometries (related to coordinate systems) found in the netCDF file.
      * This method may return a direct reference to an internal array - do not modify.
      *
      * @return all grid geometries, or an empty array if none.

Modified: sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/DiscreteSampling.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/DiscreteSampling.java?rev=1807787&r1=1807786&r2=1807787&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/DiscreteSampling.java [UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/DiscreteSampling.java [UTF-8] Fri Sep  8 17:16:08 2017
@@ -26,8 +26,8 @@ import org.apache.sis.util.resources.Err
 
 
 /**
- * Returns the features encoded in the NetCDF files when they are encoded as discrete sampling.
- * The NetCDF attributes shall be conform to the "Discrete Sampling Geometries" chapter of
+ * Returns the features encoded in the netCDF files when they are encoded as discrete sampling.
+ * The netCDF attributes shall be conform to the "Discrete Sampling Geometries" chapter of
  * <a href="http://cfconventions.org/">CF conventions</a>. Some examples are trajectories
  * and profiles.
  *

Modified: sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/GridGeometry.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/GridGeometry.java?rev=1807787&r1=1807786&r2=1807787&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/GridGeometry.java [UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/GridGeometry.java [UTF-8] Fri Sep  8 17:16:08 2017
@@ -59,7 +59,7 @@ public abstract class GridGeometry {
      *
      * <p>This method is used mostly for producing ISO 19115 metadata. It is typically invoked only once.</p>
      *
-     * @return the CRS axes, in NetCDF order (reverse of "natural" order).
+     * @return the CRS axes, in netCDF order (reverse of "natural" order).
      * @throws IOException if an I/O operation was necessary but failed.
      * @throws DataStoreException if a logical error occurred.
      */
@@ -68,7 +68,7 @@ public abstract class GridGeometry {
     /**
      * Returns a coordinate for the given two-dimensional grid coordinate axis. This is (indirectly) a callback
      * method for {@link #getAxes()}. The (<var>i</var>, <var>j</var>) indices are grid indices <em>before</em>
-     * they get reordered by the {@link Axis} constructor. In the NetCDF UCAR API, this method maps directly to
+     * they get reordered by the {@link Axis} constructor. In the netCDF UCAR API, this method maps directly to
      * {@link ucar.nc2.dataset.CoordinateAxis2D#getCoordValue(int, int)}.
      *
      * @param  axis  an implementation-dependent object representing the two-dimensional axis, or {@code null} if none.

Modified: sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/NamedElement.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/NamedElement.java?rev=1807787&r1=1807786&r2=1807787&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/NamedElement.java [UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/NamedElement.java [UTF-8] Fri Sep  8 17:16:08 2017
@@ -25,7 +25,7 @@ import org.opengis.parameter.InvalidPara
 
 
 /**
- * Base class of NetCDF dimension, variable or attribute.
+ * Base class of netCDF dimension, variable or attribute.
  * All those objects share in common a {@link #getName()} method.
  *
  * @author  Martin Desruisseaux (Geomatys)

Modified: sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Resources.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Resources.java?rev=1807787&r1=1807786&r2=1807787&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Resources.java [UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Resources.java [UTF-8] Fri Sep  8 17:16:08 2017
@@ -59,7 +59,7 @@ public final class Resources extends Ind
         }
 
         /**
-         * Can not use UCAR library for NetCDF format. Fallback on Apache SIS implementation.
+         * Can not use UCAR library for netCDF format. Fallback on Apache SIS implementation.
          */
         public static final short CanNotUseUCAR = 4;
 

Modified: sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Resources.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Resources.properties?rev=1807787&r1=1807786&r2=1807787&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Resources.properties [ISO-8859-1] (original)
+++ sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Resources.properties [ISO-8859-1] Fri Sep  8 17:16:08 2017
@@ -19,7 +19,7 @@
 # Resources in this file are for "sis-netcdf" usage only and should not be used by any other module.
 # For resources shared by all modules in the Apache SIS project, see "org.apache.sis.util.resources" package.
 #
-CanNotUseUCAR                     = Can not use UCAR library for NetCDF format. Fallback on Apache SIS implementation.
+CanNotUseUCAR                     = Can not use UCAR library for netCDF format. Fallback on Apache SIS implementation.
 DimensionNotFound_3               = Dimension \u201c{2}\u201d declared by attribute \u201c{1}\u201d is not found in the \u201c{0}\u201d file.
 UnexpectedDimensionForVariable_4  = Variable \u201c{1}\u201d in file \u201c{0}\u201d has a dimension \u201c{3}\u201d while we expected \u201c{2}\u201d.
 VariableNotFound_2                = Variable \u201c{1}\u201d is not found in the \u201c{0}\u201d file.

Modified: sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Resources_fr.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Resources_fr.properties?rev=1807787&r1=1807786&r2=1807787&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Resources_fr.properties [ISO-8859-1] (original)
+++ sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Resources_fr.properties [ISO-8859-1] Fri Sep  8 17:16:08 2017
@@ -24,7 +24,7 @@
 #   U+202F NARROW NO-BREAK SPACE  before  ; ! and ?
 #   U+00A0 NO-BREAK SPACE         before  :
 #
-CanNotUseUCAR                     = Ne peut pas utiliser la biblioth\u00e8que de l\u2019UCAR pour le format NetCDF. L\u2019impl\u00e9mentation de Apache SIS sera utilis\u00e9e \u00e0 la place.
+CanNotUseUCAR                     = Ne peut pas utiliser la biblioth\u00e8que de l\u2019UCAR pour le format netCDF. L\u2019impl\u00e9mentation de Apache SIS sera utilis\u00e9e \u00e0 la place.
 DimensionNotFound_3               = La dimension \u00ab\u202f{2}\u202f\u00bb d\u00e9clar\u00e9e par l\u2019attribut \u00ab\u202f{1}\u202f\u00bb n\u2019a pas \u00e9t\u00e9 trouv\u00e9e dans le fichier \u00ab\u202f{0}\u202f\u00bb.
 UnexpectedDimensionForVariable_4  = La variable \u00ab\u202f{1}\u202f\u00bb dans le fichier \u00ab\u202f{0}\u202f\u00bb a une dimension \u00ab\u202f{3}\u202f\u00bb alors qu\u2019on attendait \u00ab\u202f{2}\u202f\u00bb.
 VariableNotFound_2                = La variable \u00ab\u202f{1}\u202f\u00bb n\u2019a pas \u00e9t\u00e9 trouv\u00e9e dans le fichier \u00ab\u202f{0}\u202f\u00bb.

Modified: sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Variable.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Variable.java?rev=1807787&r1=1807786&r2=1807787&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Variable.java [UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Variable.java [UTF-8] Fri Sep  8 17:16:08 2017
@@ -25,7 +25,7 @@ import org.apache.sis.util.Debug;
 
 
 /**
- * A NetCDF variable created by {@link Decoder}.
+ * A netCDF variable created by {@link Decoder}.
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @author  Johann Sorel (Geomatys)
@@ -129,28 +129,28 @@ public abstract class Variable extends N
 
     /**
      * Returns {@code true} if this variable seems to be a coordinate system axis instead than the actual data.
-     * By NetCDF convention, coordinate system axes have the name of one of the dimensions defined in the NetCDF header.
+     * By netCDF convention, coordinate system axes have the name of one of the dimensions defined in the netCDF header.
      *
      * @return {@code true} if this variable seems to be a coordinate system axis.
      */
     public abstract boolean isCoordinateSystemAxis();
 
     /**
-     * Returns the names of the dimensions of this variable, in the order they are declared in the NetCDF file.
+     * Returns the names of the dimensions of this variable, in the order they are declared in the netCDF file.
      * The dimensions are those of the grid, not the dimensions of the coordinate system.
      *
-     * @return the names of all dimension of the grid, in NetCDF order (reverse of "natural" order).
+     * @return the names of all dimension of the grid, in netCDF order (reverse of "natural" order).
      */
     public abstract String[] getGridDimensionNames();
 
     /**
-     * Returns the length (number of cells) of each grid dimension, in the order they are declared in the NetCDF file.
+     * Returns the length (number of cells) of each grid dimension, in the order they are declared in the netCDF file.
      * The length of this array shall be equals to the length of the {@link #getGridDimensionNames()} array.
      *
      * <p>In ISO 19123 terminology, this method returns the upper corner of the grid envelope plus one.
      * The lower corner is always (0, 0, …, 0).</p>
      *
-     * @return the number of grid cells for each dimension, in NetCDF order (reverse of "natural" order).
+     * @return the number of grid cells for each dimension, in netCDF order (reverse of "natural" order).
      */
     public abstract int[] getGridEnvelope();
 

Modified: sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/ChannelDecoder.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/ChannelDecoder.java?rev=1807787&r1=1807786&r2=1807787&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/ChannelDecoder.java [UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/ChannelDecoder.java [UTF-8] Fri Sep  8 17:16:08 2017
@@ -64,7 +64,7 @@ import java.time.DateTimeException;
 
 
 /**
- * Provides NetCDF decoding services as a standalone library.
+ * Provides netCDF decoding services as a standalone library.
  * The javadoc in this class uses the "file" word for the source of data, but
  * this implementation actually works with arbitrary {@link ReadableByteChannel}.
  *
@@ -79,7 +79,7 @@ import java.time.DateTimeException;
  */
 public final class ChannelDecoder extends Decoder {
     /**
-     * The NetCDF magic number expected in the first integer of the stream.
+     * The netCDF magic number expected in the first integer of the stream.
      * The comparison shall ignore the 8 lowest bits, as in the following example:
      *
      * {@preformat java
@@ -96,7 +96,7 @@ public final class ChannelDecoder extend
 
     /**
      * The encoding of dimension, variable and attribute names. This is fixed to {@value} by the
-     * NetCDF specification. Note however that the encoding of attribute values may be different.
+     * netCDF specification. Note however that the encoding of attribute values may be different.
      *
      * @see #encoding
      * @see #readName()
@@ -121,7 +121,7 @@ public final class ChannelDecoder extend
 
     /*
      * NOTE: the names of the static constants below this point match the names used in the Backus-Naur Form (BNF)
-     *       definitions in the NetCDF Classic and 64-bit Offset Format (1.0) specification (link in class javdoc),
+     *       definitions in the netCDF Classic and 64-bit Offset Format (1.0) specification (link in class javdoc),
      *       with NC_ prefix omitted. The types of those constants match the expected type in the file.
      */
 
@@ -160,7 +160,7 @@ public final class ChannelDecoder extend
 
     /**
      * The character encoding of attribute values. This encoding does <strong>not</strong> apply to
-     * dimension, variable and attribute names, which are fixed to UTF-8 as of NetCDF specification.
+     * dimension, variable and attribute names, which are fixed to UTF-8 as of netCDF specification.
      *
      * The specification said: "Although the characters used in netCDF names must be encoded as UTF-8,
      * character data may use other encodings. The variable attribute “_Encoding” is reserved for this
@@ -174,7 +174,7 @@ public final class ChannelDecoder extend
     private final String encoding = "ISO-8859-1";
 
     /**
-     * The variables found in the NetCDF file.
+     * The variables found in the netCDF file.
      *
      * @see #getVariables()
      */
@@ -186,7 +186,7 @@ public final class ChannelDecoder extend
     private final Map<String,VariableInfo> variableMap;
 
     /**
-     * The attributes found in the NetCDF file.
+     * The attributes found in the netCDF file.
      * Values in this map give directly the attribute value (there is no {@code Attribute} object).
      *
      * @see #findAttribute(String)
@@ -194,7 +194,7 @@ public final class ChannelDecoder extend
     private final Map<String,Object> attributeMap;
 
     /**
-     * All dimensions in the NetCDF files.
+     * All dimensions in the netCDF files.
      *
      * @see #readDimensions(int)
      * @see #findDimension(String)
@@ -216,7 +216,7 @@ public final class ChannelDecoder extend
      *   <li>Magic number:   'C','D','F'</li>
      *   <li>Version number: 1 or 2</li>
      *   <li>Number of records</li>
-     *   <li>List of NetCDF dimensions  (see {@link #readDimensions(int)})</li>
+     *   <li>List of netCDF dimensions  (see {@link #readDimensions(int)})</li>
      *   <li>List of global attributes  (see {@link #readAttributes(int)})</li>
      *   <li>List of variables          (see {@link #readVariables(int, Dimension[])})</li>
      * </ul>
@@ -225,7 +225,7 @@ public final class ChannelDecoder extend
      * @param  input      the channel and the buffer from where data are read.
      * @param  listeners  where to send the warnings.
      * @throws IOException if an error occurred while reading the channel.
-     * @throws DataStoreException if the content of the given channel is not a NetCDF file.
+     * @throws DataStoreException if the content of the given channel is not a netCDF file.
      */
     public ChannelDecoder(final ChannelDataInput input, final GeometryLibrary geomlib, final WarningListeners<DataStore> listeners)
             throws IOException, DataStoreException
@@ -238,7 +238,7 @@ public final class ChannelDecoder extend
          */
         int version = input.readInt();
         if ((version & 0xFFFFFF00) != MAGIC_NUMBER) {
-            throw new DataStoreContentException(errors().getString(Errors.Keys.UnexpectedFileFormat_2, "NetCDF", getFilename()));
+            throw new DataStoreContentException(errors().getString(Errors.Keys.UnexpectedFileFormat_2, "netCDF", getFilename()));
         }
         /*
          * Check the version number.
@@ -247,7 +247,7 @@ public final class ChannelDecoder extend
         switch (version) {
             case 1:  is64bits = false; break;
             case 2:  is64bits = true;  break;
-            default: throw new DataStoreContentException(errors().getString(Errors.Keys.UnsupportedFormatVersion_2, "NetCDF", version));
+            default: throw new DataStoreContentException(errors().getString(Errors.Keys.UnsupportedFormatVersion_2, "netCDF", version));
             // If more cases are added, remember to increment the MAX_VERSION constant.
         }
         numrecs = input.readInt();
@@ -309,7 +309,7 @@ public final class ChannelDecoder extend
     }
 
     /**
-     * Returns the NetCDF-specific resource bundle for the locale given by {@link WarningListeners#getLocale()}.
+     * Returns the netCDF-specific resource bundle for the locale given by {@link WarningListeners#getLocale()}.
      *
      * @return the localized error resource bundle.
      */
@@ -319,10 +319,10 @@ public final class ChannelDecoder extend
 
     /**
      * Returns an exception for a malformed header. This is used only after we have determined
-     * that the file should be a NetCDF one, but we found some inconsistency or unknown tags.
+     * that the file should be a netCDF one, but we found some inconsistency or unknown tags.
      */
     private DataStoreException malformedHeader() {
-        return new DataStoreContentException(listeners.getLocale(), "NetCDF", getFilename(), null);
+        return new DataStoreContentException(listeners.getLocale(), "netCDF", getFilename(), null);
     }
 
     /**
@@ -339,7 +339,7 @@ public final class ChannelDecoder extend
      * Aligns position in the stream after reading the given amount of bytes.
      * This method should be invoked only for {@link DataType#BYTE} and {@link DataType#CHAR}.
      *
-     * <p>The NetCDF format adds padding after bytes, characters and short integers in order to align the data
+     * <p>The netCDF format adds padding after bytes, characters and short integers in order to align the data
      * on multiple of 4 bytes. This method is used for adding such padding to the number of bytes to read.</p>
      *
      * @param  length   number of byte reads.
@@ -454,7 +454,7 @@ public final class ChannelDecoder extend
     }
 
     /**
-     * Reads dimensions from the NetCDF file header. The record structure is:
+     * Reads dimensions from the netCDF file header. The record structure is:
      *
      * <ul>
      *   <li>The dimension name     (use {@link #readName()})</li>
@@ -462,7 +462,7 @@ public final class ChannelDecoder extend
      * </ul>
      *
      * @param  nelems  the number of dimensions to read.
-     * @return the dimensions in the order they are declared in the NetCDF file.
+     * @return the dimensions in the order they are declared in the netCDF file.
      */
     private Dimension[] readDimensions(final int nelems) throws IOException, DataStoreException {
         final Dimension[] dimensions = new Dimension[nelems];
@@ -482,8 +482,8 @@ public final class ChannelDecoder extend
     }
 
     /**
-     * Reads attribute values from the NetCDF file header. Current implementation has no restriction on
-     * the location in the header where the NetCDF attribute can be declared. The record structure is:
+     * Reads attribute values from the netCDF file header. Current implementation has no restriction on
+     * the location in the header where the netCDF attribute can be declared. The record structure is:
      *
      * <ul>
      *   <li>The attribute name                             (use {@link #readName()})</li>
@@ -510,7 +510,7 @@ public final class ChannelDecoder extend
     }
 
     /**
-     * Reads information (not data) about all variables from the NetCDF file header.
+     * Reads information (not data) about all variables from the netCDF file header.
      * The current implementation requires the dimensions to be read before the variables.
      * The record structure is:
      *
@@ -572,7 +572,7 @@ public final class ChannelDecoder extend
 
 
     // --------------------------------------------------------------------------------------------
-    //  Decoder API begins below this point. Above code was specific to parsing of NetCDF header.
+    //  Decoder API begins below this point. Above code was specific to parsing of netCDF header.
     // --------------------------------------------------------------------------------------------
 
     /**
@@ -590,7 +590,7 @@ public final class ChannelDecoder extend
      * Defines the groups where to search for named attributes, in preference order.
      * The {@code null} group name stands for the global attributes.
      *
-     * <p>Current implementation does nothing, since the NetCDF binary files that {@code ChannelDecoder}
+     * <p>Current implementation does nothing, since the netCDF binary files that {@code ChannelDecoder}
      * can read do not have groups anyway. Future SIS implementations may honor the given group names if
      * groups support is added.</p>
      */
@@ -601,7 +601,7 @@ public final class ChannelDecoder extend
     /**
      * Returns the path which is currently set. The array returned by this method may be only
      * a subset of the array given to {@link #setSearchPath(String[])} since only the name of
-     * groups which have been found in the NetCDF file are returned by this method.
+     * groups which have been found in the netCDF file are returned by this method.
      *
      * @return {@inheritDoc}
      */
@@ -612,7 +612,7 @@ public final class ChannelDecoder extend
 
     /**
      * Returns the dimension of the given name (eventually ignoring case), or {@code null} if none.
-     * This method searches in all dimensions found in the NetCDF file, regardless of variables.
+     * This method searches in all dimensions found in the netCDF file, regardless of variables.
      * The search will ignore case only if no exact match is found for the given name.
      *
      * @param  dimName  the name of the dimension to search.
@@ -630,7 +630,7 @@ public final class ChannelDecoder extend
     }
 
     /**
-     * Returns the NetCDF variable of the given name, or {@code null} if none.
+     * Returns the netCDF variable of the given name, or {@code null} if none.
      *
      * @param  name  the name of the variable to search, or {@code null}.
      * @return the attribute value, or {@code null} if none.
@@ -648,7 +648,7 @@ public final class ChannelDecoder extend
     }
 
     /**
-     * Returns the NetCDF attribute of the given name, or {@code null} if none.
+     * Returns the netCDF attribute of the given name, or {@code null} if none.
      * The {@code name} argument is typically (but is not restricted to) one of the constants
      * defined in the {@link org.apache.sis.storage.netcdf.AttributeNames} class.
      *
@@ -751,7 +751,7 @@ public final class ChannelDecoder extend
     }
 
     /**
-     * Returns all variables found in the NetCDF file.
+     * Returns all variables found in the netCDF file.
      * This method returns a direct reference to an internal array - do not modify.
      *
      * @return {@inheritDoc}
@@ -780,7 +780,7 @@ public final class ChannelDecoder extend
     }
 
     /**
-     * Returns all grid geometries found in the NetCDF file.
+     * Returns all grid geometries found in the netCDF file.
      * This method returns a direct reference to an internal array - do not modify.
      *
      * @return {@inheritDoc}
@@ -793,7 +793,7 @@ public final class ChannelDecoder extend
              * First, find all variables which are used as coordinate system axis. The keys in the map are
              * the grid dimensions which are the domain of the variable (i.e. the sources of the conversion
              * from grid coordinates to CRS coordinates). For each key there is usually only one value, but
-             * we try to make this code robust to unusual NetCDF files.
+             * we try to make this code robust to unusual netCDF files.
              */
             final Map<Dimension, List<VariableInfo>> dimToAxes = new IdentityHashMap<>();
             for (final VariableInfo variable : variables) {

Modified: sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/Dimension.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/Dimension.java?rev=1807787&r1=1807786&r2=1807787&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/Dimension.java [UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/Dimension.java [UTF-8] Fri Sep  8 17:16:08 2017
@@ -21,9 +21,9 @@ import org.apache.sis.util.Debug;
 
 
 /**
- * A dimension in a NetCDF file. A dimension can been seen as an axis in the grid space
+ * A dimension in a netCDF file. A dimension can been seen as an axis in the grid space
  * (not the geodetic space). Dimension are referenced by their index in other parts of
- * the NetCDF file header.
+ * the netCDF file header.
  *
  * @author  Johann Sorel (Geomatys)
  * @author  Martin Desruisseaux (Geomatys)
@@ -54,7 +54,7 @@ final class Dimension extends NamedEleme
     }
 
     /**
-     * Returns the name of this NetCDF dimension.
+     * Returns the name of this netCDF dimension.
      */
     @Override
     public String getName() {

Modified: sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/FeaturesInfo.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/FeaturesInfo.java?rev=1807787&r1=1807786&r2=1807787&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/FeaturesInfo.java [UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/FeaturesInfo.java [UTF-8] Fri Sep  8 17:16:08 2017
@@ -50,7 +50,7 @@ import org.opengis.feature.AttributeType
 
 /**
  * Implementations of the discrete sampling features decoder. This implementation shall be able to decode at least the
- * NetCDF files encoded as specified in the OGC 16-114 (OGC Moving Features Encoding Extension: NetCDF) specification.
+ * netCDF files encoded as specified in the OGC 16-114 (OGC Moving Features Encoding Extension: netCDF) specification.
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.8
@@ -383,12 +383,12 @@ search: for (final VariableInfo counts :
 
         /**
          * Returns the characteristics of the iteration over feature instances.
-         * The iteration is assumed {@link #ORDERED} in the declaration order in the NetCDF file.
+         * The iteration is assumed {@link #ORDERED} in the declaration order in the netCDF file.
          * The iteration is {@link #NONNULL} (i.e. {@link #tryAdvance(Consumer)} is not allowed
          * to return null value) and {@link #IMMUTABLE} (i.e. we do not support modification of
-         * the NetCDF file while an iteration is in progress).
+         * the netCDF file while an iteration is in progress).
          *
-         * @return characteristics of iteration over the features in the NetCDF file.
+         * @return characteristics of iteration over the features in the netCDF file.
          */
         @Override
         public int characteristics() {

Modified: sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/GridGeometryInfo.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/GridGeometryInfo.java?rev=1807787&r1=1807786&r2=1807787&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/GridGeometryInfo.java [UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/GridGeometryInfo.java [UTF-8] Fri Sep  8 17:16:08 2017
@@ -28,9 +28,9 @@ import org.apache.sis.util.resources.Err
 
 
 /**
- * Description of a grid geometry found in a NetCDF file.
+ * Description of a grid geometry found in a netCDF file.
  *
- * <p>In this class, the words "domain" and "range" are used in the NetCDF sense: they are the input
+ * <p>In this class, the words "domain" and "range" are used in the netCDF sense: they are the input
  * (domain) and output (range) of the function that convert grid indices to geodetic coordinates.</p>
  *
  * @author  Martin Desruisseaux (Geomatys)
@@ -96,25 +96,25 @@ final class GridGeometryInfo extends Gri
     }
 
     /**
-     * Returns all axes of the NetCDF coordinate system, together with the grid dimension to which the axis
+     * Returns all axes of the netCDF coordinate system, together with the grid dimension to which the axis
      * is associated. See {@code org.apache.sis.internal.netcdf.ucar.GridGeometryWrapper.getAxes()} for a
      * closer look on the relationship between this algorithm and the UCAR library.
      *
-     * <p>In this method, the words "domain" and "range" are used in the NetCDF sense: they are the input
+     * <p>In this method, the words "domain" and "range" are used in the netCDF sense: they are the input
      * (domain) and output (range) of the function that convert grid indices to geodetic coordinates.</p>
      *
      * <p>The domain of all axes is often the same than the domain of the variable, but not necessarily.
      * In particular, the relationship is not straightforward when the coordinate system contains
      * "two-dimensional axes" (in {@link ucar.nc2.dataset.CoordinateAxis2D} sense).</p>
      *
-     * @return the CRS axes, in NetCDF order (reverse of "natural" order).
+     * @return the CRS axes, in netCDF order (reverse of "natural" order).
      * @throws IOException if an I/O operation was necessary but failed.
      * @throws DataStoreException if a logical error occurred.
      */
     @Override
     public Axis[] getAxes() throws IOException, DataStoreException {
         /*
-         * Process the variables in the order the appear in the sequence of bytes that make the NetCDF files.
+         * Process the variables in the order the appear in the sequence of bytes that make the netCDF files.
          * This is often the same order than the indices, but not necessarily. The intend is to reduce the
          * amount of disk seek operations.
          */
@@ -150,7 +150,7 @@ final class GridGeometryInfo extends Gri
             /*
              * Get the grid dimensions (part of the "domain" in UCAR terminology) used for computing
              * the ordinate values along the current axis. There is exactly 1 such grid dimension in
-             * straightforward NetCDF files. However some more complex files may have 2 dimensions.
+             * straightforward netCDF files. However some more complex files may have 2 dimensions.
              */
             int i = 0;
             final Dimension[] axisDomain = axis.dimensions;

Modified: sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/VariableInfo.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/VariableInfo.java?rev=1807787&r1=1807786&r2=1807787&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/VariableInfo.java [UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/VariableInfo.java [UTF-8] Fri Sep  8 17:16:08 2017
@@ -38,9 +38,9 @@ import org.apache.sis.math.Vector;
 
 
 /**
- * Description of a variable found in a NetCDF file.
+ * Description of a variable found in a netCDF file.
  * The natural ordering of {@code VariableInfo} is the order in which the variables appear in the stream of bytes
- * that make the NetCDF file. Reading variables in natural order reduces the amount of channel seek operations.
+ * that make the netCDF file. Reading variables in natural order reduces the amount of channel seek operations.
  *
  * @author  Johann Sorel (Geomatys)
  * @author  Martin Desruisseaux (Geomatys)
@@ -103,7 +103,7 @@ final class VariableInfo extends Variabl
     private final Map<String,Object> attributes;
 
     /**
-     * The NetCDF type of data, or {@code null} if unknown.
+     * The netCDF type of data, or {@code null} if unknown.
      */
     private final DataType dataType;
 
@@ -115,7 +115,7 @@ final class VariableInfo extends Variabl
 
     /**
      * {@code true} if this variable seems to be a coordinate system axis, as determined by comparing its name
-     * with the name of all dimensions in the NetCDF file. This information is computed at construction time
+     * with the name of all dimensions in the netCDF file. This information is computed at construction time
      * because requested more than once.
      *
      * @see #isCoordinateSystemAxis()
@@ -136,9 +136,9 @@ final class VariableInfo extends Variabl
      * @param  name        the variable name.
      * @param  dimensions  the dimensions of this variable.
      * @param  attributes  the attributes associates to the variable, or an empty map if none.
-     * @param  dataType    the NetCDF type of data, or {@code null} if unknown.
+     * @param  dataType    the netCDF type of data, or {@code null} if unknown.
      * @param  size        the variable size, used for verification purpose only.
-     * @param  offset      the offset where the variable data begins in the NetCDF file.
+     * @param  offset      the offset where the variable data begins in the netCDF file.
      */
     VariableInfo(final ChannelDataInput      input,
                  final String                name,
@@ -157,7 +157,7 @@ final class VariableInfo extends Variabl
         this.attributes = attributes;
         this.dataType   = dataType;
         /*
-         * The 'size' value is provided in the NetCDF files, but doesn't need to be stored since it
+         * The 'size' value is provided in the netCDF files, but doesn't need to be stored since it
          * is redundant with the dimension lengths and is not large enough for big variables anyway.
          */
         if (dataType != null && dataType.number >= Numbers.BYTE && dataType.number <= Numbers.DOUBLE) {
@@ -229,7 +229,7 @@ final class VariableInfo extends Variabl
 
     /**
      * Returns {@code true} if this variable seems to be a coordinate system axis,
-     * determined by comparing its name with the name of all dimensions in the NetCDF file.
+     * determined by comparing its name with the name of all dimensions in the netCDF file.
      */
     @Override
     public boolean isCoordinateSystemAxis() {
@@ -464,8 +464,8 @@ final class VariableInfo extends Variabl
     }
 
     /**
-     * Returns -1 if this variable is located before the other variable in the streal of bytes that make
-     * the NetCDF file, or +1 if it is located after.
+     * Returns -1 if this variable is located before the other variable in the stream of bytes that make
+     * the netCDF file, or +1 if it is located after.
      */
     @Override
     public int compareTo(final VariableInfo other) {

Modified: sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/package-info.java?rev=1807787&r1=1807786&r2=1807787&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/package-info.java [UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/package-info.java [UTF-8] Fri Sep  8 17:16:08 2017
@@ -17,7 +17,7 @@
 
 /**
  * Implementation of the {@link org.apache.sis.internal.netcdf} API as a standalone library.
- * This is useful only for the NetCDF binary format (no NcML, no GRIB, no BUFR).
+ * This is useful only for the netCDF binary format (no NcML, no GRIB, no BUFR).
  * This package works with channels instead than files, which is a little bit easier to use
  * in some environments.
  *

Modified: sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/package-info.java?rev=1807787&r1=1807786&r2=1807787&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/package-info.java [UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/package-info.java [UTF-8] Fri Sep  8 17:16:08 2017
@@ -16,9 +16,9 @@
  */
 
 /**
- * The API used internally by Apache SIS for fetching all data from NetCDF files.
+ * The API used internally by Apache SIS for fetching all data from netCDF files.
  * We use this API for isolating Apache SIS from the library used for reading the
- * NetCDF file: it can be either the UCAR library, or our own internal library.
+ * netCDF file: it can be either the UCAR library, or our own internal library.
  *
  * <p>We do not use systematically the UCAR library because it is quite large (especially when including
  * all dependencies) while SIS uses only a fraction of it. This is because the UCAR library provides some
@@ -27,13 +27,13 @@
  * its raw format, while the UCAR high level API provides the values converted by the offset and scale
  * factors.</p>
  *
- * <p>A side effect of this isolation layer is also to adapt NetCDF vocabulary to Apache SIS one.
- * For example what NetCDF calls <cite>"coordinate system"</cite> is actually a mix of what OGC/ISO
+ * <p>A side effect of this isolation layer is also to adapt netCDF vocabulary to Apache SIS one.
+ * For example what netCDF calls <cite>"coordinate system"</cite> is actually a mix of what OGC/ISO
  * specifications call <cite>"coordinate system"</cite>, <cite>"coordinate reference system"</cite>
- * and <cite>"grid geometry"</cite>. The NetCDF coordinate system <cite>"range"</cite> is closer to
- * ISO 19123 <cite>"domain"</cite>, the NetCDF coordinate system <cite>"domain"</cite> is closer to
+ * and <cite>"grid geometry"</cite>. The netCDF coordinate system <cite>"range"</cite> is closer to
+ * ISO 19123 <cite>"domain"</cite>, the netCDF coordinate system <cite>"domain"</cite> is closer to
  * ISO 19123 <cite>"grid envelope"</cite> and the ISO 19123 <cite>"range"</cite> is rather related
- * to the NetCDF variable minimum and maximum values. Trying to use OGC/ISO and NetCDF objects in
+ * to the netCDF variable minimum and maximum values. Trying to use OGC/ISO and netCDF objects in
  * the same code appears to be <strong>very</strong> confusing. This isolation layer allows our code
  * to use a more consistent vocabulary (compared to the rest of Apache SIS).</p>
  *

Modified: sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/DecoderWrapper.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/DecoderWrapper.java?rev=1807787&r1=1807786&r2=1807787&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/DecoderWrapper.java [UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/DecoderWrapper.java [UTF-8] Fri Sep  8 17:16:08 2017
@@ -51,7 +51,7 @@ import org.apache.sis.storage.DataStoreE
 
 
 /**
- * Provides NetCDF decoding services based on the NetCDF library.
+ * Provides netCDF decoding services based on the netCDF library.
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.8
@@ -60,7 +60,7 @@ import org.apache.sis.storage.DataStoreE
  */
 public final class DecoderWrapper extends Decoder implements CancelTask {
     /**
-     * The NetCDF file to read.
+     * The netCDF file to read.
      * This file is set at construction time.
      *
      * <p>This {@code DecoderWrapper} class does <strong>not</strong> close this file.
@@ -98,12 +98,12 @@ public final class DecoderWrapper extend
     private transient GridGeometry[] geometries;
 
     /**
-     * Creates a new decoder for the given NetCDF file. While this constructor accepts arbitrary
+     * Creates a new decoder for the given netCDF file. While this constructor accepts arbitrary
      * {@link NetcdfFile} instance, the {@link NetcdfDataset} subclass is necessary in order to
      * get coordinate system information.
      *
      * @param geomlib    the library for geometric objects, or {@code null} for the default.
-     * @param file       the NetCDF file from which to read data.
+     * @param file       the netCDF file from which to read data.
      * @param listeners  where to send the warnings.
      */
     public DecoderWrapper(final NetcdfFile file, final GeometryLibrary geomlib, final WarningListeners<DataStore> listeners) {
@@ -115,9 +115,9 @@ public final class DecoderWrapper extend
      * Creates a new decoder for the given filename.
      *
      * @param  geomlib    the library for geometric objects, or {@code null} for the default.
-     * @param  filename   the name of the NetCDF file from which to read data.
+     * @param  filename   the name of the netCDF file from which to read data.
      * @param  listeners  where to send the warnings.
-     * @throws IOException if an error occurred while opening the NetCDF file.
+     * @throws IOException if an error occurred while opening the netCDF file.
      */
     @SuppressWarnings("ThisEscapedInObjectConstruction")
     public DecoderWrapper(final String filename, final GeometryLibrary geomlib, final WarningListeners<DataStore> listeners)
@@ -172,7 +172,7 @@ public final class DecoderWrapper extend
     /**
      * Returns the path which is currently set. The array returned by this method may be only
      * a subset of the array given to {@link #setSearchPath(String[])} since only the name of
-     * groups which have been found in the NetCDF file are returned by this method.
+     * groups which have been found in the netCDF file are returned by this method.
      *
      * @return the current search path.
      */
@@ -199,7 +199,7 @@ public final class DecoderWrapper extend
     }
 
     /**
-     * Returns the NetCDF attribute of the given name in the given group, or {@code null} if none.
+     * Returns the netCDF attribute of the given name in the given group, or {@code null} if none.
      * This method is invoked for every global and group attributes to be read by this class (but
      * not {@linkplain ucar.nc2.VariableSimpleIF variable} attributes), thus providing a single point
      * where we can filter the attributes to be read - if we want to do that in a future version.
@@ -341,7 +341,7 @@ public final class DecoderWrapper extend
     }
 
     /**
-     * Returns all variables found in the NetCDF file.
+     * Returns all variables found in the netCDF file.
      * This method returns a direct reference to an internal array - do not modify.
      *
      * @return all variables, or an empty array if none.
@@ -389,7 +389,7 @@ public final class DecoderWrapper extend
     }
 
     /**
-     * Returns all grid geometries (related to coordinate systems) found in the NetCDF file.
+     * Returns all grid geometries (related to coordinate systems) found in the netCDF file.
      * This method returns a direct reference to an internal array - do not modify.
      *
      * @return all grid geometries, or an empty array if none.
@@ -417,7 +417,7 @@ public final class DecoderWrapper extend
     }
 
     /**
-     * Invoked by the UCAR NetCDF library for checking if the reading process has been canceled.
+     * Invoked by the UCAR netCDF library for checking if the reading process has been canceled.
      * This method returns the {@link #canceled} flag.
      *
      * @return the {@link #canceled} flag.
@@ -438,7 +438,7 @@ public final class DecoderWrapper extend
     }
 
     /**
-     * Invoked by the UCAR NetCDF library when an error occurred.
+     * Invoked by the UCAR netCDF library when an error occurred.
      *
      * @param  message  the error message.
      */
@@ -448,7 +448,7 @@ public final class DecoderWrapper extend
     }
 
     /**
-     * Closes the NetCDF file.
+     * Closes the netCDF file.
      *
      * @throws IOException if an error occurred while closing the file.
      */

Modified: sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/GridGeometryWrapper.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/GridGeometryWrapper.java?rev=1807787&r1=1807786&r2=1807787&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/GridGeometryWrapper.java [UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/GridGeometryWrapper.java [UTF-8] Fri Sep  8 17:16:08 2017
@@ -31,7 +31,7 @@ import org.apache.sis.util.ArraysExt;
 
 
 /**
- * Information about NetCDF coordinate system, which include information about grid geometries.
+ * Information about netCDF coordinate system, which include information about grid geometries.
  * In OGC/ISO specifications, the coordinate system and the grid geometries are distinct entities.
  * However the UCAR model takes a different point of view where the coordinate system holds some
  * of the grid geometry information.
@@ -43,14 +43,14 @@ import org.apache.sis.util.ArraysExt;
  */
 final class GridGeometryWrapper extends GridGeometry {
     /**
-     * The NetCDF coordinate system to wrap.
+     * The netCDF coordinate system to wrap.
      */
     private final CoordinateSystem netcdfCS;
 
     /**
-     * Creates a new grid geometry for the given NetCDF coordinate system.
+     * Creates a new grid geometry for the given netCDF coordinate system.
      *
-     * @param  cs  the NetCDF coordinate system, or {@code null} if none.
+     * @param  cs  the netCDF coordinate system, or {@code null} if none.
      */
     GridGeometryWrapper(final CoordinateSystem cs) {
         netcdfCS = cs;
@@ -77,10 +77,10 @@ final class GridGeometryWrapper extends
     }
 
     /**
-     * Returns all axes of the NetCDF coordinate system, together with the grid dimension to which the axis
+     * Returns all axes of the netCDF coordinate system, together with the grid dimension to which the axis
      * is associated.
      *
-     * <p>In this method, the words "domain" and "range" are used in the NetCDF sense: they are the input
+     * <p>In this method, the words "domain" and "range" are used in the netCDF sense: they are the input
      * (domain) and output (range) of the function that convert grid indices to geodetic coordinates.</p>
      *
      * <p>The domain of all axes (or the {@linkplain CoordinateSystem#getDomain() coordinate system domain})
@@ -88,7 +88,7 @@ final class GridGeometryWrapper extends
      * In particular, the relationship is not straightforward when the coordinate system contains instances
      * of {@link CoordinateAxis2D}.</p>
      *
-     * @return the CRS axes, in NetCDF order (reverse of "natural" order).
+     * @return the CRS axes, in netCDF order (reverse of "natural" order).
      * @throws IOException if an I/O operation was necessary but failed.
      * @throws DataStoreException if a logical error occurred.
      */
@@ -121,7 +121,7 @@ final class GridGeometryWrapper extends
             /*
              * Get the grid dimensions (part of the "domain" in UCAR terminology) used for computing
              * the ordinate values along the current axis. There is exactly 1 such grid dimension in
-             * straightforward NetCDF files. However some more complex files may have 2 dimensions.
+             * straightforward netCDF files. However some more complex files may have 2 dimensions.
              */
             int i = 0;
             final List<Dimension> axisDomain = axis.getDimensions();
@@ -135,7 +135,7 @@ final class GridGeometryWrapper extends
                 }
                 /*
                  * If the axis dimension has not been found in the coordinate system (sourceDim < 0),
-                 * then there is maybe a problem with the NetCDF file. However for the purpose of this
+                 * then there is maybe a problem with the netCDF file. However for the purpose of this
                  * package, we can proceed as if the dimension does not exist ('i' not incremented).
                  */
             }



Mime
View raw message