conor 01/08/18 22:48:27
Modified: src/main/org/apache/tools/ant Tag: ANT_14_BRANCH
ProjectHelper.java UnknownElement.java
Log:
Taskdef'd tasks which call System.out were being reported as null
because Project believed the task that is executing is the UnknownElement.
This class now forwards the getTaskName call onto the realTask
Revision Changes Path
No revision
No revision
1.60.2.1 +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.60.2.1
diff -u -r1.60 -r1.60.2.1
--- ProjectHelper.java 2001/08/02 12:21:09 1.60
+++ ProjectHelper.java 2001/08/19 05:48:27 1.60.2.1
@@ -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.8.2.1 +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.8.2.1
diff -u -r1.8 -r1.8.2.1
--- UnknownElement.java 2001/07/27 10:13:14 1.8
+++ UnknownElement.java 2001/08/19 05:48:27 1.8.2.1
@@ -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
