Index: lutingenerator/src/java/org/codelutin/generator/UIModelGenerator.java
diff -u lutingenerator/src/java/org/codelutin/generator/UIModelGenerator.java:1.6 lutingenerator/src/java/org/codelutin/generator/UIModelGenerator.java:1.7
--- lutingenerator/src/java/org/codelutin/generator/UIModelGenerator.java:1.6	Fri Aug  6 17:46:45 2004
+++ lutingenerator/src/java/org/codelutin/generator/UIModelGenerator.java	Tue Aug 10 17:07:03 2004
@@ -1,34 +1,41 @@
 /*
- * Created on 7 janv. 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
+* Created on 7 janv. 2004
+*
+* To change the template for this generated file go to
+* Window - Preferences - Java - Code Generation - Code and Comments
+*/
 package org.codelutin.generator;
 
 import java.io.File;
-import java.io.FileWriter;
 import java.io.IOException;
 import java.io.StringWriter;
 import java.io.Writer;
-import java.util.Iterator;
 
-import org.codelutin.generator.models.ui.UIModel;
+import org.dom4j.DocumentException;
+
+import org.codelutin.generator.models.ui.javaxml.JavaXMLParser;
 import org.codelutin.generator.models.ui.xml.UIModelImpl;
+import org.codelutin.generator.models.ui.UIModel;
 import org.codelutin.generator.models.ui.UIModelObject;
+
 import org.codelutin.util.ResourceNotFoundException;
 import org.codelutin.xml.XMLObjectParser;
+
 import java.util.logging.Logger;
 import java.util.logging.Level;
+import java.util.Iterator;
 
 /**
- * @author cedric
- *
- * To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
+* UIModelGenerator.java
+* @author cedric
+*
+* To change the template for this generated type comment go to
+* Window - Preferences - Java - Code Generation - Code and Comments
+*/
+
 public class UIModelGenerator extends ChildGenerator {
 
+
     protected UIModel model = null;
 
     public UIModelGenerator(){
@@ -47,16 +54,29 @@
         setLastModifiedSource(tabUIFilesName);
         for(int i = 0; i<tabUIFilesName.length; i++){
             try {
-                XMLObjectParser parser = new XMLObjectParser(tabUIFilesName[i]);
-                parser.setPrefix("par");
-                UIModel ui = (UIModel) parser.parseRoot(new UIModelImpl());
-                generate(ui, destDir);
+                String fileName = tabUIFilesName[i].getName();
+                UIModel ui = null;
+                if (fileName.endsWith(".javaxml")){
+                    JavaXMLParser parser = new JavaXMLParser();
+                    ui = parser.parse(tabUIFilesName[i]);
+
+                }else{
+                    XMLObjectParser parser = new XMLObjectParser(tabUIFilesName[i]);
+                    parser.setPrefix("par");
+                    ui = (UIModel) parser.parseRoot(new UIModelImpl());
+                }
+                if (ui!=null){
+                    generate(ui, destDir);
+                }
             }catch (ResourceNotFoundException eee) {
                 System.out.println("Unable to parse topiaUI input file : " + i);
                 eee.printStackTrace();
             }catch (IOException eee) {
                 System.out.println("Unable to generate for file");
                 eee.printStackTrace();
+            }catch (DocumentException eee) {
+                System.out.println("Error during the processing of a DOM4J");
+                eee.printStackTrace();
             }
         }
     }
@@ -108,10 +128,11 @@
     }
 
     public void generateFromUIModel(Writer output, UIModel model)
-        throws IOException {
+    throws IOException {
     }
 
     public void generateFromUIModelObject(Writer output, UIModelObject object)
-        throws IOException {
+    throws IOException {
     }
+
 }