Author: ecki
Date: Sun Jan 11 19:09:08 2015
New Revision: 1650952
URL: http://svn.apache.org/r1650952
Log:
[sandbox] resolve checkstyle warnings in sandbox utils. make sandbox prominent
in javadoc. move RACRandomAccessFile to sandbox util.
Added:
commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/util/RACRandomAccessFile.java
- copied, changed from r1650866,
commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/RACRandomAccessFile.java
Removed:
commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/RACRandomAccessFile.java
commons/proper/vfs/trunk/sandbox/src/test/java/org/apache/commons/vfs2/provider/webdav/
Modified:
commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/provider/mime/package.html
commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/util/FileObjectDataSource.java
commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/util/SharedRandomContentInputStream.java
Modified:
commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/provider/mime/package.html
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/provider/mime/package.html?rev=1650952&r1=1650951&r2=1650952&view=diff
==============================================================================
---
commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/provider/mime/package.html
(original)
+++
commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/provider/mime/package.html
Sun Jan 11 19:09:08 2015
@@ -15,5 +15,5 @@
limitations under the License.
-->
<body>
-<p>The Mime File Provider.</p>
+<p>VFS (Sandbox) Mime File Provider.</p>
</body>
Modified:
commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/util/FileObjectDataSource.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/util/FileObjectDataSource.java?rev=1650952&r1=1650951&r2=1650952&view=diff
==============================================================================
---
commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/util/FileObjectDataSource.java
(original)
+++
commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/util/FileObjectDataSource.java
Sun Jan 11 19:09:08 2015
@@ -26,7 +26,7 @@ import org.apache.commons.vfs2.FileObjec
import org.apache.commons.vfs2.FileSystemException;
/**
- * Provide access to a FileObject as DataSource
+ * (Sandbox) Provide access to a FileObject as JAF DataSource.
*/
public class FileObjectDataSource implements DataSource
{
Copied:
commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/util/RACRandomAccessFile.java
(from r1650866,
commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/RACRandomAccessFile.java)
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/util/RACRandomAccessFile.java?p2=commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/util/RACRandomAccessFile.java&p1=commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/RACRandomAccessFile.java&r1=1650866&r2=1650952&rev=1650952&view=diff
==============================================================================
---
commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/RACRandomAccessFile.java
(original)
+++
commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/util/RACRandomAccessFile.java
Sun Jan 11 19:09:08 2015
@@ -13,21 +13,35 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.vfs2;
+package org.apache.commons.vfs2.util;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.RandomAccessFile;
+import org.apache.commons.vfs2.RandomAccessContent;
/**
- * Encapsulates a {@link RandomAccessContent} instance, allowing it to be used
+ * (Sandbox) Encapsulates a {@link RandomAccessContent} instance, allowing it
to be used
* as a {@link RandomAccessFile} instance.
*/
public class RACRandomAccessFile extends RandomAccessFile implements
RandomAccessContent
{
+ private final byte[] singleByteBuf = new byte[1];
+
private RandomAccessContent rac;
- protected final byte[] singleByteBuf = new byte[1];
+
+ public RACRandomAccessFile(final RandomAccessContent rac) throws
IOException
+ {
+ this(createTempFile());
+ this.rac = rac;
+ }
+
+ private RACRandomAccessFile(final File tempFile) throws IOException
+ {
+ super(tempFile, "r");
+ deleteTempFile(tempFile);
+ }
private static File createTempFile() throws IOException
{
@@ -46,22 +60,10 @@ public class RACRandomAccessFile extends
}
finally
{
- tempFile.delete();
+ /* ignored = */ tempFile.delete();
}
}
- public RACRandomAccessFile(final RandomAccessContent rac) throws
IOException
- {
- this(createTempFile());
- this.rac = rac;
- }
-
- private RACRandomAccessFile(final File tempFile) throws IOException
- {
- super(tempFile, "r");
- deleteTempFile(tempFile);
- }
-
@Override
public long getFilePointer() throws IOException
{
@@ -86,9 +88,6 @@ public class RACRandomAccessFile extends
return this.rac.length();
}
- /* (non-Javadoc)
- * @see org.ecc.base.io.FilterRandomAccessFile#setLength(long)
- */
@Override
public void setLength(final long newLength) throws IOException
{
@@ -106,19 +105,12 @@ public class RACRandomAccessFile extends
this.rac.close();
}
-
- /**
- * @see java.io.RandomAccessFile#read(byte[])
- */
@Override
public final int read(final byte[] b) throws IOException
{
return read(b, 0, b.length);
}
- /**
- * @see java.io.RandomAccessFile#read()
- */
@Override
public final int read() throws IOException
{
@@ -134,9 +126,6 @@ public class RACRandomAccessFile extends
return len;
}
- /**
- * @see java.io.RandomAccessFile#write(int)
- */
@Override
public final void write(final int b) throws IOException
{
@@ -145,18 +134,12 @@ public class RACRandomAccessFile extends
write(buf, 0, 1);
}
- /**
- * @see java.io.RandomAccessFile#write(byte[])
- */
@Override
public final void write(final byte[] b) throws IOException
{
write(b, 0, b.length);
}
- /**
- * @see java.io.RandomAccessFile#write(byte[],int,int)
- */
@Override
public void write(final byte[] b, final int off, final int len) throws
IOException
{
Modified:
commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/util/SharedRandomContentInputStream.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/util/SharedRandomContentInputStream.java?rev=1650952&r1=1650951&r2=1650952&view=diff
==============================================================================
---
commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/util/SharedRandomContentInputStream.java
(original)
+++
commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/util/SharedRandomContentInputStream.java
Sun Jan 11 19:09:08 2015
@@ -30,7 +30,7 @@ import org.apache.commons.vfs2.FileSyste
import org.apache.commons.vfs2.RandomAccessContent;
/**
- * A wrapper to an FileObject to get a {@link
javax.mail.internet.SharedInputStream}
+ * (Sandbox) A wrapper to an FileObject to get a {@link
javax.mail.internet.SharedInputStream}.
*/
public class SharedRandomContentInputStream extends BufferedInputStream
implements SharedInputStream
{
@@ -42,7 +42,10 @@ public class SharedRandomContentInputStr
private long pos;
private long resetCount;
- private SharedRandomContentInputStream(final
Set<SharedRandomContentInputStream> createdStreams, final FileObject fo, final
long fileStart, final long fileEnd, final InputStream is) throws
FileSystemException
+ private SharedRandomContentInputStream(final
Set<SharedRandomContentInputStream> createdStreams,
+ final FileObject fo, final long
fileStart, final long fileEnd,
+ final InputStream is)
+ throws FileSystemException
{
super(is);
@@ -56,7 +59,7 @@ public class SharedRandomContentInputStr
this.fileEnd = fileEnd;
this.createdStreams = createdStreams;
- synchronized(createdStreams)
+ synchronized (createdStreams)
{
createdStreams.add(this);
}
@@ -82,7 +85,7 @@ public class SharedRandomContentInputStr
}
@Override
- public synchronized int read(final byte b[], final int off, int len)
throws IOException
+ public synchronized int read(final byte[] b, final int off, int len)
throws IOException
{
if (checkEnd())
{
@@ -96,8 +99,8 @@ public class SharedRandomContentInputStr
}
final int nread = super.read(b, off, len);
- pos+=nread;
- resetCount+=nread;
+ pos += nread;
+ resetCount += nread;
return nread;
}
@@ -116,8 +119,8 @@ public class SharedRandomContentInputStr
}
final long nskip = super.skip(n);
- pos+=nskip;
- resetCount+=nskip;
+ pos += nskip;
+ resetCount += nskip;
return nskip;
}
@@ -157,7 +160,7 @@ public class SharedRandomContentInputStr
protected long calcFilePosition(final long nadd)
{
- return getFilePosition()+nadd;
+ return getFilePosition() + nadd;
}
@Override
@@ -171,8 +174,8 @@ public class SharedRandomContentInputStr
public synchronized void reset() throws IOException
{
super.reset();
- pos-=resetCount;
- resetCount=0;
+ pos -= resetCount;
+ resetCount = 0;
}
public long getPosition()
@@ -186,7 +189,7 @@ public class SharedRandomContentInputStr
{
super.close();
- synchronized(createdStreams)
+ synchronized (createdStreams)
{
createdStreams.remove(this);
}
@@ -196,8 +199,8 @@ public class SharedRandomContentInputStr
{
try
{
- final long newFileStart = this.fileStart+start;
- final long newFileEnd = end<0?this.fileEnd:this.fileStart+end;
+ final long newFileStart = this.fileStart + start;
+ final long newFileEnd = end < 0 ? this.fileEnd : this.fileStart +
end;
final RandomAccessContent rac =
fo.getContent().getRandomAccessContent(RandomAccessMode.READ);
rac.seek(newFileStart);
@@ -216,11 +219,12 @@ public class SharedRandomContentInputStr
public void closeAll() throws IOException
{
- synchronized(createdStreams)
+ synchronized (createdStreams)
{
final SharedRandomContentInputStream[] streams = new
SharedRandomContentInputStream[createdStreams.size()];
createdStreams.toArray(streams);
- for (final SharedRandomContentInputStream stream : streams) {
+ for (final SharedRandomContentInputStream stream : streams)
+ {
stream.close();
}
}
