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

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

Revision: 9382
          http://sourceforge.net/p/fudaa/svn/9382
Author:   deniger
Date:     2016-04-18 15:49:11 +0000 (Mon, 18 Apr 2016)
Log Message:
-----------
version 1.9-SNAPSHOT

Modified Paths:
--------------
    trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/section/ProfilSectionEditionCreator.java
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/SectionProfilAttachedToBrancheAction.java

Modified: trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/section/ProfilSectionEditionCreator.java
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/section/ProfilSectionEditionCreator.java	2016-04-18 15:41:39 UTC (rev 9381)
+++ trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/section/ProfilSectionEditionCreator.java	2016-04-18 15:49:11 UTC (rev 9382)
@@ -153,7 +153,7 @@
       //on reinitialise correctement les frottements:
       if (litNumerote.getFrot() == null) {
         if (litNumerote.getIsLitActif()) {
-          assert litNumerote.getIsLitMineur() == false;//ne doit jamais arriver.
+//          assert litNumerote.getIsLitMineur() == false;//ne doit jamais arriver.
           litNumerote.setFrot(editionProfilCreator.getOrCreateFrtMajeur(sousModele, controller.ccm));
         } else {
           if (emptyDonFrtFkSto == null) {

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/SectionProfilAttachedToBrancheAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/SectionProfilAttachedToBrancheAction.java	2016-04-18 15:41:39 UTC (rev 9381)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/SectionProfilAttachedToBrancheAction.java	2016-04-18 15:49:11 UTC (rev 9382)
@@ -50,7 +50,7 @@
 
   @Override
   protected boolean isProcessorEnable() {
-    return selection.isActionEnable();
+    return selection != null && selection.isActionEnable();
   }
 
   @Override

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