sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1807787 [2/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
Modified: sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/LogAdapter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/LogAdapter.java?rev=1807787&r1=1807786&r2=1807787&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/LogAdapter.java
[UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/LogAdapter.java
[UTF-8] Fri Sep  8 17:16:08 2017
@@ -22,7 +22,7 @@ import org.apache.sis.util.logging.Warni
 
 
 /**
- * Forwards NetCDF logging to the Apache SIS warning listeners.
+ * Forwards netCDF logging to the Apache SIS warning listeners.
  * NetCDF sends message to a user-specified {@link java.util.Formatter} with one message
per line.
  * This class intercepts the characters and send them to the {@link WarningListeners} every
time
  * that a complete line has been received.
@@ -34,7 +34,7 @@ import org.apache.sis.util.logging.Warni
  */
 final class LogAdapter implements Appendable {
     /**
-     * Temporary buffer where to append the NetCDF logging messages.
+     * Temporary buffer where to append the netCDF logging messages.
      */
     private final StringBuilder buffer = new StringBuilder();
 

Modified: sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/VariableWrapper.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/VariableWrapper.java?rev=1807787&r1=1807786&r2=1807787&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/VariableWrapper.java
[UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/VariableWrapper.java
[UTF-8] Fri Sep  8 17:16:08 2017
@@ -34,7 +34,7 @@ import org.apache.sis.storage.DataStoreC
 
 
 /**
- * A {@link Variable} backed by the UCAR NetCDF library.
+ * A {@link Variable} backed by the UCAR netCDF library.
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @author  Johann Sorel (Geomatys)
@@ -44,12 +44,12 @@ import org.apache.sis.storage.DataStoreC
  */
 final class VariableWrapper extends Variable {
     /**
-     * The NetCDF variable.
+     * The netCDF variable.
      */
     private final VariableIF variable;
 
     /**
-     * Creates a new variable wrapping the given NetCDF interface.
+     * Creates a new variable wrapping the given netCDF interface.
      */
     VariableWrapper(final VariableIF variable) {
         this.variable = variable;

Modified: sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/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/ucar/package-info.java
[UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/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 wrappers around the UCAR NetCDF library.
+ * as wrappers around the UCAR netCDF library.
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @version 0.8

Modified: sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/AttributeNames.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/AttributeNames.java?rev=1807787&r1=1807786&r2=1807787&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/AttributeNames.java
[UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/AttributeNames.java
[UTF-8] Fri Sep  8 17:16:08 2017
@@ -52,10 +52,10 @@ import org.opengis.metadata.extent.Geogr
 
 
 /**
- * Name of attributes used in the mapping from/to NetCDF metadata to ISO 19115 metadata.
+ * Name of attributes used in the mapping from/to netCDF metadata to ISO 19115 metadata.
  * The attributes recognized by SIS are listed below:
  *
- * <blockquote><table class="compact" summary="List of all NetCDF attributes.">
+ * <blockquote><table class="compact" summary="List of all netCDF attributes.">
  * <tr valign="top"><td style="width: 25%">
  * {@value     #ACCESS_CONSTRAINT}<br>
  * {@value     #ACKNOWLEDGEMENT}<br>
@@ -376,7 +376,7 @@ public class AttributeNames {
      * class and the other cells give the values assigned in this class fields for those
constants.
      *
      * <table class="sis">
-     * <caption>Names of NetCDF attributes describing a responsible party</caption>
+     * <caption>Names of netCDF attributes describing a responsible party</caption>
      * <tr>
      *   <th            >Field in this class</th>
      *   <th class="sep">{@link AttributeNames#CREATOR     CREATOR}</th>
@@ -419,7 +419,7 @@ public class AttributeNames {
      * For example {@code AttributeNames.CREATOR.EMAIL} maps exactly to the {@code "creator_email"}
string
      * and nothing else. A lower-case {@code email} member name could be misleading since
it would suggest
      * that the field contains the actual name value rather than the key by which the value
is identified
-     * in a NetCDF file.</div>
+     * in a netCDF file.</div>
      *
      * @author  Martin Desruisseaux (Geomatys)
      * @version 0.3
@@ -669,7 +669,7 @@ public class AttributeNames {
      * class and the other cells give the values assigned in this class fields for those
constants.
      *
      * <table class="sis">
-     * <caption>Names of NetCDF attributes describing an extent</caption>
+     * <caption>Names of netCDF attributes describing an extent</caption>
      * <tr>
      *   <th            >Field in this class</th>
      *   <th class="sep">{@link AttributeNames#LATITUDE  LATITUDE}</th>
@@ -725,7 +725,7 @@ public class AttributeNames {
      * For example {@code AttributeNames.LATITUDE.MINIMUM} maps exactly to the {@code "geospatial_lat_min"}
      * string and nothing else. A lower-case {@code minimum} member name could be misleading
since it would
      * suggest that the field contains the actual name value rather than the key by which
the value is
-     * identified in a NetCDF file.</div>
+     * identified in a netCDF file.</div>
      *
      * @author  Martin Desruisseaux (Geomatys)
      * @version 0.3
@@ -785,12 +785,12 @@ public class AttributeNames {
         /**
          * The default ISO-19115 dimension name type, or {@code null} if none.
          * By default, {@link DimensionNameType#COLUMN} is associated to longitudes and {@link
DimensionNameType#ROW}
-         * to latitudes since geographic maps in NetCDF files are typically shown horizontally.
+         * to latitudes since geographic maps in netCDF files are typically shown horizontally.
          *
          * <p>The default associations may not be always correct since the columns
and rows can be anything.
          * Strictly speaking, the dimension name types shall be associated to the <em>grid
axes</em> rather
          * than the <em>coordinate system axes</em>. However the default association
is correct in the common case
-         * (for NetCDF files) where there is no axis swapping in the <cite>grid to
CRS</cite> conversion.</p>
+         * (for netCDF files) where there is no axis swapping in the <cite>grid to
CRS</cite> conversion.</p>
          */
         public final DimensionNameType DEFAULT_NAME_TYPE;
 

Modified: sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java?rev=1807787&r1=1807786&r2=1807787&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java
[UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java
[UTF-8] Fri Sep  8 17:16:08 2017
@@ -78,7 +78,7 @@ import static org.apache.sis.internal.ut
 
 
 /**
- * Mapping from NetCDF metadata to ISO 19115-2 metadata. The {@link String} constants declared
in
+ * Mapping from netCDF metadata to ISO 19115-2 metadata. The {@link String} constants declared
in
  * the {@linkplain AttributeNames parent class} are the name of attributes examined by this
class.
  * The current implementation searches the attribute values in the following places, in that
order:
  *
@@ -144,7 +144,7 @@ final class MetadataReader extends Metad
     private static final VerticalCRS VERTICAL_CRS = null;
 
     /**
-     * The source of NetCDF attributes from which to infer ISO metadata.
+     * The source of netCDF attributes from which to infer ISO metadata.
      * This source is set at construction time.
      *
      * <p>This {@code MetadataReader} class does <strong>not</strong> close
this source.
@@ -168,7 +168,7 @@ final class MetadataReader extends Metad
      * more than once.
      *
      * <p>The point of contact is stored in the two following places. The semantic
of those two
-     * contacts is not strictly identical, but the distinction is not used in NetCDF file:</p>
+     * contacts is not strictly identical, but the distinction is not used in netCDF file:</p>
      *
      * <ul>
      *   <li>{@link DefaultMetadata#getContacts()}</li>
@@ -181,9 +181,9 @@ final class MetadataReader extends Metad
     private transient Responsibility pointOfContact;
 
     /**
-     * Creates a new <cite>NetCDF to ISO</cite> mapper for the given source.
+     * Creates a new <cite>netCDF to ISO</cite> mapper for the given source.
      *
-     * @param  decoder  the source of NetCDF attributes.
+     * @param  decoder  the source of netCDF attributes.
      */
     MetadataReader(final Decoder decoder) {
         this.decoder = decoder;
@@ -328,22 +328,22 @@ split:  while ((start = CharSequences.sk
     }
 
     /**
-     * Returns {@code true} if the given NetCDF attribute is either null or equals to the
+     * Returns {@code true} if the given netCDF attribute is either null or equals to the
      * string value of the given metadata value.
      *
      * @param metadata  The value stored in the metadata object.
-     * @param attribute The value parsed from the NetCDF file.
+     * @param attribute The value parsed from the netCDF file.
      */
     private static boolean canShare(final CharSequence metadata, final String attribute)
{
         return (attribute == null) || (metadata != null && metadata.toString().equals(attribute));
     }
 
     /**
-     * Returns {@code true} if the given NetCDF attribute is either null or equals to one
+     * Returns {@code true} if the given netCDF attribute is either null or equals to one
      * of the values in the given collection.
      *
      * @param  metadata   the value stored in the metadata object.
-     * @param  attribute  the value parsed from the NetCDF file.
+     * @param  attribute  the value parsed from the netCDF file.
      */
     private static boolean canShare(final Collection<String> metadata, final String
attribute) {
         return (attribute == null) || metadata.contains(attribute);
@@ -353,7 +353,7 @@ split:  while ((start = CharSequences.sk
      * Returns {@code true} if the given URL is null, or if the given resource contains that
URL.
      *
      * @param  resource  the value stored in the metadata object.
-     * @param  url       the value parsed from the NetCDF file.
+     * @param  url       the value parsed from the netCDF file.
      */
     private static boolean canShare(final OnlineResource resource, final String url) {
         return (url == null) || (resource != null && canShare(resource.getLinkage().toString(),
url));
@@ -363,7 +363,7 @@ split:  while ((start = CharSequences.sk
      * Returns {@code true} if the given email is null, or if the given address contains
that email.
      *
      * @param  address  the value stored in the metadata object.
-     * @param  email    the value parsed from the NetCDF file.
+     * @param  email    the value parsed from the netCDF file.
      */
     private static boolean canShare(final Address address, final String email) {
         return (email == null) || (address != null && canShare(address.getElectronicMailAddresses(),
email));
@@ -548,7 +548,7 @@ split:  while ((start = CharSequences.sk
             }
         }
         /*
-         * There is no distinction in NetCDF files between "point of contact" and "creator".
+         * There is no distinction in netCDF files between "point of contact" and "creator".
          * We take the first one as the data originator.
          */
         addCitedResponsibleParty(pointOfContact, Role.ORIGINATOR);
@@ -602,7 +602,7 @@ split:  while ((start = CharSequences.sk
             addSpatialRepresentation(forCodeName(SpatialRepresentationType.class, stringValue(DATA_TYPE)));
             if (!hasExtent) {
                 /*
-                 * Takes only ONE extent, because a NetCDF file may declare many time the
same
+                 * Takes only ONE extent, because a netCDF file may declare many time the
same
                  * extent with different precision. The groups are ordered in such a way
that
                  * the first extent should be the most accurate one.
                  */
@@ -629,7 +629,7 @@ split:  while ((start = CharSequences.sk
      * Adds information about axes and cell geometry.
      * This is the {@code <gmd:spatialRepresentationInfo>} element in XML.
      *
-     * @param  cs  the grid geometry (related to the NetCDF coordinate system).
+     * @param  cs  the grid geometry (related to the netCDF coordinate system).
      */
     private void addSpatialRepresentationInfo(final GridGeometry cs) throws IOException,
DataStoreException {
         final Axis[] axes = cs.getAxes();
@@ -637,7 +637,7 @@ split:  while ((start = CharSequences.sk
             final int dim = axes.length - i;
             final Axis axis = axes[--i];
             /*
-             * Axes usually have exactly one dimension. However some NetCDF axes are backed
by a two-dimensional
+             * Axes usually have exactly one dimension. However some netCDF axes are backed
by a two-dimensional
              * conversion grid. In such case, our Axis constructor should have ensured that
the first element in
              * the 'sourceDimensions' and 'sourceSizes' arrays are for the grid dimension
which is most closely
              * oriented toward the axis direction.
@@ -757,7 +757,7 @@ split:  while ((start = CharSequences.sk
     }
 
     /**
-     * Adds information about all NetCDF variables. This is the {@code <gmd:contentInfo>}
element in XML.
+     * Adds information about all netCDF variables. This is the {@code <gmd:contentInfo>}
element in XML.
      * This method groups variables by their domains, i.e. variables having the same set
of axes are grouped together.
      */
     private void addContentInfo() {
@@ -771,7 +771,7 @@ split:  while ((start = CharSequences.sk
         final String processingLevel = stringValue(PROCESSING_LEVEL);
         for (final List<Variable> group : contents.values()) {
             /*
-             * Instantiate a CoverageDescription for each distinct set of NetCDF dimensions
+             * Instantiate a CoverageDescription for each distinct set of netCDF dimensions
              * (e.g. longitude,latitude,time). This separation is based on the fact that
a
              * coverage has only one domain for every range of values.
              */
@@ -799,7 +799,7 @@ split:  while ((start = CharSequences.sk
      * Adds metadata about a sample dimension (or band) from the given variable.
      * This is the {@code <gmd:dimension>} element in XML.
      *
-     * @param  variable  the NetCDF variable.
+     * @param  variable  the netCDF variable.
      */
     private void addSampleDimension(final Variable variable) {
         newSampleDimension();
@@ -842,7 +842,7 @@ split:  while ((start = CharSequences.sk
      * <p><b>Note:</b> ISO 19115 range elements are approximatively equivalent
to
      * {@code org.apache.sis.coverage.Category} in the {@code sis-coverage} module.</p>
      *
-     * @param  variable  the NetCDF variable.
+     * @param  variable  the netCDF variable.
      * @param  name      one of the elements in the {@link AttributeNames#FLAG_NAMES} attribute,
or {@code null}.
      * @param  meaning   one of the elements in the {@link AttributeNames#FLAG_MEANINGS}
attribute or {@code null}.
      * @param  mask      one of the elements in the {@link AttributeNames#FLAG_MASKS} attribute
or {@code null}.
@@ -857,7 +857,7 @@ split:  while ((start = CharSequences.sk
     }
 
     /**
-     * Adds a globally unique identifier for the current NetCDF {@linkplain #decoder}.
+     * Adds a globally unique identifier for the current netCDF {@linkplain #decoder}.
      * The current implementation builds the identifier from the following attributes:
      *
      * <ul>
@@ -891,7 +891,7 @@ split:  while ((start = CharSequences.sk
     }
 
     /**
-     * Creates an ISO {@code Metadata} object from the information found in the NetCDF file.
+     * Creates an ISO {@code Metadata} object from the information found in the netCDF file.
      *
      * @return the ISO metadata object.
      * @throws IOException if an I/O operation was necessary but failed.
@@ -910,7 +910,7 @@ split:  while ((start = CharSequences.sk
         addContentInfo();
         /*
          * Add the dimension information, if any. This metadata node
-         * is built from the NetCDF CoordinateSystem objects.
+         * is built from the netCDF CoordinateSystem objects.
          */
         for (final GridGeometry cs : decoder.getGridGeometries()) {
             if (cs.getSourceDimensions() >= Variable.MIN_DIMENSION &&

Modified: sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/NetcdfStore.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/NetcdfStore.java?rev=1807787&r1=1807786&r2=1807787&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/NetcdfStore.java
[UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/NetcdfStore.java
[UTF-8] Fri Sep  8 17:16:08 2017
@@ -40,7 +40,7 @@ import ucar.nc2.constants.CDM;
 
 
 /**
- * A data store backed by NetCDF files.
+ * A data store backed by netCDF files.
  * Instances of this data store are created by {@link NetcdfStoreProvider#open(StorageConnector)}.
  *
  * @author  Martin Desruisseaux (Geomatys)
@@ -53,7 +53,7 @@ import ucar.nc2.constants.CDM;
  */
 public class NetcdfStore extends DataStore implements Aggregate {
     /**
-     * The object to use for decoding the NetCDF file content. There is two different implementations,
+     * The object to use for decoding the netCDF file content. There is two different implementations,
      * depending on whether we are using the embedded SIS decoder or a wrapper around the
UCAR library.
      */
     private final Decoder decoder;
@@ -76,12 +76,12 @@ public class NetcdfStore extends DataSto
     private List<Resource> components;
 
     /**
-     * Creates a new NetCDF store from the given file, URL, stream or {@link ucar.nc2.NetcdfFile}
object.
+     * Creates a new netCDF store from the given file, URL, stream or {@link ucar.nc2.NetcdfFile}
object.
      * This constructor invokes {@link StorageConnector#closeAllExcept(Object)}, keeping
open only the
      * needed resource.
      *
      * @param  connector information about the storage (URL, stream, {@link ucar.nc2.NetcdfFile}
instance, <i>etc</i>).
-     * @throws DataStoreException if an error occurred while opening the NetCDF file.
+     * @throws DataStoreException if an error occurred while opening the netCDF file.
      *
      * @deprecated Replaced by {@link #NetcdfStore(NetcdfStoreProvider, StorageConnector)}.
      */
@@ -91,13 +91,13 @@ public class NetcdfStore extends DataSto
     }
 
     /**
-     * Creates a new NetCDF store from the given file, URL, stream or {@link ucar.nc2.NetcdfFile}
object.
+     * Creates a new netCDF store from the given file, URL, stream or {@link ucar.nc2.NetcdfFile}
object.
      * This constructor invokes {@link StorageConnector#closeAllExcept(Object)}, keeping
open only the
      * needed resource.
      *
      * @param  provider   the factory that created this {@code DataStore} instance, or {@code
null} if unspecified.
      * @param  connector  information about the storage (URL, stream, {@link ucar.nc2.NetcdfFile}
instance, <i>etc</i>).
-     * @throws DataStoreException if an error occurred while opening the NetCDF file.
+     * @throws DataStoreException if an error occurred while opening the netCDF file.
      *
      * @since 0.8
      */
@@ -154,7 +154,7 @@ public class NetcdfStore extends DataSto
     }
 
     /**
-     * Returns the version number of the Climate and Forecast (CF) conventions used in the
NetCDF file.
+     * Returns the version number of the Climate and Forecast (CF) conventions used in the
netCDF file.
      * The use of CF convention is mandated by the OGC 11-165r2 standard
      * (<cite>CF-netCDF3 Data Model Extension standard</cite>).
      *
@@ -192,9 +192,9 @@ public class NetcdfStore extends DataSto
     }
 
     /**
-     * Closes this NetCDF store and releases any underlying resources.
+     * Closes this netCDF store and releases any underlying resources.
      *
-     * @throws DataStoreException if an error occurred while closing the NetCDF file.
+     * @throws DataStoreException if an error occurred while closing the netCDF file.
      */
     @Override
     public synchronized void close() throws DataStoreException {
@@ -207,10 +207,10 @@ public class NetcdfStore extends DataSto
     }
 
     /**
-     * Returns a string representation of this NetCDF store for debugging purpose.
+     * Returns a string representation of this netCDF store for debugging purpose.
      * The content of the string returned by this method may change in any future SIS version.
      *
-     * @return a string representation of this datastore for debugging purpose.
+     * @return a string representation of this data store for debugging purpose.
      */
     @Debug
     @Override

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=1807787&r1=1807786&r2=1807787&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] Fri Sep  8 17:16:08 2017
@@ -51,7 +51,7 @@ import org.apache.sis.util.Version;
 
 /**
  * The provider of {@link NetcdfStore} instances. Given a {@link StorageConnector} input,
- * this class tries to instantiate a {@code NetcdfStore} using the embedded NetCDF decoder.
+ * this class tries to instantiate a {@code NetcdfStore} using the embedded netCDF decoder.
  * If the embedded decoder can not decode the given input and the UCAR library is reachable
  * on the classpath, then this class tries to instantiate a {@code NetcdfStore} backed by
  * the UCAR library.
@@ -76,7 +76,7 @@ public class NetcdfStoreProvider extends
     static final String NAME = "NetCDF";
 
     /**
-     * The MIME type for NetCDF files.
+     * The MIME type for netCDF files.
      */
     static final String MIME_TYPE = "application/x-netcdf";
 
@@ -105,7 +105,7 @@ public class NetcdfStoreProvider extends
 
     /**
      * If the {@link #netcdfFileClass} has been found, then the {@link DecoderWrapper} constructor
receiving
-     * in argument the name of the NetCDF file as a {@link String} object. Otherwise {@code
null}.
+     * in argument the name of the netCDF file as a {@link String} object. Otherwise {@code
null}.
      */
     private static volatile Constructor<? extends Decoder> createFromPath;
 
@@ -260,7 +260,7 @@ public class NetcdfStoreProvider extends
      * @param  listeners  where to send the warnings.
      * @param  connector  information about the input (file, input stream, <i>etc.</i>)
      * @return the decoder for the given input, or {@code null} if the input type is not
recognized.
-     * @throws IOException if an error occurred while opening the NetCDF file.
+     * @throws IOException if an error occurred while opening the netCDF file.
      * @throws DataStoreException if a logical error (other than I/O) occurred.
      */
     static Decoder decoder(final WarningListeners<DataStore> listeners, final StorageConnector
connector)
@@ -291,17 +291,17 @@ public class NetcdfStoreProvider extends
     }
 
     /**
-     * Creates a new NetCDF decoder as a wrapper around the UCAR library. This decoder is
used only when we can
-     * not create our embedded NetCDF decoder. This method uses reflection for creating the
wrapper, in order
+     * Creates a new netCDF decoder as a wrapper around the UCAR library. This decoder is
used only when we can
+     * not create our embedded netCDF decoder. This method uses reflection for creating the
wrapper, in order
      * to keep the UCAR dependency optional.
      *
-     * @param  input      the NetCDF file object of filename string from which to read data.
+     * @param  input      the netCDF file object of filename string from which to read data.
      * @param  isUCAR     {@code true} if {@code input} is an instance of the UCAR {@link
ucar.nc2.NetcdfFile} object,
      *                    or {@code false} if it is the filename as a {@code String}.
      * @param  geomlib    the library for geometric objects, or {@code null} for the default.
      * @param  listeners  where to send the warnings.
      * @return the {@link DecoderWrapper} instance for the given input, or {@code null} if
the input type is not recognized.
-     * @throws IOException if an error occurred while opening the NetCDF file.
+     * @throws IOException if an error occurred while opening the netCDF file.
      * @throws DataStoreException if a logical error (other than I/O) occurred.
      */
     private static Decoder createByReflection(final Object input, final boolean isUCAR,
@@ -385,7 +385,7 @@ public class NetcdfStoreProvider extends
                      *
                      * ReflectiveOperationException should never happen because API compatibility
shall be verified
                      * by the JUnit tests. If it happen anyway  (for example because the
user puts on his classpath
-                     * a different version of the NetCDF library than the one we tested),
report a warning.
+                     * a different version of the netCDF library than the one we tested),
report a warning.
                      */
                     severity = Level.WARNING;
                     cause = e;

Modified: sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/package-info.java?rev=1807787&r1=1807786&r2=1807787&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/package-info.java
[UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/package-info.java
[UTF-8] Fri Sep  8 17:16:08 2017
@@ -17,7 +17,7 @@
 
 /**
  * Maps ISO metadata elements from/to the <a href="http://www.cfconventions.org">Climate
and Forecast (CF)</a>
- * attributes in a NetCDF file. The mapping is defined in the following web pages:
+ * attributes in a netCDF file. The mapping is defined in the following web pages:
  *
  * <ul>
  *   <li><a href="http://wiki.esipfed.org/index.php/Category:Attribute_Conventions_Dataset_Discovery">NetCDF
@@ -25,7 +25,7 @@
  *   <li><a href="https://github.com/Unidata/threddsIso/blob/master/src/main/resources/xsl/nciso/UnidataDD2MI.xsl">UnidataDD2MI.xsl</a>
file.</li>
  * </ul>
  *
- * The NetCDF attributes recognized by this package are listed in the
+ * The netCDF attributes recognized by this package are listed in the
  * {@link org.apache.sis.storage.netcdf.AttributeNames} class.
  *
  * <div class="section">Note on the definition of terms</div>
@@ -42,7 +42,7 @@
  *       but is rather related to <cite>grid envelope</cite>.</li>
  *   <li>ISO 19123 coverage <cite>domain</cite> is related to UCAR coordinate
system <cite>"range"</cite>.</li>
  *   <li>ISO 19123 coverage <cite>range</cite> is not equivalent to UCAR
<cite>"range"</cite>,
- *       but is rather related to the NetCDF variable's minimum and maximum values.</li>
+ *       but is rather related to the netCDF variable's minimum and maximum values.</li>
  * </ul>
  *
  * Care must be taken for avoiding confusion when using SIS and UCAR libraries together.

Modified: sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/DataTypeTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/DataTypeTest.java?rev=1807787&r1=1807786&r2=1807787&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/DataTypeTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/DataTypeTest.java
[UTF-8] Fri Sep  8 17:16:08 2017
@@ -32,7 +32,7 @@ import static org.junit.Assert.*;
  */
 public final strictfp class DataTypeTest extends TestCase {
     /**
-     * Verifies the relationship between the enumeration ordinal value and the NetCDF numerical
code.
+     * Verifies the relationship between the enumeration ordinal value and the netCDF numerical
code.
      */
     @Test
     public void testOrdinalValues() {

Modified: sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/TestCase.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/TestCase.java?rev=1807787&r1=1807786&r2=1807787&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/TestCase.java
[UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/TestCase.java
[UTF-8] Fri Sep  8 17:16:08 2017
@@ -36,7 +36,7 @@ import static org.junit.Assert.*;
 
 
 /**
- * Base class of NetCDF tests. Subclasses shall override the {@link #createDecoder(String)}.
+ * Base class of netCDF tests. Subclasses shall override the {@link #createDecoder(String)}.
  *
  * <p>This class is <strong>not</strong> thread safe - do not run subclasses
in parallel.</p>
  *
@@ -77,7 +77,7 @@ public abstract strictfp class TestCase
     /**
      * Returns {@code true} if the given supplemental formats (THREDDS, HDF5) is supported.
      * The default implementation returns {@code true} since the UCAR library supports all
-     * supplemental formats tested in this suite. Subclasses working only with the NetCDF
+     * supplemental formats tested in this suite. Subclasses working only with the netCDF
      * classic or 64-bits format can unconditionally returns {@code false}.
      *
      * @param  format  either {@code "THREDDS"} or {@code "HDF5"}.
@@ -93,9 +93,9 @@ public abstract strictfp class TestCase
      *
      * <ul>
      *   <li>{@link #THREDDS} for a NcML file.</li>
-     *   <li>{@link #NCEP}    for a NetCDF binary file.</li>
-     *   <li>{@link #CIP}     for a NetCDF binary file.</li>
-     *   <li>{@link #LANDSAT} for a NetCDF binary file.</li>
+     *   <li>{@link #NCEP}    for a netCDF binary file.</li>
+     *   <li>{@link #CIP}     for a netCDF binary file.</li>
+     *   <li>{@link #LANDSAT} for a netCDF binary file.</li>
      * </ul>
      *
      * The default implementation first delegates to {@link #open(String)}, then wraps the
result
@@ -140,7 +140,7 @@ public abstract strictfp class TestCase
 
     /**
      * Invoked after all tests in a class have been executed.
-     * This method closes all NetCDF files.
+     * This method closes all netCDF files.
      *
      * @throws IOException if an error occurred while closing a file.
      */
@@ -188,7 +188,7 @@ public abstract strictfp class TestCase
      *
      * @param  expected       the expected attribute value.
      * @param  attributeName  the name of the attribute to test.
-     * @throws IOException if an error occurred while reading the NetCDF file.
+     * @throws IOException if an error occurred while reading the netCDF file.
      */
     protected final void assertAttributeEquals(final String expected, final String attributeName)
throws IOException {
         assertEquals(attributeName, expected, decoder.stringValue(attributeName));
@@ -200,7 +200,7 @@ public abstract strictfp class TestCase
      *
      * @param  expected       the expected attribute value.
      * @param  attributeName  the name of the attribute to test.
-     * @throws IOException if an error occurred while reading the NetCDF file.
+     * @throws IOException if an error occurred while reading the netCDF file.
      */
     protected final void assertAttributeEquals(final Number expected, final String attributeName)
throws IOException {
         assertEquals(attributeName, expected, decoder.numericValue(attributeName));
@@ -212,7 +212,7 @@ public abstract strictfp class TestCase
      *
      * @param  expected       the expected attribute value.
      * @param  attributeName  the name of the attribute to test.
-     * @throws IOException if an error occurred while reading the NetCDF file.
+     * @throws IOException if an error occurred while reading the netCDF file.
      */
     protected final void assertAttributeEquals(final Date expected, final String attributeName)
throws IOException {
         assertEquals(attributeName, expected, decoder.dateValue(attributeName));

Modified: sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/VariableTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/VariableTest.java?rev=1807787&r1=1807786&r2=1807787&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/VariableTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/VariableTest.java
[UTF-8] Fri Sep  8 17:16:08 2017
@@ -164,7 +164,7 @@ public strictfp class VariableTest exten
     /**
      * Tests {@link Variable#read()} on a one-dimensional variable.
      *
-     * @throws IOException if an error occurred while reading the NetCDF file.
+     * @throws IOException if an error occurred while reading the netCDF file.
      * @throws DataStoreException if a logical error occurred.
      */
     @Test

Modified: sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/impl/ChannelDecoderTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/impl/ChannelDecoderTest.java?rev=1807787&r1=1807786&r2=1807787&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/impl/ChannelDecoderTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/impl/ChannelDecoderTest.java
[UTF-8] Fri Sep  8 17:16:08 2017
@@ -61,9 +61,9 @@ public final strictfp class ChannelDecod
      *
      * <ul>
      *   <li>{@link #THREDDS} for a NcML file.</li>
-     *   <li>{@link #NCEP}    for a NetCDF binary file.</li>
-     *   <li>{@link #CIP}     for a NetCDF binary file.</li>
-     *   <li>{@link #LANDSAT} for a NetCDF binary file.</li>
+     *   <li>{@link #NCEP}    for a netCDF binary file.</li>
+     *   <li>{@link #CIP}     for a netCDF binary file.</li>
+     *   <li>{@link #LANDSAT} for a netCDF binary file.</li>
      * </ul>
      *
      * @param  name  the file name as one of the above-cited constants.
@@ -81,7 +81,7 @@ public final strictfp class ChannelDecod
 
     /**
      * Unconditionally returns {@code false} since {@link ChannelDecoder}
-     * supports only the classic and 64 bits NetCDF formats.
+     * supports only the classic and 64 bits netCDF formats.
      *
      * @return {@code false}.
      */

Modified: sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/impl/GridGeometryInfoTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/impl/GridGeometryInfoTest.java?rev=1807787&r1=1807786&r2=1807787&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/impl/GridGeometryInfoTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/impl/GridGeometryInfoTest.java
[UTF-8] Fri Sep  8 17:16:08 2017
@@ -51,7 +51,7 @@ public final strictfp class GridGeometry
 
     /**
      * Unconditionally returns {@code false} since {@link ChannelDecoder}
-     * supports only the classic and 64 bits NetCDF formats.
+     * supports only the classic and 64 bits netCDF formats.
      *
      * @return {@code false}.
      */

Modified: sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/impl/VariableInfoTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/impl/VariableInfoTest.java?rev=1807787&r1=1807786&r2=1807787&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/impl/VariableInfoTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/impl/VariableInfoTest.java
[UTF-8] Fri Sep  8 17:16:08 2017
@@ -52,7 +52,7 @@ public final strictfp class VariableInfo
 
     /**
      * Unconditionally returns {@code false} since {@link ChannelDecoder}
-     * supports only the classic and 64 bits NetCDF formats.
+     * supports only the classic and 64 bits netCDF formats.
      *
      * @return {@code false}.
      */

Modified: sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/ConformanceTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/ConformanceTest.java?rev=1807787&r1=1807786&r2=1807787&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/ConformanceTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/ConformanceTest.java
[UTF-8] Fri Sep  8 17:16:08 2017
@@ -44,7 +44,7 @@ import static org.junit.Assert.*;
  * The tests are overridden in order to add some additional assertions for attributes not
parsed by
  * the GeoAPI demo code.
  *
- * <p>This tests uses the UCAR implementation for reading NetCDF attributes.
+ * <p>This tests uses the UCAR implementation for reading netCDF attributes.
  * For a test using the SIS embedded implementation, see {@link MetadataReaderTest}.</p>
  *
  * @author  Martin Desruisseaux (Geomatys)
@@ -55,7 +55,7 @@ import static org.junit.Assert.*;
 @DependsOn(MetadataReaderTest.class)
 public final strictfp class ConformanceTest extends NetcdfMetadataTest {
     /**
-     * Reads a metadata object from the given NetCDF file.
+     * Reads a metadata object from the given netCDF file.
      * This method is invoked by the tests inherited from the {@code geoapi-test} module.
      *
      * <div class="note"><b>Note:</b>
@@ -63,9 +63,9 @@ public final strictfp class ConformanceT
      * {@code NetcdfFile.findAttribute(String)} method calls. However in SIS implementation,
the metadata
      * object is fully created right at this method invocation time.</div>
      *
-     * @param  file the NetCDF file to wrap.
+     * @param  file  the netCDF file to wrap.
      * @return a metadata implementation created from the attributes found in the given file.
-     * @throws IOException if an error occurred while reading the given NetCDF file.
+     * @throws IOException if an error occurred while reading the given netCDF file.
      */
     @Override
     protected Metadata wrap(final NetcdfFile file) throws IOException {
@@ -140,7 +140,7 @@ public final strictfp class ConformanceT
     }
 
     /**
-     * Tests a NetCDF binary file. This method inherits the tests defined in GeoAPI,
+     * Tests a netCDF binary file. This method inherits the tests defined in GeoAPI,
      * and adds some additional tests for attributes parsed by SIS but not GeoAPI.
      *
      * @throws IOException if the test file can not be read.

Modified: sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/MetadataReaderTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/MetadataReaderTest.java?rev=1807787&r1=1807786&r2=1807787&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/MetadataReaderTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/MetadataReaderTest.java
[UTF-8] Fri Sep  8 17:16:08 2017
@@ -36,7 +36,7 @@ import static org.apache.sis.test.TestUt
 
 /**
  * Tests {@link MetadataReader}. This tests uses the SIS embedded implementation and the
UCAR library
- * for reading NetCDF attributes.
+ * for reading netCDF attributes.
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.8
@@ -58,7 +58,7 @@ public final strictfp class MetadataRead
     }
 
     /**
-     * Reads the metadata using the NetCDF decoder embedded with SIS,
+     * Reads the metadata using the netCDF decoder embedded with SIS,
      * and compares its string representation with the expected one.
      *
      * @throws IOException if an I/O error occurred while opening the file.

Modified: sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/NetcdfStoreProviderTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/NetcdfStoreProviderTest.java?rev=1807787&r1=1807786&r2=1807787&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/NetcdfStoreProviderTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/NetcdfStoreProviderTest.java
[UTF-8] Fri Sep  8 17:16:08 2017
@@ -48,7 +48,7 @@ import static org.opengis.test.Assert.*;
 public final strictfp class NetcdfStoreProviderTest extends IOTestCase {
     /**
      * Tests {@link NetcdfStoreProvider#probeContent(StorageConnector)} for an input stream
which shall
-     * be recognized as a classic NetCDF file.
+     * be recognized as a classic netCDF file.
      *
      * @throws DataStoreException if a logical error occurred.
      */
@@ -66,7 +66,7 @@ public final strictfp class NetcdfStoreP
     /**
      * Tests {@link NetcdfStoreProvider#probeContent(StorageConnector)} for a UCAR {@link
NetcdfFile} object.
      *
-     * @throws IOException if an error occurred while opening the NetCDF file.
+     * @throws IOException if an error occurred while opening the netCDF file.
      * @throws DataStoreException if a logical error occurred.
      */
     @Test
@@ -83,9 +83,9 @@ public final strictfp class NetcdfStoreP
 
     /**
      * Tests {@link NetcdfStoreProvider#decoder(WarningListeners, StorageConnector)} for
an input stream which
-     * shall be recognized as a classic NetCDF file. The provider shall instantiate a {@link
ChannelDecoder}.
+     * shall be recognized as a classic netCDF file. The provider shall instantiate a {@link
ChannelDecoder}.
      *
-     * @throws IOException if an error occurred while opening the NetCDF file.
+     * @throws IOException if an error occurred while opening the netCDF file.
      * @throws DataStoreException if a logical error occurred.
      */
     @Test
@@ -100,7 +100,7 @@ public final strictfp class NetcdfStoreP
      * Tests {@link NetcdfStoreProvider#decoder(WarningListeners, StorageConnector)} for
a UCAR
      * {@link NetcdfFile} object. The provider shall instantiate a {@link DecoderWrapper}.
      *
-     * @throws IOException if an error occurred while opening the NetCDF file.
+     * @throws IOException if an error occurred while opening the netCDF file.
      * @throws DataStoreException if a logical error occurred.
      */
     @Test

Modified: sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/NetcdfStoreTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/NetcdfStoreTest.java?rev=1807787&r1=1807786&r2=1807787&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/NetcdfStoreTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/NetcdfStoreTest.java
[UTF-8] Fri Sep  8 17:16:08 2017
@@ -41,10 +41,10 @@ import static org.opengis.test.Assert.*;
 })
 public final strictfp class NetcdfStoreTest extends IOTestCase {
     /**
-     * Returns a new NetCDF store to test.
+     * Returns a new netCDF store to test.
      *
      * @param  dataset the name of the datastore to load.
-     * @throws DataStoreException if an error occurred while reading the NetCDF file.
+     * @throws DataStoreException if an error occurred while reading the netCDF file.
      */
     private static NetcdfStore create(final String dataset) throws DataStoreException {
         return new NetcdfStore(null, new StorageConnector(IOTestCase.class.getResource(dataset)));
@@ -53,7 +53,7 @@ public final strictfp class NetcdfStoreT
     /**
      * Tests {@link NetcdfStore#getMetadata()}.
      *
-     * @throws DataStoreException if an error occurred while reading the NetCDF file.
+     * @throws DataStoreException if an error occurred while reading the netCDF file.
      */
     @Test
     public void testGetMetadata() throws DataStoreException {
@@ -68,7 +68,7 @@ public final strictfp class NetcdfStoreT
     /**
      * Tests {@link NetcdfStore#getConventionVersion()}.
      *
-     * @throws DataStoreException if an error occurred while reading the NetCDF file.
+     * @throws DataStoreException if an error occurred while reading the netCDF file.
      */
     @Test
     public void testGetConventionVersion() throws DataStoreException {



Mime
View raw message