[mmapps-cvs] mmapps/mmbaseconfig/src/net/sf/mmapps/modules/config ConfigurationXMLReader.java, 1.4, 1.5

[Kees J. <ke...@us...>]

Update of /cvsroot/mmapps/mmapps/mmbaseconfig/src/net/sf/mmapps/modules/config
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv24104/mmbaseconfig/src/net/sf/mmapps/modules/config

Modified Files:
	ConfigurationXMLReader.java 
Log Message:
Make simplexml compile against java 1.6. adapted the configuration reader to 
work with the new data types


Index: ConfigurationXMLReader.java
===================================================================
RCS file: /cvsroot/mmapps/mmapps/mmbaseconfig/src/net/sf/mmapps/modules/config/ConfigurationXMLReader.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ConfigurationXMLReader.java	7 Nov 2004 15:32:31 -0000	1.4
--- ConfigurationXMLReader.java	8 Nov 2009 20:08:51 -0000	1.5
***************
*** 156,159 ****
--- 156,163 ----
      public static FieldConfiguration createFieldConfiguration(Configuration config,XMLElement xmlField) {
          FieldConfiguration conf = config.createFieldConfiguration();
+ 	
+        if (xmlField.getProperty("name") != null) {
+          	conf.setName(xmlField.getProperty("name"));
+ 	}
          Iterator iter = xmlField.getChildren().iterator();
          while (iter.hasNext()) {
***************
*** 228,231 ****
--- 232,239 ----
                      }
                  }
+             } else if (child.getTagName().equals("datatype")) {
+                         if (child.getProperty("base") != null) {
+                             conf.setType(child.getProperty("base"));
+                         }
              }
          }