[Fudaa-svn-commit] SF.net SVN: fudaa:[7185] trunk/business/fudaa-sig/src/main/java/org/fudaa/ fudaa/sig

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

Revision: 7185
          http://fudaa.svn.sourceforge.net/fudaa/?rev=7185&view=rev
Author:   deniger
Date:     2012-05-10 21:16:56 +0000 (Thu, 10 May 2012)
Log Message:
-----------
maj

Modified Paths:
--------------
    trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/exetools/FSigInpFileParam.java
    trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerExporterI.java
    trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderRefluxRefondeResult.java
    trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderSerafin.java
    trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderSinusX.java

Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/exetools/FSigInpFileParam.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/exetools/FSigInpFileParam.java	2012-05-10 21:16:29 UTC (rev 7184)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/exetools/FSigInpFileParam.java	2012-05-10 21:16:56 UTC (rev 7185)
@@ -239,7 +239,7 @@
     }
 
     CtuluIOOperationSynthese ret=exporters_[numExporter].exportTo(v, ui_, outFile, null,null);
-    if (ret.containsFatalError() && _prog != null) {
+    if (ret.containsSevereError() && _prog != null) {
       _prog.appendDetailln(FSigLib.getS("Erreur d'\xE9criture"));
       return false;
     }

Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerExporterI.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerExporterI.java	2012-05-10 21:16:29 UTC (rev 7184)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerExporterI.java	2012-05-10 21:16:56 UTC (rev 7185)
@@ -301,7 +301,7 @@
         ana.addInfo(DodicoLib.getS("{0} semis sur {1} ont \xE9t\xE9 export\xE9s", "" + nbsemis, "" + nbsemis), -1);
 
         synt.getAnalyze().merge(ana);
-        if (synt.containsFatalError())
+        if (synt.containsSevereError())
           return synt;
       }
 
@@ -314,7 +314,7 @@
         mdl[1] = mdlligdir.size() == 0 ? null : new GISDataModelMultiAdapter(mdlligdir.toArray(new GISDataModel[0]));
         ana = ff.write(CtuluLibFile.appendExtensionIfNeeded(f, ff.getExtensions()[0]), mdl, _prog).getAnalyze();
         synt.getAnalyze().merge(ana);
-        if (synt.containsFatalError())
+        if (synt.containsSevereError())
           return synt;
       }
 
@@ -326,7 +326,7 @@
         mdl[1] = null;
         ana = ff.write(CtuluLibFile.appendExtensionIfNeeded(f, ff.getExtensions()[1]), mdl, _prog).getAnalyze();
         synt.getAnalyze().merge(ana);
-        if (synt.containsFatalError())
+        if (synt.containsSevereError())
           return synt;
       }
 
@@ -339,7 +339,7 @@
         String pathname = profsOrLigneDirectrice ? f.getPath() + "_" + CtuluLib.getS("autres") : f.getPath();
         ana = ff.write(CtuluLibFile.appendExtensionIfNeeded(new File(pathname), ff.getExtensions()[0]), mdl, _prog).getAnalyze();
         synt.getAnalyze().merge(ana);
-        if (synt.containsFatalError())
+        if (synt.containsSevereError())
           return synt;
       }
 

Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderRefluxRefondeResult.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderRefluxRefondeResult.java	2012-05-10 21:16:29 UTC (rev 7184)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderRefluxRefondeResult.java	2012-05-10 21:16:56 UTC (rev 7185)
@@ -71,7 +71,7 @@
     if (RefluxRefondeSolutionSequentielResult.isRefonde(_f)) {
       CtuluIOOperationSynthese s = new RefondeQuickINPReader().read(inp, _prog);
       if (s.containsMessages()) _analyze.merge(s.getAnalyze());
-      if (s.containsFatalError()) return;
+      if (s.containsSevereError()) return;
       final RefondeINPResult res = (RefondeINPResult) s.getSource();
       g = res.getGrid();
       isSeiche = res.isModuleSeiche();
@@ -80,7 +80,7 @@
 
       CtuluIOOperationSynthese s = INPFileFormat.getInstance().getLastINPVersionImpl().readGrid(inp, _prog);
       if (s.containsMessages()) _analyze.merge(s.getAnalyze());
-      if (s.containsFatalError()) return;
+      if (s.containsSevereError()) return;
       g = ((EfGridSource) s.getSource()).getGrid();
     }
     final RefluxRefondeSolutionNewReader r = new RefluxRefondeSolutionNewReader(RefluxRefondeSolutionFileFormat

Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderSerafin.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderSerafin.java	2012-05-10 21:16:29 UTC (rev 7184)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderSerafin.java	2012-05-10 21:16:56 UTC (rev 7185)
@@ -56,7 +56,7 @@
       final CtuluAnalyze _analyze) {
     if (result_ == null) {
       final CtuluIOOperationSynthese op = SerafinFileFormat.getInstance().readLast(_f, _prog);
-      if (!op.containsFatalError()) {
+      if (!op.containsSevereError()) {
         result_ = (SerafinInterface) op.getSource();
         result_.getGrid().computeBord(_prog, _analyze);
       }

Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderSinusX.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderSinusX.java	2012-05-10 21:16:29 UTC (rev 7184)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderSinusX.java	2012-05-10 21:16:56 UTC (rev 7185)
@@ -63,7 +63,7 @@
         e.printStackTrace();
       }
       _analyze.merge(op.getAnalyze());
-      if (op.containsFatalError()) {
+      if (op.containsSevereError()) {
         return;
       }
       zones_ = (GISZone) op.getSource();

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