commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ggreg...@apache.org
Subject svn commit: r1416507 [5/8] - in /commons/proper/vfs/trunk/core/src: main/java/org/apache/commons/vfs2/ main/java/org/apache/commons/vfs2/auth/ main/java/org/apache/commons/vfs2/cache/ main/java/org/apache/commons/vfs2/impl/ main/java/org/apache/commons...
Date Mon, 03 Dec 2012 13:37:52 GMT
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpClientFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpClientFactory.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpClientFactory.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpClientFactory.java Mon Dec  3 13:37:12 2012
@@ -63,18 +63,18 @@ public final class SftpClientFactory
      * @return A Session.
      * @throws FileSystemException if an error occurs.
      */
-    public static Session createConnection(String hostname, int port, char[] username, char[] password,
-            FileSystemOptions fileSystemOptions) throws FileSystemException
+    public static Session createConnection(final String hostname, final int port, final char[] username, final char[] password,
+            final FileSystemOptions fileSystemOptions) throws FileSystemException
     {
-        JSch jsch = new JSch();
+        final JSch jsch = new JSch();
 
         File sshDir = null;
 
         // new style - user passed
         final SftpFileSystemConfigBuilder builder = SftpFileSystemConfigBuilder.getInstance();
-        File knownHostsFile = builder.getKnownHosts(fileSystemOptions);
-        File[] identities = builder.getIdentities(fileSystemOptions);
-        IdentityRepositoryFactory repositoryFactory = builder.getIdentityRepositoryFactory(fileSystemOptions);
+        final File knownHostsFile = builder.getKnownHosts(fileSystemOptions);
+        final File[] identities = builder.getIdentities(fileSystemOptions);
+        final IdentityRepositoryFactory repositoryFactory = builder.getIdentityRepositoryFactory(fileSystemOptions);
 
         sshDir = findSshDir();
 
@@ -96,46 +96,46 @@ public final class SftpClientFactory
                 session.setPassword(new String(password));
             }
 
-            Integer timeout = builder.getTimeout(fileSystemOptions);
+            final Integer timeout = builder.getTimeout(fileSystemOptions);
             if (timeout != null)
             {
                 session.setTimeout(timeout.intValue());
             }
 
-            UserInfo userInfo = builder.getUserInfo(fileSystemOptions);
+            final UserInfo userInfo = builder.getUserInfo(fileSystemOptions);
             if (userInfo != null)
             {
                 session.setUserInfo(userInfo);
             }
 
-            Properties config = new Properties();
+            final Properties config = new Properties();
 
             // set StrictHostKeyChecking property
-            String strictHostKeyChecking = builder.getStrictHostKeyChecking(fileSystemOptions);
+            final String strictHostKeyChecking = builder.getStrictHostKeyChecking(fileSystemOptions);
             if (strictHostKeyChecking != null)
             {
                 config.setProperty("StrictHostKeyChecking", strictHostKeyChecking);
             }
             // set PreferredAuthentications property
-            String preferredAuthentications = builder.getPreferredAuthentications(fileSystemOptions);
+            final String preferredAuthentications = builder.getPreferredAuthentications(fileSystemOptions);
             if (preferredAuthentications != null)
             {
                 config.setProperty("PreferredAuthentications", preferredAuthentications);
             }
 
             // set compression property
-            String compression = builder.getCompression(fileSystemOptions);
+            final String compression = builder.getCompression(fileSystemOptions);
             if (compression != null)
             {
                 config.setProperty("compression.s2c", compression);
                 config.setProperty("compression.c2s", compression);
             }
 
-            String proxyHost = builder.getProxyHost(fileSystemOptions);
+            final String proxyHost = builder.getProxyHost(fileSystemOptions);
             if (proxyHost != null)
             {
-                int proxyPort = builder.getProxyPort(fileSystemOptions);
-                SftpFileSystemConfigBuilder.ProxyType proxyType = builder.getProxyType(fileSystemOptions);
+                final int proxyPort = builder.getProxyPort(fileSystemOptions);
+                final SftpFileSystemConfigBuilder.ProxyType proxyType = builder.getProxyType(fileSystemOptions);
                 Proxy proxy = null;
                 if (SftpFileSystemConfigBuilder.PROXY_HTTP.equals(proxyType))
                 {
@@ -172,7 +172,7 @@ public final class SftpClientFactory
         return session;
     }
 
-    private static void addIdentities(JSch jsch, File sshDir, File[] identities) throws FileSystemException
+    private static void addIdentities(final JSch jsch, final File sshDir, final File[] identities) throws FileSystemException
     {
         if (identities != null)
         {
@@ -192,7 +192,7 @@ public final class SftpClientFactory
         }
     }
 
-    private static void addIndentity(JSch jsch, final File privateKeyFile) throws FileSystemException
+    private static void addIndentity(final JSch jsch, final File privateKeyFile) throws FileSystemException
     {
         try
         {
@@ -204,7 +204,7 @@ public final class SftpClientFactory
         }
     }
 
-    private static void setKnownHosts(JSch jsch, File sshDir, File knownHostsFile) throws FileSystemException
+    private static void setKnownHosts(final JSch jsch, final File sshDir, File knownHostsFile) throws FileSystemException
     {
         try
         {
@@ -222,14 +222,14 @@ public final class SftpClientFactory
                 }
             }
         }
-        catch (JSchException e)
+        catch (final JSchException e)
         {
             throw new FileSystemException("vfs.provider.sftp/known-hosts.error", knownHostsFile.getAbsolutePath(), e);
         }
 
     }
 
-    private static Proxy createStreamProxy(String proxyHost, int proxyPort, FileSystemOptions fileSystemOptions,
+    private static Proxy createStreamProxy(final String proxyHost, final int proxyPort, final FileSystemOptions fileSystemOptions,
             final SftpFileSystemConfigBuilder builder)
     {
         Proxy proxy;
@@ -239,23 +239,23 @@ public final class SftpClientFactory
 
         // Here we get the settings for connecting to the proxy:
         // user, password, options and a command
-        String proxyUser = builder.getProxyUser(fileSystemOptions);
-        String proxyPassword = builder.getProxyPassword(fileSystemOptions);
-        FileSystemOptions proxyOptions = builder.getProxyOptions(fileSystemOptions);
+        final String proxyUser = builder.getProxyUser(fileSystemOptions);
+        final String proxyPassword = builder.getProxyPassword(fileSystemOptions);
+        final FileSystemOptions proxyOptions = builder.getProxyOptions(fileSystemOptions);
 
-        String proxyCommand = builder.getProxyCommand(fileSystemOptions);
+        final String proxyCommand = builder.getProxyCommand(fileSystemOptions);
 
         // Create the stream proxy
         proxy = new SftpStreamProxy(proxyCommand, proxyUser, proxyHost, proxyPort, proxyPassword, proxyOptions);
         return proxy;
     }
 
-    private static ProxySOCKS5 createProxySOCKS5(String proxyHost, int proxyPort)
+    private static ProxySOCKS5 createProxySOCKS5(final String proxyHost, final int proxyPort)
     {
         return proxyPort == 0 ? new ProxySOCKS5(proxyHost) : new ProxySOCKS5(proxyHost, proxyPort);
     }
 
-    private static ProxyHTTP createProxyHTTP(String proxyHost, int proxyPort)
+    private static ProxyHTTP createProxyHTTP(final String proxyHost, final int proxyPort)
     {
         return proxyPort == 0 ? new ProxyHTTP(proxyHost) : new ProxyHTTP(proxyHost, proxyPort);
     }
@@ -285,7 +285,7 @@ public final class SftpClientFactory
         sshDirPath = System.getProperty("vfs.sftp.sshdir");
         if (sshDirPath != null)
         {
-            File sshDir = new File(sshDirPath);
+            final File sshDir = new File(sshDirPath);
             if (sshDir.exists())
             {
                 return sshDir;
@@ -314,7 +314,7 @@ public final class SftpClientFactory
     private static class JSchLogger implements Logger
     {
         @Override
-        public boolean isEnabled(int level)
+        public boolean isEnabled(final int level)
         {
             switch (level)
             {
@@ -335,7 +335,7 @@ public final class SftpClientFactory
         }
 
         @Override
-        public void log(int level, String msg)
+        public void log(final int level, final String msg)
         {
             switch (level)
             {

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileObject.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileObject.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileObject.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileObject.java Mon Dec  3 13:37:12 2012
@@ -91,7 +91,7 @@ public class SftpFileObject extends Abst
                     attrs = null;
                     getType();
                 }
-                catch (IOException e)
+                catch (final IOException e)
                 {
                     throw new FileSystemException(e);
                 }
@@ -195,7 +195,7 @@ public class SftpFileObject extends Abst
     /**
      * Set attrs from listChildrenResolved
      */
-    private void setStat(SftpATTRS attrs)
+    private void setStat(final SftpATTRS attrs)
     {
         this.attrs = attrs;
     }
@@ -241,7 +241,7 @@ public class SftpFileObject extends Abst
     @Override
     protected boolean doSetLastModifiedTime(final long modtime) throws Exception
     {
-        int newMTime = (int) (modtime / MOD_TIME_FACTOR);
+        final int newMTime = (int) (modtime / MOD_TIME_FACTOR);
         attrs.setACMODTIME(attrs.getATime(), newMTime);
         flushStat();
         return true;
@@ -288,12 +288,12 @@ public class SftpFileObject extends Abst
      * Rename the file.
      */
     @Override
-    protected void doRename(FileObject newFile) throws Exception
+    protected void doRename(final FileObject newFile) throws Exception
     {
         final ChannelSftp channel = getAbstractFileSystem().getChannel();
         try
         {
-            SftpFileObject newSftpFileObject = (SftpFileObject) FileObjectUtils.getAbstractFileObject(newFile);
+            final SftpFileObject newSftpFileObject = (SftpFileObject) FileObjectUtils.getAbstractFileObject(newFile);
             channel.rename(relPath, newSftpFileObject.relPath);
         }
         finally
@@ -310,13 +310,13 @@ public class SftpFileObject extends Abst
      * @throws Exception If an error occurs
      * @since 2.1
      */
-    protected PosixPermissions getPermissions(boolean checkIds) throws Exception
+    protected PosixPermissions getPermissions(final boolean checkIds) throws Exception
     {
         statSelf();
         boolean isInGroup = false;
         if (checkIds)
         {
-            for (int groupId : getAbstractFileSystem().getGroupsIds())
+            for (final int groupId : getAbstractFileSystem().getGroupsIds())
             {
                 if (groupId == attrs.getGId())
                 {
@@ -338,10 +338,10 @@ public class SftpFileObject extends Abst
     }
 
     @Override
-    protected boolean doSetReadable(boolean readable, boolean ownerOnly) throws Exception
+    protected boolean doSetReadable(final boolean readable, final boolean ownerOnly) throws Exception
     {
         final PosixPermissions permissions = getPermissions(false);
-        int newPermissions = permissions.makeReadable(readable, ownerOnly);
+        final int newPermissions = permissions.makeReadable(readable, ownerOnly);
         if (newPermissions == permissions.getPermissions())
         {
             return true;
@@ -360,10 +360,10 @@ public class SftpFileObject extends Abst
     }
 
     @Override
-    protected boolean doSetWritable(boolean writable, boolean ownerOnly) throws Exception
+    protected boolean doSetWritable(final boolean writable, final boolean ownerOnly) throws Exception
     {
         final PosixPermissions permissions = getPermissions(false);
-        int newPermissions = permissions.makeWritable(writable, ownerOnly);
+        final int newPermissions = permissions.makeWritable(writable, ownerOnly);
         if (newPermissions == permissions.getPermissions())
         {
             return true;
@@ -383,10 +383,10 @@ public class SftpFileObject extends Abst
 
 
     @Override
-    protected boolean doSetExecutable(boolean executable, boolean ownerOnly) throws Exception
+    protected boolean doSetExecutable(final boolean executable, final boolean ownerOnly) throws Exception
     {
         final PosixPermissions permissions = getPermissions(false);
-        int newPermissions = permissions.makeExecutable(executable, ownerOnly);
+        final int newPermissions = permissions.makeExecutable(executable, ownerOnly);
         if (newPermissions == permissions.getPermissions())
         {
             return true;
@@ -418,7 +418,7 @@ public class SftpFileObject extends Abst
             // try the direct way to list the directory on the server to avoid too many roundtrips
             vector = channel.ls(relPath);
         }
-        catch (SftpException e)
+        catch (final SftpException e)
         {
             String workingDirectory = null;
             try
@@ -429,7 +429,7 @@ public class SftpFileObject extends Abst
                     channel.cd(relPath);
                 }
             }
-            catch (SftpException ex)
+            catch (final SftpException ex)
             {
                 // VFS-210: seems not to be a directory
                 return null;
@@ -440,7 +440,7 @@ public class SftpFileObject extends Abst
             {
                 vector = channel.ls(".");
             }
-            catch (SftpException ex)
+            catch (final SftpException ex)
             {
                 lsEx = ex;
             }
@@ -453,7 +453,7 @@ public class SftpFileObject extends Abst
                         channel.cd(workingDirectory);
                     }
                 }
-                catch (SftpException xe)
+                catch (final SftpException xe)
                 {
                     throw new FileSystemException("vfs.provider.sftp/change-work-directory-back.error",
                                                   workingDirectory, lsEx);
@@ -478,6 +478,7 @@ public class SftpFileObject extends Abst
         // Extract the child names
         final ArrayList<FileObject> children = new ArrayList<FileObject>();
         for (@SuppressWarnings("unchecked") // OK because ChannelSftp.ls() is documented to return Vector<LsEntry>
+        final
             Iterator<LsEntry> iterator = (Iterator<LsEntry>) vector.iterator(); iterator.hasNext();)
         {
             final LsEntry stat = iterator.next();
@@ -498,7 +499,7 @@ public class SftpFileObject extends Abst
                 continue;
             }
 
-            FileObject fo =
+            final FileObject fo =
                 getFileSystem()
                     .resolveFile(
                             getFileSystem().getFileSystemManager().resolveName(
@@ -549,17 +550,17 @@ public class SftpFileObject extends Abst
      * Creates an input stream to read the file content from.
      * The input stream is starting at the given position in the file.
      */
-    InputStream getInputStream(long filePointer) throws IOException
+    InputStream getInputStream(final long filePointer) throws IOException
     {
         final ChannelSftp channel = getAbstractFileSystem().getChannel();
         // Using InputStream directly from the channel
         // is much faster than the memory method.
         try
         {
-            InputStream is = channel.get(getName().getPathDecoded(), null, filePointer);
+            final InputStream is = channel.get(getName().getPathDecoded(), null, filePointer);
             return new SftpInputStream(channel, is);
         }
-        catch (SftpException e)
+        catch (final SftpException e)
         {
             getAbstractFileSystem().putChannel(channel);
             throw new FileSystemException(e);
@@ -603,7 +604,7 @@ public class SftpFileObject extends Abst
 
                     is = channel.get(relPath);
                 }
-                catch (SftpException e)
+                catch (final SftpException e)
                 {
                     if (e.id == ChannelSftp.SSH_FX_NO_SUCH_FILE)
                     {
@@ -627,7 +628,7 @@ public class SftpFileObject extends Abst
      * Creates an output stream to write the file content to.
      */
     @Override
-    protected OutputStream doGetOutputStream(boolean bAppend) throws Exception
+    protected OutputStream doGetOutputStream(final boolean bAppend) throws Exception
     {
         // TODO - Don't write the entire file into memory. Use the stream-based
         // methods on ChannelSftp once the work properly
@@ -671,7 +672,7 @@ public class SftpFileObject extends Abst
     {
         private final ChannelSftp channel;
 
-        public SftpOutputStream(final ChannelSftp channel, OutputStream out)
+        public SftpOutputStream(final ChannelSftp channel, final OutputStream out)
         {
             super(out);
             this.channel = channel;

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileSystem.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileSystem.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileSystem.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileSystem.java Mon Dec  3 13:37:12 2012
@@ -110,16 +110,16 @@ public class SftpFileSystem
             {
                 channel = (ChannelSftp) session.openChannel("sftp");
                 channel.connect();
-                Boolean userDirIsRoot =
+                final Boolean userDirIsRoot =
                     SftpFileSystemConfigBuilder.getInstance().getUserDirIsRoot(getFileSystemOptions());
-                String workingDirectory = getRootName().getPath();
+                final String workingDirectory = getRootName().getPath();
                 if (workingDirectory != null && (userDirIsRoot == null || !userDirIsRoot.booleanValue()))
                 {
                     try
                     {
                         channel.cd(workingDirectory);
                     }
-                    catch (SftpException e)
+                    catch (final SftpException e)
                     {
                         throw new FileSystemException("vfs.provider.sftp/change-work-directory.error",
                             workingDirectory, e);
@@ -238,8 +238,8 @@ public class SftpFileSystem
     {
         if (groupsIds == null)
         {
-            StringBuilder output = new StringBuilder();
-            int code = executeCommand("id -G", output);
+            final StringBuilder output = new StringBuilder();
+            final int code = executeCommand("id -G", output);
             if (code != 0)
             {
                 throw new JSchException("Could not get the groups id of the current user (error code: " + code + ")");
@@ -248,7 +248,7 @@ public class SftpFileSystem
             // Retrieve the different groups
             final String[] groups = output.toString().trim().split("\\s+");
 
-            int[] groupsIds = new int[groups.length];
+            final int[] groupsIds = new int[groups.length];
             for (int i = 0; i < groups.length; i++)
             {
                 groupsIds[i] = Integer.parseInt(groups[i]);
@@ -271,8 +271,8 @@ public class SftpFileSystem
     {
         if (uid < 0)
         {
-            StringBuilder output = new StringBuilder();
-            int code = executeCommand("id -u", output);
+            final StringBuilder output = new StringBuilder();
+            final int code = executeCommand("id -u", output);
             if (code != 0)
             {
                 throw new FileSystemException("Could not get the user id of the current user (error code: " + code
@@ -293,10 +293,10 @@ public class SftpFileSystem
      * @throws FileSystemException if a session cannot be created.
      * @throws IOException if an I/O error is detected.
      */
-    private int executeCommand(String command, StringBuilder output) throws JSchException, IOException
+    private int executeCommand(final String command, final StringBuilder output) throws JSchException, IOException
     {
         ensureSession();
-        ChannelExec channel = (ChannelExec) session.openChannel("exec");
+        final ChannelExec channel = (ChannelExec) session.openChannel("exec");
 
         channel.setCommand(command);
         channel.setInputStream(null);
@@ -305,7 +305,7 @@ public class SftpFileSystem
         channel.connect();
 
         // Read the stream
-        char[] buffer = new char[EXEC_BUFFER_SIZE];
+        final char[] buffer = new char[EXEC_BUFFER_SIZE];
         int read;
         while ((read = stream.read(buffer, 0, buffer.length)) >= 0)
         {
@@ -320,7 +320,7 @@ public class SftpFileSystem
             {
                 Thread.sleep(SLEEP_MILLIS);
             }
-            catch (Exception ee)
+            catch (final Exception ee)
             {
                 // TODO: swallow exception, really?
             }

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileSystemConfigBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileSystemConfigBuilder.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileSystemConfigBuilder.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileSystemConfigBuilder.java Mon Dec  3 13:37:12 2012
@@ -191,7 +191,7 @@ public final class SftpFileSystemConfigB
      *            The FileSystem options.
      * @return the IdentityRepositoryFactory
      */
-    public IdentityRepositoryFactory getIdentityRepositoryFactory(FileSystemOptions opts)
+    public IdentityRepositoryFactory getIdentityRepositoryFactory(final FileSystemOptions opts)
     {
         return (IdentityRepositoryFactory) this.getParam(opts, IDENTITY_REPOSITORY_FACTORY);
     }
@@ -418,7 +418,7 @@ public final class SftpFileSystemConfigB
      *             if an error occurs.
      * @see <a href="http://www.jcraft.com/jsch-agent-proxy/">JSch agent proxy</a>
      */
-    public void setIdentityRepositoryFactory(FileSystemOptions opts, IdentityRepositoryFactory factory)
+    public void setIdentityRepositoryFactory(final FileSystemOptions opts, final IdentityRepositoryFactory factory)
             throws FileSystemException
     {
         this.setParam(opts, IDENTITY_REPOSITORY_FACTORY, factory);

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpRandomAccessContent.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpRandomAccessContent.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpRandomAccessContent.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpRandomAccessContent.java Mon Dec  3 13:37:12 2012
@@ -37,7 +37,7 @@ class SftpRandomAccessContent extends Ab
     private DataInputStream dis = null;
     private InputStream mis = null;
 
-    SftpRandomAccessContent(final SftpFileObject fileObject, RandomAccessMode mode)
+    SftpRandomAccessContent(final SftpFileObject fileObject, final RandomAccessMode mode)
     {
         super(mode);
 
@@ -52,7 +52,7 @@ class SftpRandomAccessContent extends Ab
     }
 
     @Override
-    public void seek(long pos) throws IOException
+    public void seek(final long pos) throws IOException
     {
         if (pos == filePointer)
         {
@@ -88,7 +88,7 @@ class SftpRandomAccessContent extends Ab
             @Override
             public int read() throws IOException
             {
-                int ret = super.read();
+                final int ret = super.read();
                 if (ret > -1)
                 {
                     filePointer++;
@@ -97,9 +97,9 @@ class SftpRandomAccessContent extends Ab
             }
 
             @Override
-            public int read(byte[] b) throws IOException
+            public int read(final byte[] b) throws IOException
             {
-                int ret = super.read(b);
+                final int ret = super.read(b);
                 if (ret > -1)
                 {
                     filePointer += ret;
@@ -108,9 +108,9 @@ class SftpRandomAccessContent extends Ab
             }
 
             @Override
-            public int read(byte[] b, int off, int len) throws IOException
+            public int read(final byte[] b, final int off, final int len) throws IOException
             {
-                int ret = super.read(b, off, len);
+                final int ret = super.read(b, off, len);
                 if (ret > -1)
                 {
                     filePointer += ret;
@@ -138,7 +138,7 @@ class SftpRandomAccessContent extends Ab
             mis.close();
 
             // this is to avoid recursive close
-            DataInputStream oldDis = dis;
+            final DataInputStream oldDis = dis;
             dis = null;
             oldDis.close();
             mis = null;

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpStreamProxy.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpStreamProxy.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpStreamProxy.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpStreamProxy.java Mon Dec  3 13:37:12 2012
@@ -121,8 +121,8 @@ public class SftpStreamProxy implements 
      * @param proxyOptions
      *            Options used when connecting to the proxy
      */
-    public SftpStreamProxy(String commandFormat, String proxyUser, String proxyHost, int proxyPort,
-            String proxyPassword, FileSystemOptions proxyOptions)
+    public SftpStreamProxy(final String commandFormat, final String proxyUser, final String proxyHost, final int proxyPort,
+            final String proxyPassword, final FileSystemOptions proxyOptions)
     {
         this.proxyHost = proxyHost;
         this.proxyPort = proxyPort;
@@ -146,7 +146,7 @@ public class SftpStreamProxy implements 
     }
 
     @Override
-    public void connect(SocketFactory socketFactory, String targetHost, int targetPort, int timeout) throws Exception
+    public void connect(final SocketFactory socketFactory, final String targetHost, final int targetPort, final int timeout) throws Exception
     {
         session = SftpClientFactory.createConnection(proxyHost, proxyPort, proxyUser.toCharArray(),
                 proxyPassword.toCharArray(), proxyOptions);
@@ -162,7 +162,7 @@ public class SftpStreamProxy implements 
         {
             return channel.getInputStream();
         }
-        catch (IOException e)
+        catch (final IOException e)
         {
             throw new IllegalStateException("IOException getting the SSH proxy input stream", e);
         }
@@ -175,7 +175,7 @@ public class SftpStreamProxy implements 
         {
             return channel.getOutputStream();
         }
-        catch (IOException e)
+        catch (final IOException e)
         {
             throw new IllegalStateException("IOException getting the SSH proxy output stream", e);
         }

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/sftp/TrustEveryoneUserInfo.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/sftp/TrustEveryoneUserInfo.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/sftp/TrustEveryoneUserInfo.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/sftp/TrustEveryoneUserInfo.java Mon Dec  3 13:37:12 2012
@@ -41,21 +41,21 @@ public class TrustEveryoneUserInfo imple
     }
 
     @Override
-    public boolean promptPassword(String s)
+    public boolean promptPassword(final String s)
     {
         log.info(s + " - Answer: False");
         return false;
     }
 
     @Override
-    public boolean promptPassphrase(String s)
+    public boolean promptPassphrase(final String s)
     {
         log.info(s + " - Answer: False");
         return false;
     }
 
     @Override
-    public boolean promptYesNo(String s)
+    public boolean promptYesNo(final String s)
     {
         log.debug(s + " - Answer: Yes");
 
@@ -64,7 +64,7 @@ public class TrustEveryoneUserInfo imple
     }
 
     @Override
-    public void showMessage(String s)
+    public void showMessage(final String s)
     {
         log.debug(s);
     }

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/tar/TarFileObject.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/tar/TarFileObject.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/tar/TarFileObject.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/tar/TarFileObject.java Mon Dec  3 13:37:12 2012
@@ -36,10 +36,10 @@ public class TarFileObject extends Abstr
     private final HashSet<String> children = new HashSet<String>();
     private FileType type;
 
-    protected TarFileObject(AbstractFileName name,
-                            TarArchiveEntry entry,
-                            TarFileSystem fs,
-                            boolean tarExists) throws FileSystemException
+    protected TarFileObject(final AbstractFileName name,
+                            final TarArchiveEntry entry,
+                            final TarFileSystem fs,
+                            final boolean tarExists) throws FileSystemException
     {
         super(name, fs);
         setTarEntry(entry);
@@ -74,7 +74,7 @@ public class TarFileObject extends Abstr
     /**
      * Attaches a child
      */
-    protected void attachChild(FileName childName)
+    protected void attachChild(final FileName childName)
     {
         children.add(childName.getBaseName());
     }
@@ -113,7 +113,7 @@ public class TarFileObject extends Abstr
                 return null;
             }
         }
-        catch (FileSystemException e)
+        catch (final FileSystemException e)
         {
             // should not happen as the type has already been cached.
             throw new RuntimeException(e);

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/tar/TarFileSystem.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/tar/TarFileSystem.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/tar/TarFileSystem.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/tar/TarFileSystem.java Mon Dec  3 13:37:12 2012
@@ -81,11 +81,11 @@ public class TarFileSystem extends Abstr
         // Build the index
         try
         {
-            List<TarFileObject> strongRef = new ArrayList<TarFileObject>(DEFAULT_INDEX_SIZE);
+            final List<TarFileObject> strongRef = new ArrayList<TarFileObject>(DEFAULT_INDEX_SIZE);
             TarArchiveEntry entry;
             while ((entry = getTarFile().getNextTarEntry()) != null)
             {
-                AbstractFileName name = (AbstractFileName) getFileSystemManager().resolveName(getRootName(),
+                final AbstractFileName name = (AbstractFileName) getFileSystemManager().resolveName(getRootName(),
                     UriParser.encode(entry.getName()));
 
                 // Create the file
@@ -124,7 +124,7 @@ public class TarFileSystem extends Abstr
                 }
             }
         }
-        catch (IOException e)
+        catch (final IOException e)
         {
             throw new FileSystemException(e);
         }
@@ -134,7 +134,7 @@ public class TarFileSystem extends Abstr
         }
     }
 
-    public InputStream getInputStream(TarArchiveEntry entry) throws FileSystemException
+    public InputStream getInputStream(final TarArchiveEntry entry) throws FileSystemException
     {
         resetTarFile();
         try
@@ -144,7 +144,7 @@ public class TarFileSystem extends Abstr
             }
             return tarFile;
         }
-        catch (IOException e)
+        catch (final IOException e)
         {
             throw new FileSystemException(e);
         }
@@ -169,13 +169,13 @@ public class TarFileSystem extends Abstr
             {
                 this.tarFile.close();
             }
-            catch (IOException e)
+            catch (final IOException e)
             {
                 throw new FileSystemException("vfs.provider.tar/close-tar-file.error", file, e);
             }
             tarFile = null;
         }
-        TarArchiveInputStream tarFile = createTarFile(this.file);
+        final TarArchiveInputStream tarFile = createTarFile(this.file);
         this.tarFile = tarFile;
     }
 
@@ -210,7 +210,7 @@ public class TarFileSystem extends Abstr
             }
             return new TarArchiveInputStream(new FileInputStream(file));
         }
-        catch (IOException ioe)
+        catch (final IOException ioe)
         {
             throw new FileSystemException("vfs.provider.tar/open-tar-file.error", file, ioe);
         }

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/temp/TemporaryFileProvider.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/temp/TemporaryFileProvider.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/temp/TemporaryFileProvider.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/temp/TemporaryFileProvider.java Mon Dec  3 13:37:12 2012
@@ -68,10 +68,10 @@ public class TemporaryFileProvider
     }
 
     @Override
-    public int compareTo(Object o)
+    public int compareTo(final Object o)
     {
-        int h1 = hashCode();
-        int h2 = o.hashCode();
+        final int h1 = hashCode();
+        final int h2 = o.hashCode();
         if (h1 < h2)
         {
             return -1;
@@ -103,7 +103,7 @@ public class TemporaryFileProvider
 
         UriParser.fixSeparators(buffer);
 
-        FileType fileType = UriParser.normalisePath(buffer);
+        final FileType fileType = UriParser.normalisePath(buffer);
         final String path = buffer.toString();
 
         // Create the temp file system if it does not exist

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/url/UrlFileName.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/url/UrlFileName.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/url/UrlFileName.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/url/UrlFileName.java Mon Dec  3 13:37:12 2012
@@ -44,7 +44,7 @@ public class UrlFileName extends URLFile
     }
 
     @Override
-    protected void appendRootUri(final StringBuilder buffer, boolean addPassword)
+    protected void appendRootUri(final StringBuilder buffer, final boolean addPassword)
     {
         if (getHostName() != null && !"".equals(getHostName()))
         {

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/url/UrlFileNameParser.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/url/UrlFileNameParser.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/url/UrlFileNameParser.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/url/UrlFileNameParser.java Mon Dec  3 13:37:12 2012
@@ -39,7 +39,7 @@ public class UrlFileNameParser extends A
     }
 
     @Override
-    public boolean encodeCharacter(char ch)
+    public boolean encodeCharacter(final char ch)
     {
         return super.encodeCharacter(ch) || ch == '?';
     }
@@ -77,7 +77,7 @@ public class UrlFileNameParser extends A
             return true;
         }
 
-        int nuofSlash = countSlashes(filename);
+        final int nuofSlash = countSlashes(filename);
         return nuofSlash == 2;
     }
 
@@ -93,7 +93,7 @@ public class UrlFileNameParser extends A
         int nuofSlash = 0;
         for (int pos = 0; pos < filename.length(); pos++)
         {
-            char c = filename.charAt(pos);
+            final char c = filename.charAt(pos);
             if (state == 0)
             {
                 if (c >= 'a' && c <= 'z')

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/url/UrlFileObject.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/url/UrlFileObject.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/url/UrlFileObject.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/url/UrlFileObject.java Mon Dec  3 13:37:12 2012
@@ -67,7 +67,7 @@ public class UrlFileObject extends Abstr
     {
         if (name instanceof URLFileName)
         {
-            URLFileName urlName = (URLFileName) getName();
+            final URLFileName urlName = (URLFileName) getName();
 
             // TODO: charset
             return new URL(urlName.getURIEncoded(null));

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/url/UrlFileProvider.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/url/UrlFileProvider.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/url/UrlFileProvider.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/url/UrlFileProvider.java Mon Dec  3 13:37:12 2012
@@ -70,12 +70,12 @@ public class UrlFileProvider
         {
             final URL url = new URL(uri);
 
-            URL rootUrl = new URL(url, "/");
+            final URL rootUrl = new URL(url, "/");
             final String key = this.getClass().getName() + rootUrl.toString();
             FileSystem fs = findFileSystem(key, fileSystemOptions);
             if (fs == null)
             {
-                String extForm = rootUrl.toExternalForm();
+                final String extForm = rootUrl.toExternalForm();
                 final FileName rootName =
                     getContext().parseURI(extForm);
                 // final FileName rootName =

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/webdav/ExceptionConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/webdav/ExceptionConverter.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/webdav/ExceptionConverter.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/webdav/ExceptionConverter.java Mon Dec  3 13:37:12 2012
@@ -36,12 +36,12 @@ public final class ExceptionConverter
     {
     }
 
-    public static FileSystemException generate(DavException davExc) throws FileSystemException
+    public static FileSystemException generate(final DavException davExc) throws FileSystemException
     {
         return generate(davExc, null);
     }
 
-    public static FileSystemException generate(DavException davExc, DavMethod method)
+    public static FileSystemException generate(final DavException davExc, final DavMethod method)
             throws FileSystemException
     {
         String msg = davExc.getMessage();
@@ -49,23 +49,23 @@ public final class ExceptionConverter
         {
             try
             {
-                Element error = davExc.toXml(DomUtil.BUILDER_FACTORY.newDocumentBuilder().newDocument());
+                final Element error = davExc.toXml(DomUtil.BUILDER_FACTORY.newDocumentBuilder().newDocument());
                 if (DomUtil.matches(error, DavException.XML_ERROR, DavConstants.NAMESPACE))
                 {
                     if (DomUtil.hasChildElement(error, "exception", null))
                     {
-                        Element exc = DomUtil.getChildElement(error, "exception", null);
+                        final Element exc = DomUtil.getChildElement(error, "exception", null);
                         if (DomUtil.hasChildElement(exc, "message", null))
                         {
                             msg = DomUtil.getChildText(exc, "message", null);
                         }
                         if (DomUtil.hasChildElement(exc, "class", null))
                         {
-                            Class<?> cl = Class.forName(DomUtil.getChildText(exc, "class", null));
-                            Constructor<?> excConstr = cl.getConstructor(new Class[]{String.class});
+                            final Class<?> cl = Class.forName(DomUtil.getChildText(exc, "class", null));
+                            final Constructor<?> excConstr = cl.getConstructor(new Class[]{String.class});
                             if (excConstr != null)
                             {
-                                Object o = excConstr.newInstance(new Object[]{msg});
+                                final Object o = excConstr.newInstance(new Object[]{msg});
                                 if (o instanceof FileSystemException)
                                 {
                                     return (FileSystemException) o;
@@ -79,7 +79,7 @@ public final class ExceptionConverter
                     }
                 }
             }
-            catch (Exception e)
+            catch (final Exception e)
             {
                 throw new FileSystemException(e);
             }

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileContentInfoFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileContentInfoFactory.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileContentInfoFactory.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileContentInfoFactory.java Mon Dec  3 13:37:12 2012
@@ -36,17 +36,17 @@ import org.apache.jackrabbit.webdav.prop
 public class WebdavFileContentInfoFactory implements FileContentInfoFactory
 {
     @Override
-    public FileContentInfo create(FileContent fileContent) throws FileSystemException
+    public FileContentInfo create(final FileContent fileContent) throws FileSystemException
     {
-        WebdavFileObject file = (WebdavFileObject) FileObjectUtils
+        final WebdavFileObject file = (WebdavFileObject) FileObjectUtils
             .getAbstractFileObject(fileContent.getFile());
 
         String contentType = null;
         String contentEncoding = null;
 
-        DavPropertyNameSet nameSet = new DavPropertyNameSet();
+        final DavPropertyNameSet nameSet = new DavPropertyNameSet();
         nameSet.add(DavPropertyName.GETCONTENTTYPE);
-        DavPropertySet propertySet = file.getProperties((URLFileName) file.getName(), nameSet, true);
+        final DavPropertySet propertySet = file.getProperties((URLFileName) file.getName(), nameSet, true);
 
         DavProperty property = propertySet.get(DavPropertyName.GETCONTENTTYPE);
         if (property != null)

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileObject.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileObject.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileObject.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileObject.java Mon Dec  3 13:37:12 2012
@@ -95,7 +95,7 @@ public class WebdavFileObject extends Ht
         builder = (WebdavFileSystemConfigBuilder) WebdavFileSystemConfigBuilder.getInstance();
     }
 
-    protected void configureMethod(HttpMethodBase httpMethod)
+    protected void configureMethod(final HttpMethodBase httpMethod)
     {
         httpMethod.getParams().setParameter(HttpMethodParams.RETRY_HANDLER, WebdavMethodRetryHandler.getInstance());
     }
@@ -111,11 +111,11 @@ public class WebdavFileObject extends Ht
         {
             return isDirectory((URLFileName) getName()) ? FileType.FOLDER : FileType.FILE;
         }
-        catch (FileNotFolderException fnfe)
+        catch (final FileNotFolderException fnfe)
         {
             return FileType.IMAGINARY;
         }
-        catch (FileNotFoundException fnfe)
+        catch (final FileNotFoundException fnfe)
         {
             return FileType.IMAGINARY;
         }
@@ -141,32 +141,32 @@ public class WebdavFileObject extends Ht
         PropFindMethod method = null;
         try
         {
-            URLFileName name = (URLFileName) getName();
+            final URLFileName name = (URLFileName) getName();
             if (isDirectory(name))
             {
-                DavPropertyNameSet nameSet = new DavPropertyNameSet();
+                final DavPropertyNameSet nameSet = new DavPropertyNameSet();
                 nameSet.add(DavPropertyName.create(DavConstants.PROPERTY_DISPLAYNAME));
 
                 method = new PropFindMethod(toUrlString(name), nameSet,
                         DavConstants.DEPTH_1);
 
                 execute(method);
-                List<WebdavFileObject> vfs = new ArrayList<WebdavFileObject>();
+                final List<WebdavFileObject> vfs = new ArrayList<WebdavFileObject>();
                 if (method.succeeded())
                 {
-                    MultiStatusResponse[] responses =
+                    final MultiStatusResponse[] responses =
                             method.getResponseBodyAsMultiStatus().getResponses();
 
-                    for (MultiStatusResponse response : responses)
+                    for (final MultiStatusResponse response : responses)
                     {
                         if (isCurrentFile(response.getHref(), name))
                         {
                             continue;
                         }
-                        String resourceName = resourceName(response.getHref());
+                        final String resourceName = resourceName(response.getHref());
                         if (resourceName != null && resourceName.length() > 0)
                         {
-                            WebdavFileObject fo = (WebdavFileObject) FileObjectUtils.
+                            final WebdavFileObject fo = (WebdavFileObject) FileObjectUtils.
                                     getAbstractFileObject(getFileSystem().resolveFile(
                                             getFileSystem().getFileSystemManager().
                                                     resolveName(getName(), resourceName,
@@ -179,15 +179,15 @@ public class WebdavFileObject extends Ht
             }
             throw new FileNotFolderException(getName());
         }
-        catch (FileNotFolderException fnfe)
+        catch (final FileNotFolderException fnfe)
         {
             throw fnfe;
         }
-        catch (DavException e)
+        catch (final DavException e)
         {
             throw new FileSystemException(e.getMessage(), e);
         }
-        catch (IOException e)
+        catch (final IOException e)
         {
             throw new FileSystemException(e.getMessage(), e);
         }
@@ -206,13 +206,13 @@ public class WebdavFileObject extends Ht
     @Override
     protected void doCreateFolder() throws Exception
     {
-        DavMethod method = new MkColMethod(toUrlString((URLFileName) getName()));
+        final DavMethod method = new MkColMethod(toUrlString((URLFileName) getName()));
         setupMethod(method);
         try
         {
             execute(method);
         }
-        catch (FileSystemException fse)
+        catch (final FileSystemException fse)
         {
             throw new FileSystemException("vfs.provider.webdav/create-collection.error", getName(),
                     fse);
@@ -225,7 +225,7 @@ public class WebdavFileObject extends Ht
     @Override
     protected void doDelete() throws Exception
     {
-        DavMethod method = new DeleteMethod(toUrlString((URLFileName) getName()));
+        final DavMethod method = new DeleteMethod(toUrlString((URLFileName) getName()));
         setupMethod(method);
         execute(method);
     }
@@ -234,11 +234,11 @@ public class WebdavFileObject extends Ht
      * Rename the file.
      */
     @Override
-    protected void doRename(FileObject newFile) throws Exception
+    protected void doRename(final FileObject newFile) throws Exception
     {
-        String url = encodePath(toUrlString((URLFileName) getName()));
-        String dest = toUrlString((URLFileName) newFile.getName(), false);
-        DavMethod method = new MoveMethod(url, dest, false);
+        final String url = encodePath(toUrlString((URLFileName) getName()));
+        final String dest = toUrlString((URLFileName) newFile.getName(), false);
+        final DavMethod method = new MoveMethod(url, dest, false);
         setupMethod(method);
         execute(method);
     }
@@ -249,11 +249,11 @@ public class WebdavFileObject extends Ht
     @Override
     protected long doGetContentSize() throws Exception
     {
-        DavProperty property = getProperty((URLFileName) getName(),
+        final DavProperty property = getProperty((URLFileName) getName(),
                 DavConstants.PROPERTY_GETCONTENTLENGTH);
         if (property != null)
         {
-            String value = (String) property.getValue();
+            final String value = (String) property.getValue();
             return Long.parseLong(value);
         }
         return 0;
@@ -266,11 +266,11 @@ public class WebdavFileObject extends Ht
     @Override
     protected long doGetLastModifiedTime() throws Exception
     {
-        DavProperty property = getProperty((URLFileName) getName(),
+        final DavProperty property = getProperty((URLFileName) getName(),
                 DavConstants.PROPERTY_GETLASTMODIFIED);
         if (property != null)
         {
-            String value = (String) property.getValue();
+            final String value = (String) property.getValue();
             return DateUtil.parseDate(value).getTime();
         }
         return 0;
@@ -285,18 +285,20 @@ public class WebdavFileObject extends Ht
         final Map<String, Object> attributes = new HashMap<String, Object>();
         try
         {
-            URLFileName fileName = (URLFileName) getName();
+            final URLFileName fileName = (URLFileName) getName();
             DavPropertySet properties = getProperties(fileName, DavConstants.PROPFIND_ALL_PROP,
                     new DavPropertyNameSet(), false);
             @SuppressWarnings("unchecked") // iterator() is documented to return DavProperty instances
+            final
             Iterator<DavProperty> iter = properties.iterator();
             while (iter.hasNext())
             {
-                DavProperty property = iter.next();
+                final DavProperty property = iter.next();
                 attributes.put(property.getName().toString(), property.getValue());
             }
             properties = getPropertyNames(fileName);
             @SuppressWarnings("unchecked") // iterator() is documented to return DavProperty instances
+            final
             Iterator<DavProperty> iter2 = properties.iterator();
             while (iter2.hasNext())
             {
@@ -306,8 +308,8 @@ public class WebdavFileObject extends Ht
                     property = getProperty(fileName, property.getName());
                     if (property != null)
                     {
-                        Object name = property.getName();
-                        Object value = property.getValue();
+                        final Object name = property.getName();
+                        final Object value = property.getValue();
                         if (name != null && value != null)
                         {
                             attributes.put(name.toString(), value);
@@ -317,7 +319,7 @@ public class WebdavFileObject extends Ht
             }
             return attributes;
         }
-        catch (Exception e)
+        catch (final Exception e)
         {
             throw new FileSystemException("vfs.provider.webdav/get-attributes.error", getName(), e);
         }
@@ -335,11 +337,11 @@ public class WebdavFileObject extends Ht
     {
         try
         {
-            URLFileName fileName = (URLFileName) getName();
-            String urlStr = toUrlString(fileName);
-            DavPropertySet properties = new DavPropertySet();
-            DavPropertyNameSet propertyNameSet = new DavPropertyNameSet();
-            DavProperty property = new DefaultDavProperty(attrName, value, Namespace.EMPTY_NAMESPACE);
+            final URLFileName fileName = (URLFileName) getName();
+            final String urlStr = toUrlString(fileName);
+            final DavPropertySet properties = new DavPropertySet();
+            final DavPropertyNameSet propertyNameSet = new DavPropertyNameSet();
+            final DavProperty property = new DefaultDavProperty(attrName, value, Namespace.EMPTY_NAMESPACE);
             if (value != null)
             {
                 properties.add(property);
@@ -349,7 +351,7 @@ public class WebdavFileObject extends Ht
                 propertyNameSet.add(property.getName()); // remove property
             }
 
-            PropPatchMethod method = new PropPatchMethod(urlStr, properties, propertyNameSet);
+            final PropPatchMethod method = new PropPatchMethod(urlStr, properties, propertyNameSet);
             setupMethod(method);
             execute(method);
             if (!method.succeeded())
@@ -357,18 +359,18 @@ public class WebdavFileObject extends Ht
                 throw new FileSystemException("Property '" + attrName + "' could not be set.");
             }
         }
-        catch (FileSystemException fse)
+        catch (final FileSystemException fse)
         {
             throw fse;
         }
-        catch (Exception e)
+        catch (final Exception e)
         {
             throw new FileSystemException("vfs.provider.webdav/set-attributes", e, getName(), attrName);
         }
     }
 
     @Override
-    protected OutputStream doGetOutputStream(boolean bAppend) throws Exception
+    protected OutputStream doGetOutputStream(final boolean bAppend) throws Exception
     {
         return new WebdavOutputStream(this);
     }
@@ -389,7 +391,7 @@ public class WebdavFileObject extends Ht
     @Override
     protected void setupMethod(final HttpMethod method) throws FileSystemException, URIException
     {
-        String pathEncoded = ((URLFileName) getName()).getPathQueryEncoded(this.getUrlCharset());
+        final String pathEncoded = ((URLFileName) getName()).getPathQueryEncoded(this.getUrlCharset());
         method.setPath(pathEncoded);
         method.setFollowRedirects(this.getFollowRedirect());
         method.setRequestHeader("User-Agent", "Jakarta-Commons-VFS");
@@ -405,11 +407,11 @@ public class WebdavFileObject extends Ht
      * @param method The DavMethod to invoke.
      * @throws FileSystemException If an error occurs.
      */
-    private void execute(DavMethod method) throws FileSystemException
+    private void execute(final DavMethod method) throws FileSystemException
     {
         try
         {
-            int status = fileSystem.getClient().executeMethod(method);
+            final int status = fileSystem.getClient().executeMethod(method);
             if (status == HttpURLConnection.HTTP_NOT_FOUND
                     || status == HttpURLConnection.HTTP_GONE)
             {
@@ -417,15 +419,15 @@ public class WebdavFileObject extends Ht
             }
             method.checkSuccess();
         }
-        catch (FileSystemException fse)
+        catch (final FileSystemException fse)
         {
             throw fse;
         }
-        catch (IOException e)
+        catch (final IOException e)
         {
             throw new FileSystemException(e);
         }
-        catch (DavException e)
+        catch (final DavException e)
         {
             throw ExceptionConverter.generate(e);
         }
@@ -438,11 +440,11 @@ public class WebdavFileObject extends Ht
         }
     }
 
-    private boolean isDirectory(URLFileName name) throws IOException
+    private boolean isDirectory(final URLFileName name) throws IOException
     {
         try
         {
-            DavProperty property = getProperty(name, DavConstants.PROPERTY_RESOURCETYPE);
+            final DavProperty property = getProperty(name, DavConstants.PROPERTY_RESOURCETYPE);
             Node node;
             if (property != null && (node = (Node) property.getValue()) != null)
             {
@@ -453,64 +455,64 @@ public class WebdavFileObject extends Ht
                 return false;
             }
         }
-        catch (FileNotFoundException fse)
+        catch (final FileNotFoundException fse)
         {
             throw new FileNotFolderException(name);
         }
     }
 
-    DavProperty getProperty(URLFileName fileName, String property)
+    DavProperty getProperty(final URLFileName fileName, final String property)
             throws FileSystemException
     {
         return getProperty(fileName, DavPropertyName.create(property));
     }
 
-    DavProperty getProperty(URLFileName fileName, DavPropertyName name)
+    DavProperty getProperty(final URLFileName fileName, final DavPropertyName name)
             throws FileSystemException
     {
-        DavPropertyNameSet nameSet = new DavPropertyNameSet();
+        final DavPropertyNameSet nameSet = new DavPropertyNameSet();
         nameSet.add(name);
-        DavPropertySet propertySet = getProperties(fileName, nameSet, false);
+        final DavPropertySet propertySet = getProperties(fileName, nameSet, false);
         return propertySet.get(name);
     }
 
-    DavPropertySet getProperties(URLFileName name, DavPropertyNameSet nameSet, boolean addEncoding)
+    DavPropertySet getProperties(final URLFileName name, final DavPropertyNameSet nameSet, final boolean addEncoding)
             throws FileSystemException
     {
         return getProperties(name, DavConstants.PROPFIND_BY_PROPERTY, nameSet, addEncoding);
     }
 
-    DavPropertySet getProperties(URLFileName name) throws FileSystemException
+    DavPropertySet getProperties(final URLFileName name) throws FileSystemException
     {
         return getProperties(name, DavConstants.PROPFIND_ALL_PROP, new DavPropertyNameSet(),
                 false);
     }
 
 
-    DavPropertySet getPropertyNames(URLFileName name) throws FileSystemException
+    DavPropertySet getPropertyNames(final URLFileName name) throws FileSystemException
     {
         return getProperties(name, DavConstants.PROPFIND_PROPERTY_NAMES,
                 new DavPropertyNameSet(), false);
     }
 
-    DavPropertySet getProperties(URLFileName name, int type, DavPropertyNameSet nameSet,
-                                 boolean addEncoding)
+    DavPropertySet getProperties(final URLFileName name, final int type, final DavPropertyNameSet nameSet,
+                                 final boolean addEncoding)
             throws FileSystemException
     {
         try
         {
-            String urlStr = toUrlString(name);
-            PropFindMethod method = new PropFindMethod(urlStr, type, nameSet, DavConstants.DEPTH_0);
+            final String urlStr = toUrlString(name);
+            final PropFindMethod method = new PropFindMethod(urlStr, type, nameSet, DavConstants.DEPTH_0);
             setupMethod(method);
             execute(method);
             if (method.succeeded())
             {
-                MultiStatus multiStatus = method.getResponseBodyAsMultiStatus();
-                MultiStatusResponse response = multiStatus.getResponses()[0];
-                DavPropertySet props = response.getProperties(HttpStatus.SC_OK);
+                final MultiStatus multiStatus = method.getResponseBodyAsMultiStatus();
+                final MultiStatusResponse response = multiStatus.getResponses()[0];
+                final DavPropertySet props = response.getProperties(HttpStatus.SC_OK);
                 if (addEncoding)
                 {
-                    DavProperty prop = new DefaultDavProperty(RESPONSE_CHARSET,
+                    final DavProperty prop = new DefaultDavProperty(RESPONSE_CHARSET,
                             method.getResponseCharSet());
                     props.add(prop);
                 }
@@ -518,11 +520,11 @@ public class WebdavFileObject extends Ht
             }
             return new DavPropertySet();
         }
-        catch (FileSystemException fse)
+        catch (final FileSystemException fse)
         {
             throw fse;
         }
-        catch (Exception e)
+        catch (final Exception e)
         {
             throw new FileSystemException("vfs.provider.webdav/get-property.error", e, getName(), name, type,
                     nameSet.getContent(), addEncoding);
@@ -545,7 +547,7 @@ public class WebdavFileObject extends Ht
         return i >= 0 ? path.substring(i + 1) : path;
     }
 
-    private String toUrlString(URLFileName name)
+    private String toUrlString(final URLFileName name)
     {
         return toUrlString(name, true);
     }
@@ -557,7 +559,7 @@ public class WebdavFileObject extends Ht
      * @param includeUserInfo true if user information should be included.
      * @return The encoded URL String.
      */
-    private String toUrlString(URLFileName name, boolean includeUserInfo)
+    private String toUrlString(final URLFileName name, final boolean includeUserInfo)
     {
         String user = null;
         String password = null;
@@ -566,20 +568,20 @@ public class WebdavFileObject extends Ht
             user = name.getUserName();
             password = name.getPassword();
         }
-        URLFileName newFile = new URLFileName("http", name.getHostName(), name.getPort(),
+        final URLFileName newFile = new URLFileName("http", name.getHostName(), name.getPort(),
                 name.getDefaultPort(), user, password,
                 name.getPath(), name.getType(), name.getQueryString());
         try
         {
             return newFile.getURIEncoded(this.getUrlCharset());
         }
-        catch (Exception e)
+        catch (final Exception e)
         {
             return name.getURI();
         }
     }
 
-    private boolean isCurrentFile(String href, URLFileName fileName)
+    private boolean isCurrentFile(final String href, final URLFileName fileName)
     {
         String name = hrefString(fileName);
         if (href.endsWith("/") && !name.endsWith("/"))
@@ -595,16 +597,16 @@ public class WebdavFileObject extends Ht
      * @param name The FileName.
      * @return The encoded URL String.
      */
-    private String hrefString(URLFileName name)
+    private String hrefString(final URLFileName name)
     {
-        URLFileName newFile = new URLFileName("http", name.getHostName(), name.getPort(),
+        final URLFileName newFile = new URLFileName("http", name.getHostName(), name.getPort(),
                 name.getDefaultPort(), null, null,
                 name.getPath(), name.getType(), name.getQueryString());
         try
         {
             return newFile.getURIEncoded(this.getUrlCharset());
         }
-        catch (Exception e)
+        catch (final Exception e)
         {
             return name.getURI();
         }
@@ -617,9 +619,9 @@ public class WebdavFileObject extends Ht
      */
     private class WebdavOutputStream extends MonitorOutputStream
     {
-        private WebdavFileObject file;
+        private final WebdavFileObject file;
 
-        public WebdavOutputStream(WebdavFileObject file)
+        public WebdavOutputStream(final WebdavFileObject file)
         {
             super(new ByteArrayOutputStream());
             this.file = file;
@@ -631,9 +633,9 @@ public class WebdavFileObject extends Ht
         @Override
         protected void onClose() throws IOException
         {
-            RequestEntity entity = new ByteArrayRequestEntity(((ByteArrayOutputStream) out).toByteArray());
-            URLFileName fileName = (URLFileName) getName();
-            String urlStr = toUrlString(fileName);
+            final RequestEntity entity = new ByteArrayRequestEntity(((ByteArrayOutputStream) out).toByteArray());
+            final URLFileName fileName = (URLFileName) getName();
+            final String urlStr = toUrlString(fileName);
             if (builder.isVersioning(getFileSystem().getFileSystemOptions()))
             {
                 DavPropertySet set = null;
@@ -643,7 +645,7 @@ public class WebdavFileObject extends Ht
                 {
                     set = getPropertyNames(fileName);
                 }
-                catch (FileNotFoundException fnfe)
+                catch (final FileNotFoundException fnfe)
                 {
                     fileExists = false;
                 }
@@ -670,12 +672,12 @@ public class WebdavFileObject extends Ht
                 {
                     try
                     {
-                        CheckoutMethod checkout = new CheckoutMethod(urlStr);
+                        final CheckoutMethod checkout = new CheckoutMethod(urlStr);
                         setupMethod(checkout);
                         execute(checkout);
                         isCheckedIn = false;
                     }
-                    catch (FileSystemException ex)
+                    catch (final FileSystemException ex)
                     {
                         // Ignore the exception checking out.
                     }
@@ -683,24 +685,24 @@ public class WebdavFileObject extends Ht
 
                 try
                 {
-                    PutMethod method = new PutMethod(urlStr);
+                    final PutMethod method = new PutMethod(urlStr);
                     method.setRequestEntity(entity);
                     setupMethod(method);
                     execute(method);
                     setUserName(fileName, urlStr);
                 }
-                catch (FileSystemException ex)
+                catch (final FileSystemException ex)
                 {
                     if (!isCheckedIn)
                     {
                         try
                         {
-                            UncheckoutMethod method = new UncheckoutMethod(urlStr);
+                            final UncheckoutMethod method = new UncheckoutMethod(urlStr);
                             setupMethod(method);
                             execute(method);
                             isCheckedIn = true;
                         }
-                        catch (Exception e)
+                        catch (final Exception e)
                         {
                             // Ignore the exception. Going to throw original.
                         }
@@ -712,24 +714,24 @@ public class WebdavFileObject extends Ht
                     createVersion(urlStr);
                     try
                     {
-                        DavPropertySet props = getPropertyNames(fileName);
+                        final DavPropertySet props = getPropertyNames(fileName);
                         isCheckedIn = !props.contains(VersionControlledResource.CHECKED_OUT);
                     }
-                    catch (FileNotFoundException fnfe)
+                    catch (final FileNotFoundException fnfe)
                     {
                         // Ignore the error
                     }
                 }
                 if (!isCheckedIn)
                 {
-                  CheckinMethod checkin = new CheckinMethod(urlStr);
+                  final CheckinMethod checkin = new CheckinMethod(urlStr);
                   setupMethod(checkin);
                   execute(checkin);
                 }
             }
             else
             {
-                PutMethod method = new PutMethod(urlStr);
+                final PutMethod method = new PutMethod(urlStr);
                 method.setRequestEntity(entity);
                 setupMethod(method);
                 execute(method);
@@ -737,7 +739,7 @@ public class WebdavFileObject extends Ht
                 {
                     setUserName(fileName, urlStr);
                 }
-                catch (IOException e)
+                catch (final IOException e)
                 {
                     // Ignore the exception if unable to set the user name.
                 }
@@ -745,12 +747,12 @@ public class WebdavFileObject extends Ht
             ((DefaultFileContent) this.file.getContent()).resetAttributes();
         }
 
-        private void setUserName(URLFileName fileName, String urlStr)
+        private void setUserName(final URLFileName fileName, final String urlStr)
                 throws IOException
         {
-            List<DefaultDavProperty> list = new ArrayList<DefaultDavProperty>();
+            final List<DefaultDavProperty> list = new ArrayList<DefaultDavProperty>();
             String name = builder.getCreatorName(getFileSystem().getFileSystemOptions());
-            String userName = fileName.getUserName();
+            final String userName = fileName.getUserName();
             if (name == null)
             {
                 name = userName;
@@ -759,26 +761,26 @@ public class WebdavFileObject extends Ht
             {
                 if (userName != null)
                 {
-                    String comment = "Modified by user " + userName;
+                    final String comment = "Modified by user " + userName;
                     list.add(new DefaultDavProperty(DeltaVConstants.COMMENT, comment));
                 }
             }
             list.add(new DefaultDavProperty(DeltaVConstants.CREATOR_DISPLAYNAME, name));
-            PropPatchMethod method = new PropPatchMethod(urlStr, list);
+            final PropPatchMethod method = new PropPatchMethod(urlStr, list);
             setupMethod(method);
             execute(method);
         }
 
-        private boolean createVersion(String urlStr)
+        private boolean createVersion(final String urlStr)
         {
             try
             {
-                VersionControlMethod method = new VersionControlMethod(urlStr);
+                final VersionControlMethod method = new VersionControlMethod(urlStr);
                 setupMethod(method);
                 execute(method);
                 return true;
             }
-            catch (Exception ex)
+            catch (final Exception ex)
             {
                 return false;
             }

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileProvider.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileProvider.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileProvider.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileProvider.java Mon Dec  3 13:37:12 2012
@@ -86,7 +86,7 @@ public class WebdavFileProvider
     {
         // Create the file system
         final GenericFileName rootName = (GenericFileName) name;
-        FileSystemOptions fsOpts = fileSystemOptions == null ? new FileSystemOptions() : fileSystemOptions;
+        final FileSystemOptions fsOpts = fileSystemOptions == null ? new FileSystemOptions() : fileSystemOptions;
 
         UserAuthenticationData authData = null;
         HttpClient httpClient;

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileSystemConfigBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileSystemConfigBuilder.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileSystemConfigBuilder.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileSystemConfigBuilder.java Mon Dec  3 13:37:12 2012
@@ -51,7 +51,7 @@ public final class WebdavFileSystemConfi
      * @param opts The FileSystem options
      * @param creatorName The creator name to be associated with the file.
      */
-    public void setCreatorName(FileSystemOptions opts, String creatorName)
+    public void setCreatorName(final FileSystemOptions opts, final String creatorName)
     {
         setParam(opts, "creatorName", creatorName);
     }
@@ -61,7 +61,7 @@ public final class WebdavFileSystemConfi
      * @param opts The FileSystem options
      * @return The creatorName.
      */
-    public String getCreatorName(FileSystemOptions opts)
+    public String getCreatorName(final FileSystemOptions opts)
     {
         return getString(opts, "creatorName");
     }
@@ -76,7 +76,7 @@ public final class WebdavFileSystemConfi
      * @since 2.1
      */
     @Override
-    public boolean getFollowRedirect(FileSystemOptions opts)
+    public boolean getFollowRedirect(final FileSystemOptions opts)
     {
         return getBoolean(opts, KEY_FOLLOW_REDIRECT, DEFAULT_FOLLOW_REDIRECT);
     }
@@ -86,7 +86,7 @@ public final class WebdavFileSystemConfi
      * @param opts The FileSystem options.
      * @param versioning true if versioning should be enabled.
      */
-    public void setVersioning(FileSystemOptions opts, boolean versioning)
+    public void setVersioning(final FileSystemOptions opts, final boolean versioning)
     {
         setParam(opts, "versioning", Boolean.valueOf(versioning));
     }
@@ -96,7 +96,7 @@ public final class WebdavFileSystemConfi
      * @param opts The FileSystem options.
      * @return true if versioning is enabled.
      */
-    public boolean isVersioning(FileSystemOptions opts)
+    public boolean isVersioning(final FileSystemOptions opts)
     {
         return getBoolean(opts, "versioning", false);
     }

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavMethodRetryHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavMethodRetryHandler.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavMethodRetryHandler.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavMethodRetryHandler.java Mon Dec  3 13:37:12 2012
@@ -42,7 +42,7 @@ public final class WebdavMethodRetryHand
     }
 
     @Override
-    public boolean retryMethod(HttpMethod method, IOException exception, int executionCount)
+    public boolean retryMethod(final HttpMethod method, final IOException exception, final int executionCount)
     {
         return executionCount < 2;
     }

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/zip/ZipFileObject.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/zip/ZipFileObject.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/zip/ZipFileObject.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/zip/ZipFileObject.java Mon Dec  3 13:37:12 2012
@@ -38,10 +38,10 @@ public class ZipFileObject extends Abstr
 
     private FileType type;
 
-    protected ZipFileObject(AbstractFileName name,
-                            ZipEntry entry,
-                            ZipFileSystem fs,
-                            boolean zipExists) throws FileSystemException
+    protected ZipFileObject(final AbstractFileName name,
+                            final ZipEntry entry,
+                            final ZipFileSystem fs,
+                            final boolean zipExists) throws FileSystemException
     {
         super(name, fs);
         setZipEntry(entry);
@@ -81,7 +81,7 @@ public class ZipFileObject extends Abstr
      * 
      * @param childName The name of the child.
      */
-    public void attachChild(FileName childName)
+    public void attachChild(final FileName childName)
     {
         children.add(childName.getBaseName());
     }
@@ -120,7 +120,7 @@ public class ZipFileObject extends Abstr
                 return null;
             }
         }
-        catch (FileSystemException e)
+        catch (final FileSystemException e)
         {
             // should not happen as the type has already been cached.
             throw new RuntimeException(e);

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/zip/ZipFileSystem.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/zip/ZipFileSystem.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/zip/ZipFileSystem.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/zip/ZipFileSystem.java Mon Dec  3 13:37:12 2012
@@ -84,12 +84,12 @@ public class ZipFileSystem extends Abstr
         try
         {
             // Build the index
-            List<ZipFileObject> strongRef = new ArrayList<ZipFileObject>(getZipFile().size());
-            Enumeration<? extends ZipEntry> entries = getZipFile().entries();
+            final List<ZipFileObject> strongRef = new ArrayList<ZipFileObject>(getZipFile().size());
+            final Enumeration<? extends ZipEntry> entries = getZipFile().entries();
             while (entries.hasMoreElements())
             {
-                ZipEntry entry = entries.nextElement();
-                AbstractFileName name = (AbstractFileName) getFileSystemManager().resolveName(getRootName(),
+                final ZipEntry entry = entries.nextElement();
+                final AbstractFileName name = (AbstractFileName) getFileSystemManager().resolveName(getRootName(),
                     UriParser.encode(entry.getName()));
 
                 // Create the file
@@ -138,7 +138,7 @@ public class ZipFileSystem extends Abstr
     {
         if (zipFile == null && this.file.exists())
         {
-            ZipFile zipFile = createZipFile(this.file);
+            final ZipFile zipFile = createZipFile(this.file);
 
             this.zipFile = zipFile;
         }
@@ -158,7 +158,7 @@ public class ZipFileSystem extends Abstr
         {
             return new ZipFile(file);
         }
-        catch (IOException ioe)
+        catch (final IOException ioe)
         {
             throw new FileSystemException("vfs.provider.zip/open-zip-file.error", file, ioe);
         }

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/tasks/AbstractSyncTask.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/tasks/AbstractSyncTask.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/tasks/AbstractSyncTask.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/tasks/AbstractSyncTask.java Mon Dec  3 13:37:12 2012
@@ -180,7 +180,7 @@ public abstract class AbstractSyncTask
             {
                 srcDirUrl += "/";
             }
-            StringTokenizer tok = new StringTokenizer(filesList, ", \t\n\r\f", false);
+            final StringTokenizer tok = new StringTokenizer(filesList, ", \t\n\r\f", false);
             while (tok.hasMoreTokens())
             {
                 String nextFile = tok.nextToken();
@@ -226,7 +226,7 @@ public abstract class AbstractSyncTask
         }
     }
 
-    protected void logOrDie(final String message, int level)
+    protected void logOrDie(final String message, final int level)
     {
         if (!isFailonerror())
         {
@@ -327,7 +327,7 @@ public abstract class AbstractSyncTask
         if (detectMissingSourceFiles())
         {
             final FileObject[] allDestFiles = destFolder.findFiles(Selectors.SELECT_FILES);
-            for (FileObject destFile : allDestFiles)
+            for (final FileObject destFile : allDestFiles)
             {
                 if (!destFiles.contains(destFile))
                 {

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/tasks/CopyTask.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/tasks/CopyTask.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/tasks/CopyTask.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/tasks/CopyTask.java Mon Dec  3 13:37:12 2012
@@ -36,7 +36,7 @@ public class CopyTask
      * Enable/disable overwriting of up-to-date files.
      * @param overwrite true if the file should be overwritten.
      */
-    public void setOverwrite(boolean overwrite)
+    public void setOverwrite(final boolean overwrite)
     {
         this.overwrite = overwrite;
     }
@@ -45,7 +45,7 @@ public class CopyTask
      * Enable/disable preserving last modified time of copied files.
      * @param preserveLastModified true if the last modified time should be preserved.
      */
-    public void setPreserveLastModified(boolean preserveLastModified)
+    public void setPreserveLastModified(final boolean preserveLastModified)
     {
         this.preserveLastModified = preserveLastModified;
     }

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/tasks/DeleteTask.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/tasks/DeleteTask.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/tasks/DeleteTask.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/tasks/DeleteTask.java Mon Dec  3 13:37:12 2012
@@ -84,10 +84,10 @@ public class DeleteTask
                 {
                     srcDirUrl += "/";
                 }
-                StringTokenizer tok = new StringTokenizer(filesList, ", \t\n\r\f", false);
+                final StringTokenizer tok = new StringTokenizer(filesList, ", \t\n\r\f", false);
                 while (tok.hasMoreTokens())
                 {
-                    String nextFile = tok.nextToken();
+                    final String nextFile = tok.nextToken();
                     final FileObject srcFile = resolveFile(srcDirUrl + nextFile);
                     srcFile.deleteAll();
                 }

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/tasks/MoveTask.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/tasks/MoveTask.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/tasks/MoveTask.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/tasks/MoveTask.java Mon Dec  3 13:37:12 2012
@@ -35,7 +35,7 @@ public class MoveTask
      * Enable/disable move/rename of file (if possible).
      * @param tryRename true if the file should be renamed.
      */
-    public void setTryRename(boolean tryRename)
+    public void setTryRename(final boolean tryRename)
     {
         this.tryRename = tryRename;
     }

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/tasks/ShowFileTask.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/tasks/ShowFileTask.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/tasks/ShowFileTask.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/tasks/ShowFileTask.java Mon Dec  3 13:37:12 2012
@@ -90,7 +90,7 @@ public class ShowFileTask
     private void showFile(final FileObject file, final String prefix) throws Exception
     {
         // Write details
-        StringBuilder msg = new StringBuilder(prefix);
+        final StringBuilder msg = new StringBuilder(prefix);
         msg.append(file.getName().getBaseName());
         if (file.exists())
         {
@@ -121,7 +121,7 @@ public class ShowFileTask
             if (file.getType().hasChildren())
             {
                 final FileObject[] children = file.getChildren();
-                for (FileObject child : children)
+                for (final FileObject child : children)
                 {
                     if (recursive)
                     {



Mime
View raw message