You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2013/04/25 01:24:20 UTC
svn commit: r1471767 [1/3] - in
/commons/proper/io/trunk/src/main/java/org/apache/commons/io: ./
filefilter/ input/ output/
Author: sebb
Date: Wed Apr 24 23:24:19 2013
New Revision: 1471767
URL: http://svn.apache.org/r1471767
Log:
Trailing spaces
These are the worst offenders; others remain with single spaces here and there
Modified:
commons/proper/io/trunk/src/main/java/org/apache/commons/io/ByteOrderMark.java
commons/proper/io/trunk/src/main/java/org/apache/commons/io/DirectoryWalker.java
commons/proper/io/trunk/src/main/java/org/apache/commons/io/FileSystemUtils.java
commons/proper/io/trunk/src/main/java/org/apache/commons/io/FileUtils.java
commons/proper/io/trunk/src/main/java/org/apache/commons/io/FilenameUtils.java
commons/proper/io/trunk/src/main/java/org/apache/commons/io/HexDump.java
commons/proper/io/trunk/src/main/java/org/apache/commons/io/IOCase.java
commons/proper/io/trunk/src/main/java/org/apache/commons/io/IOUtils.java
commons/proper/io/trunk/src/main/java/org/apache/commons/io/LineIterator.java
commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/CanReadFileFilter.java
commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/CanWriteFileFilter.java
commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/DelegateFileFilter.java
commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/EmptyFileFilter.java
commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/FileFilterUtils.java
commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/HiddenFileFilter.java
commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/IOFileFilter.java
commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/MagicNumberFileFilter.java
commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/NameFileFilter.java
commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/NotFileFilter.java
commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/PrefixFileFilter.java
commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/SuffixFileFilter.java
commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/WildcardFilter.java
commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/CharSequenceInputStream.java
commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/ClassLoaderObjectInputStream.java
commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/ClosedInputStream.java
commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/ReaderInputStream.java
commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/Tailer.java
commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/XmlStreamReader.java
commons/proper/io/trunk/src/main/java/org/apache/commons/io/output/ByteArrayOutputStream.java
commons/proper/io/trunk/src/main/java/org/apache/commons/io/output/ClosedOutputStream.java
commons/proper/io/trunk/src/main/java/org/apache/commons/io/output/DeferredFileOutputStream.java
commons/proper/io/trunk/src/main/java/org/apache/commons/io/output/LockableFileWriter.java
commons/proper/io/trunk/src/main/java/org/apache/commons/io/output/NullOutputStream.java
commons/proper/io/trunk/src/main/java/org/apache/commons/io/output/NullWriter.java
Modified: commons/proper/io/trunk/src/main/java/org/apache/commons/io/ByteOrderMark.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/commons/io/ByteOrderMark.java?rev=1471767&r1=1471766&r2=1471767&view=diff
==============================================================================
--- commons/proper/io/trunk/src/main/java/org/apache/commons/io/ByteOrderMark.java (original)
+++ commons/proper/io/trunk/src/main/java/org/apache/commons/io/ByteOrderMark.java Wed Apr 24 23:24:19 2013
@@ -20,7 +20,7 @@ import java.io.Serializable;
/**
* Byte Order Mark (BOM) representation - see {@link org.apache.commons.io.input.BOMInputStream}.
- *
+ *
* @see org.apache.commons.io.input.BOMInputStream
* @see <a href="http://en.wikipedia.org/wiki/Byte_order_mark">Wikipedia: Byte Order Mark</a>
* @see <a href="http://www.w3.org/TR/2006/REC-xml-20060816/#sec-guessing">W3C: Autodetection of Character Encodings
@@ -34,27 +34,27 @@ public class ByteOrderMark implements Se
/** UTF-8 BOM */
public static final ByteOrderMark UTF_8 = new ByteOrderMark("UTF-8", 0xEF, 0xBB, 0xBF);
-
+
/** UTF-16BE BOM (Big-Endian) */
public static final ByteOrderMark UTF_16BE = new ByteOrderMark("UTF-16BE", 0xFE, 0xFF);
-
+
/** UTF-16LE BOM (Little-Endian) */
public static final ByteOrderMark UTF_16LE = new ByteOrderMark("UTF-16LE", 0xFF, 0xFE);
- /**
+ /**
* UTF-32BE BOM (Big-Endian)
- * @since 2.2
+ * @since 2.2
*/
public static final ByteOrderMark UTF_32BE = new ByteOrderMark("UTF-32BE", 0x00, 0x00, 0xFE, 0xFF);
-
- /**
+
+ /**
* UTF-32LE BOM (Little-Endian)
- * @since 2.2
+ * @since 2.2
*/
public static final ByteOrderMark UTF_32LE = new ByteOrderMark("UTF-32LE", 0xFF, 0xFE, 0x00, 0x00);
-
+
/**
- * Unicode BOM character; external form depends on the encoding.
+ * Unicode BOM character; external form depends on the encoding.
* @see <a href="http://unicode.org/faq/utf_bom.html#BOM">Byte Order Mark (BOM) FAQ</a>
* @since 2.5
*/
Modified: commons/proper/io/trunk/src/main/java/org/apache/commons/io/DirectoryWalker.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/commons/io/DirectoryWalker.java?rev=1471767&r1=1471766&r2=1471767&view=diff
==============================================================================
--- commons/proper/io/trunk/src/main/java/org/apache/commons/io/DirectoryWalker.java (original)
+++ commons/proper/io/trunk/src/main/java/org/apache/commons/io/DirectoryWalker.java Wed Apr 24 23:24:19 2013
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,14 +31,14 @@ import org.apache.commons.io.filefilter.
* <p>
* This class operates with a {@link FileFilter} and maximum depth to
* limit the files and direcories visited.
- * Commons IO supplies many common filter implementations in the
+ * Commons IO supplies many common filter implementations in the
* <a href="filefilter/package-summary.html"> filefilter</a> package.
* <p>
* The following sections describe:
* <ul>
* <li><a href="#example">1. Example Implementation</a> - example
* <code>FileCleaner</code> implementation.</li>
- * <li><a href="#filter">2. Filter Example</a> - using
+ * <li><a href="#filter">2. Filter Example</a> - using
* {@link FileFilter}(s) with <code>DirectoryWalker</code>.</li>
* <li><a href="#cancel">3. Cancellation</a> - how to implement cancellation
* behaviour.</li>
@@ -104,20 +104,20 @@ import org.apache.commons.io.filefilter.
* super(filter, -1);
* }
* }
- *
+ *
* // Build up the filters and create the walker
* // Create a filter for Non-hidden directories
- * IOFileFilter fooDirFilter =
+ * IOFileFilter fooDirFilter =
* FileFilterUtils.andFileFilter(FileFilterUtils.directoryFileFilter,
* HiddenFileFilter.VISIBLE);
*
* // Create a filter for Files ending in ".txt"
- * IOFileFilter fooFileFilter =
+ * IOFileFilter fooFileFilter =
* FileFilterUtils.andFileFilter(FileFilterUtils.fileFileFilter,
* FileFilterUtils.suffixFileFilter(".txt"));
*
* // Combine the directory and file filters using an OR condition
- * java.io.FileFilter fooFilter =
+ * java.io.FileFilter fooFilter =
* FileFilterUtils.orFileFilter(fooDirFilter, fooFileFilter);
*
* // Use the filter to construct a DirectoryWalker implementation
@@ -138,7 +138,7 @@ import org.apache.commons.io.filefilter.
* super(dirFilter, fileFilter, -1);
* }
* }
- *
+ *
* // Use the filters to construct the walker
* FooDirectoryWalker walker = new FooDirectoryWalker(
* HiddenFileFilter.VISIBLE,
@@ -174,7 +174,7 @@ import org.apache.commons.io.filefilter.
* <ul>
* <li><a href="#external">3.1 External / Mult-threaded</a> - cancellation being
* decided/initiated by an external process.</li>
- * <li><a href="#internal">3.2 Internal</a> - cancellation being decided/initiated
+ * <li><a href="#internal">3.2 Internal</a> - cancellation being decided/initiated
* from within a DirectoryWalker implementation.</li>
* </ul>
* <p>
@@ -218,7 +218,7 @@ import org.apache.commons.io.filefilter.
*
* This shows an example of how internal cancellation processing could be implemented.
* <b>Note</b> the decision logic and throwing a {@link CancelException} could be implemented
- * in any of the <i>lifecycle</i> methods.
+ * in any of the <i>lifecycle</i> methods.
*
* <pre>
* public class BarDirectoryWalker extends DirectoryWalker {
@@ -384,7 +384,7 @@ public abstract class DirectoryWalker<T>
* automatically by the walk of the tree. However, sometimes a single method,
* typically {@link #handleFile}, may take a long time to run. In that case,
* you may wish to check for cancellation by calling this method.
- *
+ *
* @param file the current file being processed
* @param depth the current file level (starting directory = 0)
* @param results the collection of result objects, may be updated
@@ -447,7 +447,7 @@ public abstract class DirectoryWalker<T>
* @param startDirectory the directory that the walk started from
* @param results the collection of result objects, may be updated
* @param cancel the exception throw to cancel further processing
- * containing details at the point of cancellation.
+ * containing details at the point of cancellation.
* @throws IOException if an I/O Error occurs
*/
protected void handleCancelled(final File startDirectory, final Collection<T> results,
@@ -583,7 +583,7 @@ public abstract class DirectoryWalker<T>
/** Serialization id. */
private static final long serialVersionUID = 1347339620135041008L;
-
+
/** The file being processed when the exception was thrown. */
private final File file;
/** The file depth when the exception was thrown. */
Modified: commons/proper/io/trunk/src/main/java/org/apache/commons/io/FileSystemUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/commons/io/FileSystemUtils.java?rev=1471767&r1=1471766&r2=1471767&view=diff
==============================================================================
--- commons/proper/io/trunk/src/main/java/org/apache/commons/io/FileSystemUtils.java (original)
+++ commons/proper/io/trunk/src/main/java/org/apache/commons/io/FileSystemUtils.java Wed Apr 24 23:24:19 2013
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -121,7 +121,7 @@ public class FileSystemUtils {
* of {@link #freeSpaceKb(String)} which returns a result in kilobytes.
* <p>
* Note that some OS's are NOT currently supported, including OS/390,
- * OpenVMS.
+ * OpenVMS.
* <pre>
* FileSystemUtils.freeSpace("C:"); // Windows
* FileSystemUtils.freeSpace("/volume"); // *nix
@@ -214,7 +214,7 @@ public class FileSystemUtils {
* @since 2.0
*/
public static long freeSpaceKb() throws IOException {
- return freeSpaceKb(-1);
+ return freeSpaceKb(-1);
}
/**
@@ -232,9 +232,9 @@ public class FileSystemUtils {
* @since 2.0
*/
public static long freeSpaceKb(final long timeout) throws IOException {
- return freeSpaceKb(new File(".").getAbsolutePath(), timeout);
+ return freeSpaceKb(new File(".").getAbsolutePath(), timeout);
}
-
+
//-----------------------------------------------------------------------
/**
* Returns the free space on a drive or volume in a cross-platform manner.
@@ -290,13 +290,13 @@ public class FileSystemUtils {
if (path.length() > 0 && path.charAt(0) != '"') {
path = "\"" + path + "\"";
}
-
+
// build and run the 'dir' command
final String[] cmdAttribs = new String[] {"cmd.exe", "/C", "dir /a /-c " + path};
-
+
// read in the output of the command to an ArrayList
final List<String> lines = performCommand(cmdAttribs, Integer.MAX_VALUE, timeout);
-
+
// now iterate over the lines we just read and find the LAST
// non-empty line (the free space bytes should be in the last element
// of the ArrayList anyway, but this will ensure it works even if it's
@@ -354,7 +354,7 @@ public class FileSystemUtils {
"Command line 'dir /-c' did not return valid info " +
"for path '" + path + "'");
}
-
+
// remove commas and dots in the bytes count
final StringBuilder buf = new StringBuilder(line.substring(bytesStart, bytesEnd));
for (int k = 0; k < buf.length(); k++) {
@@ -390,9 +390,9 @@ public class FileSystemUtils {
if (posix) {
flags += "P";
}
- final String[] cmdAttribs =
+ final String[] cmdAttribs =
flags.length() > 1 ? new String[] {DF, flags, path} : new String[] {DF, path};
-
+
// perform the command, asking for up to 3 lines (header, interesting, overflow)
final List<String> lines = performCommand(cmdAttribs, 3, timeout);
if (lines.size() < 2) {
@@ -402,7 +402,7 @@ public class FileSystemUtils {
"for path '" + path + "'- response was " + lines);
}
final String line2 = lines.get(1); // the line we're interested in
-
+
// Now, we tokenize the string. The fourth element is what we want.
StringTokenizer tok = new StringTokenizer(line2, " ");
if (tok.countTokens() < 4) {
@@ -427,7 +427,7 @@ public class FileSystemUtils {
//-----------------------------------------------------------------------
/**
* Parses the bytes from a string.
- *
+ *
* @param freeSpace the free space string
* @param path the path
* @return the number of bytes
@@ -442,7 +442,7 @@ public class FileSystemUtils {
"for path '" + path + "'- check path is valid");
}
return bytes;
-
+
} catch (final NumberFormatException ex) {
throw new IOExceptionWithCause(
"Command line '" + DF + "' did not return numeric data as expected " +
@@ -469,7 +469,7 @@ public class FileSystemUtils {
// http://forum.java.sun.com/thread.jspa?threadID=533029&messageID=2572018
// however, its still not perfect as the JDK support is so poor
// (see commons-exec or Ant for a better multi-threaded multi-os solution)
-
+
final List<String> lines = new ArrayList<String>(20);
Process proc = null;
InputStream in = null;
@@ -492,7 +492,7 @@ public class FileSystemUtils {
lines.add(line);
line = inr.readLine();
}
-
+
proc.waitFor();
ThreadMonitor.stop(monitor);
@@ -510,7 +510,7 @@ public class FileSystemUtils {
"for command " + Arrays.asList(cmdAttribs));
}
return lines;
-
+
} catch (final InterruptedException ex) {
throw new IOExceptionWithCause(
"Command line threw an InterruptedException " +
Modified: commons/proper/io/trunk/src/main/java/org/apache/commons/io/FileUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/commons/io/FileUtils.java?rev=1471767&r1=1471766&r2=1471767&view=diff
==============================================================================
--- commons/proper/io/trunk/src/main/java/org/apache/commons/io/FileUtils.java (original)
+++ commons/proper/io/trunk/src/main/java/org/apache/commons/io/FileUtils.java Wed Apr 24 23:24:19 2013
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -89,7 +89,7 @@ public class FileUtils {
/**
* The number of bytes in a kilobyte.
- *
+ *
* @since 2.4
*/
public static final BigInteger ONE_KB_BI = BigInteger.valueOf(ONE_KB);
@@ -101,7 +101,7 @@ public class FileUtils {
/**
* The number of bytes in a megabyte.
- *
+ *
* @since 2.4
*/
public static final BigInteger ONE_MB_BI = ONE_KB_BI.multiply(ONE_KB_BI);
@@ -118,7 +118,7 @@ public class FileUtils {
/**
* The number of bytes in a gigabyte.
- *
+ *
* @since 2.4
*/
public static final BigInteger ONE_GB_BI = ONE_KB_BI.multiply(ONE_MB_BI);
@@ -130,7 +130,7 @@ public class FileUtils {
/**
* The number of bytes in a terabyte.
- *
+ *
* @since 2.4
*/
public static final BigInteger ONE_TB_BI = ONE_KB_BI.multiply(ONE_GB_BI);
@@ -142,7 +142,7 @@ public class FileUtils {
/**
* The number of bytes in a petabyte.
- *
+ *
* @since 2.4
*/
public static final BigInteger ONE_PB_BI = ONE_KB_BI.multiply(ONE_TB_BI);
@@ -154,7 +154,7 @@ public class FileUtils {
/**
* The number of bytes in an exabyte.
- *
+ *
* @since 2.4
*/
public static final BigInteger ONE_EB_BI = ONE_KB_BI.multiply(ONE_PB_BI);
@@ -182,7 +182,7 @@ public class FileUtils {
//-----------------------------------------------------------------------
/**
* Construct a file from the set of name elements.
- *
+ *
* @param directory the parent directory
* @param names the name elements
* @return the file
@@ -204,7 +204,7 @@ public class FileUtils {
/**
* Construct a file from the set of name elements.
- *
+ *
* @param names the name elements
* @return the file
* @since 2.1
@@ -226,48 +226,48 @@ public class FileUtils {
/**
* Returns the path to the system temporary directory.
- *
+ *
* @return the path to the system temporary directory.
- *
+ *
* @since 2.0
*/
public static String getTempDirectoryPath() {
return System.getProperty("java.io.tmpdir");
}
-
+
/**
* Returns a {@link File} representing the system temporary directory.
- *
- * @return the system temporary directory.
- *
+ *
+ * @return the system temporary directory.
+ *
* @since 2.0
*/
public static File getTempDirectory() {
return new File(getTempDirectoryPath());
}
-
+
/**
* Returns the path to the user's home directory.
- *
+ *
* @return the path to the user's home directory.
- *
+ *
* @since 2.0
*/
public static String getUserDirectoryPath() {
return System.getProperty("user.home");
}
-
+
/**
* Returns a {@link File} representing the user's home directory.
- *
+ *
* @return the user's home directory.
- *
+ *
* @since 2.0
*/
public static File getUserDirectory() {
return new File(getUserDirectoryPath());
}
-
+
//-----------------------------------------------------------------------
/**
* Opens a {@link FileInputStream} for the specified file, providing better
@@ -279,7 +279,7 @@ public class FileUtils {
* An exception is thrown if the file does not exist.
* An exception is thrown if the file object exists but is a directory.
* An exception is thrown if the file exists but cannot be read.
- *
+ *
* @param file the file to open for input, must not be {@code null}
* @return a new {@link FileInputStream} for the specified file
* @throws FileNotFoundException if the file does not exist
@@ -314,7 +314,7 @@ public class FileUtils {
* An exception is thrown if the file object exists but is a directory.
* An exception is thrown if the file exists but cannot be written to.
* An exception is thrown if the parent directory cannot be created.
- *
+ *
* @param file the file to open for output, must not be {@code null}
* @return a new {@link FileOutputStream} for the specified file
* @throws IOException if the file object is a directory
@@ -338,7 +338,7 @@ public class FileUtils {
* An exception is thrown if the file object exists but is a directory.
* An exception is thrown if the file exists but cannot be written to.
* An exception is thrown if the parent directory cannot be created.
- *
+ *
* @param file the file to open for output, must not be {@code null}
* @param append if {@code true}, then bytes will be added to the
* end of the file rather than overwriting
@@ -377,7 +377,7 @@ public class FileUtils {
* <p>
* Similarly for the 1MB and 1KB boundaries.
* </p>
- *
+ *
* @param size
* the number of bytes
* @return a human-readable display value (includes units - EB, PB, TB, GB, MB, KB or bytes)
@@ -415,7 +415,7 @@ public class FileUtils {
* <p>
* Similarly for the 1MB and 1KB boundaries.
* </p>
- *
+ *
* @param size
* the number of bytes
* @return a human-readable display value (includes units - EB, PB, TB, GB, MB, KB or bytes)
@@ -476,7 +476,7 @@ public class FileUtils {
private static void innerListFiles(final Collection<File> files, final File directory,
final IOFileFilter filter, final boolean includeSubDirectories) {
final File[] found = directory.listFiles((FileFilter) filter);
-
+
if (found != null) {
for (final File file : found) {
if (file.isDirectory()) {
@@ -536,7 +536,7 @@ public class FileUtils {
* <li>Throws {@link IllegalArgumentException} if {@code directory} is not a directory</li>
* <li>Throws {@link NullPointerException} if {@code fileFilter} is null</li>
* </ul>
- *
+ *
* @param directory The File to test
* @param fileFilter The IOFileFilter to test
*/
@@ -551,9 +551,9 @@ public class FileUtils {
/**
* Returns a filter that accepts files in addition to the {@link File} objects accepted by the given filter.
- *
+ *
* @param fileFilter a base filter to add to
- * @return a filter that accepts files
+ * @return a filter that accepts files
*/
private static IOFileFilter setUpEffectiveFileFilter(final IOFileFilter fileFilter) {
return FileFilterUtils.and(fileFilter, FileFilterUtils.notFileFilter(DirectoryFileFilter.INSTANCE));
@@ -561,9 +561,9 @@ public class FileUtils {
/**
* Returns a filter that accepts directories in addition to the {@link File} objects accepted by the given filter.
- *
+ *
* @param dirFilter a base filter to add to
- * @return a filter that accepts directories
+ * @return a filter that accepts directories
*/
private static IOFileFilter setUpEffectiveDirFilter(final IOFileFilter dirFilter) {
return dirFilter == null ? FalseFileFilter.INSTANCE : FileFilterUtils.and(dirFilter,
@@ -574,10 +574,10 @@ public class FileUtils {
* Finds files within a given directory (and optionally its
* subdirectories). All files found are filtered by an IOFileFilter.
* <p>
- * The resulting collection includes the starting directory and
+ * The resulting collection includes the starting directory and
* any subdirectories that match the directory filter.
* <p>
- * @see org.apache.commons.io.FileUtils#listFiles
+ * @see org.apache.commons.io.FileUtils#listFiles
*
* @param directory the directory to search in
* @param fileFilter filter to apply when finding files.
@@ -638,7 +638,7 @@ public class FileUtils {
* which supports Iterable ('foreach' loop).
* <p>
* The resulting iterator includes the subdirectories themselves.
- *
+ *
* @param directory the directory to search in
* @param fileFilter filter to apply when finding files.
* @param dirFilter optional filter to apply when finding subdirectories.
@@ -770,13 +770,13 @@ public class FileUtils {
/**
* Compares the contents of two files to determine if they are equal or not.
* <p>
- * This method checks to see if the two files point to the same file,
+ * This method checks to see if the two files point to the same file,
* before resorting to line-by-line comparison of the contents.
* <p>
*
* @param file1 the first file
* @param file2 the second file
- * @param charsetName the character encoding to be used.
+ * @param charsetName the character encoding to be used.
* May be null, in which case the platform default is used
* @return true if the content of the files are equal or neither exists,
* false otherwise
@@ -858,7 +858,7 @@ public class FileUtils {
* percent-encoded octets and simply pass them literally through to the
* result string. Except for rare edge cases, this will make unencoded URLs
* pass through unaltered.
- *
+ *
* @param url The URL to decode, may be {@code null}.
* @return The decoded URL or {@code null} if the input was
* {@code null}.
@@ -1027,10 +1027,10 @@ public class FileUtils {
* modified date/times using {@link File#setLastModified(long)}, however
* it is not guaranteed that the operation will succeed.
* If the modification operation fails, no indication is provided.
- *
+ *
* @param srcFile an existing file to copy, must not be {@code null}
* @param destFile the new file, must not be {@code null}
- *
+ *
* @throws NullPointerException if source or destination is {@code null}
* @throws IOException if source or destination is invalid
* @throws IOException if an IO error occurs during copying
@@ -1098,7 +1098,7 @@ public class FileUtils {
* <p>
* This method buffers the input internally, so there is no need to use a <code>BufferedInputStream</code>.
* </p>
- *
+ *
* @param input
* the <code>File</code> to read from
* @param output
@@ -1118,10 +1118,10 @@ public class FileUtils {
fis.close();
}
}
-
+
/**
* Internal copy file method.
- *
+ *
* @param srcFile the validated source file, must not be {@code null}
* @param destFile the validated destination file, must not be {@code null}
* @param preserveFileDate whether to preserve the file date
@@ -1278,7 +1278,7 @@ public class FileUtils {
* it is not guaranteed that those operations will succeed.
* If the modification operation fails, no indication is provided.
*
- * <h4>Example: Copy directories only</h4>
+ * <h4>Example: Copy directories only</h4>
* <pre>
* // only copy the directory structure
* FileUtils.copyDirectory(srcDir, destDir, DirectoryFileFilter.DIRECTORY);
@@ -1328,7 +1328,7 @@ public class FileUtils {
* not guaranteed that those operations will succeed.
* If the modification operation fails, no indication is provided.
*
- * <h4>Example: Copy directories only</h4>
+ * <h4>Example: Copy directories only</h4>
* <pre>
* // only copy the directory structure
* FileUtils.copyDirectory(srcDir, destDir, DirectoryFileFilter.DIRECTORY, false);
@@ -1346,7 +1346,7 @@ public class FileUtils {
* // Copy using the filter
* FileUtils.copyDirectory(srcDir, destDir, filter, false);
* </pre>
- *
+ *
* @param srcDir an existing directory to copy, must not be {@code null}
* @param destDir the new directory, must not be {@code null}
* @param filter the filter to apply, null means copy all directories and files
@@ -1393,7 +1393,7 @@ public class FileUtils {
/**
* Internal copy directory method.
- *
+ *
* @param srcDir the validated source directory, must not be {@code null}
* @param destDir the validated destination directory, must not be {@code null}
* @param filter the filter to apply, null means copy all directories and files
@@ -1475,7 +1475,7 @@ public class FileUtils {
* @param connectionTimeout the number of milliseconds until this method
* will timeout if no connection could be established to the <code>source</code>
* @param readTimeout the number of milliseconds until this method will
- * timeout if no data could be read from the <code>source</code>
+ * timeout if no data could be read from the <code>source</code>
* @throws IOException if <code>source</code> URL cannot be opened
* @throws IOException if <code>destination</code> is a directory
* @throws IOException if <code>destination</code> cannot be written
@@ -1523,7 +1523,7 @@ public class FileUtils {
//-----------------------------------------------------------------------
/**
- * Deletes a directory recursively.
+ * Deletes a directory recursively.
*
* @param directory directory to delete
* @throws IOException in case deletion is unsuccessful
@@ -1582,7 +1582,7 @@ public class FileUtils {
* <p>
* Files are normalized before comparison.
* </p>
- *
+ *
* Edge cases:
* <ul>
* <li>A {@code directory} must not be null: if null, throw IllegalArgumentException</li>
@@ -1590,7 +1590,7 @@ public class FileUtils {
* <li>A directory does not contain itself: return false</li>
* <li>A null child file is not contained in any parent: return false</li>
* </ul>
- *
+ *
* @param directory
* the file to consider as the parent.
* @param child
@@ -1602,28 +1602,28 @@ public class FileUtils {
* @see FilenameUtils#directoryContains(String, String)
*/
public static boolean directoryContains(final File directory, final File child) throws IOException {
-
+
// Fail fast against NullPointerException
if (directory == null) {
throw new IllegalArgumentException("Directory must not be null");
}
-
+
if (!directory.isDirectory()) {
throw new IllegalArgumentException("Not a directory: " + directory);
}
-
+
if (child == null) {
return false;
}
-
+
if (!directory.exists() || !child.exists()) {
return false;
}
-
+
// Canonicalize paths (normalizes relative paths)
final String canonicalParent = directory.getCanonicalPath();
final String canonicalChild = child.getCanonicalPath();
-
+
return FilenameUtils.directoryContains(canonicalParent, canonicalChild);
}
@@ -1719,7 +1719,7 @@ public class FileUtils {
/**
* Reads the contents of a file into a String. The file is always closed.
- *
+ *
* @param file
* the file to read, must not be {@code null}
* @param encoding
@@ -1738,7 +1738,7 @@ public class FileUtils {
/**
- * Reads the contents of a file into a String using the default encoding for the VM.
+ * Reads the contents of a file into a String using the default encoding for the VM.
* The file is always closed.
*
* @param file the file to read, must not be {@code null}
@@ -1793,7 +1793,7 @@ public class FileUtils {
/**
* Reads the contents of a file line by line to a List of Strings. The file is always closed.
- *
+ *
* @param file
* the file to read, must not be {@code null}
* @param encoding
@@ -1959,7 +1959,7 @@ public class FileUtils {
/**
* Writes a String to a file creating the file if it does not exist using the default encoding for the VM.
- *
+ *
* @param file the file to write
* @param data the content to write to the file
* @throws IOException in case of an I/O error
@@ -1972,7 +1972,7 @@ public class FileUtils {
/**
* Writes a String to a file creating the file if it does not exist using the default encoding for the VM.
- *
+ *
* @param file the file to write
* @param data the content to write to the file
* @param append if {@code true}, then the String will be added to the
@@ -1988,7 +1988,7 @@ public class FileUtils {
/**
* Writes a CharSequence to a file creating the file if it does not exist using the default encoding for the VM.
- *
+ *
* @param file the file to write
* @param data the content to write to the file
* @throws IOException in case of an I/O error
@@ -2002,7 +2002,7 @@ public class FileUtils {
/**
* Writes a CharSequence to a file creating the file if it does not exist using the default encoding for the VM.
- *
+ *
* @param file the file to write
* @param data the content to write to the file
* @param append if {@code true}, then the data will be added to the
@@ -2197,7 +2197,7 @@ public class FileUtils {
public static void writeLines(final File file, final Collection<?> lines) throws IOException {
writeLines(file, null, lines, null, false);
}
-
+
/**
* Writes the <code>toString()</code> value of each item in a collection to
* the specified <code>File</code> line by line.
@@ -2438,7 +2438,7 @@ public class FileUtils {
/**
* Makes any necessary but nonexistent parent directories for a given File. If the parent directory cannot be
* created then an IOException is thrown.
- *
+ *
* @param file
* file with parent to create, must not be {@code null}
* @throws NullPointerException
@@ -2457,25 +2457,25 @@ public class FileUtils {
//-----------------------------------------------------------------------
/**
- * Returns the size of the specified file or directory. If the provided
+ * Returns the size of the specified file or directory. If the provided
* {@link File} is a regular file, then the file's length is returned.
* If the argument is a directory, then the size of the directory is
- * calculated recursively. If a directory or subdirectory is security
+ * calculated recursively. If a directory or subdirectory is security
* restricted, its size will not be included.
* <p>
* Note that overflow is not detected, and the return value may be negative if
* overflow occurs. See {@link #sizeOfAsBigInteger(File)} for an alternative
* method that does not overflow.
*
- * @param file the regular file or directory to return the size
+ * @param file the regular file or directory to return the size
* of (must not be {@code null}).
- *
- * @return the length of the file, or recursive size of the directory,
+ *
+ * @return the length of the file, or recursive size of the directory,
* provided (in bytes).
- *
+ *
* @throws NullPointerException if the file is {@code null}
* @throws IllegalArgumentException if the file does not exist.
- *
+ *
* @since 2.0
*/
public static long sizeOf(final File file) {
@@ -2494,21 +2494,21 @@ public class FileUtils {
}
/**
- * Returns the size of the specified file or directory. If the provided
+ * Returns the size of the specified file or directory. If the provided
* {@link File} is a regular file, then the file's length is returned.
* If the argument is a directory, then the size of the directory is
- * calculated recursively. If a directory or subdirectory is security
+ * calculated recursively. If a directory or subdirectory is security
* restricted, its size will not be included.
- *
- * @param file the regular file or directory to return the size
+ *
+ * @param file the regular file or directory to return the size
* of (must not be {@code null}).
- *
- * @return the length of the file, or recursive size of the directory,
+ *
+ * @return the length of the file, or recursive size of the directory,
* provided (in bytes).
- *
+ *
* @throws NullPointerException if the file is {@code null}
* @throws IllegalArgumentException if the file does not exist.
- *
+ *
* @since 2.4
*/
public static BigInteger sizeOfAsBigInteger(final File file) {
@@ -2533,7 +2533,7 @@ public class FileUtils {
* overflow occurs. See {@link #sizeOfDirectoryAsBigInteger(File)} for an alternative
* method that does not overflow.
*
- *
+ *
* @param directory
* directory to inspect, must not be {@code null}
* @return size of directory in bytes, 0 if directory is security restricted, a negative number when the real total
@@ -2568,7 +2568,7 @@ public class FileUtils {
/**
* Counts the size of a directory recursively (sum of the length of all files).
- *
+ *
* @param directory
* directory to inspect, must not be {@code null}
* @return size of directory in bytes, 0 if directory is security restricted.
@@ -2600,7 +2600,7 @@ public class FileUtils {
/**
* Checks that the given {@code File} exists and is a directory.
- *
+ *
* @param directory The {@code File} to check.
* @throws IllegalArgumentException if the given {@code File} does not exist or is not a directory.
*/
@@ -2641,7 +2641,7 @@ public class FileUtils {
/**
* Tests if the specified <code>File</code> is newer than the specified
* <code>Date</code>.
- *
+ *
* @param file the <code>File</code> of which the modification date
* must be compared, must not be {@code null}
* @param date the date reference, must not be {@code null}
@@ -2708,7 +2708,7 @@ public class FileUtils {
/**
* Tests if the specified <code>File</code> is older than the specified
* <code>Date</code>.
- *
+ *
* @param file the <code>File</code> of which the modification date
* must be compared, must not be {@code null}
* @param date the date reference, must not be {@code null}
@@ -2869,7 +2869,7 @@ public class FileUtils {
throw new IOException("Destination '" + destDir + "' is not a directory");
}
moveDirectory(src, new File(destDir, src.getName()));
-
+
}
/**
@@ -2954,7 +2954,7 @@ public class FileUtils {
* When the destination is on another file system, do a "copy and delete".
*
* @param src the file or directory to be moved
- * @param destDir the destination directory
+ * @param destDir the destination directory
* @param createDestDir If {@code true} create the destination directory,
* otherwise if {@code false} throw an IOException
* @throws NullPointerException if source or destination is {@code null}
@@ -3011,7 +3011,7 @@ public class FileUtils {
final File canonicalDir = file.getParentFile().getCanonicalFile();
fileInCanonicalDir = new File(canonicalDir, file.getName());
}
-
+
if (fileInCanonicalDir.getCanonicalFile().equals(fileInCanonicalDir.getAbsoluteFile())) {
return false;
} else {
Modified: commons/proper/io/trunk/src/main/java/org/apache/commons/io/FilenameUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/commons/io/FilenameUtils.java?rev=1471767&r1=1471766&r2=1471767&view=diff
==============================================================================
--- commons/proper/io/trunk/src/main/java/org/apache/commons/io/FilenameUtils.java (original)
+++ commons/proper/io/trunk/src/main/java/org/apache/commons/io/FilenameUtils.java Wed Apr 24 23:24:19 2013
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -131,7 +131,7 @@ public class FilenameUtils {
//-----------------------------------------------------------------------
/**
* Determines if Windows file system is in use.
- *
+ *
* @return true if the system is Windows
*/
static boolean isSystemWindows() {
@@ -141,7 +141,7 @@ public class FilenameUtils {
//-----------------------------------------------------------------------
/**
* Checks if the character is a separator.
- *
+ *
* @param ch the character to check
* @return true if it is a separator character
*/
@@ -356,10 +356,10 @@ public class FilenameUtils {
if (prefix < 0) {
return null;
}
-
+
final char[] array = new char[size + 2]; // +1 for possible extra slash, +2 for arraycopy
filename.getChars(0, filename.length(), array, 0);
-
+
// fix separators throughout
final char otherSeparator = separator == SYSTEM_SEPARATOR ? OTHER_SEPARATOR : SYSTEM_SEPARATOR;
for (int i = 0; i < array.length; i++) {
@@ -367,14 +367,14 @@ public class FilenameUtils {
array[i] = separator;
}
}
-
+
// add extra separator on the end to simplify code below
boolean lastIsDirectory = true;
if (array[size - 1] != separator) {
array[size++] = separator;
lastIsDirectory = false;
}
-
+
// adjoining slashes
for (int i = prefix + 1; i < size; i++) {
if (array[i] == separator && array[i - 1] == separator) {
@@ -383,7 +383,7 @@ public class FilenameUtils {
i--;
}
}
-
+
// dot slash
for (int i = prefix + 1; i < size; i++) {
if (array[i] == separator && array[i - 1] == '.' &&
@@ -396,7 +396,7 @@ public class FilenameUtils {
i--;
}
}
-
+
// double dot slash
outer:
for (int i = prefix + 2; i < size; i++) {
@@ -424,7 +424,7 @@ public class FilenameUtils {
i = prefix + 1;
}
}
-
+
if (size <= 0) { // should never be less than 0
return "";
}
@@ -506,14 +506,14 @@ public class FilenameUtils {
* <p>
* The files names are expected to be normalized.
* </p>
- *
+ *
* Edge cases:
* <ul>
* <li>A {@code directory} must not be null: if null, throw IllegalArgumentException</li>
* <li>A directory does not contain itself: return false</li>
* <li>A null child file is not contained in any parent: return false</li>
* </ul>
- *
+ *
* @param canonicalParent
* the file to consider as the parent.
* @param canonicalChild
@@ -546,7 +546,7 @@ public class FilenameUtils {
//-----------------------------------------------------------------------
/**
* Converts all separators to the Unix separator of forward slash.
- *
+ *
* @param path the path to be changed, null ignored
* @return the updated path
*/
@@ -559,7 +559,7 @@ public class FilenameUtils {
/**
* Converts all separators to the Windows separator of backslash.
- *
+ *
* @param path the path to be changed, null ignored
* @return the updated path
*/
@@ -572,7 +572,7 @@ public class FilenameUtils {
/**
* Converts all separators to the system separator.
- *
+ *
* @param path the path to be changed, null ignored
* @return the updated path
*/
@@ -664,7 +664,7 @@ public class FilenameUtils {
return 3;
}
return -1;
-
+
} else if (isSeparator(ch0) && isSeparator(ch1)) {
int posUnix = filename.indexOf(UNIX_SEPARATOR, 2);
int posWin = filename.indexOf(WINDOWS_SEPARATOR, 2);
@@ -687,7 +687,7 @@ public class FilenameUtils {
* The position of the last forward or backslash is returned.
* <p>
* The output will be the same irrespective of the machine that the code is running on.
- *
+ *
* @param filename the filename to find the last path separator in, null returns -1
* @return the index of the last separator character, or -1 if there
* is no such character
@@ -709,7 +709,7 @@ public class FilenameUtils {
* handle a file in either Unix or Windows format.
* <p>
* The output will be the same irrespective of the machine that the code is running on.
- *
+ *
* @param filename the filename to find the last path separator in, null returns -1
* @return the index of the last separator character, or -1 if there
* is no such character
@@ -822,7 +822,7 @@ public class FilenameUtils {
/**
* Does the work of getting the path.
- *
+ *
* @param filename the filename
* @param separatorAdd 0 to omit the end separator, 1 to return it
* @return the path
@@ -904,7 +904,7 @@ public class FilenameUtils {
/**
* Does the work of getting the path.
- *
+ *
* @param filename the filename
* @param includeSeparator true to include the end separator
* @return the path
@@ -1119,7 +1119,7 @@ public class FilenameUtils {
public static boolean equals(
String filename1, String filename2,
final boolean normalized, IOCase caseSensitivity) {
-
+
if (filename1 == null || filename2 == null) {
return filename1 == null && filename2 == null;
}
@@ -1231,7 +1231,7 @@ public class FilenameUtils {
* wildcardMatch("c.txt", "*.????") --> false
* </pre>
* N.B. the sequence "*?" does not work properly at present in match strings.
- *
+ *
* @param filename the filename to match on
* @param wildcardMatcher the wildcard string to match against
* @return true if the filename matches the wilcard string
@@ -1257,7 +1257,7 @@ public class FilenameUtils {
* wildcardMatch("c.txt", "*.????") --> false
* </pre>
* N.B. the sequence "*?" does not work properly at present in match strings.
- *
+ *
* @param filename the filename to match on
* @param wildcardMatcher the wildcard string to match against
* @return true if the filename matches the wilcard string
@@ -1274,7 +1274,7 @@ public class FilenameUtils {
* The wildcard matcher uses the characters '?' and '*' to represent a
* single or multiple (zero or more) wildcard characters.
* N.B. the sequence "*?" does not work properly at present in match strings.
- *
+ *
* @param filename the filename to match on
* @param wildcardMatcher the wildcard string to match against
* @param caseSensitivity what case sensitivity rule to use, null means case-sensitive
@@ -1296,7 +1296,7 @@ public class FilenameUtils {
int textIdx = 0;
int wcsIdx = 0;
final Stack<int[]> backtrack = new Stack<int[]>();
-
+
// loop around a backtrack stack, to handle complex * matching
do {
if (backtrack.size() > 0) {
@@ -1305,10 +1305,10 @@ public class FilenameUtils {
textIdx = array[1];
anyChars = true;
}
-
+
// loop whilst tokens and text left to process
while (wcsIdx < wcs.length) {
-
+
if (wcs[wcsIdx].equals("?")) {
// ? so move to next text char
textIdx++;
@@ -1316,14 +1316,14 @@ public class FilenameUtils {
break;
}
anyChars = false;
-
+
} else if (wcs[wcsIdx].equals("*")) {
// set any chars status
anyChars = true;
if (wcsIdx == wcs.length - 1) {
textIdx = filename.length();
}
-
+
} else {
// matching text token
if (anyChars) {
@@ -1344,22 +1344,22 @@ public class FilenameUtils {
break;
}
}
-
+
// matched text token, move text index to end of matched token
textIdx += wcs[wcsIdx].length();
anyChars = false;
}
-
+
wcsIdx++;
}
-
+
// full match
if (wcsIdx == wcs.length && textIdx == filename.length()) {
return true;
}
-
+
} while (backtrack.size() > 0);
-
+
return false;
}
@@ -1367,14 +1367,14 @@ public class FilenameUtils {
* Splits a string into a number of tokens.
* The text is split by '?' and '*'.
* Where multiple '*' occur consecutively they are collapsed into a single '*'.
- *
+ *
* @param text the text to split
* @return the array of tokens, never null
*/
static String[] splitOnTokens(final String text) {
// used by wildcardMatch
// package level so a unit test may run on this
-
+
if (text.indexOf('?') == -1 && text.indexOf('*') == -1) {
return new String[] { text };
}
Modified: commons/proper/io/trunk/src/main/java/org/apache/commons/io/HexDump.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/commons/io/HexDump.java?rev=1471767&r1=1471766&r2=1471767&view=diff
==============================================================================
--- commons/proper/io/trunk/src/main/java/org/apache/commons/io/HexDump.java (original)
+++ commons/proper/io/trunk/src/main/java/org/apache/commons/io/HexDump.java Wed Apr 24 23:24:19 2013
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -54,7 +54,7 @@ public class HexDump {
* the first byte on that line is located.
* <p>
* All bytes between the given index (inclusive) and the end of the
- * data array are dumped.
+ * data array are dumped.
*
* @param data the byte array to be dumped
* @param offset offset of the byte array within a larger entity
@@ -73,7 +73,7 @@ public class HexDump {
final OutputStream stream, final int index)
throws IOException, ArrayIndexOutOfBoundsException,
IllegalArgumentException {
-
+
if (index < 0 || index >= data.length) {
throw new ArrayIndexOutOfBoundsException(
"illegal index: " + index + " into array of length "
Modified: commons/proper/io/trunk/src/main/java/org/apache/commons/io/IOCase.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/commons/io/IOCase.java?rev=1471767&r1=1471766&r2=1471767&view=diff
==============================================================================
--- commons/proper/io/trunk/src/main/java/org/apache/commons/io/IOCase.java (original)
+++ commons/proper/io/trunk/src/main/java/org/apache/commons/io/IOCase.java Wed Apr 24 23:24:19 2013
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -40,12 +40,12 @@ public final class IOCase implements Ser
* The constant for case sensitive regardless of operating system.
*/
public static final IOCase SENSITIVE = new IOCase("Sensitive", true);
-
+
/**
* The constant for case insensitive regardless of operating system.
*/
public static final IOCase INSENSITIVE = new IOCase("Insensitive", false);
-
+
/**
* The constant for case sensitivity determined by the current operating system.
* Windows is case-insensitive when comparing filenames, Unix is case-sensitive.
@@ -65,14 +65,14 @@ public final class IOCase implements Ser
/** The enumeration name. */
private final String name;
-
+
/** The sensitivity flag. */
private final transient boolean sensitive;
//-----------------------------------------------------------------------
/**
* Factory method to create an IOCase from a name.
- *
+ *
* @param name the name to find
* @return the IOCase object
* @throws IllegalArgumentException if the name is invalid
@@ -93,7 +93,7 @@ public final class IOCase implements Ser
//-----------------------------------------------------------------------
/**
* Private constructor.
- *
+ *
* @param name the name
* @param sensitive the sensitivity
*/
@@ -105,7 +105,7 @@ public final class IOCase implements Ser
/**
* Replaces the enumeration from the stream with a real one.
* This ensures that the correct flag is set for SYSTEM.
- *
+ *
* @return the resolved object
*/
private Object readResolve() {
@@ -115,7 +115,7 @@ public final class IOCase implements Ser
//-----------------------------------------------------------------------
/**
* Gets the name of the constant.
- *
+ *
* @return the name of the constant
*/
public String getName() {
@@ -124,7 +124,7 @@ public final class IOCase implements Ser
/**
* Does the object represent case sensitive comparison.
- *
+ *
* @return true if case sensitive
*/
public boolean isCaseSensitive() {
@@ -137,7 +137,7 @@ public final class IOCase implements Ser
* <p>
* This method mimics {@link String#compareTo} but takes case-sensitivity
* into account.
- *
+ *
* @param str1 the first string to compare, not null
* @param str2 the second string to compare, not null
* @return true if equal using the case rules
@@ -155,7 +155,7 @@ public final class IOCase implements Ser
* <p>
* This method mimics {@link String#equals} but takes case-sensitivity
* into account.
- *
+ *
* @param str1 the first string to compare, not null
* @param str2 the second string to compare, not null
* @return true if equal using the case rules
@@ -173,7 +173,7 @@ public final class IOCase implements Ser
* <p>
* This method mimics {@link String#startsWith(String)} but takes case-sensitivity
* into account.
- *
+ *
* @param str the string to check, not null
* @param start the start to compare against, not null
* @return true if equal using the case rules
@@ -188,7 +188,7 @@ public final class IOCase implements Ser
* <p>
* This method mimics {@link String#endsWith} but takes case-sensitivity
* into account.
- *
+ *
* @param str the string to check, not null
* @param end the end to compare against, not null
* @return true if equal using the case rules
@@ -203,9 +203,9 @@ public final class IOCase implements Ser
* Checks if one string contains another starting at a specific index using the
* case-sensitivity rule.
* <p>
- * This method mimics parts of {@link String#indexOf(String, int)}
+ * This method mimics parts of {@link String#indexOf(String, int)}
* but takes case-sensitivity into account.
- *
+ *
* @param str the string to check, not null
* @param strStartIndex the index to start at in str
* @param search the start to search for, not null
@@ -229,9 +229,9 @@ public final class IOCase implements Ser
/**
* Checks if one string contains another at a specific index using the case-sensitivity rule.
* <p>
- * This method mimics parts of {@link String#regionMatches(boolean, int, String, int, int)}
+ * This method mimics parts of {@link String#regionMatches(boolean, int, String, int, int)}
* but takes case-sensitivity into account.
- *
+ *
* @param str the string to check, not null
* @param strStartIndex the index to start at in str
* @param search the start to search for, not null
@@ -245,7 +245,7 @@ public final class IOCase implements Ser
//-----------------------------------------------------------------------
/**
* Gets a string describing the sensitivity.
- *
+ *
* @return a string describing the sensitivity
*/
@Override