bodewig 2002/09/30 05:37:57
Modified: src/main/org/apache/tools/ant/filters Tag: ANT_15_BRANCH
LineContains.java
Log:
merge tests for linecontains from HEAD
Revision Changes Path
No revision
No revision
1.4.2.3 +2 -2
jakarta-ant/src/main/org/apache/tools/ant/filters/LineContains.java
Index: LineContains.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/filters/LineContains.java,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -r1.4.2.2 -r1.4.2.3
--- LineContains.java 11 Jun 2002 16:08:32 -0000 1.4.2.2
+++ LineContains.java 30 Sep 2002 12:37:57 -0000 1.4.2.3
@@ -143,12 +143,11 @@
line = line.substring(1);
}
} else {
- String goodLine = null;
line = readLine();
if (line == null) {
ch = -1;
} else {
- int containsSize = contains.size();
+ final int containsSize = contains.size();
for (int i = 0; i < containsSize; i++) {
String containsStr = (String) contains.elementAt(i);
if (line.indexOf(containsStr) == -1) {
@@ -156,6 +155,7 @@
break;
}
}
+
return read();
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
