peterreilly 2005/03/07 01:41:16
Modified: src/main/org/apache/tools/ant/taskdefs SubAnt.java
Log:
yuck, tabs
Revision Changes Path
1.24 +17 -17 ant/src/main/org/apache/tools/ant/taskdefs/SubAnt.java
Index: SubAnt.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/SubAnt.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- SubAnt.java 7 Mar 2005 09:37:43 -0000 1.23
+++ SubAnt.java 7 Mar 2005 09:41:16 -0000 1.24
@@ -181,16 +181,16 @@
BuildException buildException = null;
for (int i = 0; i < count; ++i) {
File file = null;
- String subdirPath = null;
+ String subdirPath = null;
Throwable thrownException = null;
try {
File directory = null;
file = new File(filenames[i]);
if (file.isDirectory()) {
- if (verbose) {
- subdirPath = file.getPath();
- log("Entering directory: " + subdirPath + "\n",
Project.MSG_INFO);
- }
+ if (verbose) {
+ subdirPath = file.getPath();
+ log("Entering directory: " + subdirPath + "\n",
Project.MSG_INFO);
+ }
if (genericantfile != null) {
directory = file;
file = genericantfile;
@@ -199,22 +199,22 @@
}
}
execute(file, directory);
- if (verbose && subdirPath != null) {
- log("Leaving directory: " + subdirPath + "\n",
Project.MSG_INFO);
- }
+ if (verbose && subdirPath != null) {
+ log("Leaving directory: " + subdirPath + "\n",
Project.MSG_INFO);
+ }
} catch (RuntimeException ex) {
if (!(getProject().isKeepGoingMode())) {
- if (verbose && subdirPath != null) {
- log("Leaving directory: " + subdirPath + "\n",
Project.MSG_INFO);
- }
+ if (verbose && subdirPath != null) {
+ log("Leaving directory: " + subdirPath + "\n",
Project.MSG_INFO);
+ }
throw ex; // throw further
}
thrownException = ex;
} catch (Throwable ex) {
if (!(getProject().isKeepGoingMode())) {
- if (verbose && subdirPath != null) {
- log("Leaving directory: " + subdirPath + "\n",
Project.MSG_INFO);
- }
+ if (verbose && subdirPath != null) {
+ log("Leaving directory: " + subdirPath + "\n",
Project.MSG_INFO);
+ }
throw new BuildException(ex);
}
thrownException = ex;
@@ -238,9 +238,9 @@
new BuildException(thrownException);
}
}
- if (verbose && subdirPath != null) {
- log("Leaving directory: " + subdirPath + "\n",
Project.MSG_INFO);
- }
+ if (verbose && subdirPath != null) {
+ log("Leaving directory: " + subdirPath + "\n",
Project.MSG_INFO);
+ }
}
}
// check if one of the builds failed in keep going mode
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
