You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2012/12/03 14:37:52 UTC
svn commit: r1416507 [3/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...
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/GenericFileName.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/GenericFileName.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/GenericFileName.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/GenericFileName.java Mon Dec 3 13:37:12 2012
@@ -111,7 +111,7 @@ public class GenericFileName extends Abs
* @return The created FileName.
*/
@Override
- public FileName createName(String absPath, FileType type)
+ public FileName createName(final String absPath, final FileType type)
{
return new GenericFileName(
getScheme(),
@@ -128,7 +128,7 @@ public class GenericFileName extends Abs
* Builds the root URI for this file name.
*/
@Override
- protected void appendRootUri(final StringBuilder buffer, boolean addPassword)
+ protected void appendRootUri(final StringBuilder buffer, final boolean addPassword)
{
buffer.append(getScheme());
buffer.append("://");
@@ -144,7 +144,7 @@ public class GenericFileName extends Abs
/**
* append the user credentials
*/
- protected void appendCredentials(StringBuilder buffer, boolean addPassword)
+ protected void appendCredentials(final StringBuilder buffer, final boolean addPassword)
{
if (userName != null && userName.length() != 0)
{
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/HostFileNameParser.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/HostFileNameParser.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/HostFileNameParser.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/HostFileNameParser.java Mon Dec 3 13:37:12 2012
@@ -44,13 +44,13 @@ public class HostFileNameParser extends
}
@Override
- public boolean encodeCharacter(char ch)
+ public boolean encodeCharacter(final char ch)
{
return super.encodeCharacter(ch);
}
@Override
- public FileName parseUri(final VfsComponentContext context, FileName base, final String filename)
+ public FileName parseUri(final VfsComponentContext context, final FileName base, final String filename)
throws FileSystemException
{
// FTP URI are generic URI (as per RFC 2396)
@@ -62,7 +62,7 @@ public class HostFileNameParser extends
// Decode and normalise the file name
UriParser.canonicalizePath(name, 0, name.length(), this);
UriParser.fixSeparators(name);
- FileType fileType = UriParser.normalisePath(name);
+ final FileType fileType = UriParser.normalisePath(name);
final String path = name.toString();
return new GenericFileName(
@@ -105,7 +105,7 @@ public class HostFileNameParser extends
final String password;
if (userInfo != null)
{
- int idx = userInfo.indexOf(':');
+ final int idx = userInfo.indexOf(':');
if (idx == -1)
{
userName = userInfo;
@@ -129,10 +129,10 @@ public class HostFileNameParser extends
{
try
{
- Cryptor cryptor = CryptorFactory.getCryptor();
+ final Cryptor cryptor = CryptorFactory.getCryptor();
auth.password = cryptor.decrypt(auth.password.substring(1, auth.password.length() - 1));
}
- catch (Exception ex)
+ catch (final Exception ex)
{
throw new FileSystemException("Unable to decrypt password", ex);
}
@@ -171,7 +171,7 @@ public class HostFileNameParser extends
if (ch == '@')
{
// Found the end of the user info
- String userInfo = name.substring(0, pos);
+ final String userInfo = name.substring(0, pos);
name.delete(0, pos + 1);
return userInfo;
}
@@ -266,7 +266,7 @@ public class HostFileNameParser extends
}
/** @since 2.0 */
- public void setScheme(String scheme)
+ public void setScheme(final String scheme)
{
this.scheme = scheme;
}
@@ -278,7 +278,7 @@ public class HostFileNameParser extends
}
/** @since 2.0 */
- public void setHostName(String hostName)
+ public void setHostName(final String hostName)
{
this.hostName = hostName;
}
@@ -290,7 +290,7 @@ public class HostFileNameParser extends
}
/** @since 2.0 */
- public void setUserName(String userName)
+ public void setUserName(final String userName)
{
this.userName = userName;
}
@@ -302,7 +302,7 @@ public class HostFileNameParser extends
}
/** @since 2.0 */
- public void setPassword(String password)
+ public void setPassword(final String password)
{
this.password = password;
}
@@ -314,7 +314,7 @@ public class HostFileNameParser extends
}
/** @since 2.0 */
- public void setPort(int port)
+ public void setPort(final int port)
{
this.port = port;
}
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/LayeredFileName.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/LayeredFileName.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/LayeredFileName.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/LayeredFileName.java Mon Dec 3 13:37:12 2012
@@ -51,13 +51,13 @@ public class LayeredFileName extends Abs
* @return The FileName.
*/
@Override
- public FileName createName(String path, FileType type)
+ public FileName createName(final String path, final FileType type)
{
return new LayeredFileName(getScheme(), getOuterName(), path, type);
}
@Override
- protected void appendRootUri(StringBuilder buffer, boolean addPassword)
+ protected void appendRootUri(final StringBuilder buffer, final boolean addPassword)
{
buffer.append(getScheme());
buffer.append(":");
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/LayeredFileNameParser.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/LayeredFileNameParser.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/LayeredFileNameParser.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/LayeredFileNameParser.java Mon Dec 3 13:37:12 2012
@@ -44,7 +44,7 @@ public class LayeredFileNameParser exten
* @return true if the character should be encoded.
*/
@Override
- public boolean encodeCharacter(char ch)
+ public boolean encodeCharacter(final char ch)
{
return super.encodeCharacter(ch) || ch == '!';
}
@@ -58,7 +58,7 @@ public class LayeredFileNameParser exten
* @throws FileSystemException if an error occurs.
*/
@Override
- public FileName parseUri(final VfsComponentContext context, FileName base, final String filename)
+ public FileName parseUri(final VfsComponentContext context, final FileName base, final String filename)
throws FileSystemException
{
final StringBuilder name = new StringBuilder();
@@ -77,7 +77,7 @@ public class LayeredFileNameParser exten
// Decode and normalise the path
UriParser.canonicalizePath(name, 0, name.length(), this);
UriParser.fixSeparators(name);
- FileType fileType = UriParser.normalisePath(name);
+ final FileType fileType = UriParser.normalisePath(name);
final String path = name.toString();
return new LayeredFileName(scheme, rootUri, path, fileType);
@@ -90,7 +90,7 @@ public class LayeredFileNameParser exten
throws FileSystemException
{
// Looking for <name>!<abspath> (staring at the end)
- int maxlen = uri.length();
+ final int maxlen = uri.length();
int pos = maxlen - 1;
for (; pos > 0 && uri.charAt(pos) != '!'; pos--)
{
@@ -104,7 +104,7 @@ public class LayeredFileNameParser exten
}
// Extract the name
- String prefix = uri.substring(0, pos);
+ final String prefix = uri.substring(0, pos);
if (pos < maxlen)
{
uri.delete(0, pos + 1);
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/URLFileName.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/URLFileName.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/URLFileName.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/URLFileName.java Mon Dec 3 13:37:12 2012
@@ -62,7 +62,7 @@ public class URLFileName extends Generic
*/
public String getPathQuery()
{
- StringBuilder sb = new StringBuilder(BUFFER_SIZE);
+ final StringBuilder sb = new StringBuilder(BUFFER_SIZE);
sb.append(getPath());
sb.append("?");
sb.append(getQueryString());
@@ -78,7 +78,7 @@ public class URLFileName extends Generic
* @throws URIException If an error occurs encoding the URI.
* @throws FileSystemException If some other error occurs.
*/
- public String getPathQueryEncoded(String charset) throws URIException, FileSystemException
+ public String getPathQueryEncoded(final String charset) throws URIException, FileSystemException
{
if (getQueryString() == null)
{
@@ -92,7 +92,7 @@ public class URLFileName extends Generic
}
}
- StringBuilder sb = new StringBuilder(BUFFER_SIZE);
+ final StringBuilder sb = new StringBuilder(BUFFER_SIZE);
if (charset != null)
{
sb.append(URIUtil.encodePath(getPathDecoded(), charset));
@@ -113,7 +113,7 @@ public class URLFileName extends Generic
* @return The FileName
*/
@Override
- public FileName createName(final String absPath, FileType type)
+ public FileName createName(final String absPath, final FileType type)
{
return new URLFileName(getScheme(),
getHostName(),
@@ -136,7 +136,7 @@ public class URLFileName extends Generic
{
if (getQueryString() != null)
{
- StringBuilder sb = new StringBuilder(BUFFER_SIZE);
+ final StringBuilder sb = new StringBuilder(BUFFER_SIZE);
sb.append(super.createURI());
sb.append("?");
sb.append(getQueryString());
@@ -154,9 +154,9 @@ public class URLFileName extends Generic
* @throws FileSystemException if some other exception occurs.
* @throws URIException if an exception occurs encoding the URI.
*/
- public String getURIEncoded(String charset) throws FileSystemException, URIException
+ public String getURIEncoded(final String charset) throws FileSystemException, URIException
{
- StringBuilder sb = new StringBuilder(BUFFER_SIZE);
+ final StringBuilder sb = new StringBuilder(BUFFER_SIZE);
appendRootUri(sb, true);
sb.append(getPathQueryEncoded(charset));
return sb.toString();
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/URLFileNameParser.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/URLFileNameParser.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/URLFileNameParser.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/URLFileNameParser.java Mon Dec 3 13:37:12 2012
@@ -32,13 +32,13 @@ public class URLFileNameParser extends H
}
@Override
- public boolean encodeCharacter(char ch)
+ public boolean encodeCharacter(final char ch)
{
return super.encodeCharacter(ch) || ch == '?';
}
@Override
- public FileName parseUri(final VfsComponentContext context, FileName base, final String filename)
+ public FileName parseUri(final VfsComponentContext context, final FileName base, final String filename)
throws FileSystemException
{
// FTP URI are generic URI (as per RFC 2396)
@@ -48,12 +48,12 @@ public class URLFileNameParser extends H
final Authority auth = extractToPath(filename, name);
// Extract the queryString
- String queryString = UriParser.extractQueryString(name);
+ final String queryString = UriParser.extractQueryString(name);
// Decode and normalise the file name
UriParser.canonicalizePath(name, 0, name.length(), this);
UriParser.fixSeparators(name);
- FileType fileType = UriParser.normalisePath(name);
+ final FileType fileType = UriParser.normalisePath(name);
final String path = name.toString();
return new URLFileName(
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/UriParser.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/UriParser.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/UriParser.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/UriParser.java Mon Dec 3 13:37:12 2012
@@ -335,15 +335,15 @@ public final class UriParser
}
// Decode
- int dig1 = Character.digit(buffer.charAt(index + 1), HEX_BASE);
- int dig2 = Character.digit(buffer.charAt(index + 2), HEX_BASE);
+ final int dig1 = Character.digit(buffer.charAt(index + 1), HEX_BASE);
+ final int dig2 = Character.digit(buffer.charAt(index + 2), HEX_BASE);
if (dig1 == -1 || dig2 == -1)
{
throw new FileSystemException(
"vfs.provider/invalid-escape-sequence.error", buffer
.substring(index, index + 3));
}
- char value = (char) (dig1 << BITS_IN_HALF_BYTE | dig2);
+ final char value = (char) (dig1 << BITS_IN_HALF_BYTE | dig2);
// Replace
buffer.setCharAt(index, value);
@@ -396,7 +396,7 @@ public final class UriParser
if (match)
{
// Encode
- char[] digits =
+ final char[] digits =
{Character.forDigit(((ch >> BITS_IN_HALF_BYTE) & LOW_MASK), HEX_BASE),
Character.forDigit((ch & LOW_MASK), HEX_BASE)};
buffer.setCharAt(index, '%');
@@ -438,7 +438,7 @@ public final class UriParser
* @param strings The array of Strings to encode.
* @return An array of encoded Strings.
*/
- public static String[] encode(String[] strings)
+ public static String[] encode(final String[] strings)
{
if (strings == null)
{
@@ -456,13 +456,13 @@ public final class UriParser
* @param uri The String to decode.
* @throws FileSystemException if an error occurs.
*/
- public static void checkUriEncoding(String uri) throws FileSystemException
+ public static void checkUriEncoding(final String uri) throws FileSystemException
{
decode(uri);
}
- public static void canonicalizePath(StringBuilder buffer, int offset,
- int length, FileNameParser fileNameParser)
+ public static void canonicalizePath(final StringBuilder buffer, final int offset,
+ final int length, final FileNameParser fileNameParser)
throws FileSystemException
{
int index = offset;
@@ -480,17 +480,17 @@ public final class UriParser
}
// Decode
- int dig1 = Character.digit(buffer.charAt(index + 1), HEX_BASE);
- int dig2 = Character.digit(buffer.charAt(index + 2), HEX_BASE);
+ final int dig1 = Character.digit(buffer.charAt(index + 1), HEX_BASE);
+ final int dig2 = Character.digit(buffer.charAt(index + 2), HEX_BASE);
if (dig1 == -1 || dig2 == -1)
{
throw new FileSystemException(
"vfs.provider/invalid-escape-sequence.error",
buffer.substring(index, index + 3));
}
- char value = (char) (dig1 << BITS_IN_HALF_BYTE | dig2);
+ final char value = (char) (dig1 << BITS_IN_HALF_BYTE | dig2);
- boolean match = value == '%' || fileNameParser.encodeCharacter(value);
+ final boolean match = value == '%' || fileNameParser.encodeCharacter(value);
if (match)
{
@@ -508,7 +508,7 @@ public final class UriParser
else if (fileNameParser.encodeCharacter(ch))
{
// Encode
- char[] digits =
+ final char[] digits =
{Character.forDigit(((ch >> BITS_IN_HALF_BYTE) & LOW_MASK), HEX_BASE),
Character.forDigit((ch & LOW_MASK), HEX_BASE) };
buffer.setCharAt(index, '%');
@@ -523,13 +523,13 @@ public final class UriParser
* @param name StringBuilder containing the URI.
* @return The query string, if any. null otherwise.
*/
- public static String extractQueryString(StringBuilder name)
+ public static String extractQueryString(final StringBuilder name)
{
for (int pos = 0; pos < name.length(); pos++)
{
if (name.charAt(pos) == '?')
{
- String queryString = name.substring(pos + 1);
+ final String queryString = name.substring(pos + 1);
name.delete(pos, name.length());
return queryString;
}
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/bzip2/Bzip2FileObject.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/bzip2/Bzip2FileObject.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/bzip2/Bzip2FileObject.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/bzip2/Bzip2FileObject.java Mon Dec 3 13:37:12 2012
@@ -31,7 +31,7 @@ import org.apache.commons.vfs2.provider.
*/
public class Bzip2FileObject extends CompressedFileFileObject<Bzip2FileSystem>
{
- protected Bzip2FileObject(AbstractFileName name, FileObject container, Bzip2FileSystem fs)
+ protected Bzip2FileObject(final AbstractFileName name, final FileObject container, final Bzip2FileSystem fs)
{
super(name, container, fs);
}
@@ -40,7 +40,7 @@ public class Bzip2FileObject extends Com
protected InputStream doGetInputStream() throws Exception
{
// check file
- InputStream is = getContainer().getContent().getInputStream();
+ final InputStream is = getContainer().getContent().getInputStream();
return wrapInputStream(getName().getURI(), is);
}
@@ -50,9 +50,9 @@ public class Bzip2FileObject extends Com
}
@Override
- protected OutputStream doGetOutputStream(boolean bAppend) throws Exception
+ protected OutputStream doGetOutputStream(final boolean bAppend) throws Exception
{
- OutputStream os = getContainer().getContent().getOutputStream(false);
+ final OutputStream os = getContainer().getContent().getOutputStream(false);
return new BZip2CompressorOutputStream(os);
}
}
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/bzip2/Bzip2FileProvider.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/bzip2/Bzip2FileProvider.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/bzip2/Bzip2FileProvider.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/bzip2/Bzip2FileProvider.java Mon Dec 3 13:37:12 2012
@@ -52,8 +52,8 @@ public class Bzip2FileProvider extends C
}
@Override
- protected FileSystem createFileSystem(FileName name, FileObject file,
- FileSystemOptions fileSystemOptions)
+ protected FileSystem createFileSystem(final FileName name, final FileObject file,
+ final FileSystemOptions fileSystemOptions)
throws FileSystemException
{
return new Bzip2FileSystem(name, file, fileSystemOptions);
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/bzip2/Bzip2FileSystem.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/bzip2/Bzip2FileSystem.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/bzip2/Bzip2FileSystem.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/bzip2/Bzip2FileSystem.java Mon Dec 3 13:37:12 2012
@@ -31,13 +31,13 @@ import org.apache.commons.vfs2.provider.
*/
public class Bzip2FileSystem extends CompressedFileFileSystem
{
- protected Bzip2FileSystem(FileName rootName, FileObject parentLayer, FileSystemOptions fileSystemOptions)
+ protected Bzip2FileSystem(final FileName rootName, final FileObject parentLayer, final FileSystemOptions fileSystemOptions)
{
super(rootName, parentLayer, fileSystemOptions);
}
@Override
- protected FileObject createFile(AbstractFileName name) throws FileSystemException
+ protected FileObject createFile(final AbstractFileName name) throws FileSystemException
{
return new Bzip2FileObject(name, getParentLayer(), this);
}
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/compressed/CompressedFileFileObject.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/compressed/CompressedFileFileObject.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/compressed/CompressedFileFileObject.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/compressed/CompressedFileFileObject.java Mon Dec 3 13:37:12 2012
@@ -38,14 +38,14 @@ public abstract class CompressedFileFile
private final FileObject container;
private final String[] children;
- protected CompressedFileFileObject(AbstractFileName name, FileObject container, FS fs)
+ protected CompressedFileFileObject(final AbstractFileName name, final FileObject container, final FS fs)
{
super(name, fs);
this.container = container;
// todo, add getBaseName(String) to FileName
String basename = container.getName().getBaseName();
- int pos = basename.lastIndexOf('.');
+ final int pos = basename.lastIndexOf('.');
if (pos > 0)
{
basename = basename.substring(0, pos);
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FTPClientWrapper.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FTPClientWrapper.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FTPClientWrapper.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FTPClientWrapper.java Mon Dec 3 13:37:12 2012
@@ -119,23 +119,23 @@ class FTPClientWrapper implements FtpCli
}
@Override
- public FTPFile[] listFiles(String relPath) throws IOException
+ public FTPFile[] listFiles(final String relPath) throws IOException
{
try
{
// VFS-210: return getFtpClient().listFiles(relPath);
- FTPFile[] files = listFilesInDirectory(relPath);
+ final FTPFile[] files = listFilesInDirectory(relPath);
return files;
}
- catch (IOException e)
+ catch (final IOException e)
{
disconnect();
- FTPFile[] files = listFilesInDirectory(relPath);
+ final FTPFile[] files = listFilesInDirectory(relPath);
return files;
}
}
- private FTPFile[] listFilesInDirectory(String relPath) throws IOException
+ private FTPFile[] listFilesInDirectory(final String relPath) throws IOException
{
FTPFile[] files;
@@ -170,13 +170,13 @@ class FTPClientWrapper implements FtpCli
}
@Override
- public boolean removeDirectory(String relPath) throws IOException
+ public boolean removeDirectory(final String relPath) throws IOException
{
try
{
return getFtpClient().removeDirectory(relPath);
}
- catch (IOException e)
+ catch (final IOException e)
{
disconnect();
return getFtpClient().removeDirectory(relPath);
@@ -184,13 +184,13 @@ class FTPClientWrapper implements FtpCli
}
@Override
- public boolean deleteFile(String relPath) throws IOException
+ public boolean deleteFile(final String relPath) throws IOException
{
try
{
return getFtpClient().deleteFile(relPath);
}
- catch (IOException e)
+ catch (final IOException e)
{
disconnect();
return getFtpClient().deleteFile(relPath);
@@ -198,13 +198,13 @@ class FTPClientWrapper implements FtpCli
}
@Override
- public boolean rename(String oldName, String newName) throws IOException
+ public boolean rename(final String oldName, final String newName) throws IOException
{
try
{
return getFtpClient().rename(oldName, newName);
}
- catch (IOException e)
+ catch (final IOException e)
{
disconnect();
return getFtpClient().rename(oldName, newName);
@@ -212,13 +212,13 @@ class FTPClientWrapper implements FtpCli
}
@Override
- public boolean makeDirectory(String relPath) throws IOException
+ public boolean makeDirectory(final String relPath) throws IOException
{
try
{
return getFtpClient().makeDirectory(relPath);
}
- catch (IOException e)
+ catch (final IOException e)
{
disconnect();
return getFtpClient().makeDirectory(relPath);
@@ -237,13 +237,13 @@ class FTPClientWrapper implements FtpCli
}
@Override
- public InputStream retrieveFileStream(String relPath) throws IOException
+ public InputStream retrieveFileStream(final String relPath) throws IOException
{
try
{
return getFtpClient().retrieveFileStream(relPath);
}
- catch (IOException e)
+ catch (final IOException e)
{
disconnect();
return getFtpClient().retrieveFileStream(relPath);
@@ -251,31 +251,31 @@ class FTPClientWrapper implements FtpCli
}
@Override
- public InputStream retrieveFileStream(String relPath, long restartOffset) throws IOException
+ public InputStream retrieveFileStream(final String relPath, final long restartOffset) throws IOException
{
try
{
- FTPClient client = getFtpClient();
+ final FTPClient client = getFtpClient();
client.setRestartOffset(restartOffset);
return client.retrieveFileStream(relPath);
}
- catch (IOException e)
+ catch (final IOException e)
{
disconnect();
- FTPClient client = getFtpClient();
+ final FTPClient client = getFtpClient();
client.setRestartOffset(restartOffset);
return client.retrieveFileStream(relPath);
}
}
@Override
- public OutputStream appendFileStream(String relPath) throws IOException
+ public OutputStream appendFileStream(final String relPath) throws IOException
{
try
{
return getFtpClient().appendFileStream(relPath);
}
- catch (IOException e)
+ catch (final IOException e)
{
disconnect();
return getFtpClient().appendFileStream(relPath);
@@ -283,13 +283,13 @@ class FTPClientWrapper implements FtpCli
}
@Override
- public OutputStream storeFileStream(String relPath) throws IOException
+ public OutputStream storeFileStream(final String relPath) throws IOException
{
try
{
return getFtpClient().storeFileStream(relPath);
}
- catch (IOException e)
+ catch (final IOException e)
{
disconnect();
return getFtpClient().storeFileStream(relPath);
@@ -309,7 +309,7 @@ class FTPClientWrapper implements FtpCli
disconnect();
return true;
}
- catch (IOException e)
+ catch (final IOException e)
{
disconnect();
}
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpClientFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpClientFactory.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpClientFactory.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpClientFactory.java Mon Dec 3 13:37:12 2012
@@ -49,8 +49,8 @@ public final class FtpClientFactory
* @return An FTPClient.
* @throws FileSystemException if an error occurs while connecting.
*/
- public static FTPClient createConnection(String hostname, int port, char[] username, char[] password,
- String workingDirectory, FileSystemOptions fileSystemOptions)
+ public static FTPClient createConnection(final String hostname, final int port, char[] username, char[] password,
+ final String workingDirectory, final FileSystemOptions fileSystemOptions)
throws FileSystemException
{
// Determine the username and password to use
@@ -70,7 +70,7 @@ public final class FtpClientFactory
configureClient(fileSystemOptions, client);
- FTPFileEntryParserFactory myFactory =
+ final FTPFileEntryParserFactory myFactory =
FtpFileSystemConfigBuilder.getInstance().getEntryParserFactory(fileSystemOptions);
if (myFactory != null)
{
@@ -80,13 +80,13 @@ public final class FtpClientFactory
try
{
// Set connect timeout
- Integer connectTimeout = FtpFileSystemConfigBuilder.getInstance().getConnectTimeout(fileSystemOptions);
+ final Integer connectTimeout = FtpFileSystemConfigBuilder.getInstance().getConnectTimeout(fileSystemOptions);
if (connectTimeout != null)
{
client.setDefaultTimeout(connectTimeout.intValue());
}
- String controlEncoding = FtpFileSystemConfigBuilder.getInstance().getControlEncoding(fileSystemOptions);
+ final String controlEncoding = FtpFileSystemConfigBuilder.getInstance().getControlEncoding(fileSystemOptions);
if (controlEncoding != null)
{
client.setControlEncoding(controlEncoding);
@@ -94,7 +94,7 @@ public final class FtpClientFactory
client.connect(hostname, port);
- int reply = client.getReplyCode();
+ final int reply = client.getReplyCode();
if (!FTPReply.isPositiveCompletion(reply))
{
throw new FileSystemException("vfs.provider.ftp/connect-rejected.error", hostname);
@@ -121,13 +121,13 @@ public final class FtpClientFactory
}
// Set dataTimeout value
- Integer dataTimeout = FtpFileSystemConfigBuilder.getInstance().getDataTimeout(fileSystemOptions);
+ final Integer dataTimeout = FtpFileSystemConfigBuilder.getInstance().getDataTimeout(fileSystemOptions);
if (dataTimeout != null)
{
client.setDataTimeout(dataTimeout.intValue());
}
- Integer socketTimeout = FtpFileSystemConfigBuilder.getInstance().getSoTimeout(fileSystemOptions);
+ final Integer socketTimeout = FtpFileSystemConfigBuilder.getInstance().getSoTimeout(fileSystemOptions);
if (socketTimeout != null)
{
client.setSoTimeout(socketTimeout.intValue());
@@ -137,7 +137,7 @@ public final class FtpClientFactory
// All file operations a relative to the filesystem-root
// String root = getRoot().getName().getPath();
- Boolean userDirIsRoot = FtpFileSystemConfigBuilder.getInstance().getUserDirIsRoot(fileSystemOptions);
+ final Boolean userDirIsRoot = FtpFileSystemConfigBuilder.getInstance().getUserDirIsRoot(fileSystemOptions);
if (workingDirectory != null && (userDirIsRoot == null || !userDirIsRoot.booleanValue()))
{
if (!client.changeWorkingDirectory(workingDirectory))
@@ -146,7 +146,7 @@ public final class FtpClientFactory
}
}
- Boolean passiveMode = FtpFileSystemConfigBuilder.getInstance().getPassiveMode(fileSystemOptions);
+ final Boolean passiveMode = FtpFileSystemConfigBuilder.getInstance().getPassiveMode(fileSystemOptions);
if (passiveMode != null && passiveMode.booleanValue())
{
client.enterLocalPassiveMode();
@@ -170,43 +170,43 @@ public final class FtpClientFactory
}
}
- private static void configureClient(FileSystemOptions fileSystemOptions, FTPClient client)
+ private static void configureClient(final FileSystemOptions fileSystemOptions, final FTPClient client)
{
- String key = FtpFileSystemConfigBuilder.getInstance().getEntryParser(fileSystemOptions);
+ final String key = FtpFileSystemConfigBuilder.getInstance().getEntryParser(fileSystemOptions);
if (key != null)
{
- FTPClientConfig config = new FTPClientConfig(key);
+ final FTPClientConfig config = new FTPClientConfig(key);
- String serverLanguageCode =
+ final String serverLanguageCode =
FtpFileSystemConfigBuilder.getInstance().getServerLanguageCode(fileSystemOptions);
if (serverLanguageCode != null)
{
config.setServerLanguageCode(serverLanguageCode);
}
- String defaultDateFormat =
+ final String defaultDateFormat =
FtpFileSystemConfigBuilder.getInstance().getDefaultDateFormat(fileSystemOptions);
if (defaultDateFormat != null)
{
config.setDefaultDateFormatStr(defaultDateFormat);
}
- String recentDateFormat =
+ final String recentDateFormat =
FtpFileSystemConfigBuilder.getInstance().getRecentDateFormat(fileSystemOptions);
if (recentDateFormat != null)
{
config.setRecentDateFormatStr(recentDateFormat);
}
- String serverTimeZoneId =
+ final String serverTimeZoneId =
FtpFileSystemConfigBuilder.getInstance().getServerTimeZoneId(fileSystemOptions);
if (serverTimeZoneId != null)
{
config.setServerTimeZoneId(serverTimeZoneId);
}
- String[] shortMonthNames =
+ final String[] shortMonthNames =
FtpFileSystemConfigBuilder.getInstance().getShortMonthNames(fileSystemOptions);
if (shortMonthNames != null)
{
- StringBuilder shortMonthNamesStr = new StringBuilder(BUFSZ);
- for (String shortMonthName : shortMonthNames)
+ final StringBuilder shortMonthNamesStr = new StringBuilder(BUFSZ);
+ for (final String shortMonthName : shortMonthNames)
{
if (shortMonthNamesStr.length() > 0)
{
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=1416507&r1=1416506&r2=1416507&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 Mon Dec 3 13:37:12 2012
@@ -69,7 +69,7 @@ public class FtpFileObject extends Abstr
throws FileSystemException
{
super(name, fileSystem);
- String relPath = UriParser.decode(rootName.getRelativeName(name));
+ final String relPath = UriParser.decode(rootName.getRelativeName(name));
if (".".equals(relPath))
{
// do not use the "." as path against the ftp-server
@@ -112,7 +112,7 @@ public class FtpFileObject extends Abstr
}
// Look for the requested child
- FTPFile ftpFile = children.get(name);
+ final FTPFile ftpFile = children.get(name);
return ftpFile;
}
@@ -183,7 +183,7 @@ public class FtpFileObject extends Abstr
/**
* Fetches the info for this file.
*/
- private void getInfo(boolean flush) throws IOException
+ private void getInfo(final boolean flush) throws IOException
{
final FtpFileObject parent = (FtpFileObject) FileObjectUtils.getAbstractFileObject(getParent());
FTPFile newFileInfo;
@@ -262,7 +262,7 @@ public class FtpFileObject extends Abstr
* Called when the children of this file change.
*/
@Override
- protected void onChildrenChanged(FileName child, FileType newType)
+ protected void onChildrenChanged(final FileName child, final FileType newType)
{
if (children != null && newType.equals(FileType.IMAGINARY))
{
@@ -270,7 +270,7 @@ public class FtpFileObject extends Abstr
{
children.remove(UriParser.decode(child.getBaseName()));
}
- catch (FileSystemException e)
+ catch (final FileSystemException e)
{
throw new RuntimeException(e.getMessage());
}
@@ -334,7 +334,7 @@ public class FtpFileObject extends Abstr
}
else if (this.fileInfo.isSymbolicLink())
{
- FileObject linkDest = getLinkDestination();
+ final FileObject linkDest = getLinkDestination();
// VFS-437: We need to check if the symbolic link links back to the symbolic link itself
if (this.isCircular(linkDest))
{
@@ -365,7 +365,7 @@ public class FtpFileObject extends Abstr
{
relativeTo = getName();
}
- FileName linkDestinationName = getFileSystem().getFileSystemManager().resolveName(relativeTo, path);
+ final FileName linkDestinationName = getFileSystem().getFileSystemManager().resolveName(relativeTo, path);
linkDestination = getFileSystem().resolveFile(linkDestinationName);
}
@@ -409,7 +409,7 @@ public class FtpFileObject extends Abstr
throw new FileNotFolderException(getName());
}
}
- catch (Exception ex)
+ catch (final Exception ex)
{
throw new FileNotFolderException(getName(), ex);
}
@@ -451,7 +451,7 @@ public class FtpFileObject extends Abstr
// TODO - get rid of this children stuff
final String[] childNames = new String[children.size()];
int childNum = -1;
- Iterator<FTPFile> iterChildren = children.values().iterator();
+ final Iterator<FTPFile> iterChildren = children.values().iterator();
while (iterChildren.hasNext())
{
childNum++;
@@ -501,7 +501,7 @@ public class FtpFileObject extends Abstr
* Renames the file
*/
@Override
- protected void doRename(FileObject newFile) throws Exception
+ protected void doRename(final FileObject newFile) throws Exception
{
synchronized (getFileSystem())
{
@@ -509,8 +509,8 @@ public class FtpFileObject extends Abstr
final FtpClient ftpClient = getAbstractFileSystem().getClient();
try
{
- String oldName = getName().getPath();
- String newName = newFile.getName().getPath();
+ final String oldName = getName().getPath();
+ final String newName = newFile.getName().getPath();
ok = ftpClient.rename(oldName, newName);
}
finally
@@ -621,7 +621,7 @@ public class FtpFileObject extends Abstr
}
return new FtpInputStream(client, instr);
}
- catch (Exception e)
+ catch (final Exception e)
{
getAbstractFileSystem().putClient(client);
throw e;
@@ -638,7 +638,7 @@ public class FtpFileObject extends Abstr
* Creates an output stream to write the file content to.
*/
@Override
- protected OutputStream doGetOutputStream(boolean bAppend)
+ protected OutputStream doGetOutputStream(final boolean bAppend)
throws Exception
{
final FtpClient client = getAbstractFileSystem().getClient();
@@ -663,7 +663,7 @@ public class FtpFileObject extends Abstr
return new FtpOutputStream(client, out);
}
- catch (Exception e)
+ catch (final Exception e)
{
getAbstractFileSystem().putClient(client);
throw e;
@@ -677,19 +677,19 @@ public class FtpFileObject extends Abstr
private long getTimestamp()
{
- Calendar timestamp = this.fileInfo.getTimestamp();
+ final Calendar timestamp = this.fileInfo.getTimestamp();
return timestamp == null ? 0L : timestamp.getTime().getTime();
}
/**
* This is an over simplistic implementation for VFS-437.
*/
- private boolean isCircular(FileObject linkDest) throws FileSystemException
+ private boolean isCircular(final FileObject linkDest) throws FileSystemException
{
return linkDest.getName().getPathDecoded().equals(this.getName().getPathDecoded());
}
- FtpInputStream getInputStream(long filePointer) throws IOException
+ FtpInputStream getInputStream(final long filePointer) throws IOException
{
final FtpClient client = getAbstractFileSystem().getClient();
try
@@ -703,7 +703,7 @@ public class FtpFileObject extends Abstr
}
return new FtpInputStream(client, instr);
}
- catch (IOException e)
+ catch (final IOException e)
{
getAbstractFileSystem().putClient(client);
throw e;
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileProvider.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileProvider.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileProvider.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileProvider.java Mon Dec 3 13:37:12 2012
@@ -83,7 +83,7 @@ public class FtpFileProvider
// Create the file system
final GenericFileName rootName = (GenericFileName) name;
- FTPClientWrapper ftpClient = new FTPClientWrapper(rootName, fileSystemOptions);
+ final FTPClientWrapper ftpClient = new FTPClientWrapper(rootName, fileSystemOptions);
/*
FTPClient ftpClient = FtpClientFactory.createConnection(rootName.getHostName(),
rootName.getPort(),
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=1416507&r1=1416506&r2=1416507&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 Mon Dec 3 13:37:12 2012
@@ -65,7 +65,7 @@ public class FtpFileSystem extends Abstr
@Override
protected void doCloseCommunicationLink()
{
- FtpClient idle = idleClient.getAndSet(null);
+ final FtpClient idle = idleClient.getAndSet(null);
// Clean up the connection
if (idle != null)
{
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=1416507&r1=1416506&r2=1416507&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 Mon Dec 3 13:37:12 2012
@@ -73,7 +73,7 @@ public final class FtpFileSystemConfigBu
* @return The timeout in milliseconds to use for the socket connection.
* @since 2.1
*/
- public Integer getConnectTimeout(FileSystemOptions opts)
+ public Integer getConnectTimeout(final FileSystemOptions opts)
{
return (Integer) getParam(opts, CONNECT_TIMEOUT);
}
@@ -83,7 +83,7 @@ public final class FtpFileSystemConfigBu
* @return The encoding.
* @since 2.0
* */
- public String getControlEncoding(FileSystemOptions opts)
+ public String getControlEncoding(final FileSystemOptions opts)
{
return (String) getParam(opts, ENCODING);
}
@@ -93,7 +93,7 @@ public final class FtpFileSystemConfigBu
* @return The timeout as an Integer.
* @see #setDataTimeout
*/
- public Integer getDataTimeout(FileSystemOptions opts)
+ public Integer getDataTimeout(final FileSystemOptions opts)
{
return getInteger(opts, DATA_TIMEOUT);
}
@@ -104,7 +104,7 @@ public final class FtpFileSystemConfigBu
* @param opts The FileSystemOptions
* @return The default date format.
*/
- public String getDefaultDateFormat(FileSystemOptions opts)
+ public String getDefaultDateFormat(final FileSystemOptions opts)
{
return getString(opts, DEFAULT_DATE_FORMAT);
}
@@ -114,7 +114,7 @@ public final class FtpFileSystemConfigBu
* @see #setEntryParser
* @return the key to the EntryParser.
*/
- public String getEntryParser(FileSystemOptions opts)
+ public String getEntryParser(final FileSystemOptions opts)
{
return getString(opts, FACTORY_KEY);
}
@@ -124,7 +124,7 @@ public final class FtpFileSystemConfigBu
* @see #setEntryParserFactory
* @return An FTPFileEntryParserFactory.
*/
- public FTPFileEntryParserFactory getEntryParserFactory(FileSystemOptions opts)
+ public FTPFileEntryParserFactory getEntryParserFactory(final FileSystemOptions opts)
{
return (FTPFileEntryParserFactory) getParam(opts, FTPFileEntryParserFactory.class.getName());
}
@@ -136,7 +136,7 @@ public final class FtpFileSystemConfigBu
* @return A FtpFileType
* @since 2.1
*/
- public FtpFileType getFileType(FileSystemOptions opts)
+ public FtpFileType getFileType(final FileSystemOptions opts)
{
return (FtpFileType) getParam(opts, FILE_TYPE);
}
@@ -146,7 +146,7 @@ public final class FtpFileSystemConfigBu
* @return true if passive mode is set.
* @see #setPassiveMode
*/
- public Boolean getPassiveMode(FileSystemOptions opts)
+ public Boolean getPassiveMode(final FileSystemOptions opts)
{
return getBoolean(opts, PASSIVE_MODE);
}
@@ -156,7 +156,7 @@ public final class FtpFileSystemConfigBu
* @param opts The FileSystemOptions.
* @return The recent date format.
*/
- public String getRecentDateFormat(FileSystemOptions opts)
+ public String getRecentDateFormat(final FileSystemOptions opts)
{
return getString(opts, RECENT_DATE_FORMAT);
}
@@ -167,7 +167,7 @@ public final class FtpFileSystemConfigBu
* @param opts The FilesystemOptions.
* @return The language code of the server.
*/
- public String getServerLanguageCode(FileSystemOptions opts)
+ public String getServerLanguageCode(final FileSystemOptions opts)
{
return getString(opts, SERVER_LANGUAGE_CODE);
}
@@ -177,7 +177,7 @@ public final class FtpFileSystemConfigBu
* @param opts The FileSystemOptions.
* @return The server timezone id.
*/
- public String getServerTimeZoneId(FileSystemOptions opts)
+ public String getServerTimeZoneId(final FileSystemOptions opts)
{
return getString(opts, SERVER_TIME_ZONE_ID);
}
@@ -187,7 +187,7 @@ public final class FtpFileSystemConfigBu
* @param opts The FileSystemOptions.
* @return An array of short month names.
*/
- public String[] getShortMonthNames(FileSystemOptions opts)
+ public String[] getShortMonthNames(final FileSystemOptions opts)
{
return (String[]) getParam(opts, SHORT_MONTH_NAMES);
}
@@ -198,7 +198,7 @@ public final class FtpFileSystemConfigBu
* @see #getDataTimeout
* @since 2.0
*/
- public Integer getSoTimeout(FileSystemOptions opts)
+ public Integer getSoTimeout(final FileSystemOptions opts)
{
return (Integer) getParam(opts, SO_TIMEOUT);
}
@@ -208,7 +208,7 @@ public final class FtpFileSystemConfigBu
* @return true if the user directory is treated as the root.
* @see #setUserDirIsRoot
*/
- public Boolean getUserDirIsRoot(FileSystemOptions opts)
+ public Boolean getUserDirIsRoot(final FileSystemOptions opts)
{
return getBoolean(opts, USER_DIR_IS_ROOT);
}
@@ -223,7 +223,7 @@ public final class FtpFileSystemConfigBu
* @param connectTimeout the timeout value in milliseconds
* @since 2.1
*/
- public void setConnectTimeout(FileSystemOptions opts, Integer connectTimeout)
+ public void setConnectTimeout(final FileSystemOptions opts, final Integer connectTimeout)
{
setParam(opts, CONNECT_TIMEOUT, connectTimeout);
}
@@ -234,7 +234,7 @@ public final class FtpFileSystemConfigBu
* @param encoding the encoding to use
* @since 2.0
*/
- public void setControlEncoding(FileSystemOptions opts, String encoding)
+ public void setControlEncoding(final FileSystemOptions opts, final String encoding)
{
setParam(opts, ENCODING, encoding);
}
@@ -247,7 +247,7 @@ public final class FtpFileSystemConfigBu
* @param opts The FileSystemOptions.
* @param dataTimeout The timeout value.
*/
- public void setDataTimeout(FileSystemOptions opts, Integer dataTimeout)
+ public void setDataTimeout(final FileSystemOptions opts, final Integer dataTimeout)
{
setParam(opts, DATA_TIMEOUT, dataTimeout);
}
@@ -258,7 +258,7 @@ public final class FtpFileSystemConfigBu
* @param opts The FileSystemOptions.
* @param defaultDateFormat The default date format.
*/
- public void setDefaultDateFormat(FileSystemOptions opts, String defaultDateFormat)
+ public void setDefaultDateFormat(final FileSystemOptions opts, final String defaultDateFormat)
{
setParam(opts, DEFAULT_DATE_FORMAT, defaultDateFormat);
}
@@ -273,7 +273,7 @@ public final class FtpFileSystemConfigBu
* @param opts The FileSystemOptions.
* @param key The key.
*/
- public void setEntryParser(FileSystemOptions opts, String key)
+ public void setEntryParser(final FileSystemOptions opts, final String key)
{
setParam(opts, FACTORY_KEY, key);
}
@@ -284,7 +284,7 @@ public final class FtpFileSystemConfigBu
* @param opts The FileSystemOptions.
* @param factory instance of your factory
*/
- public void setEntryParserFactory(FileSystemOptions opts, FTPFileEntryParserFactory factory)
+ public void setEntryParserFactory(final FileSystemOptions opts, final FTPFileEntryParserFactory factory)
{
setParam(opts, FTPFileEntryParserFactory.class.getName(), factory);
}
@@ -296,7 +296,7 @@ public final class FtpFileSystemConfigBu
* @param ftpFileType A FtpFileType
* @since 2.1
*/
- public void setFileType(FileSystemOptions opts, FtpFileType ftpFileType)
+ public void setFileType(final FileSystemOptions opts, final FtpFileType ftpFileType)
{
setParam(opts, FILE_TYPE, ftpFileType);
}
@@ -307,7 +307,7 @@ public final class FtpFileSystemConfigBu
* @param opts The FileSystemOptions.
* @param passiveMode true if passive mode should be used.
*/
- public void setPassiveMode(FileSystemOptions opts, boolean passiveMode)
+ public void setPassiveMode(final FileSystemOptions opts, final boolean passiveMode)
{
setParam(opts, PASSIVE_MODE, passiveMode ? Boolean.TRUE : Boolean.FALSE);
}
@@ -317,7 +317,7 @@ public final class FtpFileSystemConfigBu
* @param opts The FileSystemOptions.
* @param recentDateFormat The recent date format.
*/
- public void setRecentDateFormat(FileSystemOptions opts, String recentDateFormat)
+ public void setRecentDateFormat(final FileSystemOptions opts, final String recentDateFormat)
{
setParam(opts, RECENT_DATE_FORMAT, recentDateFormat);
}
@@ -328,7 +328,7 @@ public final class FtpFileSystemConfigBu
* @param opts The FileSystemOptions.
* @param serverLanguageCode The servers language code.
*/
- public void setServerLanguageCode(FileSystemOptions opts, String serverLanguageCode)
+ public void setServerLanguageCode(final FileSystemOptions opts, final String serverLanguageCode)
{
setParam(opts, SERVER_LANGUAGE_CODE, serverLanguageCode);
}
@@ -338,7 +338,7 @@ public final class FtpFileSystemConfigBu
* @param opts The FileSystemOptions.
* @param serverTimeZoneId The server timezone id.
*/
- public void setServerTimeZoneId(FileSystemOptions opts, String serverTimeZoneId)
+ public void setServerTimeZoneId(final FileSystemOptions opts, final String serverTimeZoneId)
{
setParam(opts, SERVER_TIME_ZONE_ID, serverTimeZoneId);
}
@@ -348,7 +348,7 @@ public final class FtpFileSystemConfigBu
* @param opts The FileSystemOptions.
* @param shortMonthNames an array of short month name Strings.
*/
- public void setShortMonthNames(FileSystemOptions opts, String[] shortMonthNames)
+ public void setShortMonthNames(final FileSystemOptions opts, final String[] shortMonthNames)
{
String[] clone = null;
if (shortMonthNames != null)
@@ -369,7 +369,7 @@ public final class FtpFileSystemConfigBu
* @param soTimeout The timeout value.
* @since 2.0
*/
- public void setSoTimeout(FileSystemOptions opts, Integer soTimeout)
+ public void setSoTimeout(final FileSystemOptions opts, final Integer soTimeout)
{
setParam(opts, SO_TIMEOUT, soTimeout);
}
@@ -380,7 +380,7 @@ public final class FtpFileSystemConfigBu
* @param opts The FileSystemOptions.
* @param userDirIsRoot true if the user directory should be treated as the root.
*/
- public void setUserDirIsRoot(FileSystemOptions opts, boolean userDirIsRoot)
+ public void setUserDirIsRoot(final FileSystemOptions opts, final boolean userDirIsRoot)
{
setParam(opts, USER_DIR_IS_ROOT, userDirIsRoot ? Boolean.TRUE : Boolean.FALSE);
}
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileType.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileType.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileType.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileType.java Mon Dec 3 13:37:12 2012
@@ -56,7 +56,7 @@ public enum FtpFileType
* @param fileType
* The Apache Commons Net FTP file type.
*/
- private FtpFileType(int fileType)
+ private FtpFileType(final int fileType)
{
this.value = fileType;
}
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpRandomAccessContent.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpRandomAccessContent.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpRandomAccessContent.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpRandomAccessContent.java Mon Dec 3 13:37:12 2012
@@ -35,7 +35,7 @@ class FtpRandomAccessContent extends Abs
private DataInputStream dis;
private FtpFileObject.FtpInputStream mis;
- FtpRandomAccessContent(final FtpFileObject fileObject, RandomAccessMode mode)
+ FtpRandomAccessContent(final FtpFileObject fileObject, final RandomAccessMode mode)
{
super(mode);
@@ -50,7 +50,7 @@ class FtpRandomAccessContent extends Abs
}
@Override
- public void seek(long pos) throws IOException
+ public void seek(final long pos) throws IOException
{
if (pos == filePointer)
{
@@ -86,7 +86,7 @@ class FtpRandomAccessContent extends Abs
@Override
public int read() throws IOException
{
- int ret = super.read();
+ final int ret = super.read();
if (ret > -1)
{
filePointer++;
@@ -95,9 +95,9 @@ class FtpRandomAccessContent extends Abs
}
@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;
@@ -106,9 +106,9 @@ class FtpRandomAccessContent extends Abs
}
@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;
@@ -135,7 +135,7 @@ class FtpRandomAccessContent extends Abs
mis.abort();
// 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/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=1416507&r1=1416506&r2=1416507&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 Mon Dec 3 13:37:12 2012
@@ -48,8 +48,8 @@ public final class FtpsClientFactory
* @return The FTPSClient.
* @throws FileSystemException if an error occurs.
*/
- public static FTPSClient createConnection(String hostname, int port, char[] username, char[] password,
- String workingDirectory, FileSystemOptions fileSystemOptions) throws FileSystemException
+ public static FTPSClient createConnection(final String hostname, final int port, char[] username, char[] password,
+ final String workingDirectory, final FileSystemOptions fileSystemOptions) throws FileSystemException
{
// Determine the username and password to use
if (username == null)
@@ -67,14 +67,14 @@ public final class FtpsClientFactory
final FTPSClient client = createFTPSClient(fileSystemOptions);
- String key = FtpsFileSystemConfigBuilder.getInstance().getEntryParser(fileSystemOptions);
+ final String key = FtpsFileSystemConfigBuilder.getInstance().getEntryParser(fileSystemOptions);
if (key != null)
{
- FTPClientConfig config = createFTPClientConfig(fileSystemOptions, key);
+ final FTPClientConfig config = createFTPClientConfig(fileSystemOptions, key);
client.configure(config);
}
- FTPFileEntryParserFactory myFactory = FtpsFileSystemConfigBuilder.getInstance().getEntryParserFactory(
+ final FTPFileEntryParserFactory myFactory = FtpsFileSystemConfigBuilder.getInstance().getEntryParserFactory(
fileSystemOptions);
if (myFactory != null)
{
@@ -93,7 +93,7 @@ public final class FtpsClientFactory
// client.execPROT(execPROT);
// }
- int reply = client.getReplyCode();
+ final int reply = client.getReplyCode();
if (!FTPReply.isPositiveCompletion(reply))
{
throw new FileSystemException("vfs.provider.ftp/connect-rejected.error", hostname);
@@ -113,7 +113,7 @@ public final class FtpsClientFactory
}
// Set dataTimeout value
- Integer dataTimeout = FtpsFileSystemConfigBuilder.getInstance().getDataTimeout(fileSystemOptions);
+ final Integer dataTimeout = FtpsFileSystemConfigBuilder.getInstance().getDataTimeout(fileSystemOptions);
if (dataTimeout != null)
{
client.setDataTimeout(dataTimeout.intValue());
@@ -123,7 +123,7 @@ public final class FtpsClientFactory
// All file operations a relative to the filesystem-root
// String root = getRoot().getName().getPath();
- Boolean userDirIsRoot = FtpsFileSystemConfigBuilder.getInstance().getUserDirIsRoot(fileSystemOptions);
+ final Boolean userDirIsRoot = FtpsFileSystemConfigBuilder.getInstance().getUserDirIsRoot(fileSystemOptions);
if (workingDirectory != null && (userDirIsRoot == null || !userDirIsRoot.booleanValue()))
{
if (!client.changeWorkingDirectory(workingDirectory))
@@ -132,7 +132,7 @@ public final class FtpsClientFactory
}
}
- Boolean passiveMode = FtpsFileSystemConfigBuilder.getInstance().getPassiveMode(fileSystemOptions);
+ final Boolean passiveMode = FtpsFileSystemConfigBuilder.getInstance().getPassiveMode(fileSystemOptions);
if (passiveMode != null && passiveMode.booleanValue())
{
client.enterLocalPassiveMode();
@@ -155,40 +155,40 @@ public final class FtpsClientFactory
}
}
- private static FTPClientConfig createFTPClientConfig(FileSystemOptions fileSystemOptions, String key)
+ private static FTPClientConfig createFTPClientConfig(final FileSystemOptions fileSystemOptions, final String key)
{
- FTPClientConfig config = new FTPClientConfig(key);
+ final FTPClientConfig config = new FTPClientConfig(key);
- String serverLanguageCode = FtpsFileSystemConfigBuilder.getInstance().getServerLanguageCode(
+ final String serverLanguageCode = FtpsFileSystemConfigBuilder.getInstance().getServerLanguageCode(
fileSystemOptions);
if (serverLanguageCode != null)
{
config.setServerLanguageCode(serverLanguageCode);
}
- String defaultDateFormat = FtpsFileSystemConfigBuilder.getInstance().getDefaultDateFormat(
+ final String defaultDateFormat = FtpsFileSystemConfigBuilder.getInstance().getDefaultDateFormat(
fileSystemOptions);
if (defaultDateFormat != null)
{
config.setDefaultDateFormatStr(defaultDateFormat);
}
- String recentDateFormat = FtpsFileSystemConfigBuilder.getInstance().getRecentDateFormat(
+ final String recentDateFormat = FtpsFileSystemConfigBuilder.getInstance().getRecentDateFormat(
fileSystemOptions);
if (recentDateFormat != null)
{
config.setRecentDateFormatStr(recentDateFormat);
}
- String serverTimeZoneId = FtpsFileSystemConfigBuilder.getInstance().getServerTimeZoneId(
+ final String serverTimeZoneId = FtpsFileSystemConfigBuilder.getInstance().getServerTimeZoneId(
fileSystemOptions);
if (serverTimeZoneId != null)
{
config.setServerTimeZoneId(serverTimeZoneId);
}
- String[] shortMonthNames = FtpsFileSystemConfigBuilder.getInstance().getShortMonthNames(
+ final String[] shortMonthNames = FtpsFileSystemConfigBuilder.getInstance().getShortMonthNames(
fileSystemOptions);
if (shortMonthNames != null)
{
- StringBuilder shortMonthNamesStr = new StringBuilder(SHORT_MONTH_NAME_LEN);
- for (String shortMonthName : shortMonthNames)
+ final StringBuilder shortMonthNamesStr = new StringBuilder(SHORT_MONTH_NAME_LEN);
+ for (final String shortMonthName : shortMonthNames)
{
if (shortMonthNamesStr.length() > 0)
{
@@ -201,7 +201,7 @@ public final class FtpsClientFactory
return config;
}
- private static FTPSClient createFTPSClient(FileSystemOptions fileSystemOptions)
+ private static FTPSClient createFTPSClient(final FileSystemOptions fileSystemOptions)
throws FileSystemException
{
if (FtpsFileSystemConfigBuilder.getInstance().getFtpsType(fileSystemOptions)
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=1416507&r1=1416506&r2=1416507&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 Mon Dec 3 13:37:12 2012
@@ -115,13 +115,13 @@ class FtpsClientWrapper implements FtpCl
}
@Override
- public FTPFile[] listFiles(String relPath) throws IOException
+ public FTPFile[] listFiles(final String relPath) throws IOException
{
try
{
return getFtpsClient().listFiles(relPath);
}
- catch (IOException e)
+ catch (final IOException e)
{
disconnect();
return getFtpsClient().listFiles(relPath);
@@ -129,13 +129,13 @@ class FtpsClientWrapper implements FtpCl
}
@Override
- public boolean removeDirectory(String relPath) throws IOException
+ public boolean removeDirectory(final String relPath) throws IOException
{
try
{
return getFtpsClient().removeDirectory(relPath);
}
- catch (IOException e)
+ catch (final IOException e)
{
disconnect();
return getFtpsClient().removeDirectory(relPath);
@@ -143,13 +143,13 @@ class FtpsClientWrapper implements FtpCl
}
@Override
- public boolean deleteFile(String relPath) throws IOException
+ public boolean deleteFile(final String relPath) throws IOException
{
try
{
return getFtpsClient().deleteFile(relPath);
}
- catch (IOException e)
+ catch (final IOException e)
{
disconnect();
return getFtpsClient().deleteFile(relPath);
@@ -157,13 +157,13 @@ class FtpsClientWrapper implements FtpCl
}
@Override
- public boolean rename(String oldName, String newName) throws IOException
+ public boolean rename(final String oldName, final String newName) throws IOException
{
try
{
return getFtpsClient().rename(oldName, newName);
}
- catch (IOException e)
+ catch (final IOException e)
{
disconnect();
return getFtpsClient().rename(oldName, newName);
@@ -171,13 +171,13 @@ class FtpsClientWrapper implements FtpCl
}
@Override
- public boolean makeDirectory(String relPath) throws IOException
+ public boolean makeDirectory(final String relPath) throws IOException
{
try
{
return getFtpsClient().makeDirectory(relPath);
}
- catch (IOException e)
+ catch (final IOException e)
{
disconnect();
return getFtpsClient().makeDirectory(relPath);
@@ -196,13 +196,13 @@ class FtpsClientWrapper implements FtpCl
}
@Override
- public InputStream retrieveFileStream(String relPath) throws IOException
+ public InputStream retrieveFileStream(final String relPath) throws IOException
{
try
{
return getFtpsClient().retrieveFileStream(relPath);
}
- catch (IOException e)
+ catch (final IOException e)
{
disconnect();
return getFtpsClient().retrieveFileStream(relPath);
@@ -210,32 +210,32 @@ class FtpsClientWrapper implements FtpCl
}
@Override
- public InputStream retrieveFileStream(String relPath, long restartOffset) throws IOException
+ public InputStream retrieveFileStream(final String relPath, final long restartOffset) throws IOException
{
try
{
- FTPSClient client = getFtpsClient();
+ final FTPSClient client = getFtpsClient();
client.setRestartOffset(restartOffset);
return client.retrieveFileStream(relPath);
}
- catch (IOException e)
+ catch (final IOException e)
{
disconnect();
- FTPSClient client = getFtpsClient();
+ final FTPSClient client = getFtpsClient();
client.setRestartOffset(restartOffset);
return client.retrieveFileStream(relPath);
}
}
@Override
- public OutputStream appendFileStream(String relPath) throws IOException
+ public OutputStream appendFileStream(final String relPath) throws IOException
{
try
{
return getFtpsClient().appendFileStream(relPath);
}
- catch (IOException e)
+ catch (final IOException e)
{
disconnect();
return getFtpsClient().appendFileStream(relPath);
@@ -243,13 +243,13 @@ class FtpsClientWrapper implements FtpCl
}
@Override
- public OutputStream storeFileStream(String relPath) throws IOException
+ public OutputStream storeFileStream(final String relPath) throws IOException
{
try
{
return getFtpsClient().storeFileStream(relPath);
}
- catch (IOException e)
+ catch (final IOException e)
{
disconnect();
return getFtpsClient().storeFileStream(relPath);
@@ -269,7 +269,7 @@ class FtpsClientWrapper implements FtpCl
disconnect();
return true;
}
- catch (IOException e)
+ catch (final IOException e)
{
disconnect();
}
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftps/FtpsFileProvider.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftps/FtpsFileProvider.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftps/FtpsFileProvider.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftps/FtpsFileProvider.java Mon Dec 3 13:37:12 2012
@@ -50,7 +50,7 @@ public class FtpsFileProvider extends Ft
// Create the file system
final GenericFileName rootName = (GenericFileName) name;
- FtpsClientWrapper ftpClient = new FtpsClientWrapper(rootName, fileSystemOptions);
+ final FtpsClientWrapper ftpClient = new FtpsClientWrapper(rootName, fileSystemOptions);
return new FtpFileSystem(rootName, ftpClient, fileSystemOptions);
}
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=1416507&r1=1416506&r2=1416507&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 Mon Dec 3 13:37:12 2012
@@ -80,7 +80,7 @@ public final class FtpsFileSystemConfigB
* @param opts The FileSystemOptions.
* @param factory instance of your factory
*/
- public void setEntryParserFactory(FileSystemOptions opts, FTPFileEntryParserFactory factory)
+ public void setEntryParserFactory(final FileSystemOptions opts, final FTPFileEntryParserFactory factory)
{
setParam(opts, FTPFileEntryParserFactory.class.getName(), factory);
}
@@ -90,7 +90,7 @@ public final class FtpsFileSystemConfigB
* @return The FTPFileEntryParserFactory.
* @see #setEntryParserFactory
*/
- public FTPFileEntryParserFactory getEntryParserFactory(FileSystemOptions opts)
+ public FTPFileEntryParserFactory getEntryParserFactory(final FileSystemOptions opts)
{
return (FTPFileEntryParserFactory) getParam(opts, FTPFileEntryParserFactory.class.getName());
}
@@ -105,7 +105,7 @@ public final class FtpsFileSystemConfigB
* @param opts The FileSystemOptions.
* @param key The key.
*/
- public void setEntryParser(FileSystemOptions opts, String key)
+ public void setEntryParser(final FileSystemOptions opts, final String key)
{
setParam(opts, FACTORY_KEY, key);
}
@@ -115,7 +115,7 @@ public final class FtpsFileSystemConfigB
* @return The key.
* @see #setEntryParser
*/
- public String getEntryParser(FileSystemOptions opts)
+ public String getEntryParser(final FileSystemOptions opts)
{
return (String) getParam(opts, FACTORY_KEY);
}
@@ -132,7 +132,7 @@ public final class FtpsFileSystemConfigB
* @param opts The FileSystemOptions.
* @param passiveMode true if passive mode should be used, false otherwise.
*/
- public void setPassiveMode(FileSystemOptions opts, boolean passiveMode)
+ public void setPassiveMode(final FileSystemOptions opts, final boolean passiveMode)
{
setParam(opts, PASSIVE_MODE, passiveMode ? Boolean.TRUE : Boolean.FALSE);
}
@@ -142,7 +142,7 @@ public final class FtpsFileSystemConfigB
* @return true if passive mode is being used.
* @see #setPassiveMode
*/
- public Boolean getPassiveMode(FileSystemOptions opts)
+ public Boolean getPassiveMode(final FileSystemOptions opts)
{
return (Boolean) getParam(opts, PASSIVE_MODE);
}
@@ -153,7 +153,7 @@ public final class FtpsFileSystemConfigB
* @param opts The FileSystemOptions.
* @param userDirIsRoot true if the user directory should be the root.
*/
- public void setUserDirIsRoot(FileSystemOptions opts, boolean userDirIsRoot)
+ public void setUserDirIsRoot(final FileSystemOptions opts, final boolean userDirIsRoot)
{
setParam(opts, USER_DIR_IS_ROOT,
userDirIsRoot ? Boolean.TRUE : Boolean.FALSE);
@@ -164,7 +164,7 @@ public final class FtpsFileSystemConfigB
* @return true if the user directory is the root.
* @see #setUserDirIsRoot
*/
- public Boolean getUserDirIsRoot(FileSystemOptions opts)
+ public Boolean getUserDirIsRoot(final FileSystemOptions opts)
{
return getBoolean(opts, USER_DIR_IS_ROOT, Boolean.TRUE);
}
@@ -175,7 +175,7 @@ public final class FtpsFileSystemConfigB
* @param opts The FileSystemOptions.
* @param ftpsType The file type.
*/
- public void setFtpsType(FileSystemOptions opts, String ftpsType)
+ public void setFtpsType(final FileSystemOptions opts, final String ftpsType)
{
setParam(opts, FTPS_TYPE, ftpsType);
}
@@ -187,7 +187,7 @@ public final class FtpsFileSystemConfigB
* @return The file type.
* @see #setFtpsType
*/
- public String getFtpsType(FileSystemOptions opts)
+ public String getFtpsType(final FileSystemOptions opts)
{
return getString(opts, FTPS_TYPE, FtpsFileSystemConfigBuilder.FTPS_TYPE_EXPLICIT);
}
@@ -197,7 +197,7 @@ public final class FtpsFileSystemConfigB
* @return The timeout value.
* @see #setDataTimeout
*/
- public Integer getDataTimeout(FileSystemOptions opts)
+ public Integer getDataTimeout(final FileSystemOptions opts)
{
return (Integer) getParam(opts, DATA_TIMEOUT);
}
@@ -210,7 +210,7 @@ public final class FtpsFileSystemConfigB
* @param opts The FileSystemOptions.
* @param dataTimeout The timeout value.
*/
- public void setDataTimeout(FileSystemOptions opts, Integer dataTimeout)
+ public void setDataTimeout(final FileSystemOptions opts, final Integer dataTimeout)
{
setParam(opts, DATA_TIMEOUT, dataTimeout);
}
@@ -221,7 +221,7 @@ public final class FtpsFileSystemConfigB
* @param opts The FileSystemOptions.
* @return The language code.
*/
- public String getServerLanguageCode(FileSystemOptions opts)
+ public String getServerLanguageCode(final FileSystemOptions opts)
{
return (String) getParam(opts, SERVER_LANGUAGE_CODE);
}
@@ -232,8 +232,8 @@ public final class FtpsFileSystemConfigB
* @param opts The FileSystemOptions.
* @param serverLanguageCode the language code.
*/
- public void setServerLanguageCode(FileSystemOptions opts,
- String serverLanguageCode)
+ public void setServerLanguageCode(final FileSystemOptions opts,
+ final String serverLanguageCode)
{
setParam(opts, SERVER_LANGUAGE_CODE, serverLanguageCode);
}
@@ -244,7 +244,7 @@ public final class FtpsFileSystemConfigB
* @param opts The FileSystemOptions.
* @return The default date format.
*/
- public String getDefaultDateFormat(FileSystemOptions opts)
+ public String getDefaultDateFormat(final FileSystemOptions opts)
{
return (String) getParam(opts, DEFAULT_DATE_FORMAT);
}
@@ -255,8 +255,8 @@ public final class FtpsFileSystemConfigB
* @param opts The FileSystemOptions.
* @param defaultDateFormat The default date format.
*/
- public void setDefaultDateFormat(FileSystemOptions opts,
- String defaultDateFormat)
+ public void setDefaultDateFormat(final FileSystemOptions opts,
+ final String defaultDateFormat)
{
setParam(opts, DEFAULT_DATE_FORMAT, defaultDateFormat);
}
@@ -266,7 +266,7 @@ public final class FtpsFileSystemConfigB
* @param opts The FileSystemOptions.
* @return The recent date format.
*/
- public String getRecentDateFormat(FileSystemOptions opts)
+ public String getRecentDateFormat(final FileSystemOptions opts)
{
return (String) getParam(opts, RECENT_DATE_FORMAT);
}
@@ -276,8 +276,8 @@ public final class FtpsFileSystemConfigB
* @param opts The FileSystemOptions
* @param recentDateFormat The recent date format.
*/
- public void setRecentDateFormat(FileSystemOptions opts,
- String recentDateFormat)
+ public void setRecentDateFormat(final FileSystemOptions opts,
+ final String recentDateFormat)
{
setParam(opts, RECENT_DATE_FORMAT, recentDateFormat);
}
@@ -287,7 +287,7 @@ public final class FtpsFileSystemConfigB
* @param opts The FileSystemOptions.
* @return The server timezone id.
*/
- public String getServerTimeZoneId(FileSystemOptions opts)
+ public String getServerTimeZoneId(final FileSystemOptions opts)
{
return (String) getParam(opts, SERVER_TIME_ZONE_ID);
}
@@ -297,8 +297,8 @@ public final class FtpsFileSystemConfigB
* @param opts The FileSystemOptions.
* @param serverTimeZoneId The server's timezone id.
*/
- public void setServerTimeZoneId(FileSystemOptions opts,
- String serverTimeZoneId)
+ public void setServerTimeZoneId(final FileSystemOptions opts,
+ final String serverTimeZoneId)
{
setParam(opts, SERVER_TIME_ZONE_ID, serverTimeZoneId);
}
@@ -308,7 +308,7 @@ public final class FtpsFileSystemConfigB
* @param opts The FileSystemOptions.
* @return An array of short month names.
*/
- public String[] getShortMonthNames(FileSystemOptions opts)
+ public String[] getShortMonthNames(final FileSystemOptions opts)
{
return (String[]) getParam(opts, SHORT_MONTH_NAMES);
}
@@ -318,8 +318,8 @@ public final class FtpsFileSystemConfigB
* @param opts The FileSystemOptions.
* @param shortMonthNames An array of short month names.
*/
- public void setShortMonthNames(FileSystemOptions opts,
- String[] shortMonthNames)
+ public void setShortMonthNames(final FileSystemOptions opts,
+ final String[] shortMonthNames)
{
String[] clone = null;
if (shortMonthNames != null)
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/gzip/GzipFileObject.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/gzip/GzipFileObject.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/gzip/GzipFileObject.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/gzip/GzipFileObject.java Mon Dec 3 13:37:12 2012
@@ -30,7 +30,7 @@ import org.apache.commons.vfs2.provider.
*/
public class GzipFileObject extends CompressedFileFileObject<GzipFileSystem>
{
- protected GzipFileObject(AbstractFileName name, FileObject container, GzipFileSystem fs)
+ protected GzipFileObject(final AbstractFileName name, final FileObject container, final GzipFileSystem fs)
{
super(name, container, fs);
}
@@ -38,14 +38,14 @@ public class GzipFileObject extends Comp
@Override
protected InputStream doGetInputStream() throws Exception
{
- InputStream is = getContainer().getContent().getInputStream();
+ final InputStream is = getContainer().getContent().getInputStream();
return new GZIPInputStream(is);
}
@Override
- protected OutputStream doGetOutputStream(boolean bAppend) throws Exception
+ protected OutputStream doGetOutputStream(final boolean bAppend) throws Exception
{
- OutputStream os = getContainer().getContent().getOutputStream(false);
+ final OutputStream os = getContainer().getContent().getOutputStream(false);
return new GZIPOutputStream(os);
}
}
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=1416507&r1=1416506&r2=1416507&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 Mon Dec 3 13:37:12 2012
@@ -54,7 +54,7 @@ public class GzipFileProvider extends Co
}
@Override
- protected FileSystem createFileSystem(FileName name, FileObject file, FileSystemOptions fileSystemOptions)
+ protected FileSystem createFileSystem(final FileName name, final FileObject file, final FileSystemOptions fileSystemOptions)
throws FileSystemException
{
return new GzipFileSystem(name, file, fileSystemOptions);