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 [4/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/gzip/GzipFileSystem.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/gzip/GzipFileSystem.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/gzip/GzipFileSystem.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/gzip/GzipFileSystem.java Mon Dec 3 13:37:12 2012
@@ -31,13 +31,13 @@ import org.apache.commons.vfs2.provider.
*/
public class GzipFileSystem extends CompressedFileFileSystem
{
- protected GzipFileSystem(FileName rootName, FileObject parentLayer, FileSystemOptions fileSystemOptions)
+ protected GzipFileSystem(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 GzipFileObject(name, getParentLayer(), this);
}
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=1416507&r1=1416506&r2=1416507&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 Mon Dec 3 13:37:12 2012
@@ -41,8 +41,8 @@ public final class HttpClientFactory
{
}
- public static HttpClient createConnection(String scheme, String hostname, int port, String username,
- String password, FileSystemOptions fileSystemOptions)
+ public static HttpClient createConnection(final String scheme, final String hostname, final int port, final String username,
+ final String password, final FileSystemOptions fileSystemOptions)
throws FileSystemException
{
return createConnection(HttpFileSystemConfigBuilder.getInstance(), scheme, hostname, port,
@@ -62,16 +62,16 @@ public final class HttpClientFactory
* @throws FileSystemException if an error occurs.
* @since 2.0
*/
- public static HttpClient createConnection(HttpFileSystemConfigBuilder builder, String scheme,
- String hostname, int port, String username,
- String password, FileSystemOptions fileSystemOptions)
+ public static HttpClient createConnection(final HttpFileSystemConfigBuilder builder, final String scheme,
+ final String hostname, final int port, final String username,
+ final String password, final FileSystemOptions fileSystemOptions)
throws FileSystemException
{
HttpClient client;
try
{
- HttpConnectionManager mgr = new MultiThreadedHttpConnectionManager();
- HttpConnectionManagerParams connectionMgrParams = mgr.getParams();
+ final HttpConnectionManager mgr = new MultiThreadedHttpConnectionManager();
+ final HttpConnectionManagerParams connectionMgrParams = mgr.getParams();
client = new HttpClient(mgr);
@@ -80,18 +80,18 @@ public final class HttpClientFactory
if (fileSystemOptions != null)
{
- String proxyHost = builder.getProxyHost(fileSystemOptions);
- int proxyPort = builder.getProxyPort(fileSystemOptions);
+ final String proxyHost = builder.getProxyHost(fileSystemOptions);
+ final int proxyPort = builder.getProxyPort(fileSystemOptions);
if (proxyHost != null && proxyHost.length() > 0 && proxyPort > 0)
{
config.setProxy(proxyHost, proxyPort);
}
- UserAuthenticator proxyAuth = builder.getProxyAuthenticator(fileSystemOptions);
+ final UserAuthenticator proxyAuth = builder.getProxyAuthenticator(fileSystemOptions);
if (proxyAuth != null)
{
- UserAuthenticationData authData = UserAuthenticatorUtils.authenticate(proxyAuth,
+ final UserAuthenticationData authData = UserAuthenticatorUtils.authenticate(proxyAuth,
new UserAuthenticationData.Type[]
{
UserAuthenticationData.USERNAME,
@@ -107,19 +107,19 @@ public final class HttpClientFactory
UserAuthenticatorUtils.toString(UserAuthenticatorUtils.getData(authData,
UserAuthenticationData.PASSWORD, null)));
- AuthScope scope = new AuthScope(proxyHost, AuthScope.ANY_PORT);
+ final AuthScope scope = new AuthScope(proxyHost, AuthScope.ANY_PORT);
client.getState().setProxyCredentials(scope, proxyCreds);
}
if (builder.isPreemptiveAuth(fileSystemOptions))
{
- HttpClientParams httpClientParams = new HttpClientParams();
+ final HttpClientParams httpClientParams = new HttpClientParams();
httpClientParams.setAuthenticationPreemptive(true);
client.setParams(httpClientParams);
}
}
- Cookie[] cookies = builder.getCookies(fileSystemOptions);
+ final Cookie[] cookies = builder.getCookies(fileSystemOptions);
if (cookies != null)
{
client.getState().addCookies(cookies);
@@ -139,7 +139,7 @@ public final class HttpClientFactory
{
final UsernamePasswordCredentials creds =
new UsernamePasswordCredentials(username, password);
- AuthScope scope = new AuthScope(hostname, AuthScope.ANY_PORT);
+ final AuthScope scope = new AuthScope(hostname, AuthScope.ANY_PORT);
client.getState().setCredentials(scope, creds);
}
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/http/HttpFileContentInfoFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/http/HttpFileContentInfoFactory.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/http/HttpFileContentInfoFactory.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/http/HttpFileContentInfoFactory.java Mon Dec 3 13:37:12 2012
@@ -34,9 +34,9 @@ import org.apache.commons.vfs2.util.File
public class HttpFileContentInfoFactory implements FileContentInfoFactory
{
@Override
- public FileContentInfo create(FileContent fileContent) throws FileSystemException
+ public FileContentInfo create(final FileContent fileContent) throws FileSystemException
{
- HttpFileObject httpFile = (HttpFileObject) FileObjectUtils.getAbstractFileObject(fileContent.getFile());
+ final HttpFileObject httpFile = (HttpFileObject) FileObjectUtils.getAbstractFileObject(fileContent.getFile());
String contentType = null;
String contentEncoding = null;
@@ -46,14 +46,14 @@ public class HttpFileContentInfoFactory
{
headMethod = httpFile.getHeadMethod();
}
- catch (IOException e)
+ catch (final IOException e)
{
throw new FileSystemException(e);
}
- Header header = headMethod.getResponseHeader("content-type");
+ final Header header = headMethod.getResponseHeader("content-type");
if (header != null)
{
- HeaderElement[] element = header.getElements();
+ final HeaderElement[] element = header.getElements();
if (element != null && element.length > 0)
{
contentType = element[0].getName();
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/http/HttpFileObject.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/http/HttpFileObject.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/http/HttpFileObject.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/http/HttpFileObject.java Mon Dec 3 13:37:12 2012
@@ -179,7 +179,7 @@ public class HttpFileObject<FS extends H
*/
protected void setupMethod(final HttpMethod method) throws FileSystemException, URIException
{
- String pathEncoded = ((URLFileName) getName()).getPathQueryEncoded(this.getUrlCharset());
+ final String pathEncoded = ((URLFileName) getName()).getPathQueryEncoded(this.getUrlCharset());
method.setPath(pathEncoded);
method.setFollowRedirects(this.getFollowRedirect());
method.setRequestHeader("User-Agent", "Jakarta-Commons-VFS");
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/http/HttpFileSystem.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/http/HttpFileSystem.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/http/HttpFileSystem.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/http/HttpFileSystem.java Mon Dec 3 13:37:12 2012
@@ -63,7 +63,7 @@ public class HttpFileSystem
{
if (getClient() != null)
{
- HttpConnectionManager mgr = getClient().getHttpConnectionManager();
+ final HttpConnectionManager mgr = getClient().getHttpConnectionManager();
if (mgr instanceof MultiThreadedHttpConnectionManager)
{
((MultiThreadedHttpConnectionManager) mgr).shutdown();
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=1416507&r1=1416506&r2=1416507&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 Mon Dec 3 13:37:12 2012
@@ -41,7 +41,7 @@ public class HttpFileSystemConfigBuilder
private static final String KEY_PREEMPTIVE_AUTHENTICATION = "preemptiveAuth";
/** @since 2.0 */
- protected HttpFileSystemConfigBuilder(String prefix)
+ protected HttpFileSystemConfigBuilder(final String prefix)
{
super(prefix);
}
@@ -67,7 +67,7 @@ public class HttpFileSystemConfigBuilder
* @param opts The FileSystem options.
* @param chaset the chaset
*/
- public void setUrlCharset(FileSystemOptions opts, String chaset)
+ public void setUrlCharset(final FileSystemOptions opts, final String chaset)
{
setParam(opts, "urlCharset", chaset);
}
@@ -78,7 +78,7 @@ public class HttpFileSystemConfigBuilder
* @param opts The FileSystem options.
* @return the chaset
*/
- public String getUrlCharset(FileSystemOptions opts)
+ public String getUrlCharset(final FileSystemOptions opts)
{
return getString(opts, "urlCharset");
}
@@ -91,7 +91,7 @@ public class HttpFileSystemConfigBuilder
* @param proxyHost the host
* @see #setProxyPort
*/
- public void setProxyHost(FileSystemOptions opts, String proxyHost)
+ public void setProxyHost(final FileSystemOptions opts, final String proxyHost)
{
setParam(opts, "proxyHost", proxyHost);
}
@@ -104,7 +104,7 @@ public class HttpFileSystemConfigBuilder
* @param proxyPort the port
* @see #setProxyHost
*/
- public void setProxyPort(FileSystemOptions opts, int proxyPort)
+ public void setProxyPort(final FileSystemOptions opts, final int proxyPort)
{
setParam(opts, "proxyPort", Integer.valueOf(proxyPort));
}
@@ -117,7 +117,7 @@ public class HttpFileSystemConfigBuilder
* @return proxyHost
* @see #setProxyPort
*/
- public String getProxyHost(FileSystemOptions opts)
+ public String getProxyHost(final FileSystemOptions opts)
{
return getString(opts, "proxyHost");
}
@@ -130,7 +130,7 @@ public class HttpFileSystemConfigBuilder
* @return proxyPort: the port number or 0 if it is not set
* @see #setProxyHost
*/
- public int getProxyPort(FileSystemOptions opts)
+ public int getProxyPort(final FileSystemOptions opts)
{
return getInteger(opts, "proxyPort", 0);
}
@@ -140,7 +140,7 @@ public class HttpFileSystemConfigBuilder
* @param opts The FileSystem options.
* @param authenticator The UserAuthenticator.
*/
- public void setProxyAuthenticator(FileSystemOptions opts, UserAuthenticator authenticator)
+ public void setProxyAuthenticator(final FileSystemOptions opts, final UserAuthenticator authenticator)
{
setParam(opts, "proxyAuthenticator", authenticator);
}
@@ -150,7 +150,7 @@ public class HttpFileSystemConfigBuilder
* @param opts The FileSystem options.
* @return The UserAuthenticator.
*/
- public UserAuthenticator getProxyAuthenticator(FileSystemOptions opts)
+ public UserAuthenticator getProxyAuthenticator(final FileSystemOptions opts)
{
return (UserAuthenticator) getParam(opts, "proxyAuthenticator");
}
@@ -160,7 +160,7 @@ public class HttpFileSystemConfigBuilder
* @param opts The FileSystem options.
* @param cookies An array of Cookies.
*/
- public void setCookies(FileSystemOptions opts, Cookie[] cookies)
+ public void setCookies(final FileSystemOptions opts, final Cookie[] cookies)
{
setParam(opts, "cookies", cookies);
}
@@ -175,7 +175,7 @@ public class HttpFileSystemConfigBuilder
* @see #setFollowRedirect
* @since 2.1
*/
- public void setFollowRedirect(FileSystemOptions opts, boolean redirect)
+ public void setFollowRedirect(final FileSystemOptions opts, final boolean redirect)
{
setParam(opts, KEY_FOLLOW_REDIRECT, redirect);
}
@@ -185,7 +185,7 @@ public class HttpFileSystemConfigBuilder
* @param opts The FileSystem options.
* @return the Cookie array.
*/
- public Cookie[] getCookies(FileSystemOptions opts)
+ public Cookie[] getCookies(final FileSystemOptions opts)
{
return (Cookie[]) getParam(opts, "cookies");
}
@@ -199,7 +199,7 @@ public class HttpFileSystemConfigBuilder
* @see #setFollowRedirect
* @since 2.1
*/
- public boolean getFollowRedirect(FileSystemOptions opts)
+ public boolean getFollowRedirect(final FileSystemOptions opts)
{
return getBoolean(opts, KEY_FOLLOW_REDIRECT, DEFAULT_FOLLOW_REDIRECT);
}
@@ -210,7 +210,7 @@ public class HttpFileSystemConfigBuilder
* @param maxTotalConnections The maximum number of connections.
* @since 2.0
*/
- public void setMaxTotalConnections(FileSystemOptions opts, int maxTotalConnections)
+ public void setMaxTotalConnections(final FileSystemOptions opts, final int maxTotalConnections)
{
setParam(opts, HttpConnectionManagerParams.MAX_TOTAL_CONNECTIONS, Integer.valueOf(maxTotalConnections));
}
@@ -221,7 +221,7 @@ public class HttpFileSystemConfigBuilder
* @return The maximum number of connections allowed.
* @since 2.0
*/
- public int getMaxTotalConnections(FileSystemOptions opts)
+ public int getMaxTotalConnections(final FileSystemOptions opts)
{
return getInteger(opts, HttpConnectionManagerParams.MAX_TOTAL_CONNECTIONS, DEFAULT_MAX_CONNECTIONS);
}
@@ -232,7 +232,7 @@ public class HttpFileSystemConfigBuilder
* @param maxHostConnections The maximum number of connections to a host.
* @since 2.0
*/
- public void setMaxConnectionsPerHost(FileSystemOptions opts, int maxHostConnections)
+ public void setMaxConnectionsPerHost(final FileSystemOptions opts, final int maxHostConnections)
{
setParam(opts, HttpConnectionManagerParams.MAX_HOST_CONNECTIONS, Integer.valueOf(maxHostConnections));
}
@@ -243,7 +243,7 @@ public class HttpFileSystemConfigBuilder
* @return The maximum number of connections allowed per host.
* @since 2.0
*/
- public int getMaxConnectionsPerHost(FileSystemOptions opts)
+ public int getMaxConnectionsPerHost(final FileSystemOptions opts)
{
return getInteger(opts, HttpConnectionManagerParams.MAX_HOST_CONNECTIONS, DEFAULT_MAX_HOST_CONNECTIONS);
}
@@ -255,7 +255,7 @@ public class HttpFileSystemConfigBuilder
* @return true if preemptiveAuth is requested.
* @since 2.0
*/
- public boolean isPreemptiveAuth(FileSystemOptions opts)
+ public boolean isPreemptiveAuth(final FileSystemOptions opts)
{
return getBoolean(opts, KEY_PREEMPTIVE_AUTHENTICATION, Boolean.FALSE).booleanValue();
}
@@ -269,7 +269,7 @@ public class HttpFileSystemConfigBuilder
* @param opts The FileSystemOptions.
* @param preemptiveAuth the desired setting; true=enabled and false=disabled.
*/
- public void setPreemptiveAuth(FileSystemOptions opts, boolean preemptiveAuth)
+ public void setPreemptiveAuth(final FileSystemOptions opts, final boolean preemptiveAuth)
{
setParam(opts, KEY_PREEMPTIVE_AUTHENTICATION, Boolean.valueOf(preemptiveAuth));
}
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/http/HttpRandomAccessContent.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/http/HttpRandomAccessContent.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/http/HttpRandomAccessContent.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/http/HttpRandomAccessContent.java Mon Dec 3 13:37:12 2012
@@ -40,7 +40,7 @@ class HttpRandomAccessContent extends Ab
private DataInputStream dis = null;
private MonitorInputStream mis = null;
- HttpRandomAccessContent(final HttpFileObject fileObject, RandomAccessMode mode)
+ HttpRandomAccessContent(final HttpFileObject fileObject, final RandomAccessMode mode)
{
super(mode);
@@ -55,7 +55,7 @@ class HttpRandomAccessContent extends Ab
}
@Override
- public void seek(long pos) throws IOException
+ public void seek(final long pos) throws IOException
{
if (pos == filePointer)
{
@@ -100,7 +100,7 @@ class HttpRandomAccessContent extends Ab
// If the range request was ignored
if (status == HttpURLConnection.HTTP_OK)
{
- long skipped = mis.skip(filePointer);
+ final long skipped = mis.skip(filePointer);
if (skipped != filePointer)
{
throw new FileSystemException("vfs.provider.http/get-range.error",
@@ -114,7 +114,7 @@ class HttpRandomAccessContent extends Ab
@Override
public int read() throws IOException
{
- int ret = super.read();
+ final int ret = super.read();
if (ret > -1)
{
filePointer++;
@@ -123,9 +123,9 @@ class HttpRandomAccessContent extends Ab
}
@Override
- public int read(byte[] b) throws IOException
+ public int read(final byte[] b) throws IOException
{
- int ret = super.read(b);
+ final int ret = super.read(b);
if (ret > -1)
{
filePointer += ret;
@@ -134,9 +134,9 @@ class HttpRandomAccessContent extends Ab
}
@Override
- public int read(byte[] b, int off, int len) throws IOException
+ public int read(final byte[] b, final int off, final int len) throws IOException
{
- int ret = super.read(b, off, len);
+ final int ret = super.read(b, off, len);
if (ret > -1)
{
filePointer += ret;
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/jar/JarFileObject.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/jar/JarFileObject.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/jar/JarFileObject.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/jar/JarFileObject.java Mon Dec 3 13:37:12 2012
@@ -52,7 +52,7 @@ public class JarFileObject extends ZipFi
{
getAttributes(); // early get the attributes as the zip file might be closed
}
- catch (IOException e)
+ catch (final IOException e)
{
throw new FileSystemException(e);
}
@@ -119,7 +119,7 @@ public class JarFileObject extends ZipFi
*/
private void addAll(final Attributes src, final Map<String, Object> dest)
{
- for (Entry<Object, Object> entry : src.entrySet())
+ for (final Entry<Object, Object> entry : src.entrySet())
{
// final String name = entry.getKey().toString().toLowerCase();
final String name = entry.getKey().toString();
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/jar/JarFileProvider.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/jar/JarFileProvider.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/jar/JarFileProvider.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/jar/JarFileProvider.java Mon Dec 3 13:37:12 2012
@@ -43,7 +43,7 @@ public class JarFileProvider extends Zip
static
{
- Collection<Capability> combined = new ArrayList<Capability>();
+ final Collection<Capability> combined = new ArrayList<Capability>();
combined.addAll(ZipFileProvider.capabilities);
combined.addAll(Arrays.asList(new Capability[]
{
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/jar/JarFileSystem.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/jar/JarFileSystem.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/jar/JarFileSystem.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/jar/JarFileSystem.java Mon Dec 3 13:37:12 2012
@@ -55,21 +55,21 @@ public class JarFileSystem extends ZipFi
// }
@Override
- protected ZipFile createZipFile(File file) throws FileSystemException
+ protected ZipFile createZipFile(final File file) throws FileSystemException
{
try
{
return new JarFile(file);
}
- catch (IOException ioe)
+ catch (final IOException ioe)
{
throw new FileSystemException("vfs.provider.jar/open-jar-file.error", file, ioe);
}
}
@Override
- protected ZipFileObject createZipFileObject(AbstractFileName name,
- ZipEntry entry) throws FileSystemException
+ protected ZipFileObject createZipFileObject(final AbstractFileName name,
+ final ZipEntry entry) throws FileSystemException
{
return new JarFileObject(name, entry, this, true);
}
@@ -106,7 +106,7 @@ public class JarFileSystem extends ZipFi
return attributes;
}
- Object getAttribute(Name attrName)
+ Object getAttribute(final Name attrName)
throws FileSystemException
{
try
@@ -115,13 +115,13 @@ public class JarFileSystem extends ZipFi
final String value = attr.getValue(attrName);
return value;
}
- catch (IOException ioe)
+ catch (final IOException ioe)
{
throw new FileSystemException(attrName.toString(), ioe);
}
}
- Name lookupName(String attrName)
+ Name lookupName(final String attrName)
{
if (Name.CLASS_PATH.toString().equals(attrName))
{
@@ -205,7 +205,7 @@ public class JarFileSystem extends ZipFi
* @throws FileSystemException if an error occurs.
*/
@Override
- public Object getAttribute(String attrName) throws FileSystemException
+ public Object getAttribute(final String attrName) throws FileSystemException
{
final Name name = lookupName(attrName);
return getAttribute(name);
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/jar/JarURLConnectionImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/jar/JarURLConnectionImpl.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/jar/JarURLConnectionImpl.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/jar/JarURLConnectionImpl.java Mon Dec 3 13:37:12 2012
@@ -45,7 +45,7 @@ public class JarURLConnectionImpl
private final JarFileObject file;
private final String entryName;
- public JarURLConnectionImpl(JarFileObject file, FileContent content)
+ public JarURLConnectionImpl(final JarFileObject file, final FileContent content)
throws MalformedURLException, FileSystemException
{
//This is because JarURLConnection SUCKS!!
@@ -135,7 +135,7 @@ public class JarURLConnectionImpl
{
return (int) content.getSize();
}
- catch (FileSystemException fse)
+ catch (final FileSystemException fse)
{
// Ignore the error.
}
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=1416507&r1=1416506&r2=1416507&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 Mon Dec 3 13:37:12 2012
@@ -99,10 +99,10 @@ public class DefaultLocalFileProvider
throws FileSystemException
{
final String scheme = "file:";
- StringBuilder uri = new StringBuilder(name.length() + scheme.length());
+ final StringBuilder uri = new StringBuilder(name.length() + scheme.length());
uri.append(scheme);
uri.append(name);
- FileName filename = parseUri(null, uri.toString());
+ final FileName filename = parseUri(null, uri.toString());
return findFile(filename, null);
}
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/local/GenericFileNameParser.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/local/GenericFileNameParser.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/local/GenericFileNameParser.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/local/GenericFileNameParser.java Mon Dec 3 13:37:12 2012
@@ -64,7 +64,7 @@ public class GenericFileNameParser
* so its of no value for the LocalFileName instance
*/
@Override
- protected FileName createFileName(String scheme, final String rootFile, final String path, final FileType type)
+ protected FileName createFileName(final String scheme, final String rootFile, final String path, final FileType type)
{
return new LocalFileName(scheme, "", path, type);
}
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/local/LocalFile.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/local/LocalFile.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/local/LocalFile.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/local/LocalFile.java Mon Dec 3 13:37:12 2012
@@ -73,7 +73,7 @@ public class LocalFile extends AbstractF
{
// Remove the "file:///"
// LocalFileName localFileName = (LocalFileName) getName();
- String fileName = rootFile + getName().getPathDecoded();
+ final String fileName = rootFile + getName().getPathDecoded();
// fileName = UriParser.decode(fileName);
file = new File(fileName);
}
@@ -133,7 +133,7 @@ public class LocalFile extends AbstractF
@Override
protected void doRename(final FileObject newFile) throws Exception
{
- LocalFile newLocalFile = (LocalFile) FileObjectUtils.getAbstractFileObject(newFile);
+ final LocalFile newLocalFile = (LocalFile) FileObjectUtils.getAbstractFileObject(newFile);
if (!file.renameTo(newLocalFile.getLocalFile()))
{
@@ -164,7 +164,7 @@ public class LocalFile extends AbstractF
}
@Override
- protected boolean doSetWritable(boolean writable, boolean ownerOnly) throws Exception
+ protected boolean doSetWritable(final boolean writable, final boolean ownerOnly) throws Exception
{
return file.setWritable(writable, ownerOnly);
}
@@ -197,13 +197,13 @@ public class LocalFile extends AbstractF
}
@Override
- protected boolean doSetReadable(boolean readable, boolean ownerOnly) throws Exception
+ protected boolean doSetReadable(final boolean readable, final boolean ownerOnly) throws Exception
{
return file.setReadable(readable, ownerOnly);
}
@Override
- protected boolean doSetExecutable(boolean executable, boolean ownerOnly) throws Exception
+ protected boolean doSetExecutable(final boolean executable, final boolean ownerOnly) throws Exception
{
return file.setExecutable(executable, ownerOnly);
}
@@ -240,7 +240,7 @@ public class LocalFile extends AbstractF
* Creates an output stream to write the file content to.
*/
@Override
- protected OutputStream doGetOutputStream(boolean bAppend)
+ protected OutputStream doGetOutputStream(final boolean bAppend)
throws Exception
{
return new FileOutputStream(file.getPath(), bAppend);
@@ -262,14 +262,14 @@ public class LocalFile extends AbstractF
}
@Override
- protected boolean doIsSameFile(FileObject destFile) throws FileSystemException
+ protected boolean doIsSameFile(final FileObject destFile) throws FileSystemException
{
if (!FileObjectUtils.isInstanceOf(destFile, LocalFile.class))
{
return false;
}
- LocalFile destLocalFile = (LocalFile) FileObjectUtils.getAbstractFileObject(destFile);
+ final LocalFile destLocalFile = (LocalFile) FileObjectUtils.getAbstractFileObject(destFile);
if (!exists() || !destLocalFile.exists())
{
return false;
@@ -279,7 +279,7 @@ public class LocalFile extends AbstractF
{
return file.getCanonicalPath().equals(destLocalFile.file.getCanonicalPath());
}
- catch (IOException e)
+ catch (final IOException e)
{
throw new FileSystemException(e);
}
@@ -298,7 +298,7 @@ public class LocalFile extends AbstractF
// those characters before returning
return UriParser.decode(getName().getURI());
}
- catch (FileSystemException e)
+ catch (final FileSystemException e)
{
return getName().getURI();
}
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/local/LocalFileName.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/local/LocalFileName.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/local/LocalFileName.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/local/LocalFileName.java Mon Dec 3 13:37:12 2012
@@ -69,7 +69,7 @@ public class LocalFileName extends Abstr
* @return The FileName.
*/
@Override
- public FileName createName(final String path, FileType type)
+ public FileName createName(final String path, final FileType type)
{
return new LocalFileName(getScheme(), rootFile, path, type);
}
@@ -93,7 +93,7 @@ public class LocalFileName extends Abstr
uri = UriParser.encode(uri, RESERVED_URI_CHARS);
}
- catch (FileSystemException e)
+ catch (final FileSystemException e)
{
// Default to base uri value
}
@@ -121,7 +121,7 @@ public class LocalFileName extends Abstr
uri = UriParser.encode(uri, RESERVED_URI_CHARS);
}
- catch (FileSystemException e)
+ catch (final FileSystemException e)
{
// Default to base uri value
}
@@ -141,7 +141,7 @@ public class LocalFileName extends Abstr
{
return UriParser.decode(super.getURI());
}
- catch (FileSystemException e)
+ catch (final FileSystemException e)
{
return super.getURI();
}
@@ -153,7 +153,7 @@ public class LocalFileName extends Abstr
* 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("://");
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/local/LocalFileNameParser.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/local/LocalFileNameParser.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/local/LocalFileNameParser.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/local/LocalFileNameParser.java Mon Dec 3 13:37:12 2012
@@ -36,14 +36,14 @@ public abstract class LocalFileNameParse
public boolean isAbsoluteName(final String name)
{
// TODO - this is yucky
- StringBuilder b = new StringBuilder(name);
+ final StringBuilder b = new StringBuilder(name);
try
{
UriParser.fixSeparators(b);
extractRootPrefix(name, b);
return true;
}
- catch (FileSystemException e)
+ catch (final FileSystemException e)
{
return false;
}
@@ -58,7 +58,7 @@ public abstract class LocalFileNameParse
@Override
- public FileName parseUri(final VfsComponentContext context, FileName base, final String uri)
+ public FileName parseUri(final VfsComponentContext context, final FileName base, final String uri)
throws FileSystemException
{
final StringBuilder name = new StringBuilder();
@@ -79,7 +79,7 @@ public abstract class LocalFileNameParse
final String rootFile = extractRootPrefix(uri, name);
// Normalise the path
- FileType fileType = UriParser.normalisePath(name);
+ final FileType fileType = UriParser.normalisePath(name);
final String path = name.toString();
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/local/LocalFileRandomAccessContent.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/local/LocalFileRandomAccessContent.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/local/LocalFileRandomAccessContent.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/local/LocalFileRandomAccessContent.java Mon Dec 3 13:37:12 2012
@@ -55,14 +55,14 @@ class LocalFileRandomAccessContent exten
{
return raf.readByte();
}
- catch (EOFException e)
+ catch (final EOFException e)
{
return -1;
}
}
@Override
- public long skip(long n) throws IOException
+ public long skip(final long n) throws IOException
{
raf.seek(raf.getFilePointer() + n);
return n;
@@ -75,13 +75,13 @@ class LocalFileRandomAccessContent exten
}
@Override
- public int read(byte[] b) throws IOException
+ public int read(final byte[] b) throws IOException
{
return raf.read(b);
}
@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
{
return raf.read(b, off, len);
}
@@ -89,7 +89,7 @@ class LocalFileRandomAccessContent exten
@Override
public int available() throws IOException
{
- long available = raf.length() - raf.getFilePointer();
+ final long available = raf.length() - raf.getFilePointer();
if (available > Integer.MAX_VALUE)
{
return Integer.MAX_VALUE;
@@ -99,7 +99,7 @@ class LocalFileRandomAccessContent exten
}
};
}
- catch (FileNotFoundException e)
+ catch (final FileNotFoundException e)
{
throw new FileSystemException("vfs.provider/random-access-open-failed.error", localFile);
}
@@ -112,7 +112,7 @@ class LocalFileRandomAccessContent exten
}
@Override
- public void seek(long pos) throws IOException
+ public void seek(final long pos) throws IOException
{
raf.seek(pos);
}
@@ -190,19 +190,19 @@ class LocalFileRandomAccessContent exten
}
@Override
- public int skipBytes(int n) throws IOException
+ public int skipBytes(final int n) throws IOException
{
return raf.skipBytes(n);
}
@Override
- public void readFully(byte[] b) throws IOException
+ public void readFully(final byte[] b) throws IOException
{
raf.readFully(b);
}
@Override
- public void readFully(byte[] b, int off, int len) throws IOException
+ public void readFully(final byte[] b, final int off, final int len) throws IOException
{
raf.readFully(b, off, len);
}
@@ -214,85 +214,85 @@ class LocalFileRandomAccessContent exten
}
@Override
- public void writeDouble(double v) throws IOException
+ public void writeDouble(final double v) throws IOException
{
raf.writeDouble(v);
}
@Override
- public void writeFloat(float v) throws IOException
+ public void writeFloat(final float v) throws IOException
{
raf.writeFloat(v);
}
@Override
- public void write(int b) throws IOException
+ public void write(final int b) throws IOException
{
raf.write(b);
}
@Override
- public void writeByte(int v) throws IOException
+ public void writeByte(final int v) throws IOException
{
raf.writeByte(v);
}
@Override
- public void writeChar(int v) throws IOException
+ public void writeChar(final int v) throws IOException
{
raf.writeChar(v);
}
@Override
- public void writeInt(int v) throws IOException
+ public void writeInt(final int v) throws IOException
{
raf.writeInt(v);
}
@Override
- public void writeShort(int v) throws IOException
+ public void writeShort(final int v) throws IOException
{
raf.writeShort(v);
}
@Override
- public void writeLong(long v) throws IOException
+ public void writeLong(final long v) throws IOException
{
raf.writeLong(v);
}
@Override
- public void writeBoolean(boolean v) throws IOException
+ public void writeBoolean(final boolean v) throws IOException
{
raf.writeBoolean(v);
}
@Override
- public void write(byte[] b) throws IOException
+ public void write(final byte[] b) throws IOException
{
raf.write(b);
}
@Override
- public void write(byte[] b, int off, int len) throws IOException
+ public void write(final byte[] b, final int off, final int len) throws IOException
{
raf.write(b, off, len);
}
@Override
- public void writeBytes(String s) throws IOException
+ public void writeBytes(final String s) throws IOException
{
raf.writeBytes(s);
}
@Override
- public void writeChars(String s) throws IOException
+ public void writeChars(final String s) throws IOException
{
raf.writeChars(s);
}
@Override
- public void writeUTF(String str) throws IOException
+ public void writeUTF(final String str) throws IOException
{
raf.writeUTF(str);
}
@@ -304,7 +304,7 @@ class LocalFileRandomAccessContent exten
}
@Override
- public void setLength(long newLength) throws IOException
+ public void setLength(final long newLength) throws IOException
{
raf.setLength(newLength);
}
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/local/WindowsFileName.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/local/WindowsFileName.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/local/WindowsFileName.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/local/WindowsFileName.java Mon Dec 3 13:37:12 2012
@@ -39,7 +39,7 @@ public class WindowsFileName extends Loc
* @return The FileName.
*/
@Override
- public FileName createName(final String path, FileType type)
+ public FileName createName(final String path, final FileType type)
{
return new WindowsFileName(getScheme(), getRootFile(), path, type);
}
@@ -48,7 +48,7 @@ public class WindowsFileName extends Loc
* 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("://");
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/local/WindowsFileNameParser.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/local/WindowsFileNameParser.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/local/WindowsFileNameParser.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/local/WindowsFileNameParser.java Mon Dec 3 13:37:12 2012
@@ -37,7 +37,7 @@ public class WindowsFileNameParser exten
}
@Override
- protected FileName createFileName(String scheme, final String rootFile, final String path, final FileType type)
+ protected FileName createFileName(final String scheme, final String rootFile, final String path, final FileType type)
{
return new WindowsFileName(scheme, rootFile, path, type);
}
@@ -55,7 +55,7 @@ public class WindowsFileNameParser exten
// Skip over first 4 (unc) leading '/' chars
int startPos = 0;
- int maxlen = Math.min(4, name.length());
+ final int maxlen = Math.min(4, name.length());
for (; startPos < maxlen && name.charAt(startPos) == '/'; startPos++)
{
}
@@ -67,7 +67,7 @@ public class WindowsFileNameParser exten
name.delete(0, startPos);
// Look for drive name
- String driveName = extractDrivePrefix(name);
+ final String driveName = extractDrivePrefix(name);
if (driveName != null)
{
return driveName;
@@ -93,7 +93,7 @@ public class WindowsFileNameParser exten
// Too short
return null;
}
- char ch = name.charAt(0);
+ final char ch = name.charAt(0);
if (ch == '/' || ch == ':')
{
// Missing drive letter
@@ -110,7 +110,7 @@ public class WindowsFileNameParser exten
return null;
}
- String prefix = name.substring(0, 2);
+ final String prefix = name.substring(0, 2);
name.delete(0, 2);
return prefix.intern();
@@ -126,7 +126,7 @@ public class WindowsFileNameParser exten
// Looking for <name> '/' <name> ( '/' | <end> )
// Look for first separator
- int maxpos = name.length();
+ final int maxpos = name.length();
int pos = 0;
for (; pos < maxpos && name.charAt(pos) != '/'; pos++)
{
@@ -138,7 +138,7 @@ public class WindowsFileNameParser exten
}
// Now have <name> '/'
- int startShareName = pos;
+ final int startShareName = pos;
for (; pos < maxpos && name.charAt(pos) != '/'; pos++)
{
}
@@ -148,7 +148,7 @@ public class WindowsFileNameParser exten
}
// Now have <name> '/' <name> ( '/' | <end> )
- String prefix = name.substring(0, pos);
+ final String prefix = name.substring(0, pos);
name.delete(0, pos);
return prefix;
}
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileData.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileData.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileData.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileData.java Mon Dec 3 13:37:12 2012
@@ -64,7 +64,7 @@ class RamFileData implements Serializabl
* Constructor.
* @param name The file name.
*/
- public RamFileData(FileName name)
+ public RamFileData(final FileName name)
{
super();
this.children = Collections.synchronizedCollection(new ArrayList<RamFileData>());
@@ -87,7 +87,7 @@ class RamFileData implements Serializabl
/**
* @param buffer The buffer.
*/
- void setBuffer(byte[] buffer)
+ void setBuffer(final byte[] buffer)
{
updateLastModified();
this.buffer = buffer;
@@ -105,7 +105,7 @@ class RamFileData implements Serializabl
* @param lastModified
* The lastModified to set.
*/
- void setLastModified(long lastModified)
+ void setLastModified(final long lastModified)
{
this.lastModified = lastModified;
}
@@ -122,7 +122,7 @@ class RamFileData implements Serializabl
* @param type
* The type to set.
*/
- void setType(FileType type)
+ void setType(final FileType type)
{
this.type = type;
}
@@ -168,7 +168,7 @@ class RamFileData implements Serializabl
* @param data The file data.
* @throws FileSystemException if an error occurs.
*/
- void addChild(RamFileData data) throws FileSystemException
+ void addChild(final RamFileData data) throws FileSystemException
{
if (!this.getType().hasChildren())
{
@@ -196,7 +196,7 @@ class RamFileData implements Serializabl
* @param data The file data.
* @throws FileSystemException if an error occurs.
*/
- void removeChild(RamFileData data) throws FileSystemException
+ void removeChild(final RamFileData data) throws FileSystemException
{
if (!this.getType().hasChildren())
{
@@ -229,7 +229,7 @@ class RamFileData implements Serializabl
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
- public boolean equals(Object o)
+ public boolean equals(final Object o)
{
if (this == o)
{
@@ -239,7 +239,7 @@ class RamFileData implements Serializabl
{
return false;
}
- RamFileData data = (RamFileData) o;
+ final RamFileData data = (RamFileData) o;
return this.getName().equals(data.getName());
}
@@ -254,7 +254,7 @@ class RamFileData implements Serializabl
return this.getName().hashCode();
}
- boolean hasChildren(RamFileData data)
+ boolean hasChildren(final RamFileData data)
{
return this.children.contains(data);
}
@@ -272,7 +272,7 @@ class RamFileData implements Serializabl
*
* @param newSize The new buffer size.
*/
- void resize(long newSize)
+ void resize(final long newSize)
{
// A future implementation may allow longs/multiple buffer/and so on
if (newSize > Integer.MAX_VALUE)
@@ -280,9 +280,9 @@ class RamFileData implements Serializabl
throw new IllegalArgumentException(String.format("newSize(%d) > Integer.MAX_VALUE(%d)", newSize,
Integer.MAX_VALUE));
}
- int resize = (int) newSize;
- int size = this.size();
- byte[] newBuf = new byte[resize];
+ final int resize = (int) newSize;
+ final int size = this.size();
+ final byte[] newBuf = new byte[resize];
System.arraycopy(this.buffer, 0, newBuf, 0, Math.min(resize, size));
this.buffer = newBuf;
updateLastModified();
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileObject.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileObject.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileObject.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileObject.java Mon Dec 3 13:37:12 2012
@@ -48,7 +48,7 @@ public class RamFileObject extends Abstr
* @param fs
* The FileSystem.
*/
- protected RamFileObject(AbstractFileName name, RamFileSystem fs)
+ protected RamFileObject(final AbstractFileName name, final RamFileSystem fs)
{
super(name, fs);
this.getAbstractFileSystem().attach(this);
@@ -115,7 +115,7 @@ public class RamFileObject extends Abstr
* @see org.apache.commons.vfs2.provider.AbstractFileObject#doGetOutputStream(boolean)
*/
@Override
- protected OutputStream doGetOutputStream(boolean bAppend) throws Exception
+ protected OutputStream doGetOutputStream(final boolean bAppend) throws Exception
{
if (!bAppend)
{
@@ -158,7 +158,7 @@ public class RamFileObject extends Abstr
*/
/** @since 2.0 */
@Override
- protected boolean doSetLastModifiedTime(long modtime) throws Exception
+ protected boolean doSetLastModifiedTime(final long modtime) throws Exception
{
data.setLastModified(modtime);
return true;
@@ -182,9 +182,9 @@ public class RamFileObject extends Abstr
* @see org.apache.commons.vfs2.provider.AbstractFileObject#doRename(org.apache.commons.vfs2.FileObject)
*/
@Override
- protected void doRename(FileObject newFile) throws Exception
+ protected void doRename(final FileObject newFile) throws Exception
{
- RamFileObject newRamFileObject = (RamFileObject) FileObjectUtils.getAbstractFileObject(newFile);
+ final RamFileObject newRamFileObject = (RamFileObject) FileObjectUtils.getAbstractFileObject(newFile);
getAbstractFileSystem().rename(this, newRamFileObject);
}
@@ -195,7 +195,7 @@ public class RamFileObject extends Abstr
* org.apache.commons.vfs2.util.RandomAccessMode)
*/
@Override
- protected RandomAccessContent doGetRandomAccessContent(RandomAccessMode mode) throws Exception
+ protected RandomAccessContent doGetRandomAccessContent(final RandomAccessMode mode) throws Exception
{
return new RamFileRandomAccessContent(this, mode);
}
@@ -223,7 +223,7 @@ public class RamFileObject extends Abstr
* @param data
* The data to set.
*/
- void setData(RamFileData data)
+ void setData(final RamFileData data)
{
this.data = data;
}
@@ -234,7 +234,7 @@ public class RamFileObject extends Abstr
* @see org.apache.commons.vfs2.provider.AbstractFileObject#injectType(org.apache.commons.vfs2.FileType)
*/
@Override
- protected void injectType(FileType fileType)
+ protected void injectType(final FileType fileType)
{
this.data.setType(fileType);
super.injectType(fileType);
@@ -265,14 +265,14 @@ public class RamFileObject extends Abstr
* @throws IOException
* if the new size exceeds the limit
*/
- synchronized void resize(long newSize) throws IOException
+ synchronized void resize(final long newSize) throws IOException
{
final RamFileSystem afs = getAbstractFileSystem();
final FileSystemOptions afsOptions = afs.getFileSystemOptions();
if (afsOptions != null)
{
// A future implementation may allow longs...
- int maxSize = RamFileSystemConfigBuilder.getInstance().getMaxSize(afsOptions);
+ final int maxSize = RamFileSystemConfigBuilder.getInstance().getMaxSize(afsOptions);
if (afs.size() + newSize - this.size() > maxSize)
{
throw new IOException("FileSystem capacity (" + maxSize + ") exceeded.");
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileOutputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileOutputStream.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileOutputStream.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileOutputStream.java Mon Dec 3 13:37:12 2012
@@ -45,7 +45,7 @@ public class RamFileOutputStream extends
/**
* @param file The base file.
*/
- public RamFileOutputStream(RamFileObject file)
+ public RamFileOutputStream(final RamFileObject file)
{
super();
this.file = file;
@@ -57,16 +57,16 @@ public class RamFileOutputStream extends
* @see java.io.DataOutput#write(byte[], int, int)
*/
@Override
- public void write(byte[] b, int off, int len) throws IOException
+ public void write(final byte[] b, final int off, final int len) throws IOException
{
- int size = this.file.getData().size();
- int newSize = this.file.getData().size() + len;
+ final int size = this.file.getData().size();
+ final int newSize = this.file.getData().size() + len;
// Store the Exception in order to notify the client again on close()
try
{
this.file.resize(newSize);
}
- catch (IOException e)
+ catch (final IOException e)
{
this.exc = e;
throw e;
@@ -80,7 +80,7 @@ public class RamFileOutputStream extends
* @see java.io.DataOutput#write(int)
*/
@Override
- public void write(int b) throws IOException
+ public void write(final int b) throws IOException
{
buffer1[0] = (byte) b;
this.write(buffer1);
@@ -109,7 +109,7 @@ public class RamFileOutputStream extends
// Close the
this.file.endOutput();
}
- catch (Exception e)
+ catch (final Exception e)
{
throw new FileSystemException(e);
}
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileProvider.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileProvider.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileProvider.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileProvider.java Mon Dec 3 13:37:12 2012
@@ -70,8 +70,8 @@ public class RamFileProvider extends Abs
* org.apache.commons.vfs2.FileName, org.apache.commons.vfs2.FileSystemOptions)
*/
@Override
- protected FileSystem doCreateFileSystem(FileName name,
- FileSystemOptions fileSystemOptions) throws FileSystemException
+ protected FileSystem doCreateFileSystem(final FileName name,
+ final FileSystemOptions fileSystemOptions) throws FileSystemException
{
return new RamFileSystem(name, fileSystemOptions);
}
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileRandomAccessContent.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileRandomAccessContent.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileRandomAccessContent.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileRandomAccessContent.java Mon Dec 3 13:37:12 2012
@@ -77,7 +77,7 @@ public class RamFileRandomAccessContent
* @param file The file to access.
* @param mode The access mode.
*/
- public RamFileRandomAccessContent(RamFileObject file, RandomAccessMode mode)
+ public RamFileRandomAccessContent(final RamFileObject file, final RandomAccessMode mode)
{
super();
this.buf = file.getData().getBuffer();
@@ -93,14 +93,14 @@ public class RamFileRandomAccessContent
{
return readByte();
}
- catch (EOFException e)
+ catch (final EOFException e)
{
return -1;
}
}
@Override
- public long skip(long n) throws IOException
+ public long skip(final long n) throws IOException
{
seek(getFilePointer() + n);
return n;
@@ -112,13 +112,13 @@ public class RamFileRandomAccessContent
}
@Override
- public int read(byte[] b) throws IOException
+ public int read(final byte[] b) throws IOException
{
return read(b, 0, b.length);
}
@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 retLen = -1;
final int left = getLeftBytes();
@@ -155,7 +155,7 @@ public class RamFileRandomAccessContent
* @see org.apache.commons.vfs2.RandomAccessContent#seek(long)
*/
@Override
- public void seek(long pos) throws IOException
+ public void seek(final long pos) throws IOException
{
if (pos < 0)
{
@@ -205,8 +205,8 @@ public class RamFileRandomAccessContent
@Override
public char readChar() throws IOException
{
- int ch1 = this.readUnsignedByte();
- int ch2 = this.readUnsignedByte();
+ final int ch1 = this.readUnsignedByte();
+ final int ch2 = this.readUnsignedByte();
return (char) ((ch1 << 8) + (ch2 << 0));
}
@@ -315,7 +315,7 @@ public class RamFileRandomAccessContent
* @see java.io.DataInput#skipBytes(int)
*/
@Override
- public int skipBytes(int n) throws IOException
+ public int skipBytes(final int n) throws IOException
{
if (n < 0)
{
@@ -323,7 +323,7 @@ public class RamFileRandomAccessContent
"The skip number can't be negative");
}
- long newPos = filePointer + n;
+ final long newPos = filePointer + n;
if (newPos > buf.length)
{
@@ -341,7 +341,7 @@ public class RamFileRandomAccessContent
* @see java.io.DataInput#readFully(byte[])
*/
@Override
- public void readFully(byte[] b) throws IOException
+ public void readFully(final byte[] b) throws IOException
{
this.readFully(b, 0, b.length);
}
@@ -352,7 +352,7 @@ public class RamFileRandomAccessContent
* @see java.io.DataInput#readFully(byte[], int, int)
*/
@Override
- public void readFully(byte[] b, int off, int len) throws IOException
+ public void readFully(final byte[] b, final int off, final int len) throws IOException
{
if (len < 0)
{
@@ -393,11 +393,11 @@ public class RamFileRandomAccessContent
* @see java.io.DataOutput#write(byte[], int, int)
*/
@Override
- public void write(byte[] b, int off, int len) throws IOException
+ public void write(final byte[] b, final int off, final int len) throws IOException
{
if (this.getLeftBytes() < len)
{
- int newSize = this.buf.length + len - this.getLeftBytes();
+ final int newSize = this.buf.length + len - this.getLeftBytes();
this.file.resize(newSize);
this.buf = this.file.getData().getBuffer();
}
@@ -411,7 +411,7 @@ public class RamFileRandomAccessContent
* @see java.io.DataOutput#write(byte[])
*/
@Override
- public void write(byte[] b) throws IOException
+ public void write(final byte[] b) throws IOException
{
this.write(b, 0, b.length);
}
@@ -422,7 +422,7 @@ public class RamFileRandomAccessContent
* @see java.io.DataOutput#writeByte(int)
*/
@Override
- public void writeByte(int i) throws IOException
+ public void writeByte(final int i) throws IOException
{
this.write(i);
}
@@ -433,7 +433,7 @@ public class RamFileRandomAccessContent
* @param b The byte[] to convert.
* @return A long.
*/
- public static long toLong(byte[] b)
+ public static long toLong(final byte[] b)
{
return ((((long) b[7]) & 0xFF) + ((((long) b[6]) & 0xFF) << 8)
+ ((((long) b[5]) & 0xFF) << 16)
@@ -451,7 +451,7 @@ public class RamFileRandomAccessContent
* @param b The array to fill.
* @return A byte[].
*/
- public static byte[] toBytes(long n, byte[] b)
+ public static byte[] toBytes(long n, final byte[] b)
{
b[7] = (byte) (n);
n >>>= 8;
@@ -476,7 +476,7 @@ public class RamFileRandomAccessContent
* @param b The byte[] to convert.
* @return A short.
*/
- public static short toShort(byte[] b)
+ public static short toShort(final byte[] b)
{
return (short) toUnsignedShort(b);
}
@@ -487,7 +487,7 @@ public class RamFileRandomAccessContent
* @param b The byte[] to convert.
* @return A short.
*/
- public static int toUnsignedShort(byte[] b)
+ public static int toUnsignedShort(final byte[] b)
{
return ((b[1] & 0xFF) + ((b[0] & 0xFF) << 8));
}
@@ -498,7 +498,7 @@ public class RamFileRandomAccessContent
* @see java.io.DataOutput#write(int)
*/
@Override
- public void write(int b) throws IOException
+ public void write(final int b) throws IOException
{
buffer1[0] = (byte) b;
this.write(buffer1);
@@ -510,7 +510,7 @@ public class RamFileRandomAccessContent
* @see java.io.DataOutput#writeBoolean(boolean)
*/
@Override
- public void writeBoolean(boolean v) throws IOException
+ public void writeBoolean(final boolean v) throws IOException
{
this.write(v ? 1 : 0);
}
@@ -521,7 +521,7 @@ public class RamFileRandomAccessContent
* @see java.io.DataOutput#writeBytes(java.lang.String)
*/
@Override
- public void writeBytes(String s) throws IOException
+ public void writeBytes(final String s) throws IOException
{
write(s.getBytes());
}
@@ -532,7 +532,7 @@ public class RamFileRandomAccessContent
* @see java.io.DataOutput#writeChar(int)
*/
@Override
- public void writeChar(int v) throws IOException
+ public void writeChar(final int v) throws IOException
{
buffer2[0] = (byte) ((v >>> 8) & 0xFF);
buffer2[1] = (byte) ((v >>> 0) & 0xFF);
@@ -545,9 +545,9 @@ public class RamFileRandomAccessContent
* @see java.io.DataOutput#writeChars(java.lang.String)
*/
@Override
- public void writeChars(String s) throws IOException
+ public void writeChars(final String s) throws IOException
{
- int len = s.length();
+ final int len = s.length();
for (int i = 0; i < len; i++)
{
writeChar(s.charAt(i));
@@ -560,7 +560,7 @@ public class RamFileRandomAccessContent
* @see java.io.DataOutput#writeDouble(double)
*/
@Override
- public void writeDouble(double v) throws IOException
+ public void writeDouble(final double v) throws IOException
{
writeLong(Double.doubleToLongBits(v));
}
@@ -571,7 +571,7 @@ public class RamFileRandomAccessContent
* @see java.io.DataOutput#writeFloat(float)
*/
@Override
- public void writeFloat(float v) throws IOException
+ public void writeFloat(final float v) throws IOException
{
writeInt(Float.floatToIntBits(v));
}
@@ -582,7 +582,7 @@ public class RamFileRandomAccessContent
* @see java.io.DataOutput#writeInt(int)
*/
@Override
- public void writeInt(int v) throws IOException
+ public void writeInt(final int v) throws IOException
{
buffer4[0] = (byte) ((v >>> 24) & 0xFF);
buffer4[1] = (byte) ((v >>> 16) & 0xFF);
@@ -597,7 +597,7 @@ public class RamFileRandomAccessContent
* @see java.io.DataOutput#writeLong(long)
*/
@Override
- public void writeLong(long v) throws IOException
+ public void writeLong(final long v) throws IOException
{
write(toBytes(v, buffer8));
}
@@ -608,7 +608,7 @@ public class RamFileRandomAccessContent
* @see java.io.DataOutput#writeShort(int)
*/
@Override
- public void writeShort(int v) throws IOException
+ public void writeShort(final int v) throws IOException
{
buffer2[0] = (byte) ((v >>> 8) & 0xFF);
buffer2[1] = (byte) (v & 0xFF);
@@ -621,14 +621,14 @@ public class RamFileRandomAccessContent
* @see java.io.DataOutput#writeUTF(java.lang.String)
*/
@Override
- public void writeUTF(String str) throws IOException
+ public void writeUTF(final String str) throws IOException
{
- ByteArrayOutputStream out = new ByteArrayOutputStream(str.length());
- DataOutputStream dataOut = new DataOutputStream(out);
+ final ByteArrayOutputStream out = new ByteArrayOutputStream(str.length());
+ final DataOutputStream dataOut = new DataOutputStream(out);
dataOut.writeUTF(str);
dataOut.flush();
dataOut.close();
- byte[] b = out.toByteArray();
+ final byte[] b = out.toByteArray();
write(b);
}
@@ -650,7 +650,7 @@ public class RamFileRandomAccessContent
}
@Override
- public void setLength(long newLength) throws IOException
+ public void setLength(final long newLength) throws IOException
{
this.file.resize(newLength);
this.buf = this.file.getData().getBuffer();
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=1416507&r1=1416506&r2=1416507&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 Mon Dec 3 13:37:12 2012
@@ -58,12 +58,12 @@ public class RamFileSystem extends Abstr
* @param rootName The root file name.
* @param fileSystemOptions The FileSystem options.
*/
- protected RamFileSystem(FileName rootName, FileSystemOptions fileSystemOptions)
+ protected RamFileSystem(final FileName rootName, final FileSystemOptions fileSystemOptions)
{
super(rootName, null, fileSystemOptions);
this.cache = Collections.synchronizedMap(new HashMap<FileName, RamFileData>());
// create root
- RamFileData rootData = new RamFileData(rootName);
+ final RamFileData rootData = new RamFileData(rootName);
rootData.setType(FileType.FOLDER);
rootData.setLastModified(System.currentTimeMillis());
this.cache.put(rootName, rootData);
@@ -75,7 +75,7 @@ public class RamFileSystem extends Abstr
* @see org.apache.commons.vfs2.provider.AbstractFileSystem#createFile(org.apache.commons.vfs2.FileName)
*/
@Override
- protected FileObject createFile(AbstractFileName name) throws Exception
+ protected FileObject createFile(final AbstractFileName name) throws Exception
{
return new RamFileObject(name, this);
}
@@ -86,7 +86,7 @@ public class RamFileSystem extends Abstr
* @see org.apache.commons.vfs2.provider.AbstractFileSystem#addCapabilities(java.util.Collection)
*/
@Override
- protected void addCapabilities(Collection<Capability> caps)
+ protected void addCapabilities(final Collection<Capability> caps)
{
caps.addAll(RamFileProvider.capabilities);
}
@@ -95,14 +95,14 @@ public class RamFileSystem extends Abstr
* @param name The name of the file.
* @return children The names of the children.
*/
- String[] listChildren(FileName name)
+ String[] listChildren(final FileName name)
{
- RamFileData data = this.cache.get(name);
+ final RamFileData data = this.cache.get(name);
if (data == null || !data.getType().hasChildren())
{
return null;
}
- Collection<RamFileData> children = data.getChildren();
+ final Collection<RamFileData> children = data.getChildren();
String[] names;
synchronized (children)
@@ -110,10 +110,10 @@ public class RamFileSystem extends Abstr
names = new String[children.size()];
int pos = 0;
- Iterator<RamFileData> iter = children.iterator();
+ final Iterator<RamFileData> iter = children.iterator();
while (iter.hasNext())
{
- RamFileData childData = iter.next();
+ final RamFileData childData = iter.next();
names[pos] = childData.getName().getBaseName();
pos++;
}
@@ -128,7 +128,7 @@ public class RamFileSystem extends Abstr
* @param file
* @throws FileSystemException
*/
- void delete(RamFileObject file) throws FileSystemException
+ void delete(final RamFileObject file) throws FileSystemException
{
// root is read only check
if (file.getParent() == null)
@@ -139,7 +139,7 @@ public class RamFileSystem extends Abstr
// Remove reference from cache
this.cache.remove(file.getName());
// Notify the parent
- RamFileObject parent = (RamFileObject) this.resolveFile(file
+ final RamFileObject parent = (RamFileObject) this.resolveFile(file
.getParent().getName());
parent.getData().removeChild(file.getData());
parent.close();
@@ -167,11 +167,11 @@ public class RamFileSystem extends Abstr
// Add to the parent
if (file.getName().getDepth() > 0)
{
- RamFileData parentData = this.cache.get(file.getParent().getName());
+ final RamFileData parentData = this.cache.get(file.getParent().getName());
// Only if not already added
if (!parentData.hasChildren(file.getData()))
{
- RamFileObject parent = (RamFileObject) file.getParent();
+ final RamFileObject parent = (RamFileObject) file.getParent();
parent.getData().addChild(file.getData());
parent.close();
}
@@ -187,7 +187,7 @@ public class RamFileSystem extends Abstr
* @param to The new file.
* @throws FileSystemException if an error occurs.
*/
- void rename(RamFileObject from, RamFileObject to)
+ void rename(final RamFileObject from, final RamFileObject to)
throws FileSystemException
{
if (!this.cache.containsKey(from.getName()))
@@ -205,7 +205,7 @@ public class RamFileSystem extends Abstr
this.delete(from);
}
- public void attach(RamFileObject fo)
+ public void attach(final RamFileObject fo)
{
if (fo.getName() == null)
{
@@ -225,9 +225,9 @@ public class RamFileSystem extends Abstr
* @param file The File
* @throws FileSystemException if an error occurs.
*/
- public void importTree(File file) throws FileSystemException
+ public void importTree(final File file) throws FileSystemException
{
- FileObject fileFo = getFileSystemManager().toFileObject(file);
+ final FileObject fileFo = getFileSystemManager().toFileObject(file);
this.toRamFileObject(fileFo, fileFo);
}
@@ -238,18 +238,18 @@ public class RamFileSystem extends Abstr
* @param root
* @throws FileSystemException
*/
- void toRamFileObject(FileObject fo, FileObject root)
+ void toRamFileObject(final FileObject fo, final FileObject root)
throws FileSystemException
{
- RamFileObject memFo = (RamFileObject) this.resolveFile(fo.getName()
+ final RamFileObject memFo = (RamFileObject) this.resolveFile(fo.getName()
.getPath().substring(root.getName().getPath().length()));
if (fo.getType().hasChildren())
{
// Create Folder
memFo.createFolder();
// Import recursively
- FileObject[] fos = fo.getChildren();
- for (FileObject child : fos)
+ final FileObject[] fos = fo.getChildren();
+ for (final FileObject child : fos)
{
this.toRamFileObject(child, root);
}
@@ -259,10 +259,10 @@ public class RamFileSystem extends Abstr
// Read bytes
try
{
- InputStream is = fo.getContent().getInputStream();
+ final InputStream is = fo.getContent().getInputStream();
try
{
- OutputStream os = new BufferedOutputStream(memFo
+ final OutputStream os = new BufferedOutputStream(memFo
.getOutputStream(), BUFFER_SIZE);
int i;
while ((i = is.read()) != -1)
@@ -278,13 +278,13 @@ public class RamFileSystem extends Abstr
{
is.close();
}
- catch (IOException e)
+ catch (final IOException e)
{
// ignore on close exception
}
}
}
- catch (IOException e)
+ catch (final IOException e)
{
throw new FileSystemException(e.getClass().getName() + " "
+ e.getMessage());
@@ -305,10 +305,10 @@ public class RamFileSystem extends Abstr
int size = 0;
synchronized (cache)
{
- Iterator<RamFileData> iter = cache.values().iterator();
+ final Iterator<RamFileData> iter = cache.values().iterator();
while (iter.hasNext())
{
- RamFileData data = iter.next();
+ final RamFileData data = iter.next();
size += data.size();
}
}
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=1416507&r1=1416506&r2=1416507&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 Mon Dec 3 13:37:12 2012
@@ -64,7 +64,7 @@ public final class RamFileSystemConfigBu
* @return The maximum size of the file.
* @see #setMaxSize
*/
- public int getMaxSize(FileSystemOptions opts)
+ public int getMaxSize(final FileSystemOptions opts)
{
return getInteger(opts, MAX_SIZE_KEY, Integer.MAX_VALUE);
}
@@ -75,7 +75,7 @@ public final class RamFileSystemConfigBu
* @param opts The FileSystem options.
* @param sizeInBytes The maximum file size.
*/
- public void setMaxSize(FileSystemOptions opts, int sizeInBytes)
+ public void setMaxSize(final FileSystemOptions opts, final int sizeInBytes)
{
setParam(opts, MAX_SIZE_KEY, Integer.valueOf(sizeInBytes));
}
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=1416507&r1=1416506&r2=1416507&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 Mon Dec 3 13:37:12 2012
@@ -63,9 +63,9 @@ public class ResourceFileProvider extend
final FileSystemOptions fileSystemOptions)
throws FileSystemException
{
- StringBuilder buf = new StringBuilder(BUFFER_SIZE);
+ final StringBuilder buf = new StringBuilder(BUFFER_SIZE);
UriParser.extractScheme(uri, buf);
- String resourceName = buf.toString();
+ final String resourceName = buf.toString();
ClassLoader cl = ResourceFileSystemConfigBuilder.getInstance().getClassLoader(fileSystemOptions);
if (cl == null)
@@ -89,7 +89,7 @@ public class ResourceFileProvider extend
}
@Override
- public void closeFileSystem(FileSystem filesystem)
+ public void closeFileSystem(final FileSystem filesystem)
{
// no filesystem created here - so nothing to do
}
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/res/ResourceFileSystemConfigBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/res/ResourceFileSystemConfigBuilder.java?rev=1416507&r1=1416506&r2=1416507&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/res/ResourceFileSystemConfigBuilder.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/res/ResourceFileSystemConfigBuilder.java Mon Dec 3 13:37:12 2012
@@ -44,12 +44,12 @@ public final class ResourceFileSystemCon
}
- public void setClassLoader(FileSystemOptions opts, ClassLoader classLoader)
+ public void setClassLoader(final FileSystemOptions opts, final ClassLoader classLoader)
{
setParam(opts, ClassLoader.class.getName(), classLoader);
}
- public ClassLoader getClassLoader(FileSystemOptions opts)
+ public ClassLoader getClassLoader(final FileSystemOptions opts)
{
return (ClassLoader) getParam(opts, ClassLoader.class.getName());
}