Update of /var/cvs/src/org/mmbase/util/xml
In directory james.mmbase.org:/tmp/cvs-serv31925
Modified Files:
BuilderReader.java
Log Message:
overriding 'properties' didn't quite work yet
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util/xml
Index: BuilderReader.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/util/xml/BuilderReader.java,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -b -r1.107 -r1.108
--- BuilderReader.java 4 Sep 2008 05:56:23 -0000 1.107
+++ BuilderReader.java 4 Sep 2008 16:02:21 -0000 1.108
@@ -39,7 +39,7 @@
* @author Rico Jansen
* @author Pierre van Rooden
* @author Michiel Meeuwissen
- * @version $Id: BuilderReader.java,v 1.107 2008/09/04 05:56:23 michiel Exp $
+ * @version $Id: BuilderReader.java,v 1.108 2008/09/04 16:02:21 michiel Exp $
*/
public class BuilderReader extends DocumentReader {
@@ -197,10 +197,11 @@
} else {
element = elementList.get(elementList.size() - 1);
}
- for (Element e : getChildElements(overrides.getDocumentElement(),
list + ".*")) {
+ for (Element overridesList :
getChildElements(overrides.getDocumentElement(), list)) {
+ for (Element e : getChildElements(overridesList, "*")) {
Element newE = (Element) doc.importNode(e, true);
element.appendChild(newE);
-
+ }
}
}
@@ -1040,10 +1041,10 @@
results.putAll(parentparams);
}
}
- for (Element p : getChildElements("builder.properties","property")) {
- String name = getElementAttributeValue(p,"name");
+ for (Element p : getChildElements("builder.properties", "property")) {
+ String name = getElementAttributeValue(p, "name");
String value = getElementValue(p);
- results.put(name,value);
+ results.put(name, value);
}
return results;
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
