getCitations() {
@@ -92,7 +93,7 @@ public class SecurityConstraints extends
/**
* Sets the documents that specifies the nature of the constraints.
*
- * @param newValues Citation to the new documents.
+ * @param newValues citation to the new documents.
*/
public void setCitations(final Collection newValues) {
citations = writeCollection(newValues, citations, Citation.class);
Modified: sis/branches/JDK7/profiles/sis-french-profile/src/main/java/org/apache/sis/profile/france/FrenchProfile.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/profiles/sis-french-profile/src/main/java/org/apache/sis/profile/france/FrenchProfile.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/profiles/sis-french-profile/src/main/java/org/apache/sis/profile/france/FrenchProfile.java [UTF-8] (original)
+++ sis/branches/JDK7/profiles/sis-french-profile/src/main/java/org/apache/sis/profile/france/FrenchProfile.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -61,9 +61,9 @@ public final class FrenchProfile extends
* because AFNOR requires to specify whether the system is direct or indirect.
* For reference system types, use {@link #toAFNOR(ReferenceSystem, boolean)} instead.
*
- * @param metadata The metadata to make AFNOR-compliant, or {@code null}.
- * @return A copy of the metadata as an AFNOR-compliant object, or {@code metadata} if the metadata
- * was {@code null}, does not have an AFNOR type, or was already of the appropriate type.
+ * @param metadata the metadata to make AFNOR-compliant, or {@code null}.
+ * @return a copy of the metadata as an AFNOR-compliant object, or {@code metadata} if the metadata
+ * was {@code null}, does not have an AFNOR type, or was already of the appropriate type.
*/
public static Object toAFNOR(Object metadata) {
if (metadata != null) {
@@ -113,10 +113,10 @@ public final class FrenchProfile extends
*
* }
*
- * @param rs The reference system to make AFNOR-compliant, or {@code null}.
- * @param indirect {@code false} for {@code FRA_DirectReferenceSystem},
- * or {@code true} for {@code FRA_IndirectReferenceSystem}.
- * @return A copy of the given reference system as an AFNOR-compliant object, or {@code rs}
+ * @param rs the reference system to make AFNOR-compliant, or {@code null}.
+ * @param indirect {@code false} for {@code FRA_DirectReferenceSystem}, or
+ * {@code true} for {@code FRA_IndirectReferenceSystem}.
+ * @return a copy of the given reference system as an AFNOR-compliant object, or {@code rs}
* if the given reference system was {@code null} or already of the appropriate type.
*/
public static ReferenceSystem toAFNOR(ReferenceSystem rs, final boolean indirect) {
Modified: sis/branches/JDK7/profiles/sis-french-profile/src/test/java/org/apache/sis/internal/profile/fra/DirectReferenceSystemTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/profiles/sis-french-profile/src/test/java/org/apache/sis/internal/profile/fra/DirectReferenceSystemTest.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/profiles/sis-french-profile/src/test/java/org/apache/sis/internal/profile/fra/DirectReferenceSystemTest.java [UTF-8] (original)
+++ sis/branches/JDK7/profiles/sis-french-profile/src/test/java/org/apache/sis/internal/profile/fra/DirectReferenceSystemTest.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -52,8 +52,8 @@ public final strictfp class DirectRefere
/**
* Creates the metadata object to be tested.
*
- * @param legacy {@code true} for using the legacy {@code ResponsibleParty} instead of {@code Responsibility}.
- * This is sometime needed for comparison purpose with unmarshalled metadata.
+ * @param legacy {@code true} for using the legacy {@code ResponsibleParty} instead of {@code Responsibility}.
+ * This is sometime needed for comparison purpose with unmarshalled metadata.
*/
@SuppressWarnings("deprecation")
private static DefaultMetadata createMetadata(final boolean legacy) {
Modified: sis/branches/JDK7/storage/sis-earth-observation/src/test/java/org/apache/sis/storage/earthobservation/LandsatStoreProviderTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-earth-observation/src/test/java/org/apache/sis/storage/earthobservation/LandsatStoreProviderTest.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/storage/sis-earth-observation/src/test/java/org/apache/sis/storage/earthobservation/LandsatStoreProviderTest.java [UTF-8] (original)
+++ sis/branches/JDK7/storage/sis-earth-observation/src/test/java/org/apache/sis/storage/earthobservation/LandsatStoreProviderTest.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -16,6 +16,7 @@
*/
package org.apache.sis.storage.earthobservation;
+import java.nio.charset.StandardCharsets;
import org.apache.sis.setup.OptionKey;
import org.apache.sis.storage.ProbeResult;
import org.apache.sis.storage.StorageConnector;
@@ -25,9 +26,6 @@ import org.junit.Test;
import static org.junit.Assert.*;
-// Branch-dependent imports
-import java.nio.charset.StandardCharsets;
-
/**
* Tests {@link LandsatStoreProvider}.
Modified: sis/branches/JDK7/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/CRSBuilder.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/CRSBuilder.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/CRSBuilder.java [UTF-8] (original)
+++ sis/branches/JDK7/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/CRSBuilder.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -377,7 +377,7 @@ final class CRSBuilder {
*
* See {@link #getSingleton(short)} for a discussion about why the value is removed from the map.
*
- * @param key the GeoTIFF key for which to get a value.
+ * @param key the GeoTIFF key for which to get a value.
* @return the integer value for the given key, or {@link GeoCodes#undefined} if the key was not found.
* @throws NumberFormatException if the value was stored as a string and can not be parsed.
*/
@@ -897,8 +897,8 @@ final class CRSBuilder {
*
* If no prime-meridian is defined, then the default is Greenwich as per GeoTIFF specification.
*
- * @param names the component names to use if the prime meridian is user-defined.
- * @param unit the angular unit of the longitude value relative to Greenwich.
+ * @param names the component names to use if the prime meridian is user-defined.
+ * @param unit the angular unit of the longitude value relative to Greenwich.
* @return a prime meridian created from the given {@link Unit} and the above-cited GeoTIFF keys.
* @throws NumberFormatException if a numeric value was stored as a string and can not be parsed.
* @throws FactoryException if an error occurred during objects creation with the factories.
@@ -966,8 +966,8 @@ final class CRSBuilder {
*
*
*
- * @param names the component names to use if the ellipsoid is user-defined.
- * @param unit the linear unit of the semi-axis lengths.
+ * @param names the component names to use if the ellipsoid is user-defined.
+ * @param unit the linear unit of the semi-axis lengths.
* @return an ellipsoid created from the given {@link Unit} and the above-cited GeoTIFF keys.
* @throws NoSuchElementException if a mandatory value is missing.
* @throws NumberFormatException if a numeric value was stored as a string and can not be parsed.
Modified: sis/branches/JDK7/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/ImageFileDirectory.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/ImageFileDirectory.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/ImageFileDirectory.java [UTF-8] (original)
+++ sis/branches/JDK7/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/ImageFileDirectory.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -843,7 +843,7 @@ final class ImageFileDirectory {
* Computes the tile width or height from the other size,
* or returns a negative number if the size can not be computed.
*
- * @param knownSize the tile width or height.
+ * @param knownSize the tile width or height.
* @return the tile width if the known size was height, or the tile height if the known size was width,
* or a negative number if the width or height can not be computed.
* @throws ArithmeticException if the result overflows.
@@ -979,8 +979,8 @@ final class ImageFileDirectory {
* Information not under the {@code "metadata/contentInfo"} node will be merged
* with the current content of the given {@code MetadataBuilder}.
*
- * @param metadata where to write metadata information. Caller should have already invoked
- * {@link MetadataBuilder#setFormat(String)} before {@code completeMetadata(…)} calls.
+ * @param metadata where to write metadata information. Caller should have already invoked
+ * {@link MetadataBuilder#setFormat(String)} before {@code completeMetadata(…)} calls.
*/
final void completeMetadata(final MetadataBuilder metadata, final Locale locale)
throws DataStoreContentException, FactoryException
@@ -1047,9 +1047,9 @@ final class ImageFileDirectory {
/**
* Reports a warning with a message created from the given resource keys and parameters.
*
- * @param level the logging level for the message to log.
- * @param key the {@code Resources} key of the message to format.
- * @param parameters the parameters to put in the message.
+ * @param level the logging level for the message to log.
+ * @param key the {@code Resources} key of the message to format.
+ * @param parameters the parameters to put in the message.
*/
private void warning(final Level level, final short key, final Object... parameters) {
final LogRecord r = reader.resources().getLogRecord(level, key, parameters);
Modified: sis/branches/JDK7/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/Reader.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/Reader.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/Reader.java [UTF-8] (original)
+++ sis/branches/JDK7/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/Reader.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -201,7 +201,7 @@ final class Reader extends GeoTIFF {
* Reads the {@code int} or {@code long} value (depending if the file is
* a standard of big TIFF) at the current {@linkplain #input} position.
*
- * @return The next pointer value.
+ * @return the next pointer value.
*/
private long readUnsignedInt() throws IOException, DataStoreException {
if (intSizeExpansion == 0) {
@@ -218,7 +218,7 @@ final class Reader extends GeoTIFF {
* Reads the {@code short} or {@code long} value (depending if the file is
* standard of big TIFF) at the current {@linkplain #input} position.
*
- * @return The next directory entry value.
+ * @return the next directory entry value.
*/
private long readUnsignedShort() throws IOException, DataStoreException {
if (intSizeExpansion == 0) {
Modified: sis/branches/JDK7/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/Type.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/Type.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/Type.java [UTF-8] (original)
+++ sis/branches/JDK7/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/Type.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -19,6 +19,7 @@ package org.apache.sis.storage.geotiff;
import java.util.Arrays;
import java.io.IOException;
import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import org.apache.sis.internal.storage.io.ChannelDataInput;
import org.apache.sis.internal.util.Numerics;
import org.apache.sis.math.DecimalFunctions;
@@ -26,11 +27,8 @@ import org.apache.sis.math.Vector;
import org.apache.sis.util.ArraysExt;
import org.apache.sis.util.resources.Errors;
-// Branch-dependent imports
-import java.nio.charset.StandardCharsets;
import org.apache.sis.internal.jdk8.JDK8;
-
/**
* The types of values in a TIFF header. Provides also some support for reading a value of a given type.
*
Modified: sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/DataType.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/DataType.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/DataType.java [UTF-8] (original)
+++ sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/DataType.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -165,7 +165,7 @@ public enum DataType {
* Returns the signed or unsigned variant of this data type.
* If this data type does not have the requested variant, then this method returns {@code this}.
*
- * @param u {@code true} for the unsigned variant, or {@code false} for the signed variant.
+ * @param u {@code true} for the unsigned variant, or {@code false} for the signed variant.
* @return the signed or unsigned variant of this data type.
*/
public final DataType unsigned(final boolean u) {
Modified: sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Decoder.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Decoder.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Decoder.java [UTF-8] (original)
+++ sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Decoder.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -111,8 +111,10 @@ public abstract class Decoder implements
protected final Number parseNumber(String value) {
final int s = value.indexOf(' ');
if (s >= 0) {
- // Sometime, numeric values as string are followed by
- // a unit of measurement. We ignore that unit for now...
+ /*
+ * Sometime, numeric values as string are followed by
+ * a unit of measurement. We ignore that unit for now...
+ */
value = value.substring(0, s);
}
try {
Modified: sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/NamedElement.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/NamedElement.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/NamedElement.java [UTF-8] (original)
+++ sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/NamedElement.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -55,9 +55,9 @@ public abstract class NamedElement {
* Code searching in the returned map shall ask for the original (non lower-case) name
* before to ask for the lower-cases version of that name.
*
- * @param the type of elements.
- * @param elements the elements to store in the map, or {@code null} if none.
- * @param namesLocale the locale to use for creating the "all lower cases" names.
+ * @param the type of elements.
+ * @param elements the elements to store in the map, or {@code null} if none.
+ * @param namesLocale the locale to use for creating the "all lower cases" names.
* @return a (name, element) mapping with lower cases entries where possible.
* @throws InvalidParameterCardinalityException if the same name is used for more than one element.
*/
Modified: sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Variable.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Variable.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Variable.java [UTF-8] (original)
+++ sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Variable.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -159,7 +159,7 @@ public abstract class Variable extends N
* or {@link Number} if {@code numeric} is {@code true}.
*
* @param attributeName the name of the attribute for which to get the values.
- * @param numeric {@code true} if the values are expected to be numeric, or {@code false} for strings.
+ * @param numeric {@code true} if the values are expected to be numeric, or {@code false} for strings.
* @return the sequence of {@link String} or {@link Number} values for the named attribute.
*/
public abstract Object[] getAttributeValues(String attributeName, boolean numeric);
Modified: sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/VariableInfo.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/VariableInfo.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/VariableInfo.java [UTF-8] (original)
+++ sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/VariableInfo.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -121,13 +121,13 @@ 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 attributes the attributes associates to the variable, or an empty map if none.
- * @param dataType the NetCDF type of data, or {@code null} if unknown.
- * @param 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 attributes the attributes associates to the variable, or an empty map if none.
+ * @param dataType the NetCDF type of data, or {@code null} if unknown.
+ * @param 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,
Modified: sis/branches/JDK7/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/VariableTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/VariableTest.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/VariableTest.java [UTF-8] (original)
+++ sis/branches/JDK7/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/VariableTest.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -96,8 +96,8 @@ public strictfp class VariableTest exten
/**
* Compares the basic properties of the given variables.
*
- * @param expected the expected property values.
- * @param variables the variable for which to test properties.
+ * @param expected the expected property values.
+ * @param variables the variable for which to test properties.
*/
private static void assertBasicPropertiesEqual(final Object[] expected, final Variable[] variables) {
int propertyIndex = 0;
Modified: sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/index/GeoHashCoder.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/index/GeoHashCoder.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/index/GeoHashCoder.java [UTF-8] (original)
+++ sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/index/GeoHashCoder.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -86,8 +86,8 @@ public class GeoHashCoder implements Ser
* Creates a new format for the given {@coe encoding} mapping.
* This constructor computes the {@code decoding} arrays from the {@code encoding} one.
*
- * @param highestOneBit The leftmost one-bit of the value represented by a letter or digit.
- * @param encoding The mapping from numerical values to symbols.
+ * @param highestOneBit the leftmost one-bit of the value represented by a letter or digit.
+ * @param encoding the mapping from numerical values to symbols.
*/
private Format(final int highestOneBit, final byte[] encoding) {
this.highestOneBit = highestOneBit;
@@ -98,9 +98,11 @@ public class GeoHashCoder implements Ser
}
decodingLowerCase = decoding;
decodingUpperCase = decoding;
- // Current version create a case-insensitive format.
- // However if we implement BASE36 in a future version,
- // then the two 'decoding' arrays will differ.
+ /*
+ * Current version create a case-insensitive format.
+ * However if we implement BASE36 in a future version,
+ * then the two 'decoding' arrays will differ.
+ */
}
}
@@ -133,7 +135,7 @@ public class GeoHashCoder implements Ser
* Returns the current encoding/decoding format.
* The default value is {@link Format#BASE32}.
*
- * @return The current format.
+ * @return the current format.
*/
public Format getFormat() {
return format;
@@ -142,7 +144,7 @@ public class GeoHashCoder implements Ser
/**
* Sets the encoding/decoding format.
*
- * @param format The new format.
+ * @param format the new format.
*/
public void setFormat(final Format format) {
ArgumentChecks.ensureNonNull("format", format);
@@ -153,7 +155,7 @@ public class GeoHashCoder implements Ser
* Returns the length of geohashes strings to be encoded by the {@link #encode(DirectPosition)} method.
* The default value is 12.
*
- * @return The length of geohashes strings.
+ * @return the length of geohashes strings.
*/
public int getPrecision() {
return precision;
@@ -162,19 +164,19 @@ public class GeoHashCoder implements Ser
/**
* Sets the length of geohashes strings to be encoded by the {@link #encode(DirectPosition)} method.
*
- * @param precision The new length of geohashes strings.
+ * @param precision he new length of geohashes strings.
*/
public void setPrecision(final int precision) {
ArgumentChecks.ensureBetween("precision", 1, 255, precision);
this.precision = (byte) precision;
- buffer = null; // Will recreate a new buffer when first needed.
+ buffer = null; // Will recreate a new buffer when first needed.
}
/**
* Encodes the given longitude and latitude into a geohash.
*
- * @param longitude Longitude to encode, as decimal degrees in the [-180 … 180]° range.
- * @param latitude Latitude to encode, as decimal degrees in the [-90 … 90]° range.
+ * @param longitude longitude to encode, as decimal degrees in the [-180 … 180]° range.
+ * @param latitude latitude to encode, as decimal degrees in the [-90 … 90]° range.
* @return Geohash encoding of the given longitude and latitude.
*/
public String encode(final double longitude, final double latitude) {
@@ -237,7 +239,7 @@ public class GeoHashCoder implements Ser
* The current implementation does not verify the Coordinate Reference System of the given position.
* However this may change in future SIS versions.
*
- * @param position The coordinate to encode.
+ * @param position the coordinate to encode.
* @return Geohash encoding of the given position.
*/
public String encode(final DirectPosition position) {
@@ -249,8 +251,8 @@ public class GeoHashCoder implements Ser
* Decodes the given geohash into a longitude and a latitude.
*
* @param geohash Geohash string to decode.
- * @return A new position with the longitude at ordinate 0 and latitude at ordinate 1.
- * @throws ParseException If an error occurred while parsing the given string.
+ * @return a new position with the longitude at ordinate 0 and latitude at ordinate 1.
+ * @throws ParseException if an error occurred while parsing the given string.
*/
public DirectPosition decode(final String geohash) throws ParseException {
final int length = geohash.length();
@@ -266,7 +268,7 @@ public class GeoHashCoder implements Ser
double xmin = -180, ymin = -90;
double xmax = 180, ymax = 90;
- int nc; // Number of characters for the 'c' code point.
+ int nc; // Number of characters for the 'c' code point.
for (int i=0; iThis method is for internal usage by {@link org.apache.sis.setup.About}
* only and may change without notice in any future Apache SIS version.
*
- * @param locale the locale of the strings to return. Can not be null.
- * @param resources the {@code Vocabulary.getResources(locale)} value.
+ * @param locale the locale of the strings to return. Can not be null.
+ * @param resources the {@code Vocabulary.getResources(locale)} value.
* @return localized string representations of the capabilities of all data store providers.
*/
public static String[] providers(final Locale locale, final Vocabulary resources) {
Modified: sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/CodeType.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/CodeType.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/CodeType.java [UTF-8] (original)
+++ sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/CodeType.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -108,7 +108,7 @@ public enum CodeType {
/**
* Infers the type for the given authority code.
*
- * @param codeOrPath the code or file path.
+ * @param codeOrPath the code or file path.
* @return whether the given argument seems to be a file path, URL, URN of authority code.
*/
public static CodeType guess(final String codeOrPath) {
Modified: sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/ChannelImageOutputStream.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/ChannelImageOutputStream.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/ChannelImageOutputStream.java [UTF-8] (original)
+++ sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/ChannelImageOutputStream.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -49,10 +49,10 @@ public class ChannelImageOutputStream ex
/**
* Creates a new output stream for the given channel and using the given buffer.
*
- * @param filename A file identifier used only for formatting error message.
- * @param channel The channel where to write data.
- * @param buffer The buffer from where to read the data.
- * @throws IOException If an error occurred while writing into channel.
+ * @param filename a file identifier used only for formatting error message.
+ * @param channel the channel where to write data.
+ * @param buffer the buffer from where to read the data.
+ * @throws IOException if an error occurred while writing into channel.
*/
public ChannelImageOutputStream(final String filename, final WritableByteChannel channel, final ByteBuffer buffer)
throws IOException
@@ -65,8 +65,8 @@ public class ChannelImageOutputStream ex
* This constructor is invoked when we need to change the implementation class
* from {@code ChannelDataOutput} to {@code ChannelImageOutputStream}.
*
- * @param output The existing instance from which to takes the channel and buffer.
- * @throws IOException If an error occurred while writing into channel.
+ * @param output the existing instance from which to takes the channel and buffer.
+ * @throws IOException if an error occurred while writing into channel.
*/
public ChannelImageOutputStream(final ChannelDataOutput output) throws IOException {
super(output.filename, output.channel, output.buffer);
@@ -76,7 +76,7 @@ public class ChannelImageOutputStream ex
* Writes a single byte to the stream at the current position.
* The 24 high-order bits of {@code v} are ignored.
*
- * @param v an integer whose lower 8 bits are to be written.
+ * @param v an integer whose lower 8 bits are to be written.
* @throws IOException if some I/O exception occurs during writing.
*/
@Override
@@ -89,7 +89,7 @@ public class ChannelImageOutputStream ex
* If boolean {@code v} is {@code true} the byte value 1 is written whereas if boolean is {@code false}
* zero is written.
*
- * @param v boolean to be written.
+ * @param v boolean to be written.
* @throws IOException if some I/O exception occurs during writing.
*/
@Override
@@ -104,8 +104,8 @@ public class ChannelImageOutputStream ex
* This method is provided because required by the {@link DataOutput} interface, but its
* usage should generally be avoided.
*
- * @param s the string to be written.
- * @throws IOException If an error occurred while writing the stream.
+ * @param s the string to be written.
+ * @throws IOException if an error occurred while writing the stream.
*/
@Override
public void writeBytes(final String s) throws IOException {
@@ -119,8 +119,8 @@ public class ChannelImageOutputStream ex
/**
* Writes all characters from the source into the stream.
*
- * @param s A String consider as an array of characters to be written into stream.
- * @throws IOException If an error occurred while writing the stream.
+ * @param s a String consider as an array of characters to be written into stream.
+ * @throws IOException if an error occurred while writing the stream.
*/
@Override
public final void writeChars(final String s) throws IOException {
@@ -132,8 +132,8 @@ public class ChannelImageOutputStream ex
* of every character in the {@code str} string. Each character is converted to a group of one, two, or three
* bytes, depending on the character code point value.
*
- * @param s the string to be written.
- * @throws IOException If an error occurred while writing the stream.
+ * @param s the string to be written.
+ * @throws IOException if an error occurred while writing the stream.
*/
@Override
public void writeUTF(final String s) throws IOException {
@@ -155,7 +155,7 @@ public class ChannelImageOutputStream ex
/**
* Closes the {@linkplain #channel}.
*
- * @throws IOException If an error occurred while closing the channel.
+ * @throws IOException if an error occurred while closing the channel.
*/
@Override
public final void close() throws IOException {
Modified: sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/DataTransfer.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/DataTransfer.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/DataTransfer.java [UTF-8] (original)
+++ sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/DataTransfer.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -75,7 +75,7 @@ interface DataTransfer {
/**
* Moves to the given position in the stream.
*
- * @param position The position where to move.
+ * @param position the position where to move.
* @throws IOException if the stream can not be moved to the given position.
*/
void seek(long position) throws IOException;
@@ -88,9 +88,9 @@ interface DataTransfer {
* the full content of {@link ChannelDataInput#buffer} (i.e. the view element at index 0 shall be
* defined by the buffer elements starting at index 0).
*
- * @param view Existing buffer to use as a view over {@link ChannelDataInput#buffer}, or {@code null}.
- * @param offset The starting position within {@code dest} to write.
- * @param length The number of values to read.
+ * @param view existing buffer to use as a view over {@link ChannelDataInput#buffer}, or {@code null}.
+ * @param offset the starting position within {@code dest} to write.
+ * @param length the number of values to read.
* @throws IOException if an error (including EOF) occurred while reading the stream.
*/
void readFully(Buffer view, int offset, int length) throws IOException;
Modified: sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/HyperRectangleReader.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/HyperRectangleReader.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/HyperRectangleReader.java [UTF-8] (original)
+++ sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/HyperRectangleReader.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -51,9 +51,9 @@ public final class HyperRectangleReader
/**
* Creates a new reader for the given input and source region.
*
- * @param dataType The type of elements to read, as one of the constants defined in {@link Numbers}.
- * @param input The channel from which to read the values, together with a buffer for transferring data.
- * @param origin The position in the channel of the first sample value in the hyper-rectangle.
+ * @param dataType the type of elements to read, as one of the constants defined in {@link Numbers}.
+ * @param input the channel from which to read the values, together with a buffer for transferring data.
+ * @param origin the position in the channel of the first sample value in the hyper-rectangle.
* @throws DataStoreException if the given {@code dataType} is not one of the supported values.
*/
public HyperRectangleReader(final byte dataType, final ChannelDataInput input, final long origin)
@@ -85,8 +85,8 @@ public final class HyperRectangleReader
* Creates a new reader for the data in an existing buffer.
* The data will be read from the current buffer position to the buffer limit.
*
- * @param filename A data source name, for error messages or debugging purpose.
- * @param data A buffer containing the data to read.
+ * @param filename a data source name, for error messages or debugging purpose.
+ * @param data a buffer containing the data to read.
* @throws IOException should never happen.
*/
public HyperRectangleReader(final String filename, final Buffer data) throws IOException {
@@ -108,8 +108,8 @@ public final class HyperRectangleReader
* Reads data in the given region. It is caller's responsibility to ensure that the {@code Region}
* object has been created with a {@code size} argument equals to this hyper-rectangle size.
*
- * @param region The sub-area to read and the sub-sampling to use.
- * @return The data in an array of primitive type.
+ * @param region the sub-area to read and the sub-sampling to use.
+ * @return the data in an array of primitive type.
* @throws IOException if an error occurred while transferring data from the channel.
*/
public Object read(final Region region) throws IOException {
Modified: sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/IOUtilities.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/IOUtilities.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/IOUtilities.java [UTF-8] (original)
+++ sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/IOUtilities.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -129,7 +129,8 @@ public final class IOUtilities extends S
}
if (extension) {
fromIndex = CharSequences.lastIndexOf(name, '.', fromIndex, name.length()) + 1;
- if (fromIndex <= 1) { // If the dot is the first character, do not consider as a filename extension.
+ if (fromIndex <= 1) {
+ // If the dot is the first character, do not consider as a filename extension.
return "";
}
}
@@ -144,13 +145,17 @@ public final class IOUtilities extends S
* @return the string representation, or {@code null} if none.
*/
public static String toString(final Object path) {
- // For the following types, the string that we want can be obtained only by toString(),
- // or the class is final so we know that the toString(à behavior can not be changed.
+ /*
+ * For the following types, the string that we want can be obtained only by toString(),
+ * or the class is final so we know that the toString(à behavior can not be changed.
+ */
if (path instanceof CharSequence || path instanceof Path || path instanceof URL || path instanceof URI) {
return path.toString();
}
- // While toString() would work too on the default implementation, the following
- // type is not final. So we are better to invoke the dedicated method.
+ /*
+ * While toString() would work too on the default implementation, the following
+ * type is not final. So we are better to invoke the dedicated method.
+ */
if (path instanceof File) {
return ((File) path).getPath();
}
Modified: sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/InputStreamAdapter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/InputStreamAdapter.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/InputStreamAdapter.java [UTF-8] (original)
+++ sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/InputStreamAdapter.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -106,7 +106,7 @@ public final class InputStreamAdapter ex
/**
* Marks the current position in this input stream.
*
- * @param readlimit ignored.
+ * @param readlimit ignored.
*/
@Override
public void mark(final int readlimit) {
Modified: sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/MemoryDataTransfer.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/MemoryDataTransfer.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/MemoryDataTransfer.java [UTF-8] (original)
+++ sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/MemoryDataTransfer.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -106,9 +106,9 @@ final class MemoryDataTransfer implement
* Reads {@code length} values from the buffer and stores them into the array known to subclass,
* starting at index {@code offset}.
*
- * @param view Ignored.
- * @param offset The starting position within {@code dest} to write.
- * @param length The number of values to read.
+ * @param view ignored.
+ * @param offset the starting position within {@code dest} to write.
+ * @param length the number of values to read.
*/
@Override
public void readFully(final Buffer view, final int offset, final int length) {
Modified: sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/Region.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/Region.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/Region.java [UTF-8] (original)
+++ sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/Region.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -87,10 +87,10 @@ public final class Region {
* {@code subsamplings[i] > 0} for all i
*
*
- * @param size The number of elements along each dimension.
- * @param regionLower Index of the first value to read or write along each dimension.
- * @param regionUpper Index after the last value to read or write along each dimension.
- * @param subsamplings Sub-sampling along each dimension. Shall be greater than zero.
+ * @param size the number of elements along each dimension.
+ * @param regionLower index of the first value to read or write along each dimension.
+ * @param regionUpper index after the last value to read or write along each dimension.
+ * @param subsamplings sub-sampling along each dimension. Shall be greater than zero.
*/
public Region(final long[] size, final long[] regionLower, final long[] regionUpper, final int[] subsamplings) {
final int dimension = size.length;
@@ -126,7 +126,7 @@ public final class Region {
/**
* Returns the number of dimension.
*
- * @return The hyper-rectangle dimension.
+ * @return the hyper-rectangle dimension.
*/
public final int getDimension() {
return targetSize.length;
Modified: sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/index/GeoHashCoderTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/index/GeoHashCoderTest.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/index/GeoHashCoderTest.java [UTF-8] (original)
+++ sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/index/GeoHashCoderTest.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -58,7 +58,7 @@ public final strictfp class GeoHashCoder
/**
* A list o places with their expected geohash.
*/
- private static Place[] PLACES = new Place[] {
+ private static final Place[] PLACES = new Place[] {
new Place("Empire State Building", -73.985656, 40.748433, "dr5ru6j2c62q"),
new Place("Statue Of Liberty", -74.044444, 40.689167, "dr5r7p4rx6kz"),
new Place("The White House", -77.036550, 38.897669, "dqcjqcpeq70c"),
@@ -82,7 +82,7 @@ public final strictfp class GeoHashCoder
/**
* Tests the {@link GeoHashCoder#decode(String)} method.
*
- * @throws ParseException Should never happen.
+ * @throws ParseException should never happen.
*/
@Test
public void testDecode() throws ParseException {
Modified: sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ByteArrayChannel.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ByteArrayChannel.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ByteArrayChannel.java [UTF-8] (original)
+++ sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ByteArrayChannel.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -18,12 +18,10 @@ package org.apache.sis.internal.storage.
import java.io.IOException;
import java.nio.ByteBuffer;
+import java.nio.channels.SeekableByteChannel;
import java.nio.channels.ClosedChannelException;
import org.apache.sis.util.ArgumentChecks;
-// Branch-dependent imports
-import java.nio.channels.SeekableByteChannel;
-
/**
* A readable and writable channel backed by an array.
@@ -63,9 +61,9 @@ final strictfp class ByteArrayChannel im
/**
* Creates a channel which will store all written data in the given array.
*
- * @param data Bytes array where to write the data. The length of this array is the capacity.
- * @param isContentValid {@code true} if the channel should be initialized with all the {@code data} elements,
- * or {@code false} if the channel should be considered initially empty.
+ * @param data bytes array where to write the data. The length of this array is the capacity.
+ * @param isContentValid {@code true} if the channel should be initialized with all the {@code data} elements,
+ * or {@code false} if the channel should be considered initially empty.
*/
ByteArrayChannel(final byte[] data, final boolean isDataValid) {
this.data = data;
Modified: sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ChannelDataTestCase.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ChannelDataTestCase.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ChannelDataTestCase.java [UTF-8] (original)
+++ sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ChannelDataTestCase.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -86,11 +86,11 @@ abstract strictfp class ChannelDataTestC
* This method invokes {@link #transferRandomData(int)} in a loop,
* with an operation identifier selected randomly between 0 inclusive to {@code numOperations} exclusive.
*
- * @param testedStream The stream to be tested.
- * @param length Length threshold for stopping the test. Shall be the backing array length
- * minus {@link #ARRAY_MAX_LENGTH}, in order to keep a margin for test cases.
- * @param numOperations Number of operations to be tested randomly.
- * @throws IOException If an I/O error occurred.
+ * @param testedStream the stream to be tested.
+ * @param length length threshold for stopping the test. Shall be the backing array length
+ * minus {@link #ARRAY_MAX_LENGTH}, in order to keep a margin for test cases.
+ * @param numOperations number of operations to be tested randomly.
+ * @throws IOException if an I/O error occurred.
*/
final void transferRandomData(final ChannelData testedStream, final int length, final int numOperations)
throws IOException
@@ -122,8 +122,8 @@ abstract strictfp class ChannelDataTestC
/**
* Transfers random data using a method selected randomly.
*
- * @param operation An identifier of the method to use for transfering data.
- * @throws IOException If an I/O error occurred.
+ * @param operation an identifier of the method to use for transfering data.
+ * @throws IOException if an I/O error occurred.
*/
abstract void transferRandomData(final int operation) throws IOException;
Modified: sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ChannelImageOutputStreamTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ChannelImageOutputStreamTest.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ChannelImageOutputStreamTest.java [UTF-8] (original)
+++ sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ChannelImageOutputStreamTest.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -54,7 +54,7 @@ public final strictfp class ChannelImage
/**
* Test writing a sequence of bits.
*
- * @throws IOException Should never happen.
+ * @throws IOException should never happen since we read and write in memory only.
*/
@Test
public void testWriteBits() throws IOException {
@@ -83,7 +83,7 @@ public final strictfp class ChannelImage
/**
* Tests {@link ChannelImageOutputStream#mark()} and {@code reset()} methods.
*
- * @throws IOException Should never happen.
+ * @throws IOException should never happen since we read and write in memory only.
*/
@Test
public void testMarkAndReset() throws IOException {
@@ -138,7 +138,7 @@ public final strictfp class ChannelImage
/**
* Tests {@link ChannelImageOutputStream#flushBefore(long)}.
*
- * @throws IOException Should never happen.
+ * @throws IOException should never happen since we read and write in memory only.
*/
@Test
@DependsOnMethod("testMarkAndReset")
Modified: sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/DripByteChannel.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/DripByteChannel.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/DripByteChannel.java [UTF-8] (original)
+++ sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/DripByteChannel.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -64,10 +64,10 @@ public final strictfp class DripByteChan
/**
* Creates a new {@code DripByteChannel} wrapping the given data.
*
- * @param data The data to provide.
- * @param random The random number generator to use for determining how many bytes to return.
- * @param lower Minimal amount of bytes to read, inclusive.
- * @param upper Maximal amount of bytes to read, exclusive.
+ * @param data the data to provide.
+ * @param random the random number generator to use for determining how many bytes to return.
+ * @param lower minimal amount of bytes to read, inclusive.
+ * @param upper maximal amount of bytes to read, exclusive.
*/
public DripByteChannel(final byte[] data, final Random random, final int lower, final int upper) {
this.data = data;
@@ -80,7 +80,7 @@ public final strictfp class DripByteChan
* Reads a random number of bytes from the data array.
*
* @param buffer The buffer where to copy the bytes.
- * @throws IOException If this channel is closed.
+ * @throws IOException if this channel is closed.
*/
@Override
public int read(final ByteBuffer buffer) throws IOException {
Modified: sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/HyperRectangleReaderTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/HyperRectangleReaderTest.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/HyperRectangleReaderTest.java [UTF-8] (original)
+++ sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/HyperRectangleReaderTest.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -82,9 +82,9 @@ public final strictfp class HyperRectang
* Creates an hyper-rectangle of random size and initializes the sub-region and sub-sampling to random values.
* Sample values are index values encoded in base 10. For example the value at index (4,1,2,3) will be 4123.
*
- * @param random The random number generator to use for initializing the test.
- * @param useChannel {@code true} for fetching the data from channel to a small buffer,
- * or {@code false} if the data are expected to be fully contained in the buffer.
+ * @param random the random number generator to use for initializing the test.
+ * @param useChannel {@code true} for fetching the data from channel to a small buffer, or
+ * {@code false} if the data are expected to be fully contained in the buffer.
*/
private void initialize(final Random random, final boolean useChannel) throws IOException, DataStoreException {
/*
Modified: sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ImageInputStreamComparator.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ImageInputStreamComparator.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ImageInputStreamComparator.java [UTF-8] (original)
+++ sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ImageInputStreamComparator.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -50,8 +50,8 @@ public class ImageInputStreamComparator
/**
* Creates a new comparator for the given input streams.
*
- * @param expected The stream used as a reference implementation.
- * @param actual The stream to compare against the reference implementation.
+ * @param expected the stream used as a reference implementation.
+ * @param actual the stream to compare against the reference implementation.
*/
public ImageInputStreamComparator(final ImageInputStream expected, final ImageInputStream actual) {
this.expected = expected;
@@ -61,7 +61,7 @@ public class ImageInputStreamComparator
/**
* Forwards the call to the two streams.
*
- * @param byteOrder The byte order to set.
+ * @param byteOrder the byte order to set.
*/
@Override
public void setByteOrder(final ByteOrder byteOrder) {
@@ -72,7 +72,7 @@ public class ImageInputStreamComparator
/**
* Forwards the call to the two streams and ensures that they return identical results.
*
- * @return The result of the forwarded call.
+ * @return the result of the forwarded call.
*/
@Override
public ByteOrder getByteOrder() {
@@ -84,7 +84,7 @@ public class ImageInputStreamComparator
/**
* Forwards the call to the two streams and ensures that they return identical results.
*
- * @return The result of the forwarded call.
+ * @return the result of the forwarded call.
* @throws IOException if any of the two streams failed to perform the operation.
*/
@Override
@@ -100,8 +100,8 @@ public class ImageInputStreamComparator
* This method requires that the two streams read an identical amount of bytes,
* despite the method contract allowing a different amount of bytes to be read.
*
- * @param dest The destination array where to store the bytes read.
- * @return The result of the forwarded call.
+ * @param dest the destination array where to store the bytes read.
+ * @return the result of the forwarded call.
* @throws IOException if any of the two streams failed to perform the operation.
*/
@Override
Modified: sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/xml/MimeTypeDetectorTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/xml/MimeTypeDetectorTest.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/xml/MimeTypeDetectorTest.java [UTF-8] (original)
+++ sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/xml/MimeTypeDetectorTest.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -19,14 +19,13 @@ package org.apache.sis.internal.storage.
import java.io.IOException;
import java.io.InputStream;
import java.io.StringReader;
+import org.apache.sis.xml.Namespaces;
import org.apache.sis.metadata.iso.extent.DefaultExtentTest;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
import org.junit.Test;
import static java.util.Collections.singletonMap;
-import org.apache.sis.xml.Namespaces;
-import static org.apache.sis.xml.Namespaces.GMD;
import static org.junit.Assert.*;
@@ -69,7 +68,7 @@ public final strictfp class MimeTypeDete
final StringReader in = new StringReader(xml);
assertEquals('<', in.read());
assertEquals('?', in.read());
- final MimeTypeDetector detector = new MimeTypeDetector(singletonMap(GMD, "application/vnd.iso.19139+xml")) {
+ final MimeTypeDetector detector = new MimeTypeDetector(singletonMap(Namespaces.GMD, "application/vnd.iso.19139+xml")) {
@Override int read() throws IOException {
return in.read();
}
@@ -91,7 +90,7 @@ public final strictfp class MimeTypeDete
try (InputStream in = DefaultExtentTest.getResource("Extent.xml").openStream()) {
assertEquals('<', in.read());
assertEquals('?', in.read());
- final MimeTypeDetector detector = new MimeTypeDetector(singletonMap(GMD, "application/vnd.iso.19139+xml")) {
+ final MimeTypeDetector detector = new MimeTypeDetector(singletonMap(Namespaces.GMD, "application/vnd.iso.19139+xml")) {
@Override int read() throws IOException {
return in.read();
}
Modified: sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/xml/StoreTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/xml/StoreTest.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/xml/StoreTest.java [UTF-8] (original)
+++ sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/xml/StoreTest.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -18,6 +18,7 @@ package org.apache.sis.internal.storage.
import java.util.Locale;
import java.io.StringReader;
+import java.nio.charset.StandardCharsets;
import org.opengis.metadata.Metadata;
import org.opengis.metadata.citation.*;
import org.apache.sis.xml.Namespaces;
@@ -30,9 +31,6 @@ import org.junit.Test;
import static org.opengis.test.Assert.*;
import static org.apache.sis.test.TestUtilities.getSingleton;
-// Branch-dependent imports
-import java.nio.charset.StandardCharsets;
-
/**
* Tests {@link Store}.