peterreilly 2003/12/16 13:19:26
Modified: src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
MacroInstance.java
Log:
sync with HEAD
Revision Changes Path
No revision
No revision
1.5.2.8 +1 -4
ant/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java
Index: MacroInstance.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java,v
retrieving revision 1.5.2.7
retrieving revision 1.5.2.8
diff -u -r1.5.2.7 -r1.5.2.8
--- MacroInstance.java 3 Dec 2003 13:22:30 -0000 1.5.2.7
+++ MacroInstance.java 16 Dec 2003 21:19:26 -0000 1.5.2.8
@@ -129,13 +129,10 @@
private Map getNsElements() {
if (nsElements == null) {
nsElements = new HashMap();
- String myUri = ProjectHelper.extractUriFromComponentName(
- getTaskType());
for (Iterator i = macroDef.getElements().entrySet().iterator();
i.hasNext();) {
Map.Entry entry = (Map.Entry) i.next();
- nsElements.put(ProjectHelper.genComponentName(
- myUri, (String) entry.getKey()),
+ nsElements.put((String) entry.getKey(),
entry.getValue());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
