bodewig 2004/02/11 08:02:03
Modified: src/main/org/apache/tools/ant Tag: ANT_16_BRANCH
DirectoryScanner.java
src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
Javac.java
Log:
Merge from HEAD
Revision Changes Path
No revision
No revision
1.64.2.5 +8 -0 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.64.2.4
retrieving revision 1.64.2.5
diff -u -r1.64.2.4 -r1.64.2.5
--- DirectoryScanner.java 9 Feb 2004 22:12:14 -0000 1.64.2.4
+++ DirectoryScanner.java 11 Feb 2004 16:02:01 -0000 1.64.2.5
@@ -808,6 +808,14 @@
* @see #slowScan
*/
protected void scandir(File dir, String vpath, boolean fast) {
+ if (dir == null) {
+ throw new BuildException("dir must not be null.");
+ } else if (!dir.exists()) {
+ throw new BuildException(dir + " doesn't exists.");
+ } else if (!dir.isDirectory()) {
+ throw new BuildException(dir + " is not a directory.");
+ }
+
// avoid double scanning of directories, can only happen in fast mode
if (fast && hasBeenScanned(vpath)) {
return;
No revision
No revision
1.115.2.5 +2 -2 ant/src/main/org/apache/tools/ant/taskdefs/Javac.java
Index: Javac.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Javac.java,v
retrieving revision 1.115.2.4
retrieving revision 1.115.2.5
diff -u -r1.115.2.4 -r1.115.2.5
--- Javac.java 9 Feb 2004 22:12:18 -0000 1.115.2.4
+++ Javac.java 11 Feb 2004 16:02:01 -0000 1.115.2.5
@@ -567,7 +567,7 @@
/**
* Sets the target VM that the classes will be compiled for. Valid
* values depend on the compiler, for jdk 1.4 the valid values are
- * "1.1", "1.2", "1.3" and "1.4".
+ * "1.1", "1.2", "1.3", "1.4" and "1.5".
* @param target the target VM
*/
public void setTarget(String target) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
