You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2016/09/11 18:56:07 UTC
svn commit: r1760274 [3/3] - in /sis/branches/JDK8:
core/sis-referencing/src/main/java/org/apache/sis/parameter/
core/sis-utility/src/main/java/org/apache/sis/internal/converter/
core/sis-utility/src/main/java/org/apache/sis/io/ core/sis-utility/src/ma...
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=1760274&r1=1760273&r2=1760274&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] Sun Sep 11 18:56:07 2016
@@ -138,9 +138,8 @@ public final class Numbers extends Stati
/**
* Returns {@code true} if the given {@code type} is a floating point type.
*
- * @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}.
+ * @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}.
*
* @see #isInteger(Class)
*/
@@ -154,7 +153,7 @@ public final class Numbers extends Stati
* {@link Long}, {@code long}, {@link Integer}, {@code int}, {@link Short}, {@code short},
* {@link Byte}, {@code byte} and {@link BigInteger}.
*
- * @param type The type to test (may be {@code null}).
+ * @param type the type to test (may be {@code null}).
* @return {@code true} if {@code type} is an integer type.
*
* @see #isFloat(Class)
@@ -168,8 +167,8 @@ public final class Numbers extends Stati
* Returns the number of bits used by primitive of the specified type.
* The given type must be a primitive type or its wrapper class.
*
- * @param type The primitive type (may be {@code null}).
- * @return The number of bits, or 0 if {@code type} is null.
+ * @param type the primitive type (may be {@code null}).
+ * @return the number of bits, or 0 if {@code type} is null.
* @throws IllegalArgumentException if the given type is unknown.
*/
public static int primitiveBitCount(final Class<?> type) throws IllegalArgumentException {
@@ -190,8 +189,8 @@ public final class Numbers extends Stati
* Changes a primitive class to its wrapper (for example {@code int} to {@link Integer}).
* If the specified class is not a primitive type, then it is returned unchanged.
*
- * @param type The primitive type (may be {@code null}).
- * @return The type as a wrapper.
+ * @param type the primitive type (may be {@code null}).
+ * @return the type as a wrapper.
*
* @see #wrapperToPrimitive(Class)
*/
@@ -204,8 +203,8 @@ public final class Numbers extends Stati
* Changes a wrapper class to its primitive (for example {@link Integer} to {@code int}).
* If the specified class is not a wrapper type, then it is returned unchanged.
*
- * @param type The wrapper type (may be {@code null}).
- * @return The type as a primitive.
+ * @param type the wrapper type (may be {@code null}).
+ * @return the type as a primitive.
*
* @see #primitiveToWrapper(Class)
*/
@@ -222,10 +221,10 @@ public final class Numbers extends Stati
* <p>If one of the given argument is null, then this method returns the class of the
* non-null argument. If both arguments are null, then this method returns {@code null}.</p>
*
- * @param n1 The first number, or {@code null}.
- * @param n2 The second number, or {@code null}.
- * @return The widest type of the given numbers, or {@code null} if not {@code n1} and {@code n2} are null.
- * @throws IllegalArgumentException If a number is not of a known type.
+ * @param n1 the first number, or {@code null}.
+ * @param n2 the second number, or {@code null}.
+ * @return the widest type of the given numbers, or {@code null} if not {@code n1} and {@code n2} are null.
+ * @throws IllegalArgumentException if a number is not of a known type.
*
* @see #widestClass(Number, Number)
* @see #narrowestClass(Number, Number)
@@ -253,10 +252,10 @@ public final class Numbers extends Stati
*
* returns {@code Long.class}.
*
- * @param c1 The first number type, or {@code null}.
- * @param c2 The second number type, or {@code null}.
- * @return The widest of the given types, or {@code null} if both {@code c1} and {@code c2} are null.
- * @throws IllegalArgumentException If one of the given types is unknown.
+ * @param c1 the first number type, or {@code null}.
+ * @param c2 the second number type, or {@code null}.
+ * @return the widest of the given types, or {@code null} if both {@code c1} and {@code c2} are null.
+ * @throws IllegalArgumentException if one of the given types is unknown.
*
* @see #widestClass(Class, Class)
* @see #narrowestClass(Number, Number)
@@ -283,10 +282,10 @@ public final class Numbers extends Stati
* of any of {@link Byte}, {@link Short}, {@link Integer}, {@link Long}, {@link Float}
* {@link Double}, {@link BigInteger} or {@link BigDecimal} types.
*
- * @param n1 The first number.
- * @param n2 The second number.
- * @return The narrowest type of the given numbers.
- * @throws IllegalArgumentException If a number is not of a known type.
+ * @param n1 the first number.
+ * @param n2 the second number.
+ * @return the narrowest type of the given numbers.
+ * @throws IllegalArgumentException if a number is not of a known type.
*
* @see #narrowestClass(Class, Class)
* @see #widestClass(Class, Class)
@@ -314,10 +313,10 @@ public final class Numbers extends Stati
*
* returns {@code Short.class}.
*
- * @param c1 The first number type, or {@code null}.
- * @param c2 The second number type, or {@code null}.
- * @return The narrowest of the given types, or {@code null} if both {@code c1} and {@code c2} are null.
- * @throws IllegalArgumentException If one of the given types is unknown.
+ * @param c1 the first number type, or {@code null}.
+ * @param c2 the second number type, or {@code null}.
+ * @return the narrowest of the given types, or {@code null} if both {@code c1} and {@code c2} are null.
+ * @throws IllegalArgumentException if one of the given types is unknown.
*
* @see #narrowestClass(Number, Number)
* @see #widestClass(Class, Class)
@@ -358,8 +357,8 @@ public final class Numbers extends Stati
* <li>Otherwise this method returns {@code Long.class};</li>
* </ul>
*
- * @param value The value to be wrapped in a finer (if possible) {@link Number}.
- * @return The narrowest type capable to hold the given value.
+ * @param value the value to be wrapped in a finer (if possible) {@link Number}.
+ * @return the narrowest type capable to hold the given value.
*
* @see #narrowestNumber(Number)
*/
@@ -395,8 +394,8 @@ public final class Numbers extends Stati
* return cast(value, narrowestClass(value));
* }
*
- * @param value The value to be wrapped in a finer (if possible) {@link Number}.
- * @return The narrowest type capable to hold the given value.
+ * @param value the value to be wrapped in a finer (if possible) {@link Number}.
+ * @return the narrowest type capable to hold the given value.
*
* @see #narrowestClass(Number)
* @see #cast(Number, Class)
@@ -452,8 +451,8 @@ public final class Numbers extends Stati
/**
* Returns the smallest number capable to hold the specified value.
*
- * @param value The value to be wrapped in a {@link Number}.
- * @return The narrowest type capable to hold the given value.
+ * @param value the value to be wrapped in a {@link Number}.
+ * @return the narrowest type capable to hold the given value.
* @throws NumberFormatException if the given value can not be parsed as a number.
*
* @see #narrowestNumber(Number)
@@ -492,12 +491,11 @@ public final class Numbers extends Stati
* then the behavior depends on the implementation of the corresponding
* {@code Number.fooValue()} method - typically, the value is just rounded or truncated.
*
- * @param <N> The class to cast to.
- * @param number The number to cast, or {@code null}.
- * @param type The destination type.
- * @return The number casted to the given type, or {@code null} if the given value was null.
- * @throws IllegalArgumentException If the given type is not one of the primitive
- * wrappers for numeric types.
+ * @param <N> the class to cast to.
+ * @param number the number to cast, or {@code null}.
+ * @param type the destination type.
+ * @return the number casted to the given type, or {@code null} if the given value was null.
+ * @throws IllegalArgumentException if the given type is not one of the primitive wrappers for numeric types.
*/
@SuppressWarnings("unchecked")
public static <N extends Number> N cast(final Number number, final Class<N> type)
@@ -553,13 +551,12 @@ public final class Numbers extends Stati
* Furthermore, the given value shall be convertible to the given class without precision lost,
* otherwise an {@link IllegalArgumentException} will be thrown.
*
- * @param <N> The wrapper class.
- * @param value The value to wrap.
- * @param type The desired wrapper class.
- * @return The value wrapped in an object of the given class.
- * @throws IllegalArgumentException If the given type is not one of the primitive
- * wrappers for numeric types, or if the given value can not be wrapped in
- * an instance of the given class without precision lost.
+ * @param <N> the wrapper class.
+ * @param value the value to wrap.
+ * @param type the desired wrapper class.
+ * @return the value wrapped in an object of the given class.
+ * @throws IllegalArgumentException if the given type is not one of the primitive wrappers for numeric types,
+ * or if the given value can not be wrapped in an instance of the given class without precision lost.
*/
@SuppressWarnings("unchecked")
public static <N extends Number> N wrap(final double value, final Class<N> type)
@@ -584,11 +581,11 @@ public final class Numbers extends Stati
}
/**
- * Converts the specified string into a value object. The value object can be an instance of
- * {@link BigDecimal}, {@link BigInteger},
+ * Converts the specified string into a value object.
+ * The value object can be an instance of {@link BigDecimal}, {@link BigInteger},
* {@link Double}, {@link Float}, {@link Long}, {@link Integer}, {@link Short}, {@link Byte},
- * {@link Boolean}, {@link Character} or {@link String} according the specified type. This
- * method makes the following choice:
+ * {@link Boolean}, {@link Character} or {@link String} according the specified type.
+ * This method makes the following choice:
*
* <ul>
* <li>If the given type is {@code Double.class}, then this method returns
@@ -598,13 +595,13 @@ public final class Numbers extends Stati
* <li>And likewise for all remaining known types.</li>
* </ul>
*
- * @param <T> The requested type.
- * @param value the value to parse.
- * @param type The requested type.
- * @return The value object, or {@code null} if {@code value} was null.
+ * @param <T> the requested type.
+ * @param value the value to parse.
+ * @param type the requested type.
+ * @return the value object, or {@code null} if {@code value} was null.
* @throws IllegalArgumentException if {@code type} is not a recognized type.
- * @throws NumberFormatException if {@code type} is a subclass of {@link Number} and the
- * string value is not parsable as a number of the specified type.
+ * @throws NumberFormatException if {@code type} is a subclass of {@link Number}
+ * and the string value is not parsable as a number of the specified type.
*/
@SuppressWarnings("unchecked")
public static <T> T valueOf(final String value, final Class<T> type)
@@ -667,9 +664,9 @@ public final class Numbers extends Stati
* extended to array and collection types because those objects can also be seen as
* mathematical concepts.
*
- * @param <T> The compile-time type of the requested object.
- * @param type The type of the object for which to get a nil value.
- * @return An object of the given type which represents a nil value, or {@code null}.
+ * @param <T> the compile-time type of the requested object.
+ * @param type the type of the object for which to get a nil value.
+ * @return an object of the given type which represents a nil value, or {@code null}.
*
* @see org.apache.sis.xml.NilObject
*/
Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/Types.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/Types.java?rev=1760274&r1=1760273&r2=1760274&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/Types.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/Types.java [UTF-8] Sun Sep 11 18:56:07 2016
@@ -174,8 +174,8 @@ public final class Types extends Static
* </ul>
* </div>
*
- * @param code The code for which to get the class name, or {@code null}.
- * @return The ISO (preferred) or Java (fallback) class name, or {@code null} if the given code is null.
+ * @param code the code for which to get the class name, or {@code null}.
+ * @return the ISO (preferred) or Java (fallback) class name, or {@code null} if the given code is null.
*/
public static String getListName(final ControlledVocabulary code) {
if (code == null) {
@@ -199,9 +199,8 @@ public final class Types extends Static
* </ul>
* </div>
*
- * @param code The code for which to get the name, or {@code null}.
- * @return The UML identifiers or programmatic name for the given code,
- * or {@code null} if the given code is null.
+ * @param code the code for which to get the name, or {@code null}.
+ * @return the UML identifiers or programmatic name for the given code, or {@code null} if the given code is null.
*
* @see #getCodeLabel(ControlledVocabulary)
* @see #getCodeTitle(ControlledVocabulary)
@@ -234,8 +233,8 @@ public final class Types extends Static
* </ul>
* </div>
*
- * @param code The code from which to get a title, or {@code null}.
- * @return A unlocalized title for the given code, or {@code null} if the given code is null.
+ * @param code the code from which to get a title, or {@code null}.
+ * @return a unlocalized title for the given code, or {@code null} if the given code is null.
*
* @see #getCodeName(ControlledVocabulary)
* @see #getCodeTitle(ControlledVocabulary)
@@ -266,8 +265,8 @@ public final class Types extends Static
* with the {@link #forCodeTitle(CharSequence)} method. See <cite>Substituting a free text by a code list</cite>
* in this class javadoc for more information.</p>
*
- * @param code The code for which to get the title, or {@code null}.
- * @return The title, or {@code null} if the given code is null.
+ * @param code the code for which to get the title, or {@code null}.
+ * @return the title, or {@code null} if the given code is null.
*
* @see #getDescription(ControlledVocabulary)
* @see #forCodeTitle(CharSequence)
@@ -281,8 +280,8 @@ public final class Types extends Static
* For a description of the code list as a whole instead than a particular code,
* see {@link Types#getDescription(Class)}.
*
- * @param code The code for which to get the localized description, or {@code null}.
- * @return The description, or {@code null} if none or if the given code is null.
+ * @param code the code for which to get the localized description, or {@code null}.
+ * @return the description, or {@code null} if none or if the given code is null.
*
* @see #getCodeTitle(ControlledVocabulary)
* @see #getDescription(Class)
@@ -301,8 +300,8 @@ public final class Types extends Static
* Returns a description for the given class, or {@code null} if none.
* This method can be used for GeoAPI interfaces or {@link CodeList}.
*
- * @param type The GeoAPI interface or code list from which to get the description, or {@code null}.
- * @return The description, or {@code null} if none or if the given type is {@code null}.
+ * @param type the GeoAPI interface or code list from which to get the description, or {@code null}.
+ * @return the description, or {@code null} if none or if the given type is {@code null}.
*
* @see #getDescription(ControlledVocabulary)
*/
@@ -323,9 +322,9 @@ public final class Types extends Static
* be a UML identifier. If any of the input argument is {@code null}, then
* this method returns {@code null}.
*
- * @param type The GeoAPI interface from which to get the description of a property, or {@code null}.
- * @param property The ISO name of the property for which to get the description, or {@code null}.
- * @return The description, or {@code null} if none or if the given type or property name is {@code null}.
+ * @param type the GeoAPI interface from which to get the description of a property, or {@code null}.
+ * @param property the ISO name of the property for which to get the description, or {@code null}.
+ * @return the description, or {@code null} if none or if the given type or property name is {@code null}.
*/
public static InternationalString getDescription(final Class<?> type, final String property) {
if (property != null) {
@@ -364,8 +363,8 @@ public final class Types extends Static
/**
* Creates a new international string from the specified resource bundle and key.
*
- * @param resources The name of the resource bundle, as a fully qualified class name.
- * @param key The key for the resource to fetch.
+ * @param resources the name of the resource bundle, as a fully qualified class name.
+ * @param key the key for the resource to fetch.
*/
Description(final String resources, final String key) {
super(resources, key);
@@ -438,7 +437,7 @@ public final class Types extends Static
/**
* Creates a new international string for the given code list element.
*
- * @param code The code list for which to create a title.
+ * @param code the code list for which to create a title.
*/
CodeTitle(final ControlledVocabulary code) {
super("org.opengis.metadata.CodeLists", resourceKey(code));
@@ -457,8 +456,8 @@ public final class Types extends Static
/**
* Returns the resource name for the given GeoAPI type, or {@code null} if none.
*
- * @param classname The fully qualified name of the GeoAPI type.
- * @return The resource bundle to load, or {@code null} if none.
+ * @param classname the fully qualified name of the GeoAPI type.
+ * @return the resource bundle to load, or {@code null} if none.
*/
static String getResources(final String classname) {
String resources = "org.opengis.metadata.Descriptions";
@@ -478,9 +477,9 @@ public final class Types extends Static
* This method works with both {@link Enum} and {@link CodeList}. However if the type is known to be an
* {@code Enum}, then the standard {@link Class#getEnumConstants()} method is more efficient.</div>
*
- * @param <T> The compile-time type given as the {@code codeType} parameter.
- * @param codeType The type of code list or enumeration.
- * @return The list of values for the given code list or enumeration, or an empty array if none.
+ * @param <T> the compile-time type given as the {@code codeType} parameter.
+ * @param codeType the type of code list or enumeration.
+ * @return the list of values for the given code list or enumeration, or an empty array if none.
*
* @see Class#getEnumConstants()
*/
@@ -519,8 +518,8 @@ public final class Types extends Static
* Only identifiers for the stable part of GeoAPI are recognized. This method does not handle
* the identifiers for the {@code geoapi-pending} module.
*
- * @param identifier The ISO {@linkplain UML} identifier, or {@code null}.
- * @return The GeoAPI interface, or {@code null} if the given identifier is {@code null} or unknown.
+ * @param identifier the ISO {@linkplain UML} identifier, or {@code null}.
+ * @return the GeoAPI interface, or {@code null} if the given identifier is {@code null} or unknown.
*/
public static synchronized Class<?> forStandardName(final String identifier) {
if (identifier == null) {
@@ -570,10 +569,10 @@ public final class Types extends Static
* If there is no match, this method returns {@code null} \u2014 it does not thrown an exception,
* unless the given class is not an enumeration.
*
- * @param <T> The compile-time type given as the {@code enumType} parameter.
- * @param enumType The type of enumeration.
- * @param name The name of the enumeration value to obtain, or {@code null}.
- * @return A value matching the given name, or {@code null} if the name is null
+ * @param <T> the compile-time type given as the {@code enumType} parameter.
+ * @param enumType the type of enumeration.
+ * @param name the name of the enumeration value to obtain, or {@code null}.
+ * @return a value matching the given name, or {@code null} if the name is null
* or if no matching enumeration is found.
*
* @see Enum#valueOf(Class, String)
@@ -622,11 +621,11 @@ public final class Types extends Static
* If no match is found, then a new code is created only if the {@code canCreate} argument is {@code true}.
* Otherwise this method returns {@code null}.
*
- * @param <T> The compile-time type given as the {@code codeType} parameter.
- * @param codeType The type of code list.
- * @param name The name of the code to obtain, or {@code null}.
- * @param canCreate {@code true} if this method is allowed to create new code.
- * @return A code matching the given name, or {@code null} if the name is null
+ * @param <T> the compile-time type given as the {@code codeType} parameter.
+ * @param codeType the type of code list.
+ * @param name the name of the code to obtain, or {@code null}.
+ * @param canCreate {@code true} if this method is allowed to create new code.
+ * @return a code matching the given name, or {@code null} if the name is null
* or if no matching code is found and {@code canCreate} is {@code false}.
*
* @see #getCodeName(ControlledVocabulary)
@@ -650,8 +649,8 @@ public final class Types extends Static
* <li>Otherwise returns {@code null}.</li>
* </ul>
*
- * @param title The title for which to get a code or enumeration value, or {@code null}.
- * @return The code or enumeration value associated with the given title, or {@code null}.
+ * @param title the title for which to get a code or enumeration value, or {@code null}.
+ * @return the code or enumeration value associated with the given title, or {@code null}.
*
* @since 0.7
*
@@ -679,11 +678,11 @@ public final class Types extends Static
* <li>The value for the decoded locale is added in the international string to be returned.</li>
* </ul>
*
- * @param properties The map from which to get the string values for an international string, or {@code null}.
- * @param prefix The prefix of keys to use for creating the international string.
- * @return The international string, or {@code null} if the given map is null or does not contain values
+ * @param properties the map from which to get the string values for an international string, or {@code null}.
+ * @param prefix the prefix of keys to use for creating the international string.
+ * @return the international string, or {@code null} if the given map is null or does not contain values
* associated to keys starting with the given prefix.
- * @throws IllegalArgumentException If a key starts by the given prefix and:
+ * @throws IllegalArgumentException if a key starts by the given prefix and:
* <ul>
* <li>The key suffix is an illegal {@link Locale} code,</li>
* <li>or the value associated to that key is a not a {@link CharSequence}.</li>
@@ -775,9 +774,8 @@ public final class Types extends Static
* Otherwise, this method copies the {@link InternationalString#toString()} value in a new
* {@link SimpleInternationalString} instance and returns it.
*
- * @param string The characters sequence to convert, or {@code null}.
- * @return The given sequence as an international string,
- * or {@code null} if the given sequence was null.
+ * @param string the characters sequence to convert, or {@code null}.
+ * @return the given sequence as an international string, or {@code null} if the given sequence was null.
*
* @see DefaultNameFactory#createInternationalString(Map)
*/
@@ -798,8 +796,8 @@ public final class Types extends Static
* <p>If a defensive copy of the {@code strings} array is wanted, then the caller needs to check
* if the returned array is the same instance than the one given in argument to this method.</p>
*
- * @param strings The characters sequences to convert, or {@code null}.
- * @return The given array as an array of type {@code InternationalString[]},
+ * @param strings the characters sequences to convert, or {@code null}.
+ * @return the given array as an array of type {@code InternationalString[]},
* or {@code null} if the given array was null.
*/
public static InternationalString[] toInternationalStrings(final CharSequence... strings) {
Modified: sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStoreRegistry.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStoreRegistry.java?rev=1760274&r1=1760273&r2=1760274&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStoreRegistry.java [UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStoreRegistry.java [UTF-8] Sun Sep 11 18:56:07 2016
@@ -63,7 +63,7 @@ final class DataStoreRegistry {
/**
* Creates a new registry which will look for data stores accessible to the given class loader.
*
- * @param loader The class loader to use for loading {@link DataStoreProvider} implementations.
+ * @param loader the class loader to use for loading {@link DataStoreProvider} implementations.
*/
public DataStoreRegistry(final ClassLoader loader) {
ArgumentChecks.ensureNonNull("loader", loader);
@@ -73,9 +73,9 @@ final class DataStoreRegistry {
/**
* Returns the MIME type of the storage file format, or {@code null} if unknown or not applicable.
*
- * @param storage The input/output object as a URL, file, image input stream, <i>etc.</i>.
- * @return The storage MIME type, or {@code null} if unknown or not applicable.
- * @throws DataStoreException If an error occurred while opening the storage.
+ * @param storage the input/output object as a URL, file, image input stream, <i>etc.</i>.
+ * @return the storage MIME type, or {@code null} if unknown or not applicable.
+ * @throws DataStoreException if an error occurred while opening the storage.
*/
public String probeContentType(final Object storage) throws DataStoreException {
ArgumentChecks.ensureNonNull("storage", storage);
@@ -97,10 +97,10 @@ final class DataStoreRegistry {
* <li>An existing {@link StorageConnector} instance.</li>
* </ul>
*
- * @param storage The input/output object as a URL, file, image input stream, <i>etc.</i>.
- * @return The object to use for reading geospatial data from the given storage.
+ * @param storage the input/output object as a URL, file, image input stream, <i>etc.</i>.
+ * @return the object to use for reading geospatial data from the given storage.
* @throws UnsupportedStorageException if no {@link DataStoreProvider} is found for a given storage object.
- * @throws DataStoreException If an error occurred while opening the storage.
+ * @throws DataStoreException if an error occurred while opening the storage.
*/
public DataStore open(final Object storage) throws UnsupportedStorageException, DataStoreException {
ArgumentChecks.ensureNonNull("storage", storage);
@@ -110,10 +110,10 @@ final class DataStoreRegistry {
/**
* Implementation of {@link #probeContentType(Object)} and {@link #open(Object)}.
*
- * @param storage The input/output object as a URL, file, image input stream, <i>etc.</i>.
- * @param open {@code true} for creating a {@link DataStore}, or {@code false} if not needed.
+ * @param storage the input/output object as a URL, file, image input stream, <i>etc.</i>.
+ * @param open {@code true} for creating a {@link DataStore}, or {@code false} if not needed.
* @throws UnsupportedStorageException if no {@link DataStoreProvider} is found for a given storage object.
- * @throws DataStoreException If an error occurred while opening the storage.
+ * @throws DataStoreException if an error occurred while opening the storage.
*/
private ProbeProviderPair lookup(final Object storage, final boolean open) throws DataStoreException {
StorageConnector connector;
Modified: sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStores.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStores.java?rev=1760274&r1=1760273&r2=1760274&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStores.java [UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStores.java [UTF-8] Sun Sep 11 18:56:07 2016
@@ -80,9 +80,9 @@ public final class DataStores extends St
/**
* Returns the MIME type of the storage file format, or {@code null} if unknown or not applicable.
*
- * @param storage The input/output object as a URL, file, image input stream, <i>etc.</i>.
- * @return The storage MIME type, or {@code null} if unknown or not applicable.
- * @throws DataStoreException If an error occurred while opening the storage.
+ * @param storage the input/output object as a URL, file, image input stream, <i>etc.</i>.
+ * @return the storage MIME type, or {@code null} if unknown or not applicable.
+ * @throws DataStoreException if an error occurred while opening the storage.
*/
public static String probeContentType(final Object storage) throws DataStoreException {
return registry().probeContentType(storage);
@@ -102,10 +102,10 @@ public final class DataStores extends St
* <li>An existing {@link StorageConnector} instance.</li>
* </ul>
*
- * @param storage The input/output object as a URL, file, image input stream, <i>etc.</i>.
- * @return The object to use for reading geospatial data from the given storage.
+ * @param storage the input/output object as a URL, file, image input stream, <i>etc.</i>.
+ * @return the object to use for reading geospatial data from the given storage.
* @throws UnsupportedStorageException if no {@link DataStoreProvider} is found for a given storage object.
- * @throws DataStoreException If an error occurred while opening the storage.
+ * @throws DataStoreException if an error occurred while opening the storage.
*/
public static DataStore open(final Object storage) throws UnsupportedStorageException, DataStoreException {
return registry().open(storage);