conor 01/08/18 22:52:00
Modified: src/main/org/apache/tools/ant ProjectHelper.java
UnknownElement.java
Log:
Merge from fix in 1.4 branch for gump test
Revision Changes Path
1.61 +2 -0
jakarta-ant/src/main/org/apache/tools/ant/ProjectHelper.java
Index: ProjectHelper.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/ProjectHelper.java,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- ProjectHelper.java 2001/08/02 12:21:09 1.60
+++ ProjectHelper.java 2001/08/19 05:52:00 1.61
@@ -464,6 +464,8 @@
if (task == null) {
task = new UnknownElement(tag);
task.setProject(project);
+ task.setTaskType(tag);
+ task.setTaskName(tag);
}
task.setLocation(new Location(buildFile.toString(),
locator.getLineNumber(), locator.getColumnNumber()));
1.9 +9 -0
jakarta-ant/src/main/org/apache/tools/ant/UnknownElement.java
Index: UnknownElement.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/UnknownElement.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- UnknownElement.java 2001/07/27 10:13:14 1.8
+++ UnknownElement.java 2001/08/19 05:52:00 1.9
@@ -169,4 +169,13 @@
return task;
}
+ /**
+ * Get the name to use in logging messages.
+ *
+ * @return the name to use in logging messages.
+ */
+ public String getTaskName() {
+ return realTask == null ? super.getTaskName() :
realTask.getTaskName();
+ }
+
}// UnknownElement
