Author: imario Date: Sun May 13 22:51:00 2007 New Revision: 537714 URL: http://svn.apache.org/viewvc?view=rev&rev=537714 Log: VFS-133: added RandomAccessMode.getModeString - Thanks to Adam Heath for the patch
Modified: jakarta/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/local/LocalFileRandomAccessContent.java jakarta/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/util/RandomAccessMode.java jakarta/commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs/provider/smb/SmbFileRandomAccessContent.java Modified: jakarta/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/local/LocalFileRandomAccessContent.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/local/LocalFileRandomAccessContent.java?view=diff&rev=537714&r1=537713&r2=537714 ============================================================================== --- jakarta/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/local/LocalFileRandomAccessContent.java (original) +++ jakarta/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/local/LocalFileRandomAccessContent.java Sun May 13 22:51:00 2007 @@ -43,19 +43,9 @@ { super(mode); - StringBuffer modes = new StringBuffer(2); - if (mode.requestRead()) - { - modes.append('r'); - } - if (mode.requestWrite()) - { - modes.append('w'); - } - try { - raf = new RandomAccessFile(localFile, modes.toString()); + raf = new RandomAccessFile(localFile, mode.getModeString()); rafis = new InputStream() { public int read() throws IOException Modified: jakarta/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/util/RandomAccessMode.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/util/RandomAccessMode.java?view=diff&rev=537714&r1=537713&r2=537714 ============================================================================== --- jakarta/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/util/RandomAccessMode.java (original) +++ jakarta/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/util/RandomAccessMode.java Sun May 13 22:51:00 2007 @@ -24,33 +24,54 @@ */ public class RandomAccessMode { - /** - * read - */ - public static final RandomAccessMode READ = new RandomAccessMode(true, false); - - /** - * read/write - */ - public static final RandomAccessMode READWRITE = new RandomAccessMode(true, true); - - - private final boolean read; - private final boolean write; - - private RandomAccessMode(final boolean read, final boolean write) - { - this.read = read; - this.write = write; - } - - public boolean requestRead() - { - return read; - } - - public boolean requestWrite() - { - return write; - } + /** + * read + */ + public static final RandomAccessMode READ = new RandomAccessMode(true, false); + + /** + * read/write + */ + public static final RandomAccessMode READWRITE = new RandomAccessMode(true, true); + + + private final boolean read; + private final boolean write; + + private RandomAccessMode(final boolean read, final boolean write) + { + this.read = read; + this.write = write; + } + + public boolean requestRead() + { + return read; + } + + public boolean requestWrite() + { + return write; + } + + public String getModeString() + { + if (requestRead()) + { + if (requestWrite()) + { + return "rw"; // NON-NLS + } + else + { + return "r"; // NON-NLS + } + } + else if (requestWrite()) + { + return "w"; // NON-NLS + } + + return ""; + } } Modified: jakarta/commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs/provider/smb/SmbFileRandomAccessContent.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs/provider/smb/SmbFileRandomAccessContent.java?view=diff&rev=537714&r1=537713&r2=537714 ============================================================================== --- jakarta/commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs/provider/smb/SmbFileRandomAccessContent.java (original) +++ jakarta/commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs/provider/smb/SmbFileRandomAccessContent.java Sun May 13 22:51:00 2007 @@ -43,19 +43,9 @@ { super(mode); - StringBuffer modes = new StringBuffer(2); - if (mode.requestRead()) - { - modes.append('r'); - } - if (mode.requestWrite()) - { - modes.append('w'); - } - try { - raf = new SmbRandomAccessFile(smbFile, modes.toString()); + raf = new SmbRandomAccessFile(smbFile, mode.getModeString()); rafis = new InputStream() { public int read() throws IOException --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]