bodewig 2004/10/26 07:57:26
Modified: . Tag: ANT_16_BRANCH CONTRIBUTORS
src/main/org/apache/tools/ant/helper Tag: ANT_16_BRANCH
ProjectHelper2.java
Log:
merge
Revision Changes Path
No revision
No revision
1.1.2.25 +1 -0 ant/CONTRIBUTORS
Index: CONTRIBUTORS
===================================================================
RCS file: /home/cvs/ant/CONTRIBUTORS,v
retrieving revision 1.1.2.24
retrieving revision 1.1.2.25
diff -u -r1.1.2.24 -r1.1.2.25
--- CONTRIBUTORS 30 Sep 2004 09:26:23 -0000 1.1.2.24
+++ CONTRIBUTORS 26 Oct 2004 14:57:26 -0000 1.1.2.25
@@ -104,6 +104,7 @@
Juerg Wanner
Keiron Liddle
Keith Visco
+Kevin Greiner
Kevin Ross
Kevin Z Grey
Kirk Wylie
No revision
No revision
1.33.2.16 +11 -1
ant/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
Index: ProjectHelper2.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/helper/ProjectHelper2.java,v
retrieving revision 1.33.2.15
retrieving revision 1.33.2.16
diff -u -r1.33.2.15 -r1.33.2.16
--- ProjectHelper2.java 30 Sep 2004 17:34:05 -0000 1.33.2.15
+++ ProjectHelper2.java 26 Oct 2004 14:57:26 -0000 1.33.2.16
@@ -220,6 +220,8 @@
be.setLocation(location);
}
throw be;
+ } else if (t == null) {
+ t = exc;
}
throw new BuildException(exc.getMessage(), t, location);
@@ -227,6 +229,8 @@
Throwable t = exc.getException();
if (t instanceof BuildException) {
throw (BuildException) t;
+ } else if (t == null) {
+ t = exc;
}
throw new BuildException(exc.getMessage(), t);
} catch (FileNotFoundException exc) {
@@ -552,8 +556,14 @@
// if (qname.equals( "target" ) )
// return ProjectHelper2.targetHandler;
// }
- throw new SAXParseException("Unexpected element \"" + qname
+ if (name.equals(qname)) {
+ throw new SAXParseException("Unexpected element \"{" +
uri
+ + "}" + name + "\" {" + ANT_CORE_URI + "}" + name,
+ context.getLocator());
+ } else {
+ throw new SAXParseException("Unexpected element \"" +
qname
+ "\" " + name, context.getLocator());
+ }
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
