commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgo...@apache.org
Subject svn commit: r1034953 - in /commons/proper/vfs/trunk: ./ core/src/main/java/org/apache/commons/vfs2/ core/src/main/java/org/apache/commons/vfs2/cache/ core/src/main/java/org/apache/commons/vfs2/impl/ core/src/main/java/org/apache/commons/vfs2/operations...
Date Sun, 14 Nov 2010 08:06:04 GMT
Author: rgoers
Date: Sun Nov 14 08:06:03 2010
New Revision: 1034953

URL: http://svn.apache.org/viewvc?rev=1034953&view=rev
Log:
Fix some checkstyle errors

Modified:
    commons/proper/vfs/trunk/checkstyle.xml
    commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/FileSystemOptions.java
    commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/cache/OnCallRefreshFileObject.java
    commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/DecoratedFileObject.java
    commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/DefaultFileSystemConfigBuilder.java
    commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/SynchronizedFileObject.java
    commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/operations/AbstractFileOperationProvider.java
    commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/operations/DefaultFileOperations.java
    commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/FileSystemKey.java
    commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/bzip2/CBZip2OutputStream.java
    commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileObject.java
    commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileSystem.java
    commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileSystemConfigBuilder.java
    commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftps/FtpsClientFactory.java
    commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftps/FtpsClientWrapper.java
    commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftps/FtpsFileSystemConfigBuilder.java
    commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/gzip/GzipFileProvider.java
    commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/http/HttpClientFactory.java
    commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/http/HttpFileSystemConfigBuilder.java
    commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/local/DefaultLocalFileProvider.java
    commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileSystem.java
    commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileSystemConfigBuilder.java
    commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/res/ResourceFileProvider.java
    commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileObject.java
    commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileProvider.java
    commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/tar/TarFileProvider.java
    commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/tar/TarInputStream.java
    commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/url/UrlFileProvider.java
    commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavMethodRetryHandler.java
    commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/zip/ZipFileProvider.java
    commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/CombinedResources.java
    commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/DelegatingFileSystemOptionsBuilder.java
    commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/FileObjectUtils.java

Modified: commons/proper/vfs/trunk/checkstyle.xml
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/checkstyle.xml?rev=1034953&r1=1034952&r2=1034953&view=diff
==============================================================================
--- commons/proper/vfs/trunk/checkstyle.xml (original)
+++ commons/proper/vfs/trunk/checkstyle.xml Sun Nov 14 08:06:03 2010
@@ -92,7 +92,9 @@
 
         <!-- Checks for Naming Conventions.                  -->
         <!-- See http://checkstyle.sf.net/config_naming.html -->
-        <module name="ConstantName"/>
+        <module name="ConstantName">
+          <property name="format" value="^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$|^capabilities$|^log$"/>
+        </module>
         <module name="LocalFinalVariableName"/>
         <module name="LocalVariableName"/>
         <module name="MemberName"/>

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/FileSystemOptions.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/FileSystemOptions.java?rev=1034953&r1=1034952&r2=1034953&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/FileSystemOptions.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/FileSystemOptions.java Sun Nov 14 08:06:03 2010
@@ -48,7 +48,7 @@ public final class FileSystemOptions imp
         /** The option name */
         private final String name;
 
-        // TODO the parameter name suggests that the class should only be a 
+        // TODO: the parameter name suggests that the class should only be a
         // a FileSystem, however some of the tests pass in DefaultFileSystemConfigBuilder
         private FileSystemOptionKey(Class<? extends FileSystem> fileSystemClass, String name)
         {

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/cache/OnCallRefreshFileObject.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/cache/OnCallRefreshFileObject.java?rev=1034953&r1=1034952&r2=1034953&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/cache/OnCallRefreshFileObject.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/cache/OnCallRefreshFileObject.java Sun Nov 14 08:06:03 2010
@@ -89,7 +89,8 @@ public class OnCallRefreshFileObject ext
     }
 
     @Override
-    public void findFiles(FileSelector selector, boolean depthwise, List<FileObject> selected) throws FileSystemException
+    public void findFiles(FileSelector selector, boolean depthwise, List<FileObject> selected)
+        throws FileSystemException
     {
         refresh();
         super.findFiles(selector, depthwise, selected);

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/DecoratedFileObject.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/DecoratedFileObject.java?rev=1034953&r1=1034952&r2=1034953&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/DecoratedFileObject.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/DecoratedFileObject.java Sun Nov 14 08:06:03 2010
@@ -85,7 +85,8 @@ public class DecoratedFileObject impleme
         return decoratedFileObject.exists();
     }
 
-    public void findFiles(FileSelector selector, boolean depthwise, List<FileObject> selected) throws FileSystemException
+    public void findFiles(FileSelector selector, boolean depthwise, List<FileObject> selected)
+        throws FileSystemException
     {
         decoratedFileObject.findFiles(selector, depthwise, selected);
     }

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/DefaultFileSystemConfigBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/DefaultFileSystemConfigBuilder.java?rev=1034953&r1=1034952&r2=1034953&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/DefaultFileSystemConfigBuilder.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/DefaultFileSystemConfigBuilder.java Sun Nov 14 08:06:03 2010
@@ -61,7 +61,8 @@ public class DefaultFileSystemConfigBuil
     /**
      * Dummy class that implements FileSystem.
      */
-    abstract static class DefaultFileSystem implements FileSystem {
+    abstract static class DefaultFileSystem implements FileSystem
+    {
     }
 
     @Override

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/SynchronizedFileObject.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/SynchronizedFileObject.java?rev=1034953&r1=1034952&r2=1034953&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/SynchronizedFileObject.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/SynchronizedFileObject.java Sun Nov 14 08:06:03 2010
@@ -102,7 +102,8 @@ public class SynchronizedFileObject exte
     }
 
         @Override
-        public void findFiles(FileSelector selector, boolean depthwise, List<FileObject> selected) throws FileSystemException
+        public void findFiles(FileSelector selector, boolean depthwise, List<FileObject> selected)
+            throws FileSystemException
         {
         synchronized (this)
         {

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/operations/AbstractFileOperationProvider.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/operations/AbstractFileOperationProvider.java?rev=1034953&r1=1034952&r2=1034953&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/operations/AbstractFileOperationProvider.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/operations/AbstractFileOperationProvider.java Sun Nov 14 08:06:03 2010
@@ -29,8 +29,7 @@ import java.util.Iterator;
  * @author Siarhei Baidun
  * @since 0.1
  */
-public abstract class AbstractFileOperationProvider implements
-        FileOperationProvider
+public abstract class AbstractFileOperationProvider implements FileOperationProvider
 {
 
     /**
@@ -39,7 +38,8 @@ public abstract class AbstractFileOperat
      * "svn", "svnssh", but not for "file", etc. The Map has scheme as a key and
      * Colleaction of operations that are available for that scheme.
      */
-    private final Collection<Class<? extends FileOperation>> operations = new ArrayList<Class<? extends FileOperation>>();
+    private final Collection<Class<? extends FileOperation>> operations =
+        new ArrayList<Class<? extends FileOperation>>();
 
     /**
      * Gather available operations for the specified FileObject and put them into
@@ -58,7 +58,6 @@ public abstract class AbstractFileOperat
     public final void collectOperations(final Collection<Class<? extends FileOperation>> operationsList,
             final FileObject file) throws FileSystemException
     {
-
         doCollectOperations(operations, operationsList, file);
     }
 
@@ -67,7 +66,8 @@ public abstract class AbstractFileOperat
      * @throws FileSystemException
      */
     protected abstract void doCollectOperations(
-            final Collection<Class<? extends FileOperation>> availableOperations, final Collection<Class<? extends FileOperation>> resultList,
+            final Collection<Class<? extends FileOperation>> availableOperations,
+            final Collection<Class<? extends FileOperation>> resultList,
             final FileObject file) throws FileSystemException;
 
     /**

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/operations/DefaultFileOperations.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/operations/DefaultFileOperations.java?rev=1034953&r1=1034952&r2=1034953&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/operations/DefaultFileOperations.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/operations/DefaultFileOperations.java Sun Nov 14 08:06:03 2010
@@ -78,7 +78,8 @@ public class DefaultFileOperations imple
         }
 
         @SuppressWarnings("unchecked")
-        Class<? extends FileOperation>[] array = (Class<? extends FileOperation>[]) operations.toArray(new Class<?>[] {});
+        Class<? extends FileOperation>[] array =
+            (Class<? extends FileOperation>[]) operations.toArray(new Class<?>[] {});
         return array;
     }
 

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/FileSystemKey.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/FileSystemKey.java?rev=1034953&r1=1034952&r2=1034953&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/FileSystemKey.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/FileSystemKey.java Sun Nov 14 08:06:03 2010
@@ -33,7 +33,7 @@ class FileSystemKey implements Comparabl
 
     /**
      * Create the FS key.
-     * 
+     *
      * @param key must implement Comparable, and must be self-comparable
      * @param fileSystemOptions the required options
      */
@@ -53,7 +53,7 @@ class FileSystemKey implements Comparabl
     public int compareTo(FileSystemKey o)
     {
         @SuppressWarnings("unchecked") // Keys must implement comparable, and be comparable to themselves
-        Comparable<Comparable<?>> comparable = (Comparable<Comparable<?>>)key;
+        Comparable<Comparable<?>> comparable = (Comparable<Comparable<?>>) key;
         int ret = comparable.compareTo(o.key);
         if (ret != 0)
         {

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/bzip2/CBZip2OutputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/bzip2/CBZip2OutputStream.java?rev=1034953&r1=1034952&r2=1034953&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/bzip2/CBZip2OutputStream.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/bzip2/CBZip2OutputStream.java Sun Nov 14 08:06:03 2010
@@ -488,7 +488,7 @@ class CBZip2OutputStream
             int ch = (bsBuff >> 24);
             try
             {
-                bsStream.write(ch);// write 8-bit
+                bsStream.write(ch); // write 8-bit
             }
             catch (IOException e)
             {
@@ -535,7 +535,7 @@ class CBZip2OutputStream
             int ch = (bsBuff >> 24);
             try
             {
-                bsStream.write(ch);// write 8-bit
+                bsStream.write(ch); // write 8-bit
             }
             catch (IOException e)
             {

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileObject.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileObject.java?rev=1034953&r1=1034952&r2=1034953&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileObject.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileObject.java Sun Nov 14 08:06:03 2010
@@ -52,7 +52,8 @@ import org.apache.commons.vfs2.util.Rand
 public class FtpFileObject
     extends AbstractFileObject
 {
-    private static final Map<String, FTPFile> EMPTY_FTP_FILE_MAP = Collections.unmodifiableMap(new TreeMap<String, FTPFile>());
+    private static final Map<String, FTPFile> EMPTY_FTP_FILE_MAP =
+        Collections.unmodifiableMap(new TreeMap<String, FTPFile>());
     private static final FTPFile UNKNOWN = new FTPFile();
 
     private final Log log = LogFactory.getLog(FtpFileObject.class);

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileSystem.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileSystem.java?rev=1034953&r1=1034952&r2=1034953&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileSystem.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileSystem.java Sun Nov 14 08:06:03 2010
@@ -48,7 +48,8 @@ public class FtpFileSystem extends Abstr
     // An idle client
     private FtpClient idleClient;
 
-    public FtpFileSystem(final GenericFileName rootName, final FtpClient ftpClient, final FileSystemOptions fileSystemOptions)
+    public FtpFileSystem(final GenericFileName rootName, final FtpClient ftpClient,
+                         final FileSystemOptions fileSystemOptions)
     {
         super(rootName, null, fileSystemOptions);
         // hostname = rootName.getHostName();

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileSystemConfigBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileSystemConfigBuilder.java?rev=1034953&r1=1034952&r2=1034953&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileSystemConfigBuilder.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileSystemConfigBuilder.java Sun Nov 14 08:06:03 2010
@@ -316,11 +316,13 @@ public final class FtpFileSystemConfigBu
      * @param opts The FileSystemOptions.
      * @param encoding the encoding to use
      */
-    public void setControlEncoding(FileSystemOptions opts, String encoding){
+    public void setControlEncoding(FileSystemOptions opts, String encoding)
+    {
         setParam(opts, ENCODING, encoding);
-	}
+    }
 
-    public String getControlEncoding(FileSystemOptions opts) {
+    public String getControlEncoding(FileSystemOptions opts)
+    {
         return  (String) getParam(opts, ENCODING);
     }
 }

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftps/FtpsClientFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftps/FtpsClientFactory.java?rev=1034953&r1=1034952&r2=1034953&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftps/FtpsClientFactory.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftps/FtpsClientFactory.java Sun Nov 14 08:06:03 2010
@@ -42,7 +42,9 @@ public class FtpsClientFactory
     /**
      * Creates a new connection to the server.
      */
-    public static FTPSClient createConnection(String hostname, int port, char[] username, char[] password, String workingDirectory, FileSystemOptions fileSystemOptions) throws FileSystemException
+    public static FTPSClient createConnection(String hostname, int port, char[] username, char[] password,
+                                              String workingDirectory, FileSystemOptions fileSystemOptions)
+        throws FileSystemException
     {
         // Determine the username and password to use
         if (username == null)
@@ -57,129 +59,146 @@ public class FtpsClientFactory
 
         try
         {
-            
+
             final FTPSClient client;
-          
+
             if (FtpsFileSystemConfigBuilder.getInstance().getFtpsType(fileSystemOptions).equals("explicit"))
-              client = new FTPSClient();
+            {
+                client = new FTPSClient();
+            }
             else if (FtpsFileSystemConfigBuilder.getInstance().getFtpsType(fileSystemOptions).equals("implicit"))
-              client = new FTPSClient(true);
+            {
+                client = new FTPSClient(true);
+            }
             else
-              throw new FileSystemException("Invalid FTPS type of "+FtpsFileSystemConfigBuilder.getInstance().getFtpsType(fileSystemOptions)+" specified. Must be 'implicit' or 'explicit'");
-          
-            String key = FtpsFileSystemConfigBuilder.getInstance().getEntryParser(fileSystemOptions);
-            if (key != null)
             {
-                FTPClientConfig config = new FTPClientConfig(key);
-                
-                String serverLanguageCode = FtpsFileSystemConfigBuilder.getInstance().getServerLanguageCode(fileSystemOptions);
-                if (serverLanguageCode != null)
-                {
-                    config.setServerLanguageCode(serverLanguageCode);
-                }
-                String defaultDateFormat = FtpsFileSystemConfigBuilder.getInstance().getDefaultDateFormat(fileSystemOptions);
-                if (defaultDateFormat != null)
-                {
-                    config.setDefaultDateFormatStr(defaultDateFormat);
-                }
-                String recentDateFormat = FtpsFileSystemConfigBuilder.getInstance().getRecentDateFormat(fileSystemOptions);
-                if (recentDateFormat != null)
-                {
-                    config.setRecentDateFormatStr(recentDateFormat);
-                }
-                String serverTimeZoneId = FtpsFileSystemConfigBuilder.getInstance().getServerTimeZoneId(fileSystemOptions);
-                if (serverTimeZoneId != null)
-                {
-                    config.setServerTimeZoneId(serverTimeZoneId);
-                }
-                String[] shortMonthNames = FtpsFileSystemConfigBuilder.getInstance().getShortMonthNames(fileSystemOptions);
-                if (shortMonthNames != null)
+                throw new FileSystemException(
+                    "Invalid FTPS type of " + FtpsFileSystemConfigBuilder.getInstance().getFtpsType(
+                        fileSystemOptions) + " specified. Must be 'implicit' or 'explicit'");
+            }
+
+                String key = FtpsFileSystemConfigBuilder.getInstance().getEntryParser(fileSystemOptions);
+                if (key != null)
                 {
-                    StringBuffer shortMonthNamesStr = new StringBuffer(40);
-                    for (int i = 0; i<shortMonthNames.length; i++)
+                    FTPClientConfig config = new FTPClientConfig(key);
+
+                    String serverLanguageCode = FtpsFileSystemConfigBuilder.getInstance().getServerLanguageCode(
+                        fileSystemOptions);
+                    if (serverLanguageCode != null)
+                    {
+                        config.setServerLanguageCode(serverLanguageCode);
+                    }
+                    String defaultDateFormat = FtpsFileSystemConfigBuilder.getInstance().getDefaultDateFormat(
+                        fileSystemOptions);
+                    if (defaultDateFormat != null)
+                    {
+                        config.setDefaultDateFormatStr(defaultDateFormat);
+                    }
+                    String recentDateFormat = FtpsFileSystemConfigBuilder.getInstance().getRecentDateFormat(
+                        fileSystemOptions);
+                    if (recentDateFormat != null)
+                    {
+                        config.setRecentDateFormatStr(recentDateFormat);
+                    }
+                    String serverTimeZoneId = FtpsFileSystemConfigBuilder.getInstance().getServerTimeZoneId(
+                        fileSystemOptions);
+                    if (serverTimeZoneId != null)
                     {
-                        if (shortMonthNamesStr.length()>0)
+                        config.setServerTimeZoneId(serverTimeZoneId);
+                    }
+                    String[] shortMonthNames = FtpsFileSystemConfigBuilder.getInstance().getShortMonthNames(
+                        fileSystemOptions);
+                    if (shortMonthNames != null)
+                    {
+                        StringBuffer shortMonthNamesStr = new StringBuffer(40);
+                        for (int i = 0; i < shortMonthNames.length; i++)
                         {
-                            shortMonthNamesStr.append("|");
+                            if (shortMonthNamesStr.length() > 0)
+                            {
+                                shortMonthNamesStr.append("|");
+                            }
+                            shortMonthNamesStr.append(shortMonthNames[i]);
                         }
-                        shortMonthNamesStr.append(shortMonthNames[i]);                        
+                        config.setShortMonthNames(shortMonthNamesStr.toString());
                     }
-                    config.setShortMonthNames(shortMonthNamesStr.toString());
-                }
-                
-                client.configure(config);
-            }
-            
-            FTPFileEntryParserFactory myFactory = FtpsFileSystemConfigBuilder.getInstance().getEntryParserFactory(fileSystemOptions);
-            if (myFactory != null)
-            {
-                client.setParserFactory(myFactory);
-            }
-
-            try
-            {
-                client.connect(hostname, port);
 
-                int reply = client.getReplyCode();
-                if (!FTPReply.isPositiveCompletion(reply))
-                {
-                    throw new FileSystemException("vfs.provider.ftp/connect-rejected.error", hostname);
+                    client.configure(config);
                 }
 
-                // Login
-                if (!client.login(
-                    UserAuthenticatorUtils.toString(username),
-                    UserAuthenticatorUtils.toString(password)))
+                FTPFileEntryParserFactory myFactory = FtpsFileSystemConfigBuilder.getInstance().getEntryParserFactory(
+                    fileSystemOptions);
+                if (myFactory != null)
                 {
-                    throw new FileSystemException("vfs.provider.ftp/login.error", new Object[]{hostname, UserAuthenticatorUtils.toString(username)}, null);
+                    client.setParserFactory(myFactory);
                 }
 
-                // Set binary mode
-                if (!client.setFileType(FTP.BINARY_FILE_TYPE))
+                try
                 {
-                    throw new FileSystemException("vfs.provider.ftp/set-binary.error", hostname);
-                }
+                    client.connect(hostname, port);
 
-                // Set dataTimeout value
-                Integer dataTimeout = FtpsFileSystemConfigBuilder.getInstance().getDataTimeout(fileSystemOptions);
-                if (dataTimeout != null)
-                {
-                    client.setDataTimeout(dataTimeout.intValue());
-                }
+                    int reply = client.getReplyCode();
+                    if (!FTPReply.isPositiveCompletion(reply))
+                    {
+                        throw new FileSystemException("vfs.provider.ftp/connect-rejected.error", hostname);
+                    }
 
-                // Change to root by default
-                // All file operations a relative to the filesystem-root
-                // String root = getRoot().getName().getPath();
+                    // Login
+                    if (!client.login(
+                        UserAuthenticatorUtils.toString(username),
+                        UserAuthenticatorUtils.toString(password)))
+                    {
+                        throw new FileSystemException("vfs.provider.ftp/login.error",
+                            new Object[]{hostname, UserAuthenticatorUtils.toString(username)}, null);
+                    }
 
-                Boolean userDirIsRoot = FtpsFileSystemConfigBuilder.getInstance().getUserDirIsRoot(fileSystemOptions);
-                if (workingDirectory != null && (userDirIsRoot == null || !userDirIsRoot.booleanValue()))
-                {
-                    if (!client.changeWorkingDirectory(workingDirectory))
+                    // Set binary mode
+                    if (!client.setFileType(FTP.BINARY_FILE_TYPE))
                     {
-                        throw new FileSystemException("vfs.provider.ftp/change-work-directory.error", workingDirectory);
+                        throw new FileSystemException("vfs.provider.ftp/set-binary.error", hostname);
+                    }
+
+                    // Set dataTimeout value
+                    Integer dataTimeout = FtpsFileSystemConfigBuilder.getInstance().getDataTimeout(fileSystemOptions);
+                    if (dataTimeout != null)
+                    {
+                        client.setDataTimeout(dataTimeout.intValue());
+                    }
+
+                    // Change to root by default
+                    // All file operations a relative to the filesystem-root
+                    // String root = getRoot().getName().getPath();
+
+                    Boolean userDirIsRoot = FtpsFileSystemConfigBuilder.getInstance().getUserDirIsRoot(
+                        fileSystemOptions);
+                    if (workingDirectory != null && (userDirIsRoot == null || !userDirIsRoot.booleanValue()))
+                    {
+                        if (!client.changeWorkingDirectory(workingDirectory))
+                        {
+                            throw new FileSystemException("vfs.provider.ftp/change-work-directory.error",
+                                workingDirectory);
+                        }
                     }
-                }
 
-                Boolean passiveMode = FtpsFileSystemConfigBuilder.getInstance().getPassiveMode(fileSystemOptions);
-                if (passiveMode != null && passiveMode.booleanValue())
+                    Boolean passiveMode = FtpsFileSystemConfigBuilder.getInstance().getPassiveMode(fileSystemOptions);
+                    if (passiveMode != null && passiveMode.booleanValue())
+                    {
+                        client.enterLocalPassiveMode();
+                    }
+                }
+                catch (final IOException e)
                 {
-                    client.enterLocalPassiveMode();
+                    if (client.isConnected())
+                    {
+                        client.disconnect();
+                    }
+                    throw e;
                 }
+
+                return client;
             }
-            catch (final IOException e)
+            catch (final Exception exc)
             {
-                if (client.isConnected())
-                {
-                    client.disconnect();
-                }
-                throw e;
+                throw new FileSystemException("vfs.provider.ftp/connect.error", new Object[]{hostname}, exc);
             }
-
-            return client;
-        }
-        catch (final Exception exc)
-        {
-            throw new FileSystemException("vfs.provider.ftp/connect.error", new Object[]{hostname}, exc);
         }
     }
-}

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftps/FtpsClientWrapper.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftps/FtpsClientWrapper.java?rev=1034953&r1=1034952&r2=1034953&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftps/FtpsClientWrapper.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftps/FtpsClientWrapper.java Sun Nov 14 08:06:03 2010
@@ -71,8 +71,10 @@ class FtpsClientWrapper implements FtpCl
 
             return FtpsClientFactory.createConnection(rootName.getHostName(),
                 rootName.getPort(),
-                UserAuthenticatorUtils.getData(authData, UserAuthenticationData.USERNAME, UserAuthenticatorUtils.toChar(rootName.getUserName())),
-                UserAuthenticatorUtils.getData(authData, UserAuthenticationData.PASSWORD, UserAuthenticatorUtils.toChar(rootName.getPassword())),
+                UserAuthenticatorUtils.getData(authData, UserAuthenticationData.USERNAME,
+                                               UserAuthenticatorUtils.toChar(rootName.getUserName())),
+                UserAuthenticatorUtils.getData(authData, UserAuthenticationData.PASSWORD,
+                                               UserAuthenticatorUtils.toChar(rootName.getPassword())),
                 rootName.getPath(),
                 getFileSystemOptions());
         }

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftps/FtpsFileSystemConfigBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftps/FtpsFileSystemConfigBuilder.java?rev=1034953&r1=1034952&r2=1034953&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftps/FtpsFileSystemConfigBuilder.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftps/FtpsFileSystemConfigBuilder.java Sun Nov 14 08:06:03 2010
@@ -23,248 +23,274 @@ import org.apache.commons.vfs2.FileSyste
 import org.apache.commons.vfs2.provider.ftp.FtpFileSystem;
 
 /**
- * The config builder for various ftp configuration options
+ * The config BUILDER for various ftp configuration options
  *
  * @author <a href="mailto:imario@apache.org">Mario Ivankovits</a>
  * @version $Revision: 480428 $ $Date: 2006-11-29 07:15:24 +0100 (Mi, 29 Nov 2006) $
  */
-public class FtpsFileSystemConfigBuilder extends FileSystemConfigBuilder {
-  private final static FtpsFileSystemConfigBuilder builder =
-    new FtpsFileSystemConfigBuilder();
-
-  private final static String FACTORY_KEY =
-    FTPFileEntryParserFactory.class.getName() + ".KEY";
-  private final static String PASSIVE_MODE =
-    FtpsFileSystemConfigBuilder.class.getName() + ".PASSIVE";
-  private final static String USER_DIR_IS_ROOT =
-    FtpsFileSystemConfigBuilder.class.getName() + ".USER_DIR_IS_ROOT";
-  private final static String DATA_TIMEOUT =
-    FtpsFileSystemConfigBuilder.class.getName() + ".DATA_TIMEOUT";
-  private final static String FTPS_TYPE =
-    FtpsFileSystemConfigBuilder.class.getName() + ".FTPS_TYPE";
-
-  private final static String SERVER_LANGUAGE_CODE =
-    FtpsFileSystemConfigBuilder.class.getName() + ".SERVER_LANGUAGE_CODE";
-  private final static String DEFAULT_DATE_FORMAT =
-    FtpsFileSystemConfigBuilder.class.getName() + ".DEFAULT_DATE_FORMAT";
-  private final static String RECENT_DATE_FORMAT =
-    FtpsFileSystemConfigBuilder.class.getName() + ".RECENT_DATE_FORMAT";
-  private final static String SERVER_TIME_ZONE_ID =
-    FtpsFileSystemConfigBuilder.class.getName() + ".SERVER_TIME_ZONE_ID";
-  private final static String SHORT_MONTH_NAMES =
-    FtpsFileSystemConfigBuilder.class.getName() + ".SHORT_MONTH_NAMES";
-
-  public static FtpsFileSystemConfigBuilder getInstance() {
-    return builder;
-  }
-
-  private FtpsFileSystemConfigBuilder() {
-  }
-
-  /**
-   * FTPFileEntryParserFactory which will be used for ftp-entry parsing
-   *
-   * @param opts
-   * @param factory instance of your factory
-   */
-  public void setEntryParserFactory(FileSystemOptions opts,
-                                    FTPFileEntryParserFactory factory) {
-    setParam(opts, FTPFileEntryParserFactory.class.getName(), factory);
-  }
-
-  /**
-   * @param opts
-   * @see #setEntryParserFactory
-   */
-  public FTPFileEntryParserFactory getEntryParserFactory(FileSystemOptions opts) {
-    return (FTPFileEntryParserFactory)getParam(opts,
-                                               FTPFileEntryParserFactory.class.getName());
-  }
-
-  /**
-   * set the FQCN of your FileEntryParser used to parse the directory listing from your server.<br />
-   * <br />
-   * <i>If you do not use the default commons-net FTPFileEntryParserFactory e.g. by using {@link #setEntryParserFactory}
-   * this is the "key" parameter passed as argument into your custom factory</i>
-   *
-   * @param opts
-   * @param key
-   */
-  public void setEntryParser(FileSystemOptions opts, String key) {
-    setParam(opts, FACTORY_KEY, key);
-  }
-
-  /**
-   * @param opts
-   * @see #setEntryParser
-   */
-  public String getEntryParser(FileSystemOptions opts) {
-    return (String)getParam(opts, FACTORY_KEY);
-  }
-
-  @Override
-  protected Class<? extends FileSystem> getConfigClass() {
-    return FtpFileSystem.class;
-  }
-
-  /**
-   * enter into passive mode
-   *
-   * @param opts
-   * @param passiveMode
-   */
-  public void setPassiveMode(FileSystemOptions opts, boolean passiveMode) {
-    setParam(opts, PASSIVE_MODE, passiveMode ? Boolean.TRUE : Boolean.FALSE);
-  }
-
-  /**
-   * @param opts
-   * @see #setPassiveMode
-   */
-  public Boolean getPassiveMode(FileSystemOptions opts) {
-    return (Boolean)getParam(opts, PASSIVE_MODE);
-  }
-
-  /**
-   * use user directory as root (do not change to fs root)
-   *
-   * @param opts
-   * @param userDirIsRoot
-   */
-  public void setUserDirIsRoot(FileSystemOptions opts, boolean userDirIsRoot) {
-    setParam(opts, USER_DIR_IS_ROOT,
-             userDirIsRoot ? Boolean.TRUE : Boolean.FALSE);
-  }
-
-  /**
-   * @param opts
-   * @see #setUserDirIsRoot
-   */
-  public Boolean getUserDirIsRoot(FileSystemOptions opts) {
-    return getBoolean(opts, USER_DIR_IS_ROOT, Boolean.TRUE);
-  }
-
-  /**
-   * Set FTPS security mode, either "implicit" or "explicit"
-   *
-   * @param opts
-   * @param ftpsType
-   */
-  public void setFtpsType(FileSystemOptions opts, String ftpsType) {
-    setParam(opts, FTPS_TYPE, ftpsType);
-  }
-
-  /**
-   * Return the FTPS security mode. Defaults to "explicit" if not defined.
-   * @param opts
-   * @see #setFtpsType
-   */
-  public String getFtpsType(FileSystemOptions opts) {
-    return getString(opts, FTPS_TYPE, "explicit");
-  }
-
-  /**
-   * @param opts
-   * @see #setDataTimeout
-   */
-  public Integer getDataTimeout(FileSystemOptions opts) {
-    return (Integer)getParam(opts, DATA_TIMEOUT);
-  }
-
-  /**
-   * set the data timeout for the ftp client.<br />
-   * If you set the dataTimeout to <code>null</code> no dataTimeout will be set on the
-   * ftp client.
-   *
-   * @param opts
-   * @param dataTimeout
-   */
-  public void setDataTimeout(FileSystemOptions opts, Integer dataTimeout) {
-    setParam(opts, DATA_TIMEOUT, dataTimeout);
-  }
-
-  /**
-   * get the language code used by the server. see {@link org.apache.commons.net.ftp.FTPClientConfig}
-   * for details and examples.
-   */
-  public String getServerLanguageCode(FileSystemOptions opts) {
-    return (String)getParam(opts, SERVER_LANGUAGE_CODE);
-  }
-
-  /**
-   * set the language code used by the server. see {@link org.apache.commons.net.ftp.FTPClientConfig}
-   * for details and examples.
-   */
-  public void setServerLanguageCode(FileSystemOptions opts,
-                                    String serverLanguageCode) {
-    setParam(opts, SERVER_LANGUAGE_CODE, serverLanguageCode);
-  }
-
-  /**
-   * get the language code used by the server. see {@link org.apache.commons.net.ftp.FTPClientConfig}
-   * for details and examples.
-   */
-  public String getDefaultDateFormat(FileSystemOptions opts) {
-    return (String)getParam(opts, DEFAULT_DATE_FORMAT);
-  }
-
-  /**
-   * set the language code used by the server. see {@link org.apache.commons.net.ftp.FTPClientConfig}
-   * for details and examples.
-   */
-  public void setDefaultDateFormat(FileSystemOptions opts,
-                                   String defaultDateFormat) {
-    setParam(opts, DEFAULT_DATE_FORMAT, defaultDateFormat);
-  }
-
-  /**
-   * see {@link org.apache.commons.net.ftp.FTPClientConfig} for details and examples.
-   */
-  public String getRecentDateFormat(FileSystemOptions opts) {
-    return (String)getParam(opts, RECENT_DATE_FORMAT);
-  }
-
-  /**
-   * see {@link org.apache.commons.net.ftp.FTPClientConfig} for details and examples.
-   */
-  public void setRecentDateFormat(FileSystemOptions opts,
-                                  String recentDateFormat) {
-    setParam(opts, RECENT_DATE_FORMAT, recentDateFormat);
-  }
-
-  /**
-   * see {@link org.apache.commons.net.ftp.FTPClientConfig} for details and examples.
-   */
-  public String getServerTimeZoneId(FileSystemOptions opts) {
-    return (String)getParam(opts, SERVER_TIME_ZONE_ID);
-  }
-
-  /**
-   * see {@link org.apache.commons.net.ftp.FTPClientConfig} for details and examples.
-   */
-  public void setServerTimeZoneId(FileSystemOptions opts,
-                                  String serverTimeZoneId) {
-    setParam(opts, SERVER_TIME_ZONE_ID, serverTimeZoneId);
-  }
-
-  /**
-   * see {@link org.apache.commons.net.ftp.FTPClientConfig} for details and examples.
-   */
-  public String[] getShortMonthNames(FileSystemOptions opts) {
-    return (String[])getParam(opts, SHORT_MONTH_NAMES);
-  }
-
-  /**
-   * see {@link org.apache.commons.net.ftp.FTPClientConfig} for details and examples.
-   */
-  public void setShortMonthNames(FileSystemOptions opts,
-                                 String[] shortMonthNames) {
-    String[] clone = null;
-    if (shortMonthNames != null) {
-      clone = new String[shortMonthNames.length];
-      System.arraycopy(shortMonthNames, 0, clone, 0, shortMonthNames.length);
+public class FtpsFileSystemConfigBuilder extends FileSystemConfigBuilder
+{
+    private static final FtpsFileSystemConfigBuilder BUILDER =
+        new FtpsFileSystemConfigBuilder();
+
+    private static final String FACTORY_KEY =
+        FTPFileEntryParserFactory.class.getName() + ".KEY";
+    private static final String PASSIVE_MODE =
+        FtpsFileSystemConfigBuilder.class.getName() + ".PASSIVE";
+    private static final String USER_DIR_IS_ROOT =
+        FtpsFileSystemConfigBuilder.class.getName() + ".USER_DIR_IS_ROOT";
+    private static final String DATA_TIMEOUT =
+        FtpsFileSystemConfigBuilder.class.getName() + ".DATA_TIMEOUT";
+    private static final String FTPS_TYPE =
+        FtpsFileSystemConfigBuilder.class.getName() + ".FTPS_TYPE";
+
+    private static final String SERVER_LANGUAGE_CODE =
+        FtpsFileSystemConfigBuilder.class.getName() + ".SERVER_LANGUAGE_CODE";
+    private static final String DEFAULT_DATE_FORMAT =
+        FtpsFileSystemConfigBuilder.class.getName() + ".DEFAULT_DATE_FORMAT";
+    private static final String RECENT_DATE_FORMAT =
+        FtpsFileSystemConfigBuilder.class.getName() + ".RECENT_DATE_FORMAT";
+    private static final String SERVER_TIME_ZONE_ID =
+        FtpsFileSystemConfigBuilder.class.getName() + ".SERVER_TIME_ZONE_ID";
+    private static final String SHORT_MONTH_NAMES =
+        FtpsFileSystemConfigBuilder.class.getName() + ".SHORT_MONTH_NAMES";
+
+    private FtpsFileSystemConfigBuilder()
+    {
+    }
+
+    public static FtpsFileSystemConfigBuilder getInstance()
+    {
+        return BUILDER;
+    }
+
+    /**
+     * FTPFileEntryParserFactory which will be used for ftp-entry parsing
+     *
+     * @param opts
+     * @param factory instance of your factory
+     */
+    public void setEntryParserFactory(FileSystemOptions opts, FTPFileEntryParserFactory factory)
+    {
+        setParam(opts, FTPFileEntryParserFactory.class.getName(), factory);
+    }
+
+    /**
+     * @param opts
+     * @see #setEntryParserFactory
+     */
+    public FTPFileEntryParserFactory getEntryParserFactory(FileSystemOptions opts)
+    {
+        return (FTPFileEntryParserFactory) getParam(opts, FTPFileEntryParserFactory.class.getName());
+    }
+
+    /**
+     * set the FQCN of your FileEntryParser used to parse the directory listing from your server.<br />
+     * <br />
+     * <i>If you do not use the default commons-net FTPFileEntryParserFactory e.g. by using {@link #setEntryParserFactory}
+     * this is the "key" parameter passed as argument into your custom factory</i>
+     *
+     * @param opts
+     * @param key
+     */
+    public void setEntryParser(FileSystemOptions opts, String key)
+    {
+        setParam(opts, FACTORY_KEY, key);
+    }
+
+    /**
+     * @param opts
+     * @see #setEntryParser
+     */
+    public String getEntryParser(FileSystemOptions opts)
+    {
+        return (String) getParam(opts, FACTORY_KEY);
+    }
+
+    @Override
+    protected Class<? extends FileSystem> getConfigClass()
+    {
+        return FtpFileSystem.class;
+    }
+
+    /**
+     * enter into passive mode
+     *
+     * @param opts
+     * @param passiveMode
+     */
+    public void setPassiveMode(FileSystemOptions opts, boolean passiveMode)
+    {
+        setParam(opts, PASSIVE_MODE, passiveMode ? Boolean.TRUE : Boolean.FALSE);
+    }
+
+    /**
+     * @param opts
+     * @see #setPassiveMode
+     */
+    public Boolean getPassiveMode(FileSystemOptions opts)
+    {
+        return (Boolean) getParam(opts, PASSIVE_MODE);
+    }
+
+    /**
+     * use user directory as root (do not change to fs root)
+     *
+     * @param opts
+     * @param userDirIsRoot
+     */
+    public void setUserDirIsRoot(FileSystemOptions opts, boolean userDirIsRoot)
+    {
+        setParam(opts, USER_DIR_IS_ROOT,
+            userDirIsRoot ? Boolean.TRUE : Boolean.FALSE);
+    }
+
+    /**
+     * @param opts
+     * @see #setUserDirIsRoot
+     */
+    public Boolean getUserDirIsRoot(FileSystemOptions opts)
+    {
+        return getBoolean(opts, USER_DIR_IS_ROOT, Boolean.TRUE);
+    }
+
+    /**
+     * Set FTPS security mode, either "implicit" or "explicit"
+     *
+     * @param opts
+     * @param ftpsType
+     */
+    public void setFtpsType(FileSystemOptions opts, String ftpsType)
+    {
+        setParam(opts, FTPS_TYPE, ftpsType);
+    }
+
+    /**
+     * Return the FTPS security mode. Defaults to "explicit" if not defined.
+     *
+     * @param opts
+     * @see #setFtpsType
+     */
+    public String getFtpsType(FileSystemOptions opts)
+    {
+        return getString(opts, FTPS_TYPE, "explicit");
     }
 
-    setParam(opts, SHORT_MONTH_NAMES, clone);
-  }
+    /**
+     * @param opts
+     * @see #setDataTimeout
+     */
+    public Integer getDataTimeout(FileSystemOptions opts)
+    {
+        return (Integer) getParam(opts, DATA_TIMEOUT);
+    }
+
+    /**
+     * set the data timeout for the ftp client.<br />
+     * If you set the dataTimeout to <code>null</code> no dataTimeout will be set on the
+     * ftp client.
+     *
+     * @param opts
+     * @param dataTimeout
+     */
+    public void setDataTimeout(FileSystemOptions opts, Integer dataTimeout)
+    {
+        setParam(opts, DATA_TIMEOUT, dataTimeout);
+    }
+
+    /**
+     * get the language code used by the server. see {@link org.apache.commons.net.ftp.FTPClientConfig}
+     * for details and examples.
+     */
+    public String getServerLanguageCode(FileSystemOptions opts)
+    {
+        return (String) getParam(opts, SERVER_LANGUAGE_CODE);
+    }
+
+    /**
+     * set the language code used by the server. see {@link org.apache.commons.net.ftp.FTPClientConfig}
+     * for details and examples.
+     */
+    public void setServerLanguageCode(FileSystemOptions opts,
+                                      String serverLanguageCode)
+    {
+        setParam(opts, SERVER_LANGUAGE_CODE, serverLanguageCode);
+    }
+
+    /**
+     * get the language code used by the server. see {@link org.apache.commons.net.ftp.FTPClientConfig}
+     * for details and examples.
+     */
+    public String getDefaultDateFormat(FileSystemOptions opts)
+    {
+        return (String) getParam(opts, DEFAULT_DATE_FORMAT);
+    }
+
+    /**
+     * set the language code used by the server. see {@link org.apache.commons.net.ftp.FTPClientConfig}
+     * for details and examples.
+     */
+    public void setDefaultDateFormat(FileSystemOptions opts,
+                                     String defaultDateFormat)
+    {
+        setParam(opts, DEFAULT_DATE_FORMAT, defaultDateFormat);
+    }
+
+    /**
+     * see {@link org.apache.commons.net.ftp.FTPClientConfig} for details and examples.
+     */
+    public String getRecentDateFormat(FileSystemOptions opts)
+    {
+        return (String) getParam(opts, RECENT_DATE_FORMAT);
+    }
+
+    /**
+     * see {@link org.apache.commons.net.ftp.FTPClientConfig} for details and examples.
+     */
+    public void setRecentDateFormat(FileSystemOptions opts,
+                                    String recentDateFormat)
+    {
+        setParam(opts, RECENT_DATE_FORMAT, recentDateFormat);
+    }
+
+    /**
+     * see {@link org.apache.commons.net.ftp.FTPClientConfig} for details and examples.
+     */
+    public String getServerTimeZoneId(FileSystemOptions opts)
+    {
+        return (String) getParam(opts, SERVER_TIME_ZONE_ID);
+    }
+
+    /**
+     * see {@link org.apache.commons.net.ftp.FTPClientConfig} for details and examples.
+     */
+    public void setServerTimeZoneId(FileSystemOptions opts,
+                                    String serverTimeZoneId)
+    {
+        setParam(opts, SERVER_TIME_ZONE_ID, serverTimeZoneId);
+    }
+
+    /**
+     * see {@link org.apache.commons.net.ftp.FTPClientConfig} for details and examples.
+     */
+    public String[] getShortMonthNames(FileSystemOptions opts)
+    {
+        return (String[]) getParam(opts, SHORT_MONTH_NAMES);
+    }
+
+    /**
+     * see {@link org.apache.commons.net.ftp.FTPClientConfig} for details and examples.
+     */
+    public void setShortMonthNames(FileSystemOptions opts,
+                                   String[] shortMonthNames)
+    {
+        String[] clone = null;
+        if (shortMonthNames != null)
+        {
+            clone = new String[shortMonthNames.length];
+            System.arraycopy(shortMonthNames, 0, clone, 0, shortMonthNames.length);
+        }
+
+        setParam(opts, SHORT_MONTH_NAMES, clone);
+    }
 }

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/gzip/GzipFileProvider.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/gzip/GzipFileProvider.java?rev=1034953&r1=1034952&r2=1034953&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/gzip/GzipFileProvider.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/gzip/GzipFileProvider.java Sun Nov 14 08:06:03 2010
@@ -39,7 +39,8 @@ public class GzipFileProvider extends Co
     /**
      * Capabilities.
      */
-    protected static final Collection<Capability> capabilities = Collections.unmodifiableCollection(Arrays.asList(new Capability[]
+    protected static final Collection<Capability> capabilities =
+        Collections.unmodifiableCollection(Arrays.asList(new Capability[]
     {
         Capability.GET_LAST_MODIFIED,
         Capability.GET_TYPE,

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/http/HttpClientFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/http/HttpClientFactory.java?rev=1034953&r1=1034952&r2=1034953&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/http/HttpClientFactory.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/http/HttpClientFactory.java Sun Nov 14 08:06:03 2010
@@ -113,10 +113,11 @@ public final class HttpClientFactory
                         client.getState().setProxyCredentials(scope, proxyCreds);
                     }
 
-                    if (builder.isPreemptiveAuth(fileSystemOptions)) {
-	                    HttpClientParams httpClientParams = new HttpClientParams();
-	                    httpClientParams.setAuthenticationPreemptive(true);
-	                    client.setParams(httpClientParams);
+                    if (builder.isPreemptiveAuth(fileSystemOptions))
+                    {
+                        HttpClientParams httpClientParams = new HttpClientParams();
+                        httpClientParams.setAuthenticationPreemptive(true);
+                        client.setParams(httpClientParams);
                     }
                 }
 

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/http/HttpFileSystemConfigBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/http/HttpFileSystemConfigBuilder.java?rev=1034953&r1=1034952&r2=1034953&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/http/HttpFileSystemConfigBuilder.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/http/HttpFileSystemConfigBuilder.java Sun Nov 14 08:06:03 2010
@@ -39,7 +39,7 @@ public class HttpFileSystemConfigBuilder
 
     private static final String OPTION_NAME__PREEMPTIVE_AUTHENTICATION = "preemptiveAuth";
 
-	protected HttpFileSystemConfigBuilder(String prefix)
+    protected HttpFileSystemConfigBuilder(String prefix)
     {
         super(prefix);
     }
@@ -214,8 +214,9 @@ public class HttpFileSystemConfigBuilder
      * @param opts The FileSystemOptions.
      * @return true if preemptiveAuth is requested.
      */
-    public boolean isPreemptiveAuth(FileSystemOptions opts) {
-		return getBoolean(opts, OPTION_NAME__PREEMPTIVE_AUTHENTICATION, Boolean.FALSE).booleanValue();
+    public boolean isPreemptiveAuth(FileSystemOptions opts)
+    {
+        return getBoolean(opts, OPTION_NAME__PREEMPTIVE_AUTHENTICATION, Boolean.FALSE).booleanValue();
 	}
 
     /**
@@ -227,8 +228,9 @@ public class HttpFileSystemConfigBuilder
      * @param opts The FileSystemOptions.
      * @param preemptiveAuth the desired setting; true=enabled and false=disabled.
      */
-	public void setPreemptiveAuth(FileSystemOptions opts, boolean preemptiveAuth) {
-		setParam(opts, OPTION_NAME__PREEMPTIVE_AUTHENTICATION, Boolean.valueOf(preemptiveAuth));
+	public void setPreemptiveAuth(FileSystemOptions opts, boolean preemptiveAuth)
+    {
+        setParam(opts, OPTION_NAME__PREEMPTIVE_AUTHENTICATION, Boolean.valueOf(preemptiveAuth));
 	}
 
 	@Override

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/local/DefaultLocalFileProvider.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/local/DefaultLocalFileProvider.java?rev=1034953&r1=1034952&r2=1034953&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/local/DefaultLocalFileProvider.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/local/DefaultLocalFileProvider.java Sun Nov 14 08:06:03 2010
@@ -43,7 +43,8 @@ public class DefaultLocalFileProvider
     implements LocalFileProvider
 {
     /** The provider's capabilities. */
-    public static final Collection<Capability> capabilities = Collections.unmodifiableCollection(Arrays.asList(new Capability[]
+    public static final Collection<Capability> capabilities =
+        Collections.unmodifiableCollection(Arrays.asList(new Capability[]
     {
         Capability.CREATE,
         Capability.DELETE,

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileSystem.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileSystem.java?rev=1034953&r1=1034952&r2=1034953&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileSystem.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileSystem.java Sun Nov 14 08:06:03 2010
@@ -100,7 +100,8 @@ public class RamFileSystem extends Abstr
         Collection<RamFileData> children = data.getChildren();
         String[] names;
 
-        synchronized(children) {
+        synchronized (children)
+        {
             names = new String[children.size()];
 
             int pos = 0;
@@ -298,7 +299,8 @@ public class RamFileSystem extends Abstr
     int size()
     {
         int size = 0;
-        synchronized(cache) {
+        synchronized (cache)
+        {
             Iterator<RamFileData> iter = cache.values().iterator();
             while (iter.hasNext())
             {

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileSystemConfigBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileSystemConfigBuilder.java?rev=1034953&r1=1034952&r2=1034953&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileSystemConfigBuilder.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileSystemConfigBuilder.java Sun Nov 14 08:06:03 2010
@@ -30,8 +30,8 @@ public final class RamFileSystemConfigBu
     /** max size key. */
     private static final String MAX_SIZE_KEY = "maxsize";
 
-    /** config builder singleton. */
-    private static final RamFileSystemConfigBuilder singleton = new RamFileSystemConfigBuilder();
+    /** config builder SINGLETON. */
+    private static final RamFileSystemConfigBuilder SINGLETON = new RamFileSystemConfigBuilder();
 
     /**
      * Constructor
@@ -42,11 +42,11 @@ public final class RamFileSystemConfigBu
     }
 
     /**
-     * @return the config builder singleton
+     * @return the config builder SINGLETON
      */
     public static RamFileSystemConfigBuilder getInstance()
     {
-        return singleton;
+        return SINGLETON;
     }
 
     /**

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/res/ResourceFileProvider.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/res/ResourceFileProvider.java?rev=1034953&r1=1034952&r2=1034953&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/res/ResourceFileProvider.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/res/ResourceFileProvider.java Sun Nov 14 08:06:03 2010
@@ -39,7 +39,8 @@ import java.util.Collections;
 public class ResourceFileProvider extends AbstractFileProvider
 {
     /** The provider's capabilities */
-    protected static final Collection<Capability> capabilities = Collections.unmodifiableCollection(Arrays.asList(new Capability[]
+    protected static final Collection<Capability> capabilities =
+        Collections.unmodifiableCollection(Arrays.asList(new Capability[]
     {
         Capability.DISPATCHER
     }));

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=1034953&r1=1034952&r2=1034953&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 Sun Nov 14 08:06:03 2010
@@ -343,7 +343,8 @@ public class SftpFileObject extends Abst
                 }
                 catch (SftpException xe)
                 {
-                    throw new FileSystemException("vfs.provider.sftp/change-work-directory-back.error", workingDirectory, lsEx);
+                    throw new FileSystemException("vfs.provider.sftp/change-work-directory-back.error",
+                                                  workingDirectory, lsEx);
                 }
             }
 

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileProvider.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileProvider.java?rev=1034953&r1=1034952&r2=1034953&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileProvider.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileProvider.java Sun Nov 14 08:06:03 2010
@@ -52,7 +52,8 @@ public class SftpFileProvider extends Ab
             };
 
     /** The provider's capabilities. */
-    protected static final Collection<Capability> capabilities = Collections.unmodifiableCollection(Arrays.asList(new Capability[]
+    protected static final Collection<Capability> capabilities =
+        Collections.unmodifiableCollection(Arrays.asList(new Capability[]
     {
         Capability.CREATE,
         Capability.DELETE,

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/tar/TarFileProvider.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/tar/TarFileProvider.java?rev=1034953&r1=1034952&r2=1034953&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/tar/TarFileProvider.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/tar/TarFileProvider.java Sun Nov 14 08:06:03 2010
@@ -40,7 +40,8 @@ public class TarFileProvider
     implements FileProvider
 {
     /** The provider's capabilities */
-    protected static final Collection<Capability> capabilities = Collections.unmodifiableCollection(Arrays.asList(new Capability[]
+    protected static final Collection<Capability> capabilities =
+        Collections.unmodifiableCollection(Arrays.asList(new Capability[]
         {
             Capability.GET_LAST_MODIFIED,
             Capability.GET_TYPE,

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/tar/TarInputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/tar/TarInputStream.java?rev=1034953&r1=1034952&r2=1034953&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/tar/TarInputStream.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/tar/TarInputStream.java Sun Nov 14 08:06:03 2010
@@ -34,7 +34,7 @@ import java.io.OutputStream;
  * @see TarEntry
  */
 class TarInputStream
-        extends FilterInputStream
+    extends FilterInputStream
 {
     private TarBuffer buffer;
     private TarEntry currEntry;
@@ -80,9 +80,7 @@ class TarInputStream
      * @param blockSize  the block size to use
      * @param recordSize the record size to use
      */
-    TarInputStream(final InputStream input,
-                   final int blockSize,
-                   final int recordSize)
+    TarInputStream(final InputStream input, final int blockSize, final int recordSize)
     {
         super(input);
 
@@ -112,8 +110,7 @@ class TarInputStream
      * @return The next TarEntry in the archive, or null.
      * @throws IOException Description of Exception
      */
-    public TarEntry getNextEntry()
-            throws IOException
+    public TarEntry getNextEntry() throws IOException
     {
         if (hasHitEOF)
         {
@@ -127,8 +124,8 @@ class TarInputStream
             if (debug)
             {
                 final String message = "TarInputStream: SKIP currENTRY '" +
-                        currEntry.getName() + "' SZ " + entrySize +
-                        " OFF " + entryOffset + "  skipping " + numToSkip + " bytes";
+                    currEntry.getName() + "' SZ " + entrySize +
+                    " OFF " + entryOffset + "  skipping " + numToSkip + " bytes";
                 debug(message);
             }
 
@@ -168,8 +165,8 @@ class TarInputStream
             currEntry = new TarEntry(headerBuf);
 
             if (!(headerBuf[257] == 'u' && headerBuf[258] == 's' &&
-                    headerBuf[259] == 't' && headerBuf[260] == 'a' &&
-                    headerBuf[261] == 'r'))
+                headerBuf[259] == 't' && headerBuf[260] == 'a' &&
+                headerBuf[261] == 'r'))
             {
                 //Must be v7Format
             }
@@ -177,7 +174,7 @@ class TarInputStream
             if (debug)
             {
                 final String message = "TarInputStream: SET CURRENTRY '" +
-                        currEntry.getName() + "' size = " + currEntry.getSize();
+                    currEntry.getName() + "' size = " + currEntry.getSize();
                 debug(message);
             }
 
@@ -201,7 +198,7 @@ class TarInputStream
 
             // remove trailing null terminator
             if (longName.length() > 0
-                    && longName.charAt(longName.length() - 1) == 0)
+                && longName.charAt(longName.length() - 1) == 0)
             {
                 longName.deleteCharAt(longName.length() - 1);
             }
@@ -233,16 +230,16 @@ class TarInputStream
      * @throws IOException when an IO error causes operation to fail
      */
     @Override
-    public int available()
-            throws IOException
+    public int available() throws IOException
     {
-      long remaining = entrySize - entryOffset;
+        long remaining = entrySize - entryOffset;
 
-      if(remaining > Integer.MAX_VALUE) {
-        return Integer.MAX_VALUE;
-      }
+        if (remaining > Integer.MAX_VALUE)
+        {
+            return Integer.MAX_VALUE;
+        }
 
-      return (int) remaining;
+        return (int) remaining;
     }
 
     /**
@@ -251,8 +248,7 @@ class TarInputStream
      * @throws IOException when an IO error causes operation to fail
      */
     @Override
-    public void close()
-            throws IOException
+    public void close() throws IOException
     {
         buffer.close();
     }
@@ -264,8 +260,7 @@ class TarInputStream
      * @param output The OutputStream into which to write the entry's data.
      * @throws IOException when an IO error causes operation to fail
      */
-    public void copyEntryContents(final OutputStream output)
-            throws IOException
+    public void copyEntryContents(final OutputStream output) throws IOException
     {
         final byte[] buffer = new byte[32 * 1024];
         while (true)
@@ -309,8 +304,7 @@ class TarInputStream
      * @throws IOException when an IO error causes operation to fail
      */
     @Override
-    public int read()
-            throws IOException
+    public int read() throws IOException
     {
         final int num = read(oneBuf, 0, 1);
         if (num == -1)
@@ -332,8 +326,7 @@ class TarInputStream
      * @throws IOException when an IO error causes operation to fail
      */
     @Override
-    public int read(final byte[] buffer)
-            throws IOException
+    public int read(final byte[] buffer) throws IOException
     {
         return read(buffer, 0, buffer.length);
     }
@@ -350,10 +343,7 @@ class TarInputStream
      * @throws IOException when an IO error causes operation to fail
      */
     @Override
-    public int read(final byte[] buffer,
-                    final int offset,
-                    final int count)
-            throws IOException
+    public int read(final byte[] buffer, final int offset, final int count) throws IOException
     {
         int position = offset;
         int numToRead = count;
@@ -366,13 +356,13 @@ class TarInputStream
 
         if ((numToRead + entryOffset) > entrySize)
         {
-            numToRead = (int)(entrySize - entryOffset);
+            numToRead = (int) (entrySize - entryOffset);
         }
 
         if (null != readBuf)
         {
             final int size =
-                    (numToRead > readBuf.length) ? readBuf.length : numToRead;
+                (numToRead > readBuf.length) ? readBuf.length : numToRead;
 
             System.arraycopy(readBuf, 0, buffer, position, size);
 
@@ -402,7 +392,7 @@ class TarInputStream
             {
                 // Unexpected EOF!
                 final String message =
-                        "unexpected EOF with " + numToRead + " bytes unread";
+                    "unexpected EOF with " + numToRead + " bytes unread";
                 throw new IOException(message);
             }
 
@@ -442,16 +432,21 @@ class TarInputStream
     {
     }
 
-    public void longSkip(final long numToSkip) throws IOException {
-      for(long skipped = 0; skipped < numToSkip;) {
-        if(numToSkip - skipped > Integer.MAX_VALUE) {
-          skip(Integer.MAX_VALUE);
-          skipped += Integer.MAX_VALUE;
-        } else {
-          skip((int)(numToSkip - skipped));
-          skipped += numToSkip - skipped;
+    public void longSkip(final long numToSkip) throws IOException
+    {
+        for (long skipped = 0; skipped < numToSkip;)
+        {
+            if (numToSkip - skipped > Integer.MAX_VALUE)
+            {
+                skip(Integer.MAX_VALUE);
+                skipped += Integer.MAX_VALUE;
+            }
+            else
+            {
+                skip((int) (numToSkip - skipped));
+                skipped += numToSkip - skipped;
+            }
         }
-      }
     }
 
     /**
@@ -462,8 +457,7 @@ class TarInputStream
      * @param numToSkip The number of bytes to skip.
      * @throws IOException when an IO error causes operation to fail
      */
-    public void skip(final int numToSkip)
-            throws IOException
+    public void skip(final int numToSkip) throws IOException
     {
         // REVIEW
         // This is horribly inefficient, but it ensures that we

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=1034953&r1=1034952&r2=1034953&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 Sun Nov 14 08:06:03 2010
@@ -41,7 +41,8 @@ public class UrlFileProvider
     extends AbstractFileProvider
 {
     /** The provider's capabilities */
-    protected static final Collection<Capability> capabilities = Collections.unmodifiableCollection(Arrays.asList(new Capability[]
+    protected static final Collection<Capability> capabilities =
+        Collections.unmodifiableCollection(Arrays.asList(new Capability[]
     {
         Capability.READ_CONTENT,
         Capability.URI,

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=1034953&r1=1034952&r2=1034953&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 Sun Nov 14 08:06:03 2010
@@ -42,8 +42,8 @@ public final class WebdavMethodRetryHand
         return INSTANCE;
     }
 
-    public boolean retryMethod(HttpMethod method, IOException exception,
-            int executionCount) {
+    public boolean retryMethod(HttpMethod method, IOException exception, int executionCount)
+    {
         return executionCount < 2;
     }
 }

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/zip/ZipFileProvider.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/zip/ZipFileProvider.java?rev=1034953&r1=1034952&r2=1034953&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/zip/ZipFileProvider.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/zip/ZipFileProvider.java Sun Nov 14 08:06:03 2010
@@ -42,7 +42,8 @@ public class ZipFileProvider
     implements FileProvider
 {
     /** The list of capabilities this provider supports */
-    protected static final Collection<Capability> capabilities = Collections.unmodifiableCollection(Arrays.asList(new Capability[]
+    protected static final Collection<Capability> capabilities =
+        Collections.unmodifiableCollection(Arrays.asList(new Capability[]
         {
             Capability.GET_LAST_MODIFIED,
             Capability.GET_TYPE,

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/CombinedResources.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/CombinedResources.java?rev=1034953&r1=1034952&r2=1034953&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/CombinedResources.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/CombinedResources.java Sun Nov 14 08:06:03 2010
@@ -120,11 +120,14 @@ public class CombinedResources extends R
         {
             init();
         }
-        return new Enumeration<String>(){
-            public boolean hasMoreElements() {
+        return new Enumeration<String>()
+        {
+            public boolean hasMoreElements()
+            {
                 return properties.keys().hasMoreElements();
             }
-            public String nextElement() {
+            public String nextElement()
+            {
                 // We know that our properties will only ever contain Strings
                 return (String) properties.keys().nextElement();
             }

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/DelegatingFileSystemOptionsBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/DelegatingFileSystemOptionsBuilder.java?rev=1034953&r1=1034952&r2=1034953&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/DelegatingFileSystemOptionsBuilder.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/DelegatingFileSystemOptionsBuilder.java Sun Nov 14 08:06:03 2010
@@ -371,7 +371,8 @@ public class DelegatingFileSystemOptions
     /**
      * invokes the method with the converted values
      */
-    private void invokeSetter(Class<?> valueParameter, final Context ctx, final Method configSetter, final Object values)
+    private void invokeSetter(Class<?> valueParameter, final Context ctx, final Method configSetter,
+                              final Object values)
         throws FileSystemException
     {
         Object[] args;

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/FileObjectUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/FileObjectUtils.java?rev=1034953&r1=1034952&r2=1034953&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/FileObjectUtils.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/FileObjectUtils.java Sun Nov 14 08:06:03 2010
@@ -66,7 +66,8 @@ public final class FileObjectUtils
      * @return true if fileObject is an instance of the specified Class.
      * @throws FileSystemException if an error occurs.
      */
-    public static boolean isInstanceOf(final FileObject fileObject, final Class<?> wantedClass) throws FileSystemException
+    public static boolean isInstanceOf(final FileObject fileObject, final Class<?> wantedClass)
+        throws FileSystemException
     {
         Object searchObject = fileObject;
         while (searchObject instanceof DecoratedFileObject)



Mime
View raw message