[Fudaa-cvs-commit] fudaa_devel/fudaa/src/org/fudaa/fudaa/mascaret MascaretImplementation.java,1.20,1.21

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

Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/mascaret
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7543/src/org/fudaa/fudaa/mascaret

Modified Files:
	MascaretImplementation.java 
Log Message:
Maj pour boony

Index: MascaretImplementation.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/mascaret/MascaretImplementation.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** MascaretImplementation.java	27 Apr 2004 16:10:20 -0000	1.20
--- MascaretImplementation.java	27 Apr 2004 16:35:40 -0000	1.21
***************
*** 22,25 ****
--- 22,27 ----
  import javax.swing.event.ChangeEvent;
  import javax.swing.event.ChangeListener;
+ 
+ import org.fudaa.dodico.boony.BoonyLib;
  import org.fudaa.dodico.corba.calcul.SProgression;
  import org.fudaa.dodico.corba.evenement.IObjetEvent;
***************
*** 854,858 ****
      fermer();
      if (ietude1d_ == null) {
!       ietude1d_= CDodico.findUsine().creeHydraulique1dEtude1d();
      }
      projet_.setEtude1d(ietude1d_);
--- 856,860 ----
      fermer();
      if (ietude1d_ == null) {
!       ietude1d_= BoonyLib.findUsine().creeHydraulique1dEtude1d();
      }
      projet_.setEtude1d(ietude1d_);
***************
*** 965,969 ****
    protected void creer() {
      fermer();
!     IUsine usine= CDodico.findUsine();
      usine.setEventMuet(true);
      projet_= Hydraulique1dProjet.getInstance();
--- 967,971 ----
    protected void creer() {
      fermer();
!     IUsine usine= BoonyLib.findUsine();
      usine.setEventMuet(true);
      projet_= Hydraulique1dProjet.getInstance();
***************
*** 1062,1066 ****
      }
  
!     IUsine usine= CDodico.findUsine();
      //NOTE: pour eviter d'envoyer des evt
      usine.setEventMuet(true);
--- 1064,1068 ----
      }
  
!     IUsine usine= BoonyLib.findUsine();
      //NOTE: pour eviter d'envoyer des evt
      usine.setEventMuet(true);
***************
*** 1309,1313 ****
        }
      }
!     IUsine usine= CDodico.findUsine();
      if (grille_ == null) {
        grille_= new DjaGridInteractive();
--- 1311,1315 ----
        }
      }
!     IUsine usine= BoonyLib.findUsine();
      if (grille_ == null) {
        grille_= new DjaGridInteractive();
***************
*** 1520,1529 ****
        new CConversionHydraulique1d(SERVEUR_HYDRO1D, CONNEXION_MASCARET);
      if (evtSupport_ != null) {
!       CDodico.findUsine().removeObjetEventListener(
          (IObjetEventListenerSupport)evtSupport_.tie());
      }
      evtSupport_= DObjetEventListenerSupport.createEventSupport();
      evtSupport_.clientListener(this);
!     CDodico.findUsine().addObjetEventListener(
        (IObjetEventListenerSupport)evtSupport_.tie());
    }
--- 1522,1531 ----
        new CConversionHydraulique1d(SERVEUR_HYDRO1D, CONNEXION_MASCARET);
      if (evtSupport_ != null) {
!       BoonyLib.findUsine().removeObjetEventListener(
          (IObjetEventListenerSupport)evtSupport_.tie());
      }
      evtSupport_= DObjetEventListenerSupport.createEventSupport();
      evtSupport_.clientListener(this);
!     BoonyLib.findUsine().addObjetEventListener(
        (IObjetEventListenerSupport)evtSupport_.tie());
    }