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

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

Revision: 8033
          http://fudaa.svn.sourceforge.net/fudaa/?rev=8033&view=rev
Author:   deniger
Date:     2012-11-20 23:40:20 +0000 (Tue, 20 Nov 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java
    trunk/soft/fudaa-crue/ui-loader/src/main/java/org/fudaa/fudaa/crue/loader/LoaderService.java
    trunk/soft/fudaa-crue/ui-loader/src/main/java/org/fudaa/fudaa/crue/loader/ScenarioLoaderServiceAbstract.java

Modified: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java	2012-11-20 23:39:16 UTC (rev 8032)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java	2012-11-20 23:40:20 UTC (rev 8033)
@@ -31,7 +31,7 @@
 import org.fudaa.dodico.crue.projet.EMHProjetController;
 import org.fudaa.dodico.crue.projet.EMHScenarioContainer;
 import org.fudaa.dodico.crue.projet.ScenarioLoader;
-import org.fudaa.dodico.crue.projet.ScenarioLoaderResult;
+import org.fudaa.dodico.crue.projet.ScenarioLoaderOperation;
 import org.fudaa.dodico.crue.projet.calcul.CalculCrueContrat;
 import org.fudaa.dodico.crue.projet.calcul.CalculCrueRunnerManager;
 import org.fudaa.dodico.crue.projet.calcul.ExecInputDefault;
@@ -285,7 +285,7 @@
     }
     ScenarioLoader loader = new ScenarioLoader(managerScenario, projet, projet.getCoeurConfig());
 
-    ScenarioLoaderResult load = loader.load(managerScenario.getRunCourant());//on charge le run courant:
+    ScenarioLoaderOperation load = loader.load(managerScenario.getRunCourant());//on charge le run courant:
 
     logs.addGroup(load.getLogs().createCleanGroup());
     EMHScenario emhScenario = null;

Modified: trunk/soft/fudaa-crue/ui-loader/src/main/java/org/fudaa/fudaa/crue/loader/LoaderService.java
===================================================================
--- trunk/soft/fudaa-crue/ui-loader/src/main/java/org/fudaa/fudaa/crue/loader/LoaderService.java	2012-11-20 23:39:16 UTC (rev 8032)
+++ trunk/soft/fudaa-crue/ui-loader/src/main/java/org/fudaa/fudaa/crue/loader/LoaderService.java	2012-11-20 23:40:20 UTC (rev 8033)
@@ -13,7 +13,7 @@
 import org.fudaa.dodico.crue.metier.etude.EMHRun;
 import org.fudaa.dodico.crue.metier.etude.ManagerEMHScenario;
 import org.fudaa.dodico.crue.projet.ScenarioLoader;
-import org.fudaa.dodico.crue.projet.ScenarioLoaderResult;
+import org.fudaa.dodico.crue.projet.ScenarioLoaderOperation;
 import org.fudaa.dodico.crue.config.coeur.CoeurConfigContrat;
 import org.fudaa.fudaa.crue.common.CommonMessage;
 import org.fudaa.fudaa.crue.common.log.LogsDisplayer;
@@ -49,7 +49,7 @@
   public EMHScenario load(final EMHProjet projet, final ManagerEMHScenario scenario, EMHRun run, boolean displayOnlyIfError) {
 
     ScenarioLoader loader = new ScenarioLoader(scenario, projet, projet.getCoeurConfig());
-    final ScenarioLoaderResult load = loader.load(run);
+    final ScenarioLoaderOperation load = loader.load(run);
     final boolean isLoadedWithoutFatalError = load.getResult() != null && !load.getLogs().containsFatalError();
     if (displayOnlyIfError) {
       if (load.getLogs().containsError() || load.getLogs().containsFatalError()) {

Modified: trunk/soft/fudaa-crue/ui-loader/src/main/java/org/fudaa/fudaa/crue/loader/ScenarioLoaderServiceAbstract.java
===================================================================
--- trunk/soft/fudaa-crue/ui-loader/src/main/java/org/fudaa/fudaa/crue/loader/ScenarioLoaderServiceAbstract.java	2012-11-20 23:39:16 UTC (rev 8032)
+++ trunk/soft/fudaa-crue/ui-loader/src/main/java/org/fudaa/fudaa/crue/loader/ScenarioLoaderServiceAbstract.java	2012-11-20 23:40:20 UTC (rev 8033)
@@ -9,7 +9,7 @@
 import org.fudaa.dodico.crue.metier.etude.EMHRun;
 import org.fudaa.dodico.crue.metier.etude.ManagerEMHScenario;
 import org.fudaa.dodico.crue.projet.ScenarioLoader;
-import org.fudaa.dodico.crue.projet.ScenarioLoaderResult;
+import org.fudaa.dodico.crue.projet.ScenarioLoaderOperation;
 import org.fudaa.fudaa.crue.common.CommonMessage;
 import org.fudaa.fudaa.crue.common.PerspectiveEnum;
 import org.fudaa.fudaa.crue.common.log.LogsDisplayer;
@@ -99,7 +99,7 @@
 
   protected boolean loadScenario(final EMHProjet projet, final ManagerEMHScenario scenario, final EMHRun run) {
     ScenarioLoader loader = new ScenarioLoader(scenario, projet, projet.getCoeurConfig());
-    final ScenarioLoaderResult load = loader.load(run);
+    final ScenarioLoaderOperation load = loader.load(run);
     EventQueue.invokeLater(new Runnable() {
       @Override
       public void run() {

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