[Fudaa-svn-commit] SF.net SVN: fudaa:[8362] trunk/soft/fudaa-mascaret/server/src/main/java/org /fudaa/dodico/mascaret

[<de...@us...>]

Revision: 8362
          http://fudaa.svn.sourceforge.net/fudaa/?rev=8362&view=rev
Author:   deniger
Date:     2013-03-22 16:40:09 +0000 (Fri, 22 Mar 2013)
Log Message:
-----------
am?\195?\169lioration aide

Modified Paths:
--------------
    trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/mascaret/EdamoxXMLContent.java
    trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/mascaret/EdamoxXmlReaderWriter.java

Modified: trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/mascaret/EdamoxXMLContent.java
===================================================================
--- trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/mascaret/EdamoxXMLContent.java	2013-03-22 16:14:34 UTC (rev 8361)
+++ trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/mascaret/EdamoxXMLContent.java	2013-03-22 16:40:09 UTC (rev 8362)
@@ -11,9 +11,6 @@
  */
 public class EdamoxXMLContent {
 
-//  protected String xmlns = "http://www.fudaa.fr/xsd/mascaret";
-//  protected String xmlnsxsi = "http://www.w3.org/2001/XMLSchema-instance";
-//  protected String xsischemaLocation;
   private SParametresCAS parametresCas;
 
   public EdamoxXMLContent(SParametresCAS parametresCas) {
@@ -23,14 +20,6 @@
   public EdamoxXMLContent() {
   }
 
-//  protected void setXsdName(final String xsdFile) {
-//    xsischemaLocation = "http://www.fudaa.fr/xsd/crue http://www.fudaa.fr/xsd/mascaret/" + xsdFile;
-//  }
-//
-//  public void updateXmlns() {
-//    xmlns = "http://www.fudaa.fr/xsd/mascaret";
-//    xmlnsxsi = "http://www.w3.org/2001/XMLSchema-instance";
-//  }
 
   public SParametresCAS getParametresCas() {
     return parametresCas;

Modified: trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/mascaret/EdamoxXmlReaderWriter.java
===================================================================
--- trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/mascaret/EdamoxXmlReaderWriter.java	2013-03-22 16:14:34 UTC (rev 8361)
+++ trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/mascaret/EdamoxXmlReaderWriter.java	2013-03-22 16:40:09 UTC (rev 8362)
@@ -4,7 +4,6 @@
 package org.fudaa.dodico.mascaret;
 
 import com.memoire.fu.FuLib;
-import org.fudaa.ctulu.xml.DoubleArrayConverter;
 import com.thoughtworks.xstream.XStream;
 import com.thoughtworks.xstream.converters.ConversionException;
 import com.thoughtworks.xstream.io.naming.NameCoder;
@@ -39,8 +38,9 @@
 import org.fudaa.ctulu.CtuluLibFile;
 import org.fudaa.ctulu.CtuluLibString;
 import org.fudaa.ctulu.CtuluLog;
-import org.fudaa.ctulu.xml.ErrorHandlerDefault;
 import org.fudaa.ctulu.xml.BooleanArrayConverter;
+import org.fudaa.ctulu.xml.DoubleArrayConverter;
+import org.fudaa.ctulu.xml.ErrorHandlerDefault;
 import org.fudaa.ctulu.xml.FloatArrayConverter;
 import org.fudaa.ctulu.xml.IntegerArrayConverter;
 import org.fudaa.dodico.corba.mascaret.SNoeud;
@@ -73,12 +73,15 @@
  */
 public class EdamoxXmlReaderWriter {
 
+  public static final String VERSION_1_0 = "1.0";
+  public static final String LAST_VERSION = VERSION_1_0;
+
   /**
    *
    * @return
    */
   public static EdamoxXmlReaderWriter createReaderWriter() {
-    return new EdamoxXmlReaderWriter("1.0");
+    return new EdamoxXmlReaderWriter(LAST_VERSION);
   }
 
   /**
@@ -87,6 +90,7 @@
    * @return
    */
   public static EdamoxXmlReaderWriter findReader(File xcas) {
+    //voir XmlVersionFinder
     return new EdamoxXmlReaderWriter("1.0");
   }
   public static final String ENCODING = "ISO-8859-1";
@@ -112,8 +116,6 @@
   public EdamoxXmlReaderWriter(String version) {
     this.version = version;
     this.xsdId = "mascaret";
-//    dtdFile = xsdId + "-" + version + ".xsd";
-//    xsdPath = "/xsd/" + dtdFile;
     dtdFile = xsdId + "-" + version + ".dtd";
     dtdPath = "/dtd/" + dtdFile;
   }
@@ -150,13 +152,6 @@
     final StaxDriver staxDriver = new StaxDriver(replacer);
     final XStream xstream = new XStream(staxDriver);
     xstream.setMode(XStream.NO_REFERENCES);
-//    xstream.aliasAttribute("xmlns:xsi", "xmlnsxsi");
-//    xstream.aliasAttribute("xsi:schemaLocation", "xsischemaLocation");
-
-//    xstream.useAttributeFor(EdamoxXMLContent.class, "xmlns");
-//    xstream.useAttributeFor(EdamoxXMLContent.class, "xmlnsxsi");
-//    xstream.useAttributeFor(EdamoxXMLContent.class, "xsischemaLocation");
-
     configureXStream(xstream);
     return xstream;
   }
@@ -476,7 +471,7 @@
     xstream.aliasField("impressionligneEauInitiale", SParametresImpress.class, "ligneEauInit");
     xstream.aliasField("impressionCalcul", SParametresImpress.class, "calcul");
 
-    
+
     xstream.aliasField("noms", SParametresExtrLibres.class, "Nom");
     xstream.aliasField("noms", SParametresDeversLateraux.class, "nom");
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.