sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1734122 - in /sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis: internal/storage/ChannelDataInput.java internal/storage/wkt/Store.java internal/storage/xml/Store.java storage/StorageConnector.java
Date Tue, 08 Mar 2016 19:01:43 GMT
Author: desruisseaux
Date: Tue Mar  8 19:01:43 2016
New Revision: 1734122

URL: http://svn.apache.org/viewvc?rev=1734122&view=rev
Log:
Javadoc and code formatting (no significant code change).

Modified:
    sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/ChannelDataInput.java
    sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/wkt/Store.java
    sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/xml/Store.java
    sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/storage/StorageConnector.java

Modified: sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/ChannelDataInput.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/ChannelDataInput.java?rev=1734122&r1=1734121&r2=1734122&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/ChannelDataInput.java
[UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/ChannelDataInput.java
[UTF-8] Tue Mar  8 19:01:43 2016
@@ -642,7 +642,7 @@ public class ChannelDataInput extends Ch
         @Override void   createDataArray(int n) {dest = new byte[n];}
         @Override void   transfer(int p, int n) {buffer.get(dest, p, n);}
         @Override void   setDest(Object array)  {dest = (byte[]) array;};
-        @Override void readFully(Buffer view, int offset, int length) throws IOException
{
+        @Override void   readFully(Buffer view, int offset, int length) throws IOException
{
             ChannelDataInput.this.readFully(dest, offset, length);
         }
     };

Modified: sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/wkt/Store.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/wkt/Store.java?rev=1734122&r1=1734121&r2=1734122&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/wkt/Store.java
[UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/wkt/Store.java
[UTF-8] Tue Mar  8 19:01:43 2016
@@ -142,14 +142,14 @@ final class Store extends DataStore {
     public Metadata getMetadata() throws DataStoreException {
         if (metadata == null) {
             parse();
-            DefaultMetadata d = null;
+            DefaultMetadata md = null;
             for (final Object object : objects) {
                 if (object instanceof ReferenceSystem) {
-                    if (d == null) d = new DefaultMetadata();
-                    d.getReferenceSystemInfo().add((ReferenceSystem) object);
+                    if (md == null) md = new DefaultMetadata();
+                    md.getReferenceSystemInfo().add((ReferenceSystem) object);
                 }
             }
-            metadata = d;
+            metadata = md;
         }
         return metadata;
     }

Modified: sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/xml/Store.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/xml/Store.java?rev=1734122&r1=1734121&r2=1734122&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/xml/Store.java
[UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/xml/Store.java
[UTF-8] Tue Mar  8 19:01:43 2016
@@ -178,9 +178,9 @@ final class Store extends DataStore {
             if (object instanceof Metadata) {
                 metadata = (Metadata) object;
             } else if (object instanceof ReferenceSystem) {
-                final DefaultMetadata d = new DefaultMetadata();
-                d.setReferenceSystemInfo(singleton((ReferenceSystem) object));
-                metadata = d;
+                final DefaultMetadata md = new DefaultMetadata();
+                md.setReferenceSystemInfo(singleton((ReferenceSystem) object));
+                metadata = md;
             }
         }
         return metadata;

Modified: sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/storage/StorageConnector.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/storage/StorageConnector.java?rev=1734122&r1=1734121&r2=1734122&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/storage/StorageConnector.java
[UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/storage/StorageConnector.java
[UTF-8] Tue Mar  8 19:01:43 2016
@@ -359,8 +359,8 @@ public class StorageConnector implements
      * @param  type The desired type as one of {@code ByteBuffer}, {@code DataInput}, {@code
Connection}
      *         class or other type supported by {@code StorageConnector} subclasses.
      * @return The storage as a view of the given type, or {@code null} if no view can be
created for the given type.
-     * @throws IllegalArgumentException If the given {@code type} argument is not a known
type.
-     * @throws DataStoreException If an error occurred while opening a stream or database
connection.
+     * @throws IllegalArgumentException if the given {@code type} argument is not a supported
type.
+     * @throws DataStoreException if an error occurred while opening a stream or database
connection.
      *
      * @see #getStorage()
      * @see #closeAllExcept(Object)
@@ -439,7 +439,7 @@ public class StorageConnector implements
      * If the view can not be created, remember that fact in order to avoid new attempts.
      *
      * @param  asImageInputStream If the {@code ChannelDataInput} needs to be {@link ChannelImageInputStream}
subclass.
-     * @throws IOException If an error occurred while opening a channel for the input.
+     * @throws IOException if an error occurred while opening a channel for the input.
      */
     private void createChannelDataInput(final boolean asImageInputStream) throws IOException
{
         /*
@@ -484,7 +484,7 @@ public class StorageConnector implements
      * data input may imply creating a {@link ByteBuffer}, in which case the buffer will
be stored under
      * the {@code ByteBuffer.class} key together with the {@code DataInput.class} case.
      *
-     * @throws IOException If an error occurred while opening a stream for the input.
+     * @throws IOException if an error occurred while opening a stream for the input.
      */
     private void createDataInput() throws IOException {
         final DataInput asDataInput;
@@ -523,7 +523,7 @@ public class StorageConnector implements
      * of bytes read from the input. This amount is not sufficient, it can be increased by
a call
      * to {@link #prefetch()}.
      *
-     * @throws IOException If an error occurred while opening a stream for the input.
+     * @throws IOException if an error occurred while opening a stream for the input.
      */
     private void createByteBuffer() throws IOException, DataStoreException {
         /*
@@ -569,7 +569,7 @@ public class StorageConnector implements
      * for {@link DataStoreProvider#probeContent(StorageConnector)} purpose.</p>
      *
      * @return {@code true} on success.
-     * @throws DataStoreException If an error occurred while reading more bytes.
+     * @throws DataStoreException if an error occurred while reading more bytes.
      */
     final boolean prefetch() throws DataStoreException {
         try {
@@ -606,8 +606,8 @@ public class StorageConnector implements
      *
      * @param  type The type of the view to create.
      * @return The storage as a view of the given type, or {@code null} if no view can be
created for the given type.
-     * @throws IllegalArgumentException If the given {@code type} argument is not a known
type.
-     * @throws Exception If an error occurred while opening a stream or database connection.
+     * @throws IllegalArgumentException if the given {@code type} argument is not a supported
type.
+     * @throws Exception if an error occurred while opening a stream or database connection.
      */
     private Object createView(final Class<?> type) throws IllegalArgumentException,
Exception {
         if (type == String.class) {
@@ -732,7 +732,7 @@ public class StorageConnector implements
      * <p>This {@code StorageConnector} instance shall not be used anymore after invocation
of this method.</p>
      *
      * @param  view The view to leave open, or {@code null} if none.
-     * @throws DataStoreException If an error occurred while closing the stream or database
connection.
+     * @throws DataStoreException if an error occurred while closing the stream or database
connection.
      *
      * @see #getStorageAs(Class)
      * @see DataStoreProvider#open(StorageConnector)



Mime
View raw message