[Fudaa-svn-commit] SF.net SVN: fudaa:[8340] trunk/soft/fudaa-crue

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

Revision: 8340
          http://fudaa.svn.sourceforge.net/fudaa/?rev=8340&view=rev
Author:   deniger
Date:     2013-03-19 17:05:04 +0000 (Tue, 19 Mar 2013)
Log Message:
-----------


Modified Paths:
--------------
    trunk/soft/fudaa-crue/crue-compare/pom.xml
    trunk/soft/fudaa-crue/crue-config/pom.xml
    trunk/soft/fudaa-crue/crue-core/pom.xml
    trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties
    trunk/soft/fudaa-crue/crue-emh/pom.xml
    trunk/soft/fudaa-crue/crue-io/pom.xml
    trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/common/CrueDataXmlReaderWriterImpl.java

Modified: trunk/soft/fudaa-crue/crue-compare/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-compare/pom.xml	2013-03-19 17:03:07 UTC (rev 8339)
+++ trunk/soft/fudaa-crue/crue-compare/pom.xml	2013-03-19 17:05:04 UTC (rev 8340)
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>fudaa-crue</artifactId>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
-    <version>0.66-SNAPSHOT</version>
+    <version>0.67-SNAPSHOT</version>
   </parent>
   <artifactId>crue-compare</artifactId>
   <name>Crue Compare</name>

Modified: trunk/soft/fudaa-crue/crue-config/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-config/pom.xml	2013-03-19 17:03:07 UTC (rev 8339)
+++ trunk/soft/fudaa-crue/crue-config/pom.xml	2013-03-19 17:05:04 UTC (rev 8340)
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>fudaa-crue</artifactId>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
-    <version>0.66-SNAPSHOT</version>
+    <version>0.67-SNAPSHOT</version>
   </parent>
   <artifactId>crue-config</artifactId>
   <name>Crue Config</name>

Modified: trunk/soft/fudaa-crue/crue-core/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-core/pom.xml	2013-03-19 17:03:07 UTC (rev 8339)
+++ trunk/soft/fudaa-crue/crue-core/pom.xml	2013-03-19 17:05:04 UTC (rev 8340)
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>fudaa-crue</artifactId>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
-    <version>0.66-SNAPSHOT</version>
+    <version>0.67-SNAPSHOT</version>
   </parent>
   <artifactId>crue-core</artifactId>
   <name>Crue Core</name>

Modified: trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties
===================================================================
--- trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties	2013-03-19 17:03:07 UTC (rev 8339)
+++ trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties	2013-03-19 17:05:04 UTC (rev 8340)
@@ -787,7 +787,7 @@
 otfaBatch.noArgument=Pas d'arguments. Commande attendue:  java -DSiteConfigDir="C:\\data\\etc" -jar <otfa>.jar "C:\\cheminVersOtfa\\fichier.otfa.xml"
 otfaBatch.fileNotExists=Le fichier OTFA n''existe pas: {0}
 otfaBatch.fileLoaded=Fichier OTFA pris en compte: {0}
-otfaBatch.ctfaCantBeDeleted=Le fichier CTFA ne peut pas \u00eatre effac\u00e9: {0}
+otfaBatch.rtfaZipCantBeDeleted=Le fichier zip RTFA ne peut pas \u00eatre effac\u00e9: {0}
 otfaBatch.rtfaCantBeDeleted=Le fichier RTFA ne peut pas \u00eatre effac\u00e9: {0}
 otfaBatch.fileNotValid=Le fichier OTFA n''est pas valide. Le compte-rendu est disponible: {0}
 otfaBatch.fileCantBeLoaded=Le fichier OTFA ne peut pas \u00eatre charg\u00e9. Le compte-rendu est disponible: {0}

Modified: trunk/soft/fudaa-crue/crue-emh/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/pom.xml	2013-03-19 17:03:07 UTC (rev 8339)
+++ trunk/soft/fudaa-crue/crue-emh/pom.xml	2013-03-19 17:05:04 UTC (rev 8340)
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>fudaa-crue</artifactId>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
-    <version>0.66-SNAPSHOT</version>
+    <version>0.67-SNAPSHOT</version>
   </parent>
   <artifactId>crue-emh</artifactId>
   <name>Crue EMH</name>

Modified: trunk/soft/fudaa-crue/crue-io/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-io/pom.xml	2013-03-19 17:03:07 UTC (rev 8339)
+++ trunk/soft/fudaa-crue/crue-io/pom.xml	2013-03-19 17:05:04 UTC (rev 8340)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
     <artifactId>fudaa-crue</artifactId>
-    <version>0.66-SNAPSHOT</version>
+    <version>0.67-SNAPSHOT</version>
   </parent>
   <artifactId>crue-io</artifactId>
   <name>Crue IO</name>

Modified: trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/common/CrueDataXmlReaderWriterImpl.java
===================================================================
--- trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/common/CrueDataXmlReaderWriterImpl.java	2013-03-19 17:03:07 UTC (rev 8339)
+++ trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/common/CrueDataXmlReaderWriterImpl.java	2013-03-19 17:05:04 UTC (rev 8340)
@@ -340,6 +340,18 @@
 
   }
 
+  public final CrueIOResu<M> readXML(final InputStream f, final CtuluLog analyzer, final CrueData dataLinked) {
+    analyzer.setDefaultResourceBundle(BusinessMessages.RESOURCE_BUNDLE);
+    analyzer.setDesc("read.file");
+//    analyzer.setDescriptionArgs(f.getName());
+    final D d = readDao(f, analyzer, dataLinked);
+    if (d != null) {
+      return createResu(d, converter.convertDaoToMetier(d, dataLinked, analyzer), analyzer);
+    }
+    return createResu(null, null, analyzer);
+
+  }
+
   public final CrueIOResu<M> readXML(final String pathToResource, final CtuluLog analyzer) {
     return readXML(pathToResource, analyzer, null);
   }

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