peterreilly 2004/01/06 09:13:06
Modified: src/main/org/apache/tools/ant IntrospectionHelper.java
Log:
Fix for ant namespace support for nested elements
Obtained from: Dominique Devienne
Revision Changes Path
1.72 +12 -0
ant/src/main/org/apache/tools/ant/IntrospectionHelper.java
Index: IntrospectionHelper.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/IntrospectionHelper.java,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- IntrospectionHelper.java 30 Dec 2003 12:48:35 -0000 1.71
+++ IntrospectionHelper.java 6 Jan 2004 17:13:06 -0000 1.72
@@ -610,6 +610,12 @@
String uri = ProjectHelper.extractUriFromComponentName(elementName);
String name =
ProjectHelper.extractNameFromComponentName(elementName);
+ if (uri.equals(ProjectHelper.ANT_CORE_URI)) {
+ uri = "";
+ }
+ if (parentUri.equals(ProjectHelper.ANT_CORE_URI)) {
+ parentUri = "";
+ }
NestedCreator nc = null;
if (uri.equals(parentUri)) { // || uri.equals("")) {
nc = (NestedCreator) nestedCreators.get(
@@ -741,7 +747,13 @@
* @return true if the given nested element is supported
*/
public boolean supportsNestedElement(String parentUri, String
elementName) {
+ if (parentUri.equals(ProjectHelper.ANT_CORE_URI)) {
+ parentUri = "";
+ }
String uri = ProjectHelper.extractUriFromComponentName(elementName);
+ if (uri.equals(ProjectHelper.ANT_CORE_URI)) {
+ uri = "";
+ }
String name =
ProjectHelper.extractNameFromComponentName(elementName);
return (
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
