Update of /var/cvs/src/org/mmbase/util/xml
In directory james.mmbase.org:/tmp/cvs-serv9573/xml
Modified Files:
BuilderReader.java
Removed Files:
ApplicationReader.java ApplicationWriter.java
Log Message:
cleaning project. Resolve some of the @move tags
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.105
retrieving revision 1.106
diff -u -b -r1.105 -r1.106
--- BuilderReader.java 3 Sep 2008 21:08:31 -0000 1.105
+++ BuilderReader.java 3 Sep 2008 23:17:25 -0000 1.106
@@ -39,7 +39,7 @@
* @author Rico Jansen
* @author Pierre van Rooden
* @author Michiel Meeuwissen
- * @version $Id: BuilderReader.java,v 1.105 2008/09/03 21:08:31 michiel Exp $
+ * @version $Id: BuilderReader.java,v 1.106 2008/09/03 23:17:25 michiel Exp $
*/
public class BuilderReader extends DocumentReader {
@@ -143,10 +143,10 @@
/**
* @since MMBase-1.9
*/
- public BuilderReader(Document doc, MMBase mmb, int maxVersion) {
+ private BuilderReader(Document doc, MMBase mmb, int maxVersion) {
super(doc);
mmbase = mmb;
- if (this.getVersion() < maxVersion) {
+ if (this.getVersion() <= maxVersion) {
if (getRootElement().getTagName().equals("builder")) {
resolveInheritance();
}
@@ -248,7 +248,7 @@
if (!
doc.getDocumentElement().getTagName().equals("builder")) {
continue;
}
- BuilderReader prop = new BuilderReader(doc, mmbase,
thisVersion);
+ BuilderReader prop = new BuilderReader(doc, mmbase,
thisVersion - 1);
int v = prop.getVersion();
if (v < thisVersion && v > foundVersion) {
parent = prop;
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
