[MMBASE SCM] r42251 - mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/util/xml

[michiel]

Author: michiel
Date: 2010-05-25 10:49:06 +0200 (Tue, 25 May 2010)
New Revision: 42251

Modified:
   
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/util/xml/AbstractBuilderReader.java
   
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/util/xml/BuilderReader.java
   
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/util/xml/EntityResolver.java
Log:
moved init of ids to static of builder reader itself, to avoid circularity

Modified: 
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/util/xml/AbstractBuilderReader.java
===================================================================
--- 
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/util/xml/AbstractBuilderReader.java
        2010-05-25 08:03:55 UTC (rev 42250)
+++ 
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/util/xml/AbstractBuilderReader.java
        2010-05-25 08:49:06 UTC (rev 42251)
@@ -103,6 +103,8 @@
     private static List<Runnable> postponedDataTypeDecoders = new 
CopyOnWriteArrayList<Runnable>();
 
     static {
+        BuilderReader.registerPublicIDs();
+        BuilderReader.registerSystemIDs();
         EventManager.getInstance().addEventListener(new SystemEventListener() {
                 public void notify(SystemEvent se) {
                     if (se instanceof BuildersRead) {

Modified: 
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/util/xml/BuilderReader.java
===================================================================
--- 
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/util/xml/BuilderReader.java
        2010-05-25 08:03:55 UTC (rev 42250)
+++ 
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/util/xml/BuilderReader.java
        2010-05-25 08:49:06 UTC (rev 42251)
@@ -190,7 +190,7 @@
         Map<String, CoreField> oldset = new HashMap<String, CoreField>();
         int pos = 1;
         if (parentBuilder != null) {
-            List<CoreField> parentfields = 
parentBuilder.getFields(NodeManager.ORDER_CREATE);
+            Collection<CoreField> parentfields = parentBuilder.getFields();
             if (parentfields != null) {
                 // have to clone the parent fields
                 // need clone()!

Modified: 
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/util/xml/EntityResolver.java
===================================================================
--- 
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/util/xml/EntityResolver.java
       2010-05-25 08:03:55 UTC (rev 42250)
+++ 
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/util/xml/EntityResolver.java
       2010-05-25 08:49:06 UTC (rev 42251)
@@ -120,10 +120,8 @@
 
     static {
         // ask known (core) xml readers to register their public ids and dtds
-        // the advantage of doing it this soon, is that the 1DTD are know as 
early as possible.
+        // the advantage of doing it this soon, is that the DTD are know as 
early as possible.
         org.mmbase.util.xml.DocumentReader.registerPublicIDs();
-        BuilderReader.registerPublicIDs();
-        BuilderReader.registerSystemIDs();
         ApplicationReader.registerPublicIDs();
         ModuleReader.registerPublicIDs();
         org.mmbase.util.xml.UtilReader.registerPublicIDs();

_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs