peterreilly 2005/01/20 06:35:15
Modified: src/main/org/apache/tools/ant DirectoryScanner.java
Log:
trailing whitespace + multi setting
Revision Changes Path
1.79 +7 -6 ant/src/main/org/apache/tools/ant/DirectoryScanner.java
Index: DirectoryScanner.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/DirectoryScanner.java,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- DirectoryScanner.java 20 Jan 2005 13:50:56 -0000 1.78
+++ DirectoryScanner.java 20 Jan 2005 14:35:15 -0000 1.79
@@ -630,12 +630,12 @@
public void addExcludes(String[] excludes) {
if (excludes != null) {
if (this.excludes != null) {
- String[] tmp = new String[excludes.length
+ String[] tmp = new String[excludes.length
+ this.excludes.length];
- System.arraycopy(this.excludes, 0, tmp, 0,
+ System.arraycopy(this.excludes, 0, tmp, 0,
this.excludes.length);
for (int i = 0; i < excludes.length; i++) {
- tmp[this.excludes.length + i] =
+ tmp[this.excludes.length + i] =
normalizePattern(excludes[i]);
}
this.excludes = tmp;
@@ -1052,7 +1052,7 @@
if ((isCaseSensitive() && includeNonPatterns.contains(name))
||
- (!isCaseSensitive()
+ (!isCaseSensitive()
&& includeNonPatterns.contains(name.toUpperCase()))) {
return true;
}
@@ -1122,7 +1122,7 @@
if ((isCaseSensitive() && excludeNonPatterns.contains(name))
||
- (!isCaseSensitive()
+ (!isCaseSensitive()
&& excludeNonPatterns.contains(name.toUpperCase()))) {
return true;
}
@@ -1538,7 +1538,8 @@
scannedDirs.clear();
includeNonPatterns.clear();
excludeNonPatterns.clear();
- includePatterns = excludePatterns = null;
+ includePatterns = null;
+ excludePatterns = null;
areNonPatternSetsReady = false;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
