Update of /var/cvs/src/org/mmbase/util/xml
In directory james.mmbase.org:/tmp/cvs-serv12414/xml
Modified Files:
UtilReader.java
Log Message:
added the possibility to override the creation of the Map.Entry's
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util/xml
Index: UtilReader.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/util/xml/UtilReader.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- UtilReader.java 4 Sep 2008 05:56:23 -0000 1.38
+++ UtilReader.java 14 Nov 2008 10:06:11 -0000 1.39
@@ -37,7 +37,7 @@
* @since MMBase-1.6.4
* @author Rob Vermeulen
* @author Michiel Meeuwissen
- * @version $Id: UtilReader.java,v 1.38 2008/09/04 05:56:23 michiel Exp $
+ * @version $Id: UtilReader.java,v 1.39 2008/11/14 10:06:11 michiel Exp $
*/
public class UtilReader {
@@ -188,6 +188,15 @@
}
}
+ /**
+ * @since MMBase-1.9.1
+ */
+ protected Map.Entry<String, String> getEntry(DocumentReader reader, String
k, String v) {
+ return new Entry<String,String>(k, v);
+ }
+
+
+
protected void readProperties(String s) {
properties.clear();
maps.clear();
@@ -226,7 +235,7 @@
}
}
if (key != null) {
- entryList.add(new
Entry<String,String>(key, value));
+ entryList.add(getEntry(reader, key,
value));
}
}
if (maps.containsKey(name)) {
@@ -236,10 +245,11 @@
}
} else {
String value = reader.getElementValue(p);
- if (properties.containsKey(name)) {
- log.debug("Property '" + name + "' ('" + value
+ "') of " + url + " is shadowed");
+ Map.Entry<String, String> entry = getEntry(reader,
name, value);
+ if (properties.containsKey(entry.getKey())) {
+ log.debug("Property '" + entry.getKey() + "'
('" + entry.getValue() + "') of " + url + " is shadowed");
} else {
- properties.put(name, value);
+ properties.put(entry.getKey(),
entry.getValue());
}
}
}
@@ -247,6 +257,7 @@
} else {
log.debug("Resource " + s + " does not exist");
}
+
}
if (properties.size() == 0) {
log.service("No properties read from " + configList);
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
