sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1760671 - in /sis/branches/JDK8: core/sis-utility/src/main/java/org/apache/sis/util/ core/sis-utility/src/test/java/org/apache/sis/util/ storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ storage/sis-netcdf/src/main/java/org/...
Date Wed, 14 Sep 2016 11:02:46 GMT
Author: desruisseaux
Date: Wed Sep 14 11:02:45 2016
New Revision: 1760671

URL: http://svn.apache.org/viewvc?rev=1760671&view=rev
Log:
Javadoc formatting.

Modified:
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/Numbers.java
    sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/util/NumbersTest.java
    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/Decoder.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/Variable.java
    sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/Attribute.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/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/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/package-info.java

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/Numbers.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/Numbers.java?rev=1760671&r1=1760670&r2=1760671&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/Numbers.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/Numbers.java [UTF-8] Wed Sep 14 11:02:45 2016
@@ -137,9 +137,11 @@ public final class Numbers extends Stati
 
     /**
      * Returns {@code true} if the given {@code type} is a floating point type.
+     * The list of floating point types include primitive and wrapper classes of
+     * {@link Float} and {@link Double}, together with the {@link BigDecimal} class.
      *
      * @param  type  the type to test (may be {@code null}).
-     * @return {@code true} if {@code type} is the primitive or wrapper class of {@link Float} or {@link Double}.
+     * @return {@code true} if {@code type} is one of the known types capable to represent floating point numbers.
      *
      * @see #isInteger(Class)
      */
@@ -414,16 +416,18 @@ public final class Numbers extends Stati
                 final float  floatValue  = (float) doubleValue;
                 isFloat = (doubleToLongBits(floatValue) == doubleToLongBits(doubleValue));
                 if (doubleValue != longValue) {
-                    candidate = isFloat ? ((Number) Float   .valueOf(floatValue))
-                                        : ((Number) Numerics.valueOf(doubleValue));
+                    // Do not use "isFloat ? … : …" operator as it inserts undesired automatic auto-(un)boxing.
+                    if (isFloat) candidate = Float   .valueOf(floatValue);
+                    else         candidate = Numerics.valueOf(doubleValue);
                     break;
                 }
                 // Fall through everywhere.
             }
             case LONG: {
                 if (((int) longValue) != longValue) {
-                    candidate = isFloat ? ((Number) Float.valueOf((float) longValue))
-                                        : ((Number) Long.valueOf(longValue));
+                    // Do not use "isFloat ? … : …" operator as it inserts undesired automatic auto-(un)boxing.
+                    if (isFloat) candidate = Float.valueOf(longValue);
+                    else         candidate = Long .valueOf(longValue);
                     break;
                 }
             }

Modified: sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/util/NumbersTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/util/NumbersTest.java?rev=1760671&r1=1760670&r2=1760671&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/util/NumbersTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/util/NumbersTest.java [UTF-8] Wed Sep 14 11:02:45 2016
@@ -168,6 +168,7 @@ public final strictfp class NumbersTest
      * Tests {@link Numbers#narrowestNumber(Number)}.
      */
     @Test
+    @SuppressWarnings("UnnecessaryBoxing")
     public void testNarrowestNumber() {
         assertEquals(Byte   .valueOf((byte)   127),  narrowestNumber(    127.0));
         assertEquals(Short  .valueOf((short)  128),  narrowestNumber(    128.0));
@@ -186,6 +187,7 @@ public final strictfp class NumbersTest
      */
     @Test
     public void testCast() {
+        @SuppressWarnings("UnnecessaryBoxing")
         final Integer value = new Integer(10); // Intentionally a new instance.
         assertEquals(Byte   .valueOf((byte)   10), cast(value, Byte   .class));
         assertEquals(Short  .valueOf((short)  10), cast(value, Short  .class));

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=1760671&r1=1760670&r2=1760671&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] Wed Sep 14 11:02:45 2016
@@ -63,10 +63,10 @@ public final class Axis {
      * In the particular case where the number of dimensions is equals to 2, this
      * constructor will detects by itself which grid dimension varies fastest.
      *
-     * @param owner            Provides callback for the conversion from grid coordinates to geodetic coordinates.
-     * @param attributeNames   The attributes to use for fetching dimension information, or {@code null} if unknown.
-     * @param sourceDimensions The index of the grid dimension associated to this axis.
-     * @param sourceSizes      The number of cell elements along that axis.
+     * @param owner             provides callback for the conversion from grid coordinates to geodetic coordinates.
+     * @param attributeNames    the attributes to use for fetching dimension information, or {@code null} if unknown.
+     * @param sourceDimensions  the index of the grid dimension associated to this axis.
+     * @param sourceSizes       the number of cell elements along that axis.
      */
     public Axis(final GridGeometry owner, final AttributeNames.Dimension attributeNames,
             final int[] sourceDimensions, final int[] sourceSizes)

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=1760671&r1=1760670&r2=1760671&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] Wed Sep 14 11:02:45 2016
@@ -50,7 +50,7 @@ public abstract class Decoder implements
     /**
      * Creates a new decoder.
      *
-     * @param listeners Where to send the warnings.
+     * @param  listeners  where to send the warnings.
      */
     protected Decoder(final WarningListeners<?> listeners) {
         Objects.requireNonNull(listeners);
@@ -61,8 +61,8 @@ public abstract class Decoder implements
      * Defines the groups where to search for named attributes, in preference order.
      * The {@code null} group name stands for the global attributes.
      *
-     * @param  groupNames The name of the group where to search, in preference order.
-     * @throws IOException If an I/O operation was necessary but failed.
+     * @param  groupNames  the name of the group where to search, in preference order.
+     * @throws IOException if an I/O operation was necessary but failed.
      */
     public abstract void setSearchPath(final String... groupNames) throws IOException;
 
@@ -71,8 +71,8 @@ public abstract class Decoder implements
      * 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.
      *
-     * @return The current search path.
-     * @throws IOException If an I/O operation was necessary but failed.
+     * @return the current search path.
+     * @throws IOException if an I/O operation was necessary but failed.
      */
     public abstract String[] getSearchPath() throws IOException;
 
@@ -81,26 +81,26 @@ public abstract class Decoder implements
      * This method searches in the groups specified by the last call to {@link #setSearchPath(String[])}.
      * Null values and empty strings are ignored.
      *
-     * @param  name The name of the attribute to search, or {@code null}.
-     * @return The attribute value, or {@code null} if none or empty or if the given name was null.
-     * @throws IOException If an I/O operation was necessary but failed.
+     * @param  name  the name of the attribute to search, or {@code null}.
+     * @return the attribute value, or {@code null} if none or empty or if the given name was null.
+     * @throws IOException if an I/O operation was necessary but failed.
      */
     public abstract String stringValue(final String name) throws IOException;
 
     /**
      * Returns the value of the attribute of the given name as a number, or {@code null} if none.
      *
-     * @param  name The name of the attribute to search, or {@code null}.
-     * @return The attribute value, or {@code null} if none or unparsable or if the given name was null.
-     * @throws IOException If an I/O operation was necessary but failed.
+     * @param  name  the name of the attribute to search, or {@code null}.
+     * @return the attribute value, or {@code null} if none or unparsable or if the given name was null.
+     * @throws IOException if an I/O operation was necessary but failed.
      */
     public abstract Number numericValue(final String name) throws IOException;
 
     /**
      * Convenience method for {@link #numericValue(String)} implementation.
      *
-     * @param  value The attribute value to parse.
-     * @return The parsed attribute value, or {@code null} if the given value can not be parsed.
+     * @param  value  the attribute value to parse.
+     * @return the parsed attribute value, or {@code null} if the given value can not be parsed.
      */
     protected final Number parseNumber(String value) {
         final int s = value.indexOf(' ');
@@ -120,18 +120,18 @@ public abstract class Decoder implements
     /**
      * Returns the value of the attribute of the given name as a date, or {@code null} if none.
      *
-     * @param  name The name of the attribute to search, or {@code null}.
-     * @return The attribute value, or {@code null} if none or unparsable or if the given name was null.
-     * @throws IOException If an I/O operation was necessary but failed.
+     * @param  name  the name of the attribute to search, or {@code null}.
+     * @return the attribute value, or {@code null} if none or unparsable or if the given name was null.
+     * @throws IOException if an I/O operation was necessary but failed.
      */
     public abstract Date dateValue(final String name) throws IOException;
 
     /**
      * Returns the value of the attribute of the given name as a unit of measurement, or {@code null} if none.
      *
-     * @param  name The name of the attribute to search, or {@code null}.
-     * @return The attribute value, or {@code null} if none or unparsable or if the given name was null.
-     * @throws IOException If an I/O operation was necessary but failed.
+     * @param  name  the name of the attribute to search, or {@code null}.
+     * @return the attribute value, or {@code null} if none or unparsable or if the given name was null.
+     * @throws IOException if an I/O operation was necessary but failed.
      *
      * @todo Current Units.valueOf(String) implementation ignore direction in "degrees_east" or "degrees_west".
      *       We may need to take that in account (with "degrees_west" to "degrees_east" converter that reverse
@@ -151,10 +151,10 @@ public abstract class Decoder implements
      * Converts the given numerical values to date, using the information provided in the given unit symbol.
      * The unit symbol is typically a string like <cite>"days since 1970-01-01T00:00:00Z"</cite>.
      *
-     * @param  symbol The temporal unit name or symbol, followed by the epoch.
-     * @param  values The values to convert. May contains {@code null} elements.
-     * @return The converted values. May contains {@code null} elements.
-     * @throws IOException If an I/O operation was necessary but failed.
+     * @param  symbol  the temporal unit name or symbol, followed by the epoch.
+     * @param  values  the values to convert. May contains {@code null} elements.
+     * @return the converted values. May contains {@code null} elements.
+     * @throws IOException if an I/O operation was necessary but failed.
      */
     public abstract Date[] numberToDate(final String symbol, final Number... values) throws IOException;
 
@@ -163,8 +163,8 @@ public abstract class Decoder implements
      * {@link ucar.nc2.NetcdfFile#getId()} method for that purpose, which we will use when
      * possible in case that {@code getId()} method is defined in an other way.
      *
-     * @return The global dataset identifier, or {@code null} if none.
-     * @throws IOException If an I/O operation was necessary but failed.
+     * @return the global dataset identifier, or {@code null} if none.
+     * @throws IOException if an I/O operation was necessary but failed.
      */
     public String getId() throws IOException {
         return stringValue("_Id");
@@ -175,8 +175,8 @@ public abstract class Decoder implements
      * {@link ucar.nc2.NetcdfFile#getTitle()} method for that purpose, which we will use when
      * possible in case that {@code getTitle()} method is defined in an other way.
      *
-     * @return The dataset title, or {@code null} if none.
-     * @throws IOException If an I/O operation was necessary but failed.
+     * @return the dataset title, or {@code null} if none.
+     * @throws IOException if an I/O operation was necessary but failed.
      */
     public String getTitle() throws IOException {
         return stringValue("_Title");
@@ -186,8 +186,8 @@ public abstract class Decoder implements
      * 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.
-     * @throws IOException If an I/O operation was necessary but failed.
+     * @return all variables, or an empty array if none.
+     * @throws IOException if an I/O operation was necessary but failed.
      */
     public abstract Variable[] getVariables() throws IOException;
 
@@ -195,8 +195,8 @@ public abstract class Decoder implements
      * 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.
-     * @throws IOException If an I/O operation was necessary but failed.
+     * @return all grid geometries, or an empty array if none.
+     * @throws IOException if an I/O operation was necessary but failed.
      */
     public abstract GridGeometry[] getGridGeometries() throws IOException;
 }

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=1760671&r1=1760670&r2=1760671&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] Wed Sep 14 11:02:45 2016
@@ -36,7 +36,7 @@ public abstract class GridGeometry {
      * Returns the number of dimensions in the grid.
      * This is the number of dimensions of source coordinates in the <cite>"grid to CRS"</cite> transform.
      *
-     * @return Number of grid dimensions.
+     * @return number of grid dimensions.
      */
     public abstract int getSourceDimensions();
 
@@ -45,7 +45,7 @@ public abstract class GridGeometry {
      * This is the number of dimensions of target coordinates in the <cite>"grid to CRS"</cite> transform.
      * It should also be equal to the size of the list returned by {@link #getAxes()}.
      *
-     * @return Number of CRS dimensions.
+     * @return number of CRS dimensions.
      */
     public abstract int getTargetDimensions();
 
@@ -53,7 +53,7 @@ public abstract class GridGeometry {
      * Returns the axes of the coordinate reference system. The size of this list is expected equals to the
      * value returned by {@link #getTargetDimensions()}, however the caller should be robust to inconsistencies.
      *
-     * @return The CRS axes, in NetCDF order (reverse of "natural" order).
+     * @return the CRS axes, in NetCDF order (reverse of "natural" order).
      */
     public abstract Axis[] getAxes();
 
@@ -62,9 +62,9 @@ public abstract class GridGeometry {
      * This is a callback method for {@link #getAxes()}. In the NetCDF UCAR API, this method maps directly
      * to {@link ucar.nc2.dataset.CoordinateAxis2D#getCoordValue(int, int)}.
      *
-     * @param  j The fastest varying (right-most) index.
-     * @param  i The slowest varying (left-most) index.
-     * @return The coordinate at the given index, or {@link Double#NaN} if it can not be computed.
+     * @param  j  the fastest varying (right-most) index.
+     * @param  i  the slowest varying (left-most) index.
+     * @return the coordinate at the given index, or {@link Double#NaN} if it can not be computed.
      */
     protected abstract double coordinateForCurrentAxis(final int j, final int i);
 }

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=1760671&r1=1760670&r2=1760671&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] Wed Sep 14 11:02:45 2016
@@ -57,28 +57,28 @@ public abstract class Variable {
     /**
      * Returns the name of this variable, or {@code null} if none.
      *
-     * @return The name of this variable, or {@code null}.
+     * @return the name of this variable, or {@code null}.
      */
     public abstract String getName();
 
     /**
      * Returns the description of this variable, or {@code null} if none.
      *
-     * @return The description of this variable, or {@code null}.
+     * @return the description of this variable, or {@code null}.
      */
     public abstract String getDescription();
 
     /**
      * Returns the unit of measurement as a string, or {@code null} if none.
      *
-     * @return The unit of measurement, or {@code null}.
+     * @return the unit of measurement, or {@code null}.
      */
     public abstract String getUnitsString();
 
     /**
      * Returns the variable data type, as a primitive type if possible.
      *
-     * @return The variable data type, or {@code null} if unknown.
+     * @return the variable data type, or {@code null} if unknown.
      */
     public abstract Class<?> getDataType();
 
@@ -87,7 +87,7 @@ public abstract class Variable {
      * followed by the span of each dimension (in unit of grid cells) between brackets.
      * Example: {@code "short[180][360]"}.
      *
-     * @return The name of the variable data type.
+     * @return the name of the variable data type.
      */
     public final String getDataTypeName() {
         final StringBuilder buffer = new StringBuilder(20);
@@ -107,7 +107,7 @@ public abstract class Variable {
      * This is the value to be returned by {@link java.awt.image.SampleModel#getDataType()} for the Java2D rasters
      * created from this variable data.
      *
-     * @return The Java2D data type, or {@link DataBuffer#TYPE_UNDEFINED} if this variable data type
+     * @return the Java2D data type, or {@link DataBuffer#TYPE_UNDEFINED} if this variable data type
      *         can not be mapped to a Java2D data type.
      */
     public final int getRasterDataType() {
@@ -148,7 +148,7 @@ public abstract class Variable {
      *       with images.</li>
      * </ul>
      *
-     * @param  minSpan Minimal span (in unit of grid cells) along the dimensions.
+     * @param  minSpan minimal span (in unit of grid cells) along the dimensions.
      * @return {@code true} if the variable can be considered a coverage.
      */
     public final boolean isCoverage(final int minSpan) {
@@ -176,7 +176,7 @@ public abstract class Variable {
      * 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();
 
@@ -187,7 +187,7 @@ public abstract class Variable {
      * <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();
 
@@ -205,7 +205,7 @@ public abstract class Variable {
     /**
      * Reads all the data for this variable and returns them as an array of a Java primitive type.
      *
-     * @return The data as an array of a Java primitive type.
+     * @return the data as an array of a Java primitive type.
      * @throws IOException if an error occurred while reading the data.
      * @throws DataStoreException if a logical error occurred.
      */
@@ -221,10 +221,10 @@ public abstract class Variable {
      *       to {@code Integer.toUnsignedLong(getGridEnvelope()[i])} exclusive.</li>
      * </ul>
      *
-     * @param  areaLower   Index of the first value to read along each dimension.
-     * @param  areaUpper   Index after the last value to read along each dimension.
-     * @param  subsampling Sub-sampling along each dimension. 1 means no sub-sampling.
-     * @return The data as an array of a Java primitive type.
+     * @param  areaLower    index of the first value to read along each dimension.
+     * @param  areaUpper    index after the last value to read along each dimension.
+     * @param  subsampling  sub-sampling along each dimension. 1 means no sub-sampling.
+     * @return the data as an array of a Java primitive type.
      * @throws IOException if an error occurred while reading the data.
      * @throws DataStoreException if a logical error occurred.
      */
@@ -233,7 +233,7 @@ public abstract class Variable {
     /**
      * Returns a string representation of this variable for debugging purpose.
      *
-     * @return A string representation of this variable.
+     * @return a string representation of this variable.
      */
     @Debug
     @Override

Modified: sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/Attribute.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/Attribute.java?rev=1760671&r1=1760670&r2=1760671&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/Attribute.java [UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/Attribute.java [UTF-8] Wed Sep 14 11:02:45 2016
@@ -57,8 +57,8 @@ final class Attribute {
     /**
      * Creates a new attribute of the given name and value.
      *
-     * @param name  The attribute name (can not be null).
-     * @param value The value (trimmed if a {@code String}).
+     * @param  name   the attribute name (can not be null).
+     * @param  value  the value (trimmed if a {@code String}).
      */
     Attribute(final String name, final Object value) {
         this.name  = name;
@@ -108,8 +108,8 @@ final class Attribute {
      * For example missing minutes or seconds fields are automatically added. The intend is to turn
      * a NetCDF date into something parseable by {@code java.util.time} or {@code javax.xml.bind}.
      *
-     * @param  date The date to parse, or {@code null}.
-     * @return The date modified if needed or {@code null} if the given string was {@code null}.
+     * @param  date  the date to parse, or {@code null}.
+     * @return the date modified if needed or {@code null} if the given string was {@code null}.
      *
      * @since 0.5 (derived from 0.3)
      */
@@ -168,7 +168,7 @@ final class Attribute {
             int indexOfLastDigit = 0;
             for (int i=modified.length(); --i >= 0;) {
                 char c = modified.charAt(i);
-                final boolean isDigit = (c >= '0' && c <= '9'); // Do not use Character.isDigit(char).
+                final boolean isDigit = (c >= '0' && c <= '9');         // Do not use Character.isDigit(char).
                 if (indexOfLastDigit == 0) {
                     // We were not scaning a number. Check if we are now starting doing so.
                     if (isDigit) {

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=1760671&r1=1760670&r2=1760671&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] Wed Sep 14 11:02:45 2016
@@ -187,10 +187,10 @@ public final class ChannelDecoder extend
      * Creates a new decoder for the given file.
      * This constructor parses immediately the header.
      *
-     * @param  listeners Where to send the warnings.
-     * @param  input     The channel and the buffer from where data are read.
-     * @throws IOException If an error occurred while reading the channel.
-     * @throws DataStoreException If the content of the given channel is not a NetCDF file.
+     * @param  listeners  where to send the warnings.
+     * @param  input      the channel and the buffer from where data are read.
+     * @throws IOException if an error occurred while reading the channel.
+     * @throws DataStoreException if the content of the given channel is not a NetCDF file.
      */
     public ChannelDecoder(final WarningListeners<?> listeners, final ChannelDataInput input)
             throws IOException, DataStoreException
@@ -244,9 +244,9 @@ public final class ChannelDecoder extend
     /**
      * Return the localized name of the given tag.
      *
-     * @param  tag One of {@link #DIMENSION}, {@link #VARIABLE} or {@link #ATTRIBUTE} constants.
-     * @return The localized name of the given tag, or its hexadecimal number if the given value is not
-     *         one of the expected constants.
+     * @param  tag  one of {@link #DIMENSION}, {@link #VARIABLE} or {@link #ATTRIBUTE} constants.
+     * @return the localized name of the given tag, or its hexadecimal number if the given value
+     *         is not one of the expected constants.
      */
     private static String tagName(final int tag) {
         final short key;
@@ -262,7 +262,7 @@ public final class ChannelDecoder extend
     /**
      * Returns the localized error resource bundle for the locale given by {@link #getLocale()}.
      *
-     * @return The localized error resource bundle.
+     * @return the localized error resource bundle.
      */
     private Errors errors() {
         return Errors.getResources(listeners.getLocale());
@@ -295,10 +295,10 @@ public final class ChannelDecoder extend
      * <p>The NetCDF format add padding after bytes, characters and short integers in order to align
      * the data on multiple of 4 bytes. This method adds such padding to the number of bytes to read.</p>
      *
-     * @param  n        The number of elements to read.
-     * @param  dataSize The size of each element, in bytes.
-     * @param  name     The name of the element to read, used only in case of error for formatting the message.
-     * @return The number of bytes to read, rounded to the next multiple of 4.
+     * @param  n         the number of elements to read.
+     * @param  dataSize  the size of each element, in bytes.
+     * @param  name      the name of the element to read, used only in case of error for formatting the message.
+     * @return the number of bytes to read, rounded to the next multiple of 4.
      */
     private int ensureBufferContains(final int n, final int dataSize, String name) throws IOException, DataStoreException {
         // (n+3) & ~3  is a trick for rounding 'n' to the next multiple of 4.
@@ -344,7 +344,7 @@ public final class ChannelDecoder extend
      * <p>If the value is a {@code String}, then leading and trailing spaces and control characters have been trimmed
      * by {@link String#trim()}.</p>
      *
-     * @return The value, or {@code null} if it was an empty string or an empty array.
+     * @return the value, or {@code null} if it was an empty string or an empty array.
      */
     private Object readValues(final String name, final int type, final int length) throws IOException, DataStoreException {
         if (length == 0) {
@@ -406,8 +406,8 @@ public final class ChannelDecoder extend
      *   <li>The dimension length   (use {@link #readInt()})</li>
      * </ul>
      *
-     * @param nelems The number of dimensions to read.
-     * @return The dimensions in the order they are declared in the NetCDF file.
+     * @param  nelems  the number of dimensions to read.
+     * @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];
@@ -439,7 +439,7 @@ public final class ChannelDecoder extend
      * If the value is a {@code String}, then leading and trailing spaces and control characters
      * have been trimmed by {@link String#trim()}.
      *
-     * @param nelems The number of attributes to read.
+     * @param  nelems  the number of attributes to read.
      */
     private Attribute[] readAttributes(final int nelems) throws IOException, DataStoreException {
         final Attribute[] attributes = new Attribute[nelems];
@@ -471,8 +471,8 @@ public final class ChannelDecoder extend
      *   <li>Offset where data begins   (use {@link #readOffset()})</li>
      * </ul>
      *
-     * @param nelems     The number of variables to read.
-     * @param dimensions The dimensions previously read by {@link #readDimensions(int)}.
+     * @param  nelems      the number of variables to read.
+     * @param  dimensions  the dimensions previously read by {@link #readDimensions(int)}.
      */
     private VariableInfo[] readVariables(final int nelems, final Dimension[] dimensions)
             throws IOException, DataStoreException
@@ -524,11 +524,11 @@ public final class ChannelDecoder extend
      * <p>Code searching in the returned map shall ask for the original (non lower-case) name
      * <strong>before</strong> to ask for the lower-cases version of that name.</p>
      *
-     * @param  <E>          The type of elements.
-     * @param  elements     The elements to store in the map, or {@code null} if none.
-     * @param  nameFunction The function for computing a name from an element.
-     * @return A (<cite>name</cite>, <cite>element</cite>) mapping with lower cases entries where possible.
-     * @throws DataStoreException If the same name is used for more than one element.
+     * @param  <E>           the type of elements.
+     * @param  elements      the elements to store in the map, or {@code null} if none.
+     * @param  nameFunction  the function for computing a name from an element.
+     * @return a (<cite>name</cite>, <cite>element</cite>) mapping with lower cases entries where possible.
+     * @throws DataStoreException if the same name is used for more than one element.
      *
      * @see #findAttribute(String)
      */
@@ -578,8 +578,8 @@ public final class ChannelDecoder extend
      * The {@code name} argument is typically (but is not restricted too) one of
      * the constants defined in the {@link AttributeNames} class.
      *
-     * @param  name The name of the attribute to search, or {@code null}.
-     * @return The attribute, or {@code null} if none.
+     * @param  name  the name of the attribute to search, or {@code null}.
+     * @return the attribute, or {@code null} if none.
      */
     private Attribute findAttribute(final String name) {
         Attribute attribute = attributeMap.get(name);
@@ -595,8 +595,8 @@ public final class ChannelDecoder extend
     /**
      * Returns the value for the attribute of the given name, or {@code null} if none.
      *
-     * @param  name The name of the attribute to search, or {@code null}.
-     * @return The attribute value, or {@code null} if none or empty or if the given name was null.
+     * @param  name  the name of the attribute to search, or {@code null}.
+     * @return the attribute value, or {@code null} if none or empty or if the given name was null.
      * @throws IOException {@inheritDoc}
      */
     @Override
@@ -651,8 +651,8 @@ public final class ChannelDecoder extend
      * Converts the given numerical values to date, using the information provided in the given unit symbol.
      * The unit symbol is typically a string like <cite>"days since 1970-01-01T00:00:00Z"</cite>.
      *
-     * @param  values The values to convert. May contains {@code null} elements.
-     * @return The converted values. May contains {@code null} elements.
+     * @param  values  the values to convert. May contains {@code null} elements.
+     * @return the converted values. May contains {@code null} elements.
      * @throws IOException {@inheritDoc}
      */
     @Override
@@ -753,7 +753,7 @@ nextVar:    for (final VariableInfo vari
     /**
      * Closes the channel.
      *
-     * @throws IOException If an error occurred while closing the channel.
+     * @throws IOException if an error occurred while closing the channel.
      */
     @Override
     public void close() throws IOException {

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=1760671&r1=1760670&r2=1760671&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] Wed Sep 14 11:02:45 2016
@@ -44,8 +44,8 @@ final class Dimension {
     /**
      * Creates a new dimension of the given name and length.
      *
-     * @param name   The dimension name.
-     * @param length The number of grid cell value along this dimension, as an unsigned number.
+     * @param name    the dimension name.
+     * @param length  the number of grid cell value along this dimension, as an unsigned number.
      */
     Dimension(final String name, final int length) {
         this.name   = name;

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=1760671&r1=1760670&r2=1760671&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] Wed Sep 14 11:02:45 2016
@@ -62,8 +62,8 @@ final class GridGeometryInfo extends Gri
     /**
      * Constructs a new grid geometry information.
      *
-     * @param domain Describes the input values of the "grid to CRS" conversion.
-     * @param range  The output values of the "grid to CRS" conversion.
+     * @param  domain  describes the input values of the "grid to CRS" conversion.
+     * @param  range   the output values of the "grid to CRS" conversion.
      */
     GridGeometryInfo(final Dimension[] domain, final VariableInfo[] range) {
         this.domain = domain;

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=1760671&r1=1760670&r2=1760671&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] Wed Sep 14 11:02:45 2016
@@ -138,14 +138,14 @@ final class VariableInfo extends Variabl
     /**
      * Creates a new variable.
      *
-     * @param input         The channel together with a buffer for reading the variable data.
-     * @param name          The variable name.
-     * @param dimensions    The dimensions of this variable.
-     * @param allDimensions All dimensions in the NetCDF files.
-     * @param attributes    The attributes associates to the variable, or an empty map if none.
-     * @param dataType      The type of data, as one of the {@code BYTE} and similar constants defined in this class.
-     * @param size          The variable size, used for verification purpose only.
-     * @param offset        The offset where the variable data begins in the NetCDF file.
+     * @param  input          the channel together with a buffer for reading the variable data.
+     * @param  name           the variable name.
+     * @param  dimensions     the dimensions of this variable.
+     * @param  allDimensions  all dimensions in the NetCDF files.
+     * @param  attributes     the attributes associates to the variable, or an empty map if none.
+     * @param  dataType       the type of data, as one of the {@code BYTE} and similar constants defined in this class.
+     * @param  size           the variable size, used for verification purpose only.
+     * @param  offset         the offset where the variable data begins in the NetCDF file.
      */
     VariableInfo(final ChannelDataInput input, final String name,
             final Dimension[] dimensions, final Dimension[] allDimensions,
@@ -279,7 +279,7 @@ final class VariableInfo extends Variabl
      * Returns the length (number of cells) of each grid dimension. In ISO 19123 terminology, this method
      * returns the upper corner of the grid envelope plus one. The lower corner is always (0,0,…,0).
      *
-     * @return The number of grid cells for each dimension, as unsigned integers.
+     * @return the number of grid cells for each dimension, as unsigned integers.
      */
     @Override
     public int[] getGridEnvelope() {
@@ -332,10 +332,10 @@ final class VariableInfo extends Variabl
     /**
      * Reads a sub-sampled sub-area of the variable.
      *
-     * @param  areaLower   Index of the first value to read along each dimension, as unsigned integers.
-     * @param  areaUpper   Index after the last value to read along each dimension, as unsigned integers.
-     * @param  subsampling Sub-sampling along each dimension. 1 means no sub-sampling.
-     * @return The data as an array of a Java primitive type.
+     * @param  areaLower    index of the first value to read along each dimension, as unsigned integers.
+     * @param  areaUpper    index after the last value to read along each dimension, as unsigned integers.
+     * @param  subsampling  sub-sampling along each dimension. 1 means no sub-sampling.
+     * @return the data as an array of a Java primitive type.
      */
     @Override
     public Object read(int[] areaLower, int[] areaUpper, int[] subsampling) throws IOException, DataStoreException {

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=1760671&r1=1760670&r2=1760671&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] Wed Sep 14 11:02:45 2016
@@ -30,7 +30,7 @@
  * @author  Johann Sorel (Geomatys)
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.3
- * @version 0.3
+ * @version 0.8
  * @module
  */
 package org.apache.sis.internal.netcdf.impl;

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=1760671&r1=1760670&r2=1760671&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] Wed Sep 14 11:02:45 2016
@@ -35,11 +35,11 @@
  * 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
  * the same code appears to be <strong>very</strong> confusing. This isolation layer allows our code
- * use a more consistent vocabulary (compared to the rest of Apache SIS).</p>
+ * to use a more consistent vocabulary (compared to the rest of Apache SIS).</p>
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @since   0.3
- * @version 0.3
+ * @version 0.8
  * @module
  */
 package org.apache.sis.internal.netcdf;

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=1760671&r1=1760670&r2=1760671&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] Wed Sep 14 11:02:45 2016
@@ -87,8 +87,8 @@ public final class DecoderWrapper extend
      * {@link NetcdfFile} instance, the {@link NetcdfDataset} subclass is necessary in order to
      * get coordinate system information.
      *
-     * @param listeners Where to send the warnings.
-     * @param file The NetCDF file from which to read data.
+     * @param listeners  where to send the warnings.
+     * @param file       the NetCDF file from which to read data.
      */
     public DecoderWrapper(final WarningListeners<?> listeners, final NetcdfFile file) {
         super(listeners);
@@ -98,9 +98,9 @@ public final class DecoderWrapper extend
     /**
      * Creates a new decoder for the given filename.
      *
-     * @param  listeners Where to send the warnings.
-     * @param  filename  The name of the NetCDF file from which to read data.
-     * @throws IOException If an error occurred while opening the NetCDF file.
+     * @param  listeners  where to send the warnings.
+     * @param  filename   the name of the NetCDF file from which to read data.
+     * @throws IOException if an error occurred while opening the NetCDF file.
      */
     public DecoderWrapper(final WarningListeners<?> listeners, final String filename) throws IOException {
         super(listeners);
@@ -119,7 +119,7 @@ public final class DecoderWrapper extend
             if (name != null) {
                 final Group group = file.findGroup(name);
                 if (group == null) {
-                    continue; // Group not found - do not increment the counter.
+                    continue;                   // Group not found - do not increment the counter.
                 }
                 groups[count] = group;
             }
@@ -133,7 +133,7 @@ public final class DecoderWrapper extend
      * 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.
      *
-     * @return The current search path.
+     * @return the current search path.
      */
     @Override
     public String[] getSearchPath() {
@@ -156,9 +156,9 @@ public final class DecoderWrapper extend
      * <p>The {@code name} argument is typically (but is not restricted too) one of the constants
      * defined in the {@link AttributeNames} class.</p>
      *
-     * @param  group The group in which to search the attribute, or {@code null} for global attributes.
-     * @param  name  The name of the attribute to search (can not be null).
-     * @return The attribute, or {@code null} if none.
+     * @param  group  the group in which to search the attribute, or {@code null} for global attributes.
+     * @param  name   the name of the attribute to search (can not be null).
+     * @return the attribute, or {@code null} if none.
      */
     private Attribute findAttribute(final Group group, final String name) {
         return (group != null) ? group.findAttributeIgnoreCase(name) : file.findGlobalAttributeIgnoreCase(name);
@@ -169,12 +169,12 @@ public final class DecoderWrapper extend
      * This method searches in the groups specified by the last call to {@link #setSearchPath(String[])}.
      * Null values and empty strings are ignored.
      *
-     * @param  name The name of the attribute to search, or {@code null}.
-     * @return The attribute value, or {@code null} if none or empty or if the given name was null.
+     * @param  name  the name of the attribute to search, or {@code null}.
+     * @return the attribute value, or {@code null} if none or empty or if the given name was null.
      */
     @Override
     public String stringValue(final String name) {
-        if (name != null) { // For createResponsibleParty(...) convenience.
+        if (name != null) {                                 // For createResponsibleParty(...) convenience.
             for (final Group group : groups) {
                 final Attribute attribute = findAttribute(group, name);
                 if (attribute != null && attribute.isString()) {
@@ -191,8 +191,8 @@ public final class DecoderWrapper extend
     /**
      * Returns the value of the attribute of the given name as a number, or {@code null} if none.
      *
-     * @param  name The name of the attribute to search, or {@code null}.
-     * @return The attribute value, or {@code null} if none or unparsable or if the given name was null.
+     * @param  name  the name of the attribute to search, or {@code null}.
+     * @return the attribute value, or {@code null} if none or unparsable or if the given name was null.
      */
     @Override
     public Number numericValue(final String name) {
@@ -217,8 +217,8 @@ public final class DecoderWrapper extend
     /**
      * Returns the value of the attribute of the given name as a date, or {@code null} if none.
      *
-     * @param  name The name of the attribute to search, or {@code null}.
-     * @return The attribute value, or {@code null} if none or unparsable or if the given name was null.
+     * @param  name  the name of the attribute to search, or {@code null}.
+     * @return the attribute value, or {@code null} if none or unparsable or if the given name was null.
      */
     @Override
     public Date dateValue(final String name) {
@@ -247,8 +247,8 @@ public final class DecoderWrapper extend
      * Converts the given numerical values to date, using the information provided in the given unit symbol.
      * The unit symbol is typically a string like <cite>"days since 1970-01-01T00:00:00Z"</cite>.
      *
-     * @param  values The values to convert. May contains {@code null} elements.
-     * @return The converted values. May contains {@code null} elements.
+     * @param  values  the values to convert. May contains {@code null} elements.
+     * @return the converted values. May contains {@code null} elements.
      */
     @Override
     public Date[] numberToDate(final String symbol, final Number... values) {
@@ -272,7 +272,7 @@ public final class DecoderWrapper extend
     /**
      * Returns the globally unique dataset identifier as determined by the UCAR library.
      *
-     * @return The global dataset identifier, or {@code null} if none.
+     * @return the global dataset identifier, or {@code null} if none.
      */
     @Override
     public String getId() {
@@ -282,7 +282,7 @@ public final class DecoderWrapper extend
     /**
      * Returns the human readable title as determined by the UCAR library.
      *
-     * @return The dataset title, or {@code null} if none.
+     * @return the dataset title, or {@code null} if none.
      */
     @Override
     public String getTitle() {
@@ -293,10 +293,10 @@ public final class DecoderWrapper extend
      * 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.
+     * @return all variables, or an empty array if none.
      */
     @Override
-    @SuppressWarnings("null")
+    @SuppressWarnings({"ReturnOfCollectionOrArrayField", "null"})
     public Variable[] getVariables() {
         if (variables == null) {
             final List<Dimension> dimensions = file.getDimensions();
@@ -313,11 +313,11 @@ public final class DecoderWrapper extend
      * 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.
-     * @throws IOException If an I/O operation was necessary but failed.
+     * @return all grid geometries, or an empty array if none.
+     * @throws IOException if an I/O operation was necessary but failed.
      */
     @Override
-    @SuppressWarnings("null")
+    @SuppressWarnings({"ReturnOfCollectionOrArrayField", "null"})
     public GridGeometry[] getGridGeometries() throws IOException {
         if (geometries == null) {
             List<CoordinateSystem> systems = null;
@@ -341,7 +341,7 @@ public final class DecoderWrapper extend
      * 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.
+     * @return the {@link #canceled} flag.
      */
     @Override
     public boolean isCancel() {
@@ -351,8 +351,8 @@ public final class DecoderWrapper extend
     /**
      * Invoked by the UCAR library during the reading process for progress information.
      *
-     * @param message The message to show to the user.
-     * @param progress Count of progress, or -1 if unknown. This is not necessarily a percentage done.
+     * @param  message   the message to show to the user.
+     * @param  progress  count of progress, or -1 if unknown. This is not necessarily a percentage done.
      */
     @Override
     public void setProgress(final String message, final int progress) {
@@ -361,7 +361,7 @@ public final class DecoderWrapper extend
     /**
      * Invoked by the UCAR NetCDF library when an error occurred.
      *
-     * @param message The error message.
+     * @param  message  the error message.
      */
     @Override
     public void setError(final String message) {
@@ -371,7 +371,7 @@ public final class DecoderWrapper extend
     /**
      * Closes the NetCDF file.
      *
-     * @throws IOException If an error occurred while closing the file.
+     * @throws IOException if an error occurred while closing the file.
      */
     @Override
     public void close() throws IOException {

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=1760671&r1=1760670&r2=1760671&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] Wed Sep 14 11:02:45 2016
@@ -53,7 +53,7 @@ final class GridGeometryWrapper extends
     /**
      * 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;

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=1760671&r1=1760670&r2=1760671&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] Wed Sep 14 11:02:45 2016
@@ -190,10 +190,10 @@ final class VariableWrapper extends Vari
     /**
      * Reads a sub-sampled sub-area of the variable.
      *
-     * @param  areaLower   Index of the first value to read along each dimension.
-     * @param  areaUpper   Index after the last value to read along each dimension.
-     * @param  subsampling Sub-sampling along each dimension. 1 means no sub-sampling.
-     * @return The data as an array of a Java primitive type.
+     * @param  areaLower    index of the first value to read along each dimension.
+     * @param  areaUpper    index after the last value to read along each dimension.
+     * @param  subsampling  sub-sampling along each dimension. 1 means no sub-sampling.
+     * @return the data as an array of a Java primitive type.
      */
     @Override
     public Object read(final int[] areaLower, final int[] areaUpper, final int[] subsampling)

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=1760671&r1=1760670&r2=1760671&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] Wed Sep 14 11:02:45 2016
@@ -21,7 +21,7 @@
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @since   0.3
- * @version 0.3
+ * @version 0.8
  * @module
  */
 package org.apache.sis.internal.netcdf.ucar;

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=1760671&r1=1760670&r2=1760671&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] Wed Sep 14 11:02:45 2016
@@ -493,13 +493,12 @@ public class AttributeNames {
         /**
          * Creates a new set of attribute names. Any argument can be {@code null} if not applicable.
          *
-         * @param name        The attribute name for the responsible's name.
-         * @param institution The attribute name for the responsible's institution.
-         * @param url         The attribute name for the responsible's URL.
-         * @param email       The attribute name for the responsible's email address.
-         * @param role        The attribute name for the responsible's role.
-         * @param defaultRole The role to use as a fallback if no attribute value is associated to the
-         *                    {@code role} key.
+         * @param name         the attribute name for the responsible's name.
+         * @param institution  the attribute name for the responsible's institution.
+         * @param url          the attribute name for the responsible's URL.
+         * @param email        the attribute name for the responsible's email address.
+         * @param role         the attribute name for the responsible's role.
+         * @param defaultRole  the role to use as a fallback if no attribute value is associated to the {@code role} key.
          */
         public Responsible(final String name, final String institution, final String url, final String email,
                 final String role, final Role defaultRole)
@@ -789,13 +788,13 @@ public class AttributeNames {
         /**
          * Creates a new set of attribute names.
          *
-         * @param type       The default ISO-19115 dimension name type, or {@code null} if none.
-         * @param min        The attribute name for the minimal value of the bounding box.
-         * @param max        The attribute name for the maximal value of the bounding box.
-         * @param span       The attribute name for the difference between the minimal and maximal values.
-         * @param resolution The attribute name for a further refinement of the geospatial bounding box.
-         * @param units      The attribute name for the bounding box units of measurement.
-         * @param positive   The attribute name for indicating which direction is positive.
+         * @param type        the default ISO-19115 dimension name type, or {@code null} if none.
+         * @param min         the attribute name for the minimal value of the bounding box.
+         * @param max         the attribute name for the maximal value of the bounding box.
+         * @param span        the attribute name for the difference between the minimal and maximal values.
+         * @param resolution  the attribute name for a further refinement of the geospatial bounding box.
+         * @param units       the attribute name for the bounding box units of measurement.
+         * @param positive    the attribute name for indicating which direction is positive.
          */
         public Dimension(final DimensionNameType type, final String min, final String max, final String span,
                 final String resolution,final String units, final String positive)

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=1760671&r1=1760670&r2=1760671&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] Wed Sep 14 11:02:45 2016
@@ -177,8 +177,8 @@ final class MetadataReader {
     /**
      * Creates a new <cite>NetCDF to ISO</cite> mapper for the given source.
      *
-     * @param  decoder The source of NetCDF attributes.
-     * @throws IOException If an I/O operation was necessary but failed.
+     * @param  decoder  the source of NetCDF attributes.
+     * @throws IOException if an I/O operation was necessary but failed.
      */
     MetadataReader(final Decoder decoder) throws IOException {
         this.decoder = decoder;
@@ -198,7 +198,7 @@ final class MetadataReader {
     /**
      * Returns the localized error resource bundle for the locale given by {@link #getLocale()}.
      *
-     * @return The localized error resource bundle.
+     * @return the localized error resource bundle.
      */
     private Errors errors() {
         return Errors.getResources(decoder.listeners.getLocale());
@@ -298,8 +298,8 @@ final class MetadataReader {
      * 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  metadata   the value stored in the metadata object.
+     * @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);
@@ -308,8 +308,8 @@ final class MetadataReader {
     /**
      * 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  resource  the value stored in the metadata object.
+     * @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));
@@ -318,8 +318,8 @@ final class MetadataReader {
     /**
      * 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  address  the value stored in the metadata object.
+     * @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));
@@ -330,8 +330,8 @@ final class MetadataReader {
      * declares the URL as a mandatory attribute, this method will ignore all other attributes
      * if the given URL is null.
      *
-     * @param  url The URL (mandatory - if {@code null}, no resource will be created).
-     * @return The online resource, or {@code null} if the URL was null.
+     * @param  url  the URL (mandatory - if {@code null}, no resource will be created).
+     * @return the online resource, or {@code null} if the URL was null.
      */
     private OnlineResource createOnlineResource(final String url) {
         if (url != null) try {
@@ -379,10 +379,10 @@ final class MetadataReader {
      * <p>Implementation note: this method tries to reuse the existing {@link #pointOfContact} instance,
      * or part of it, if it is suitable.</p>
      *
-     * @param  keys The group of attribute names to use for fetching the values.
+     * @param  keys  the group of attribute names to use for fetching the values.
      * @param  isPointOfContact {@code true} for forcing the role to {@link Role#POINT_OF_CONTACT}.
-     * @return The responsible party, or {@code null} if none.
-     * @throws IOException If an I/O operation was necessary but failed.
+     * @return the responsible party, or {@code null} if none.
+     * @throws IOException if an I/O operation was necessary but failed.
      *
      * @see AttributeNames#CREATOR
      * @see AttributeNames#CONTRIBUTOR
@@ -469,8 +469,8 @@ final class MetadataReader {
      * Creates a {@code Citation} element if at least one of the required attributes is non-null.
      * This method will reuse the {@link #pointOfContact} field, if non-null and suitable.
      *
-     * @param  identifier The citation {@code <gmd:identifier>} attribute.
-     * @throws IOException If an I/O operation was necessary but failed.
+     * @param  identifier  the citation {@code <gmd:identifier>} attribute.
+     * @throws IOException if an I/O operation was necessary but failed.
      */
     private Citation createCitation(final Identifier identifier) throws IOException {
         String title = stringValue(TITLE);
@@ -518,9 +518,9 @@ final class MetadataReader {
      * Creates a {@code DataIdentification} element if at least one of the required attributes is non-null.
      * This method will reuse the {@link #pointOfContact} value, if non-null and suitable.
      *
-     * @param  identifier The citation {@code <gmd:identifier>} attribute.
-     * @param  publisher  The publisher names, built by the caller in an opportunist way.
-     * @throws IOException If an I/O operation was necessary but failed.
+     * @param  identifier  the citation {@code <gmd:identifier>} attribute.
+     * @param  publisher   the publisher names, built by the caller in an opportunist way.
+     * @throws IOException if an I/O operation was necessary but failed.
      */
     private DataIdentification createIdentificationInfo(final Identifier identifier,
             final Set<InternationalString> publisher) throws IOException
@@ -611,7 +611,7 @@ final class MetadataReader {
      * For more consistent results, the caller should restrict the {@linkplain Decoder#setSearchPath
      * search path} to a single group before invoking this method.
      *
-     * @throws IOException If an I/O operation was necessary but failed.
+     * @throws IOException if an I/O operation was necessary but failed.
      */
     private Keywords createKeywords(final KeywordType type, final boolean standard) throws IOException {
         final String list = stringValue(standard ? STANDARD_NAME : KEYWORDS);
@@ -640,9 +640,9 @@ final class MetadataReader {
     /**
      * Creates a {@code <gmd:spatialRepresentationInfo>} element from the given grid geometries.
      *
-     * @param  cs The grid geometry (related to the NetCDF coordinate system).
-     * @return The grid spatial representation info.
-     * @throws IOException If an I/O operation was necessary but failed.
+     * @param  cs  the grid geometry (related to the NetCDF coordinate system).
+     * @return the grid spatial representation info.
+     * @throws IOException if an I/O operation was necessary but failed.
      */
     private GridSpatialRepresentation createSpatialRepresentationInfo(final GridGeometry cs) throws IOException {
         final DefaultGridSpatialRepresentation grid = new DefaultGridSpatialRepresentation();
@@ -785,8 +785,8 @@ final class MetadataReader {
     /**
      * Creates a {@code <gmd:contentInfo>} elements from all applicable NetCDF attributes.
      *
-     * @return The content information.
-     * @throws IOException If an I/O operation was necessary but failed.
+     * @return the content information.
+     * @throws IOException if an I/O operation was necessary but failed.
      */
     private Collection<DefaultCoverageDescription> createContentInfo() throws IOException {
         final Map<List<String>, DefaultCoverageDescription> contents = new HashMap<>(4);
@@ -845,9 +845,9 @@ final class MetadataReader {
     /**
      * Creates a {@code <gmd:dimension>} element from the given variable.
      *
-     * @param  variable The NetCDF variable.
-     * @return The sample dimension information.
-     * @throws IOException If an I/O operation was necessary but failed.
+     * @param  variable  the NetCDF variable.
+     * @return the sample dimension information.
+     * @throws IOException if an I/O operation was necessary but failed.
      */
     private Band createSampleDimension(final Variable variable) throws IOException {
         final DefaultBand band = new DefaultBand();
@@ -878,13 +878,13 @@ final class MetadataReader {
      * <p><b>Note:</b> ISO 19115 range elements are approximatively equivalent to
      * {@link org.apache.sis.coverage.Category} in the {@code sis-coverage} module.</p>
      *
-     * @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}.
-     * @param  value    One of the elements in the {@link AttributeNames#FLAG_VALUES} attribute or {@code null}.
-     * @return The sample dimension information or {@code null} if none.
-     * @throws IOException If an I/O operation was necessary but failed.
+     * @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}.
+     * @param  value     one of the elements in the {@link AttributeNames#FLAG_VALUES} attribute or {@code null}.
+     * @return the sample dimension information or {@code null} if none.
+     * @throws IOException if an I/O operation was necessary but failed.
      */
     private RangeElementDescription createRangeElementDescription(final Variable variable,
             final String name, final String meaning, final Number mask, final Number value) throws IOException
@@ -909,8 +909,8 @@ final class MetadataReader {
      *   <li>{@value #IDENTIFIER}, or {@link ucar.nc2.NetcdfFile#getId()} if no identifier attribute was found.</li>
      * </ul>
      *
-     * @return The globally unique identifier, or {@code null} if none.
-     * @throws IOException If an I/O operation was necessary but failed.
+     * @return the globally unique identifier, or {@code null} if none.
+     * @throws IOException if an I/O operation was necessary but failed.
      */
     private Identifier getFileIdentifier() throws IOException {
         String identifier = stringValue(IDENTIFIER);
@@ -927,8 +927,8 @@ final class MetadataReader {
     /**
      * 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.
+     * @return the ISO metadata object.
+     * @throws IOException if an I/O operation was necessary but failed.
      */
     public Metadata read() throws IOException {
         final DefaultMetadata metadata = new DefaultMetadata();

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=1760671&r1=1760670&r2=1760671&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] Wed Sep 14 11:02:45 2016
@@ -49,7 +49,7 @@
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @since   0.3
- * @version 0.3
+ * @version 0.8
  * @module
  */
 package org.apache.sis.storage.netcdf;



Mime
View raw message