[jboss-svn-commits] JBL Code SVN: r6991 - in labs/jbossesb/workspace/eschifman/trunk/product/core/rosetta/src/org/jboss: internal/soa/esb/notification soa/esb/helpers

[jboss-svn-commits at lists.jboss.org]

Author: estebanschifman
Date: 2006-10-20 17:53:32 -0400 (Fri, 20 Oct 2006)
New Revision: 6991

Modified:
   labs/jbossesb/workspace/eschifman/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/notification/MacroExpander.java
   labs/jbossesb/workspace/eschifman/trunk/product/core/rosetta/src/org/jboss/soa/esb/helpers/ConfigTree.java
Log:
Fix bugs introduced by DomElement -> ConfigTree refactoring

Modified: labs/jbossesb/workspace/eschifman/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/notification/MacroExpander.java
===================================================================
--- labs/jbossesb/workspace/eschifman/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/notification/MacroExpander.java	2006-10-20 21:48:08 UTC (rev 6990)
+++ labs/jbossesb/workspace/eschifman/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/notification/MacroExpander.java	2006-10-20 21:53:32 UTC (rev 6991)
@@ -22,10 +22,14 @@
 
 package org.jboss.internal.soa.esb.notification;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 
 import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.helpers.KeyValuePair;
 
+
 /**
  * MacroExpander class.
  * <p/>
@@ -57,7 +61,9 @@
 	 */
 	public static void replaceMacros(ConfigTree domTree, Map replacementTokenMap) {
 
-		for (String currAtt : domTree.getAttributeNames()) {
+		List<KeyValuePair> changed = new ArrayList<KeyValuePair>();
+		for (String currAtt : domTree.getAttributeNames()) 
+		{
 			String sVal = domTree.getAttribute(currAtt);
 			boolean bSubst = false;
 			int iPos = 0;
@@ -78,16 +84,15 @@
 					break;
 				}
 			}
-			if (bSubst) {
-				domTree.setAttribute(currAtt,sVal);
-			}
+			if (bSubst)
+					changed.add(new KeyValuePair(currAtt,sVal));
 		}
+		for (KeyValuePair kvp : changed)
+			domTree.setAttribute(kvp.getKey(),kvp.getValue());
+		changed	= null;
 		
 		// Iterate over the child elements and recursively call this method...
-		for (ConfigTree child : domTree.getAllChildren()) {
-			
-			if(! child.isPureText())
+		for (ConfigTree child : domTree.getAllChildren())
 				replaceMacros(child, replacementTokenMap);
-		}
 	}
 }

Modified: labs/jbossesb/workspace/eschifman/trunk/product/core/rosetta/src/org/jboss/soa/esb/helpers/ConfigTree.java
===================================================================
--- labs/jbossesb/workspace/eschifman/trunk/product/core/rosetta/src/org/jboss/soa/esb/helpers/ConfigTree.java	2006-10-20 21:48:08 UTC (rev 6990)
+++ labs/jbossesb/workspace/eschifman/trunk/product/core/rosetta/src/org/jboss/soa/esb/helpers/ConfigTree.java	2006-10-20 21:53:32 UTC (rev 6991)
@@ -75,8 +75,8 @@
 	{ 
 		if (null!=_dad && null!=_dad._childs)
 				_dad._childs.remove(this);
-		if (null!=_dad)
-			_dad.addChild(this); 
+		if (null!=dad)
+			dad.addChild(this); 
 	} 	
 	/**
 	 * assign a value to a named attribute 
@@ -407,8 +407,6 @@
 			for (int i1=0; i1<NL.getLength(); i1++)
 			{
 				Node node = NL.item(i1);
-				if (!(node instanceof Element))
-					continue;
 				switch (node.getNodeType())
 				{	
 					case Node.ELEMENT_NODE: