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/02/15 21:46:01 UTC
svn commit: r1244700 - in
/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2: ./
impl/ operations/vcs/ provider/ provider/compressed/ provider/ftp/
provider/http/ provider/local/ provider/ram/ provider/sftp/ provider/tar/
provider/url...
Author: ggregory
Date: Wed Feb 15 20:45:59 2012
New Revision: 1244700
URL: http://svn.apache.org/viewvc?rev=1244700&view=rev
Log:
Remove trailing whitespace.
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/FileContent.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/FileDepthSelector.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/FileExtensionSelector.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/FileName.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/FileObject.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/PatternFileSelector.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/DecoratedFileObject.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/operations/vcs/VcsStatus.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/AbstractFileName.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/AbstractFileObject.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/DefaultFileContent.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/compressed/CompressedFileFileObject.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileObject.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/http/HttpRandomAccessContent.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/local/LocalFile.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/local/LocalFileName.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileObject.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileObject.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/tar/TarFileObject.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/url/UrlFileObject.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileObject.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/zip/ZipFileObject.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/DelegatingFileSystemOptionsBuilder.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/Messages.java
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/FileContent.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/FileContent.java?rev=1244700&r1=1244699&r2=1244700&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/FileContent.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/FileContent.java Wed Feb 15 20:45:59 2012
@@ -238,47 +238,47 @@ public interface FileContent
/**
* Writes this content to another FileContent.
- *
+ *
* @param output
* The target OutputStream.
* @throws IOException
* if an error occurs writing the content.
- * @since 2.1
+ * @since 2.1
*/
long write(FileContent output) throws IOException;
-
+
/**
* Writes this content to another FileObject.
- *
+ *
* @param file
* The target FileObject.
* @throws IOException
* if an error occurs writing the content.
- * @since 2.1
+ * @since 2.1
*/
long write(FileObject file) throws IOException;
-
+
/**
* Writes this content to an OutputStream.
- *
+ *
* @param output
* The target OutputStream.
* @throws IOException
* if an error occurs writing the content.
- * @since 2.1
+ * @since 2.1
*/
long write(OutputStream output) throws IOException;
-
+
/**
* Writes this content to an OutputStream.
- *
+ *
* @param output
* The target OutputStream.
* @param bufferSize
* The buffer size to write data chunks.
* @throws IOException
* if an error occurs writing the file.
- * @since 2.1
+ * @since 2.1
*/
long write(OutputStream output, int bufferSize) throws IOException;
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/FileDepthSelector.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/FileDepthSelector.java?rev=1244700&r1=1244699&r2=1244700&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/FileDepthSelector.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/FileDepthSelector.java Wed Feb 15 20:45:59 2012
@@ -18,7 +18,7 @@ package org.apache.commons.vfs2;
/**
* A {@link FileSelector} that selects all files in a particular depth range.
- *
+ *
* @author <a href="http://commons.apache.org/vfs/team-list.html">Commons VFS team</a>
*/
public class FileDepthSelector implements FileSelector
@@ -35,7 +35,7 @@ public class FileDepthSelector implement
/**
* Creates a selector with the given minimum and maximum depths.
- *
+ *
* @param minDepth
* minimum depth
* @param maxDepth
@@ -49,7 +49,7 @@ public class FileDepthSelector implement
/**
* Creates a selector with the same minimum and maximum depths.
- *
+ *
* @param minMaxDepth
* minimum and maximum depth
* @since 2.1
@@ -61,7 +61,7 @@ public class FileDepthSelector implement
/**
* Creates a selector with the same minimum and maximum depths of 0.
- *
+ *
* @since 2.1
*/
public FileDepthSelector()
@@ -71,7 +71,7 @@ public class FileDepthSelector implement
/**
* Determines if a file or folder should be selected.
- *
+ *
* @param fileInfo
* The file selection information
* @return true if the file or folder should be included, false otherwise.
@@ -84,7 +84,7 @@ public class FileDepthSelector implement
/**
* Determines whether a folder should be traversed.
- *
+ *
* @param fileInfo
* The file selection information
* @return true if the file or folder should be traversed, false otherwise.
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/FileExtensionSelector.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/FileExtensionSelector.java?rev=1244700&r1=1244699&r2=1244700&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/FileExtensionSelector.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/FileExtensionSelector.java Wed Feb 15 20:45:59 2012
@@ -29,7 +29,7 @@ import java.util.Set;
* <p>
* The selector makes a copy of a given Collection or array. Changing the object passed in the constructors will not affect the selector.
* </p>
- *
+ *
* @since 2.1
*/
public class FileExtensionSelector implements FileSelector
@@ -42,7 +42,7 @@ public class FileExtensionSelector imple
/**
* Creates a new selector for the given extensions.
- *
+ *
* @param extensions
* The extensions to be included by this selector.
*/
@@ -56,7 +56,7 @@ public class FileExtensionSelector imple
/**
* Creates a new selector for the given extensions.
- *
+ *
* @param extensions
* The extensions to be included by this selector.
*/
@@ -70,7 +70,7 @@ public class FileExtensionSelector imple
/**
* Determines if a file or folder should be selected.
- *
+ *
* @param fileInfo
* The file selection information.
* @return true if the file should be selected, false otherwise.
@@ -93,7 +93,7 @@ public class FileExtensionSelector imple
/**
* Determines whether a folder should be traversed.
- *
+ *
* @param fileInfo
* The file selection information.
* @return true if descendents should be traversed, fase otherwise.
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/FileName.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/FileName.java?rev=1244700&r1=1244699&r2=1244700&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/FileName.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/FileName.java Wed Feb 15 20:45:59 2012
@@ -183,10 +183,10 @@ public interface FileName extends Compar
/**
* Checks if this file name is a name for a regular file.
- *
+ *
* @return true if this file name is a name for a regular file.
* @throws FileSystemException if an error occurs.
- * @see #getType()
+ * @see #getType()
* @see FileType#FILE
* @since 2.1
*/
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/FileObject.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/FileObject.java?rev=1244700&r1=1244699&r2=1244700&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/FileObject.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/FileObject.java Wed Feb 15 20:45:59 2012
@@ -352,10 +352,10 @@ public interface FileObject extends Comp
/**
* Checks if this file is a regular file.
- *
+ *
* @return true if this file is a regular file.
* @throws FileSystemException if an error occurs.
- * @see #getType()
+ * @see #getType()
* @see FileType#FILE
* @since 2.1
*/
@@ -363,10 +363,10 @@ public interface FileObject extends Comp
/**
* Checks if this file is a folder.
- *
+ *
* @return true if this file is a folder.
* @throws FileSystemException if an error occurs.
- * @see #getType()
+ * @see #getType()
* @see FileType#FOLDER
* @since 2.1
*/
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/PatternFileSelector.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/PatternFileSelector.java?rev=1244700&r1=1244699&r2=1244700&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/PatternFileSelector.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/PatternFileSelector.java Wed Feb 15 20:45:59 2012
@@ -20,7 +20,7 @@ import java.util.regex.Pattern;
/**
* A {@link FileSelector} that selects based on regular expressions matched against base filename.
- *
+ *
* @since 2.1
*/
public class PatternFileSelector implements FileSelector
@@ -33,7 +33,7 @@ public class PatternFileSelector impleme
/**
* Creates a new selector for the given pattern.
- *
+ *
* @param pattern
* The regular expressed used by this selector.
*/
@@ -44,7 +44,7 @@ public class PatternFileSelector impleme
/**
* Creates a new selector for the given pattern.
- *
+ *
* @param regex
* The regular expressed used by this selector.
*/
@@ -55,13 +55,13 @@ public class PatternFileSelector impleme
/**
* Creates a new selector for the given Pattern and flags.
- *
+ *
* @param regex
* The expression to be compiled
- *
+ *
* @param flags
* Match flags, a bit mask.
- *
+ *
* @see Pattern#compile(String, int)
*/
public PatternFileSelector(String regex, int flags)
@@ -71,7 +71,7 @@ public class PatternFileSelector impleme
/**
* Determines if a file or folder should be selected.
- *
+ *
* @param fileInfo
* The file selection information.
* @return true if the file should be selected, false otherwise.
@@ -89,7 +89,7 @@ public class PatternFileSelector impleme
/**
* Determines whether a folder should be traversed.
- *
+ *
* @param fileInfo
* The file selection information.
* @return true if descendents should be traversed, false otherwise.
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/DecoratedFileObject.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/DecoratedFileObject.java?rev=1244700&r1=1244699&r2=1244700&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/DecoratedFileObject.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/DecoratedFileObject.java Wed Feb 15 20:45:59 2012
@@ -55,7 +55,7 @@ public class DecoratedFileObject impleme
decoratedFileObject.close();
}
- public int compareTo(FileObject fo)
+ public int compareTo(FileObject fo)
{
return decoratedFileObject.compareTo(fo);
}
@@ -201,14 +201,14 @@ public class DecoratedFileObject impleme
return decoratedFileObject.isContentOpen();
}
- public boolean isFile() throws FileSystemException
+ public boolean isFile() throws FileSystemException
{
- return decoratedFileObject.isFile();
+ return decoratedFileObject.isFile();
}
- public boolean isFolder() throws FileSystemException
+ public boolean isFolder() throws FileSystemException
{
- return decoratedFileObject.isFolder();
+ return decoratedFileObject.isFolder();
}
@Override
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/operations/vcs/VcsStatus.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/operations/vcs/VcsStatus.java?rev=1244700&r1=1244699&r2=1244700&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/operations/vcs/VcsStatus.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/operations/vcs/VcsStatus.java Wed Feb 15 20:45:59 2012
@@ -51,7 +51,7 @@ public enum VcsStatus
private VcsStatus(int status)
{
this.status = status;
- }
+ }
/**
*
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/AbstractFileName.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/AbstractFileName.java?rev=1244700&r1=1244699&r2=1244700&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/AbstractFileName.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/AbstractFileName.java Wed Feb 15 20:45:59 2012
@@ -448,17 +448,17 @@ public abstract class AbstractFileName i
/**
* Checks if this file name is a name for a regular file by using its type.
- *
+ *
* @return true if this file is a regular file.
* @throws FileSystemException
- * @see #getType()
+ * @see #getType()
* @see FileType#FILE
*/
public boolean isFile() throws FileSystemException {
// Use equals instead of == to avoid any class loader worries.
return FileType.FILE.equals(this.getType());
}
-
+
/**
* Returns the requested or current type of this name. <br />
* <p>
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/AbstractFileObject.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/AbstractFileObject.java?rev=1244700&r1=1244699&r2=1244700&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/AbstractFileObject.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/AbstractFileObject.java Wed Feb 15 20:45:59 2012
@@ -512,30 +512,30 @@ public abstract class AbstractFileObject
/**
* Checks if this file is a regular file by using its file type.
- *
+ *
* @return true if this file is a regular file.
* @throws FileSystemException
- * @see #getType()
+ * @see #getType()
* @see FileType#FILE
*/
public boolean isFile() throws FileSystemException {
// Use equals instead of == to avoid any class loader worries.
return FileType.FILE.equals(this.getType());
}
-
+
/**
* Checks if this file is a folder by using its file type.
- *
+ *
* @return true if this file is a regular file.
* @throws FileSystemException
- * @see #getType()
+ * @see #getType()
* @see FileType#FOLDER
*/
public boolean isFolder() throws FileSystemException {
// Use equals instead of == to avoid any class loader worries.
return FileType.FOLDER.equals(this.getType());
}
-
+
/**
* Determines if this file can be read.
* @return true if the file is a hidden file, false otherwise.
@@ -615,7 +615,7 @@ public abstract class AbstractFileObject
/**
* Returns an iterator over a set of all FileObject in this file object.
- *
+ *
* @return an Iterator.
*/
public Iterator<FileObject> iterator()
@@ -628,7 +628,7 @@ public abstract class AbstractFileObject
throw new IllegalStateException(e);
}
}
-
+
/**
* Lists the set of matching descendents of this file, in depthwise
* order.
@@ -1081,14 +1081,14 @@ public abstract class AbstractFileObject
/**
* Compares two FileObjects (ignores case)
*/
- public int compareTo(FileObject fo)
- {
+ public int compareTo(FileObject fo)
+ {
if (fo == null) {
return 1;
}
return this.toString().compareToIgnoreCase(fo.toString());
}
-
+
/**
* Copies another file to this file.
* @param file The FileObject to copy.
@@ -1160,7 +1160,7 @@ public abstract class AbstractFileObject
{
if (!getParent().isWriteable())
{
- throw new FileSystemException("vfs.provider/rename-parent-read-only.error",
+ throw new FileSystemException("vfs.provider/rename-parent-read-only.error",
getName(),
getParent().getName());
}
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/DefaultFileContent.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/DefaultFileContent.java?rev=1244700&r1=1244699&r2=1244700&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/DefaultFileContent.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/DefaultFileContent.java Wed Feb 15 20:45:59 2012
@@ -53,7 +53,7 @@ public final class DefaultFileContent im
* The default buffer size for {@link #write(OutputStream)}
*/
private static final int WRITE_BUFFER_SIZE = 4096;
-
+
static final int STATE_CLOSED = 0;
static final int STATE_OPENED = 1;
@@ -738,15 +738,15 @@ public final class DefaultFileContent im
return fileContentInfo;
}
-
+
/**
* Writes this content to another FileContent.
- *
+ *
* @param fileContent
* The target FileContent.
* @throws IOException
* if an error occurs writing the content.
- * @since 2.1
+ * @since 2.1
*/
public long write(final FileContent fileContent) throws IOException
{
@@ -754,51 +754,51 @@ public final class DefaultFileContent im
try
{
return this.write(output);
- }
+ }
finally
{
output.close();
}
}
-
+
/**
* Writes this content to another FileObject.
- *
+ *
* @param file
* The target FileObject.
* @throws IOException
* if an error occurs writing the content.
- * @since 2.1
+ * @since 2.1
*/
public long write(final FileObject file) throws IOException
{
return write(file.getContent());
}
-
+
/**
* Writes this content to an OutputStream.
- *
+ *
* @param output
* The target OutputStream.
* @throws IOException
* if an error occurs writing the content.
- * @since 2.1
+ * @since 2.1
*/
public long write(final OutputStream output) throws IOException
{
return write(output, WRITE_BUFFER_SIZE);
}
-
+
/**
* Writes this content to an OutputStream.
- *
+ *
* @param output
* The target OutputStream.
* @param bufferSize
* The buffer size to write data chunks.
* @throws IOException
* if an error occurs writing the file.
- * @since 2.1
+ * @since 2.1
*/
public long write(final OutputStream output, final int bufferSize) throws IOException
{
@@ -814,7 +814,7 @@ public final class DefaultFileContent im
output.write(buffer, 0, n);
count += n;
}
- }
+ }
finally
{
input.close();
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=1244700&r1=1244699&r2=1244700&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 Wed Feb 15 20:45:59 2012
@@ -29,7 +29,7 @@ import org.apache.commons.vfs2.provider.
*
* @author <a href="http://commons.apache.org/vfs/team-list.html">Commons VFS team</a>
*/
-public abstract class CompressedFileFileObject extends AbstractFileObject
+public abstract class CompressedFileFileObject extends AbstractFileObject
{
private final FileObject container;
private final String[] children;
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=1244700&r1=1244699&r2=1244700&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 Wed Feb 15 20:45:59 2012
@@ -642,7 +642,7 @@ public class FtpFileObject extends Abstr
if (out == null)
{
- throw new FileSystemException("vfs.provider.ftp/output-error.debug",
+ throw new FileSystemException("vfs.provider.ftp/output-error.debug",
this.getName(),
client.getReplyString());
}
@@ -669,7 +669,7 @@ public class FtpFileObject extends Abstr
final InputStream instr = client.retrieveFileStream(relPath, filePointer);
if (instr == null)
{
- throw new FileSystemException("vfs.provider.ftp/input-error.debug",
+ throw new FileSystemException("vfs.provider.ftp/input-error.debug",
this.getName(),
client.getReplyString());
}
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=1244700&r1=1244699&r2=1244700&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 Wed Feb 15 20:45:59 2012
@@ -89,7 +89,7 @@ class HttpRandomAccessContent extends Ab
final int status = fileSystem.getClient().executeMethod(getMethod);
if (status != HttpURLConnection.HTTP_PARTIAL && status != HttpURLConnection.HTTP_OK)
{
- throw new FileSystemException("vfs.provider.http/get-range.error",
+ throw new FileSystemException("vfs.provider.http/get-range.error",
fileObject.getName(),
Long.valueOf(filePointer),
Integer.valueOf(status));
@@ -102,7 +102,7 @@ class HttpRandomAccessContent extends Ab
long skipped = mis.skip(filePointer);
if (skipped != filePointer)
{
- throw new FileSystemException("vfs.provider.http/get-range.error",
+ throw new FileSystemException("vfs.provider.http/get-range.error",
fileObject.getName(),
Long.valueOf(filePointer),
Integer.valueOf(status));
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=1244700&r1=1244699&r2=1244700&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 Wed Feb 15 20:45:59 2012
@@ -38,7 +38,7 @@ import org.apache.commons.vfs2.util.Rand
*
* @author <a href="http://commons.apache.org/vfs/team-list.html">Commons VFS team</a>
*/
-public class LocalFile extends AbstractFileObject
+public class LocalFile extends AbstractFileObject
{
private final String rootFile;
@@ -257,7 +257,7 @@ public class LocalFile extends AbstractF
throw new FileSystemException(e);
}
}
-
+
/**
* Returns the URI of the file.
* @return The URI of the file.
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=1244700&r1=1244699&r2=1244700&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 Wed Feb 15 20:45:59 2012
@@ -29,12 +29,12 @@ import org.apache.commons.vfs2.provider.
*/
public class LocalFileName extends AbstractFileName
{
- // URI Characters that are possible in local filenames, but must be escaped
+ // URI Characters that are possible in local filenames, but must be escaped
// for proper URI handling.
//
// How reserved URI chars were selected:
//
- // URIs can contain :, /, ?, #, @
+ // URIs can contain :, /, ?, #, @
// See http://download.oracle.com/javase/6/docs/api/java/net/URI.html
// http://tools.ietf.org/html/rfc3986#section-2.2
//
@@ -43,7 +43,7 @@ public class LocalFileName extends Abstr
// Therefore only # is a reserved char in a URI as part of the path that can be in the filename.
private static final char RESERVED_URI_CHARS[] = {'#'};
-
+
private final String rootFile;
protected LocalFileName(final String scheme,
@@ -75,7 +75,7 @@ public class LocalFileName extends Abstr
{
return new LocalFileName(getScheme(), rootFile, path, type);
}
-
+
/**
* Returns the absolute URI of the file.
* @return The absolute URI of the file.
@@ -84,7 +84,7 @@ public class LocalFileName extends Abstr
public String getURI()
{
String uri = super.getURI();
-
+
if (uri != null && uri.length() > 0)
{
try
@@ -92,7 +92,7 @@ public class LocalFileName extends Abstr
// VFS-325: Handle URI special characters in filename
// Decode the base uri and re-encode with URI special characters
uri = UriParser.decode(uri);
-
+
uri = UriParser.encode(uri, RESERVED_URI_CHARS);
}
catch(FileSystemException e)
@@ -100,10 +100,10 @@ public class LocalFileName extends Abstr
// Default to base uri value
}
}
-
+
return uri;
- }
-
+ }
+
/**
* returns a "friendly path", this is a path without a password.
* @return The "friendly" URI.
@@ -112,7 +112,7 @@ public class LocalFileName extends Abstr
public String getFriendlyURI()
{
String uri = super.getFriendlyURI();
-
+
if (uri != null && uri.length() > 0)
{
try
@@ -120,7 +120,7 @@ public class LocalFileName extends Abstr
// VFS-325: Handle URI special characters in filename
// Decode the base uri and re-encode with URI special characters
uri = UriParser.decode(uri);
-
+
uri = UriParser.encode(uri, RESERVED_URI_CHARS);
}
catch(FileSystemException e)
@@ -128,10 +128,10 @@ public class LocalFileName extends Abstr
// Default to base uri value
}
}
-
+
return uri;
}
-
+
/**
* Returns the decoded URI of the file.
* @return the FileName as a URI.
@@ -148,8 +148,8 @@ public class LocalFileName extends Abstr
return super.getURI();
}
}
-
-
+
+
/**
* Builds the root URI for this file name.
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=1244700&r1=1244699&r2=1244700&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 Wed Feb 15 20:45:59 2012
@@ -34,7 +34,7 @@ import org.apache.commons.vfs2.util.Rand
* access the data by implementing FileObject interface.
* @author <a href="http://commons.apache.org/vfs/team-list.html">Commons VFS team</a>
*/
-public class RamFileObject extends AbstractFileObject
+public class RamFileObject extends AbstractFileObject
{
/**
* File System.
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileObject.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileObject.java?rev=1244700&r1=1244699&r2=1244700&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileObject.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileObject.java Wed Feb 15 20:45:59 2012
@@ -51,7 +51,7 @@ import com.jcraft.jsch.SftpException;
* @author <a href="http://commons.apache.org/vfs/team-list.html">Commons VFS team</a>
* 2005) $
*/
-public class SftpFileObject extends AbstractFileObject
+public class SftpFileObject extends AbstractFileObject
{
private final SftpFileSystem fileSystem;
private SftpATTRS attrs;
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/tar/TarFileObject.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/tar/TarFileObject.java?rev=1244700&r1=1244699&r2=1244700&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/tar/TarFileObject.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/tar/TarFileObject.java Wed Feb 15 20:45:59 2012
@@ -30,7 +30,7 @@ import org.apache.commons.vfs2.provider.
* A file in a Tar file system.
* @author <a href="http://commons.apache.org/vfs/team-list.html">Commons VFS team</a>
*/
-public class TarFileObject extends AbstractFileObject
+public class TarFileObject extends AbstractFileObject
{
/** The TarArchiveEntry */
protected TarArchiveEntry entry;
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/url/UrlFileObject.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/url/UrlFileObject.java?rev=1244700&r1=1244699&r2=1244700&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/url/UrlFileObject.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/url/UrlFileObject.java Wed Feb 15 20:45:59 2012
@@ -39,7 +39,7 @@ import org.apache.commons.vfs2.provider.
* @todo Implement set lastModified and get/set attribute
* @todo Implement getOutputStream()
*/
-public class UrlFileObject extends AbstractFileObject
+public class UrlFileObject extends AbstractFileObject
{
private URL url;
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileObject.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileObject.java?rev=1244700&r1=1244699&r2=1244700&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileObject.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileObject.java Wed Feb 15 20:45:59 2012
@@ -78,7 +78,7 @@ import org.w3c.dom.Node;
* @author <a href="http://commons.apache.org/vfs/team-list.html">Commons VFS team</a>
* @since 2.0
*/
-public class WebdavFileObject extends HttpFileObject
+public class WebdavFileObject extends HttpFileObject
{
/** The character set property name. */
public static final DavPropertyName RESPONSE_CHARSET = DavPropertyName.create(
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/zip/ZipFileObject.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/zip/ZipFileObject.java?rev=1244700&r1=1244699&r2=1244700&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/zip/ZipFileObject.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/zip/ZipFileObject.java Wed Feb 15 20:45:59 2012
@@ -31,7 +31,7 @@ import org.apache.commons.vfs2.provider.
*
* @author <a href="http://commons.apache.org/vfs/team-list.html">Commons VFS team</a>
*/
-public class ZipFileObject extends AbstractFileObject
+public class ZipFileObject extends AbstractFileObject
{
/** The ZipEntry. */
protected ZipEntry entry;
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/DelegatingFileSystemOptionsBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/DelegatingFileSystemOptionsBuilder.java?rev=1244700&r1=1244699&r2=1244700&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/DelegatingFileSystemOptionsBuilder.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/DelegatingFileSystemOptionsBuilder.java Wed Feb 15 20:45:59 2012
@@ -217,7 +217,7 @@ public class DelegatingFileSystemOptions
}
}
- throw new FileSystemException("vfs.provider/config-value-invalid.error",
+ throw new FileSystemException("vfs.provider/config-value-invalid.error",
ctx.scheme,
ctx.name,
ctx.values);
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/Messages.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/Messages.java?rev=1244700&r1=1244699&r2=1244700&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/Messages.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/Messages.java Wed Feb 15 20:45:59 2012
@@ -53,7 +53,7 @@ public final class Messages
/**
* Formats a message.
- *
+ *
* @param code
* The message code.
* @param param