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/06/30 12:25:29 UTC
svn commit: r1750789 [2/2] - in /sis/branches/0.7: ./
application/sis-console/src/main/java/org/apache/sis/console/
core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/
core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/...
Modified: sis/branches/0.7/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/NetcdfStoreProvider.java
URL: http://svn.apache.org/viewvc/sis/branches/0.7/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/NetcdfStoreProvider.java?rev=1750789&r1=1750788&r2=1750789&view=diff
==============================================================================
--- sis/branches/0.7/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/NetcdfStoreProvider.java [UTF-8] (original)
+++ sis/branches/0.7/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/NetcdfStoreProvider.java [UTF-8] Thu Jun 30 12:25:29 2016
@@ -202,7 +202,7 @@ public class NetcdfStoreProvider extends
*
* @param storage Information about the storage (URL, stream, {@link ucar.nc2.NetcdfFile} instance, <i>etc</i>).
* @return A data store implementation associated with this provider for the given storage.
- * @throws DataStoreException If an error occurred while creating the data store instance.
+ * @throws DataStoreException if an error occurred while creating the data store instance.
*/
@Override
public DataStore open(final StorageConnector storage) throws DataStoreException {
@@ -215,9 +215,9 @@ public class NetcdfStoreProvider extends
*
* @param listeners Where to send the warnings.
* @param storage Information about the input (file, input stream, <i>etc.</i>)
- * @return The decoder for the given input.
- * @throws IOException If an error occurred while opening the NetCDF file.
- * @throws DataStoreException If a logical error (other than I/O) occurred.
+ * @return The decoder for the given input, or {@code null} if the input type is not recognized.
+ * @throws IOException if an error occurred while opening the NetCDF file.
+ * @throws DataStoreException if a logical error (other than I/O) occurred.
*/
static Decoder decoder(final WarningListeners<?> listeners, final StorageConnector storage)
throws IOException, DataStoreException
@@ -252,9 +252,9 @@ public class NetcdfStoreProvider extends
* @param input The NetCDF file object of filename string from which to read data.
* @param isUCAR {@code true} if {@code input} is an instance of the UCAR {@link ucar.nc2.NetcdfFile} object,
* or {@code false} if it is the filename as a {@code String}.
- * @return The {@link DecoderWrapper} instance for the given input.
- * @throws IOException If an error occurred while opening the NetCDF file.
- * @throws DataStoreException If a logical error (other than I/O) occurred.
+ * @return The {@link DecoderWrapper} instance for the given input, or {@code null} if the input type is not recognized.
+ * @throws IOException if an error occurred while opening the NetCDF file.
+ * @throws DataStoreException if a logical error (other than I/O) occurred.
*/
private static Decoder createByReflection(final WarningListeners<?> listeners, final Object input, final boolean isUCAR)
throws IOException, DataStoreException
Modified: sis/branches/0.7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/xml/Store.java
URL: http://svn.apache.org/viewvc/sis/branches/0.7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/xml/Store.java?rev=1750789&r1=1750788&r2=1750789&view=diff
==============================================================================
--- sis/branches/0.7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/xml/Store.java [UTF-8] (original)
+++ sis/branches/0.7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/xml/Store.java [UTF-8] Thu Jun 30 12:25:29 2016
@@ -144,7 +144,7 @@ final class Store extends DataStore {
private void unmarshal() throws DataStoreException {
final StreamSource s = source;
final Closeable in = input(s);
- source = null; // Cleared first in case of error.
+ source = null; // Cleared first in case of error.
if (in != null) try {
try {
object = XML.unmarshal(s, properties());
@@ -197,7 +197,7 @@ final class Store extends DataStore {
public void close() throws DataStoreException {
object = null;
final Closeable in = input(source);
- source = null; // Cleared first in case of failure.
+ source = null; // Cleared first in case of failure.
if (in != null) try {
in.close();
} catch (IOException e) {
Modified: sis/branches/0.7/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStore.java
URL: http://svn.apache.org/viewvc/sis/branches/0.7/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStore.java?rev=1750789&r1=1750788&r2=1750789&view=diff
==============================================================================
--- sis/branches/0.7/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStore.java [UTF-8] (original)
+++ sis/branches/0.7/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStore.java [UTF-8] Thu Jun 30 12:25:29 2016
@@ -94,7 +94,7 @@ public abstract class DataStore implemen
* or distributor, data quality, update frequency, usage constraints and more.
*
* @return Information about the dataset, or {@code null} if none.
- * @throws DataStoreException If an error occurred while reading the data.
+ * @throws DataStoreException if an error occurred while reading the data.
*/
public abstract Metadata getMetadata() throws DataStoreException;
@@ -122,7 +122,7 @@ public abstract class DataStore implemen
* }
*
* @param listener The listener to add.
- * @throws IllegalArgumentException If the given listener is already registered in this data store.
+ * @throws IllegalArgumentException if the given listener is already registered in this data store.
*/
public void addWarningListener(final WarningListener<? super DataStore> listener)
throws IllegalArgumentException
@@ -134,7 +134,7 @@ public abstract class DataStore implemen
* Removes a previously registered listener.
*
* @param listener The listener to remove.
- * @throws NoSuchElementException If the given listener is not registered in this data store.
+ * @throws NoSuchElementException if the given listener is not registered in this data store.
*/
public void removeWarningListener(final WarningListener<? super DataStore> listener)
throws NoSuchElementException
@@ -145,7 +145,7 @@ public abstract class DataStore implemen
/**
* Closes this data store and releases any underlying resources.
*
- * @throws DataStoreException If an error occurred while closing this data store.
+ * @throws DataStoreException if an error occurred while closing this data store.
*/
public abstract void close() throws DataStoreException;
}