[Fudaa-cvs-commit] fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier Hydraulique1dCasierSemiPointsEditor.java,1.4,1.5

[<jm_...@us...>]

Update of /cvsroot/fudaa//fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier
In directory sc8-pr-cvs1:/tmp/cvs-serv15043/editor/casier

Modified Files:
	Hydraulique1dCasierSemiPointsEditor.java 
Log Message:
Gestion de la cohérence du modèle hydraulique1d paramètres temporels et généraux
dans le cas du passage du noyau transcritique à fluvial (NP et P).
Changement de message de la vérification des contraintes de Hydraulique1dCasierSemiPointsEditor
permettant de passer outre les contraintes.


Index: Hydraulique1dCasierSemiPointsEditor.java
===================================================================
RCS file: /cvsroot/fudaa//fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier/Hydraulique1dCasierSemiPointsEditor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Hydraulique1dCasierSemiPointsEditor.java	25 Nov 2003 10:13:45 -0000	1.4
--- Hydraulique1dCasierSemiPointsEditor.java	26 Nov 2003 17:19:28 -0000	1.5
***************
*** 158,162 ****
          fermer();
        } else {
!         new BuDialogMessage(
            (BuCommonInterface)Hydraulique1dBaseApplication.FRAME,
            ((BuCommonInterface)Hydraulique1dBaseApplication.FRAME)
--- 158,162 ----
          fermer();
        } else {
!         int resp= new Hydraulique1dDialogContraintes(
            (BuCommonInterface)Hydraulique1dBaseApplication.FRAME,
            ((BuCommonInterface)Hydraulique1dBaseApplication.FRAME)
***************
*** 167,172 ****
              + messageTableauInter
              + "\n\n"
!             + messageEcartZ)
            .activate();
        }
      } else if ("EDITER_AXES".equals(cmd)) {
--- 167,173 ----
              + messageTableauInter
              + "\n\n"
!             + messageEcartZ,true)
            .activate();
+         if (resp==Hydraulique1dDialogContraintes.IGNORER) fermer();
        }
      } else if ("EDITER_AXES".equals(cmd)) {