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

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

Revision: 9291
          http://sourceforge.net/p/fudaa/svn/9291
Author:   deniger
Date:     2016-02-24 12:58:11 +0000 (Wed, 24 Feb 2016)
Log Message:
-----------
CRUE-667

Modified Paths:
--------------
    trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/factory/DclmFactory.java
    trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/CalculNodeFactory.java
    trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/importer/CLimMsImporter.java

Modified: trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/factory/DclmFactory.java
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/factory/DclmFactory.java	2016-02-24 12:20:58 UTC (rev 9290)
+++ trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/factory/DclmFactory.java	2016-02-24 12:58:11 UTC (rev 9291)
@@ -232,6 +232,10 @@
       return shortNom;
     }
 
+    public String getShortName() {
+      return shortNom;
+    }
+
     @Override
     public String geti18nLongName() {
       return getNom();

Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/CalculNodeFactory.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/CalculNodeFactory.java	2016-02-24 12:20:58 UTC (rev 9290)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/CalculNodeFactory.java	2016-02-24 12:58:11 UTC (rev 9291)
@@ -25,7 +25,6 @@
 import org.fudaa.dodico.crue.metier.helper.CalcHelper;
 import org.fudaa.dodico.crue.metier.helper.OrdCalcCloner;
 import org.fudaa.dodico.crue.metier.helper.OrdCalcCloner.Result;
-import org.fudaa.dodico.crue.metier.transformer.TransformerEMHHelper;
 import org.fudaa.fudaa.crue.common.node.NodeHelper;
 import org.fudaa.fudaa.crue.common.services.ModellingScenarioService;
 import org.fudaa.fudaa.crue.modelling.perspective.PerspectiveServiceModelling;
@@ -114,7 +113,9 @@
   public CalculDclmNode createDclmNode(DonCLimM donCLimM) {
     if (donCLimM.getCalculParent().isTransitoire()) {
       CalcTransItem asTrans = (CalcTransItem) donCLimM;
-      asTrans.setLoi(clonedLoisByName.get(asTrans.getLoi().getNom()));
+      if (asTrans.getLoi() != null) {
+        asTrans.setLoi(clonedLoisByName.get(asTrans.getLoi().getNom()));
+      }
       return new CalculDclmTransNode(Children.LEAF, (CalcTransItem) donCLimM, modellingScenarioService.getSelectedProjet().getPropDefinition(),
               perspectiveServiceModelling, donLoiHYConteneurCloned);
     }

Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/importer/CLimMsImporter.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/importer/CLimMsImporter.java	2016-02-24 12:20:58 UTC (rev 9290)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/importer/CLimMsImporter.java	2016-02-24 12:58:11 UTC (rev 9291)
@@ -5,6 +5,7 @@
 
 import gnu.trove.TLongObjectHashMap;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -190,7 +191,10 @@
         it.remove();
       }
     }
-    Map<String, DclmFactory.CalcBuilder> toMapOfNom = TransformerHelper.toMapOfNom(creators);
+    Map<String, DclmFactory.CalcBuilder> toMapOfNom = new HashMap<>();
+    for (DclmFactory.CalcBuilder creator : creators) {
+      toMapOfNom.put(creator.getShortName(), creator);
+    }
     return toMapOfNom;
   }
 }

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