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

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

Revision: 9654
          http://sourceforge.net/p/fudaa/svn/9654
Author:   deniger
Date:     2017-06-28 17:33:24 +0000 (Wed, 28 Jun 2017)
Log Message:
-----------
Classes AOC

Modified Paths:
--------------
    trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/etude/EMHProjectInfos.java
    trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/etude/FichierLHPTSupport.java
    trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/projet/EMHProjetControllerTest.java

Modified: trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/etude/EMHProjectInfos.java
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/etude/EMHProjectInfos.java	2017-06-28 17:18:45 UTC (rev 9653)
+++ trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/etude/EMHProjectInfos.java	2017-06-28 17:33:24 UTC (rev 9654)
@@ -217,6 +217,9 @@
   }
 
   private File getDir(String id) {
+    if(directories==null){
+      return null;
+    }
     String path = directories.get(id);
     if (CrueFileHelper.isRelative(path) && parentDirOfEtuFile == null) {
       LOGGER.log(Level.WARNING, "path is relative for {0} and dir of etu is not set", id);

Modified: trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/etude/FichierLHPTSupport.java
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/etude/FichierLHPTSupport.java	2017-06-28 17:18:45 UTC (rev 9653)
+++ trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/etude/FichierLHPTSupport.java	2017-06-28 17:33:24 UTC (rev 9654)
@@ -58,6 +58,9 @@
     private void createMap(EMHProjet emhProjet) {
         final Set<String> scenarioNames = TransformerHelper.toSetNom(emhProjet.getListeScenarios());
         final File dirOfFichiersEtudes = emhProjet.getDirOfFichiersEtudes();
+        if(dirOfFichiersEtudes==null){
+            return;
+        }
         final String extension = CrueFileType.LHPT.getExtension();
         for (String scenarioName : scenarioNames) {
             String fileName = StringUtils.removeStart(scenarioName, CruePrefix.P_SCENARIO);

Modified: trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/projet/EMHProjetControllerTest.java
===================================================================
--- trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/projet/EMHProjetControllerTest.java	2017-06-28 17:18:45 UTC (rev 9653)
+++ trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/projet/EMHProjetControllerTest.java	2017-06-28 17:33:24 UTC (rev 9654)
@@ -189,6 +189,9 @@
 
   private void testFiles(File etuDir, String name, CrueLevelType level, CrueVersionType version) {
     for (CrueFileType type : CrueFileType.values()) {
+      if(CrueFileType.LHPT.equals(type)){
+        continue;
+      }
       if ((type.getCrueVersionType() == version) && (type.getLevel() == level) && (!type.isResultFileType())) {
         assertTrue(new File(etuDir, name + "." + type.getExtension()).isFile());
       }

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