[Fudaa-cvs-commit] fudaa_devel/fudaa/src/org/fudaa/fudaa/mascaret Mascaret.java,1.6,1.7 MascaretImplementation.java,1.23,1.24

[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-serv26257/src/org/fudaa/fudaa/mascaret

Modified Files:
	Mascaret.java MascaretImplementation.java 
Log Message:
Maj

Index: Mascaret.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/mascaret/Mascaret.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Mascaret.java	30 Apr 2004 13:52:18 -0000	1.6
--- Mascaret.java	30 Apr 2004 14:41:32 -0000	1.7
***************
*** 78,83 ****
            + ls;
        System.out.println(wlcmsg);
!     } else
!       new FudaaTee();
      System.out.println("Client Mascaret");
      BuPreferences.BU.applyLanguage(
--- 78,82 ----
            + ls;
        System.out.println(wlcmsg);
!     } 
      System.out.println("Client Mascaret");
      BuPreferences.BU.applyLanguage(

Index: MascaretImplementation.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/mascaret/MascaretImplementation.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** MascaretImplementation.java	30 Apr 2004 13:52:18 -0000	1.23
--- MascaretImplementation.java	30 Apr 2004 14:41:32 -0000	1.24
***************
*** 396,408 ****
            activateInternalFrame(fProprietes_);
          }
-       } else if (action.equals("CONSOLE")) {
-         if (ts_ != null) {
-           if (fts_ == null) {
-             fts_= new JFrame();
-             fts_.setContentPane(ts_);
-             fts_.pack();
-           }
-           fts_.show();
-         }
        } else if (action.equals("EXPORTMASCARET")) {
          exporterMascaret();
--- 396,399 ----
***************
*** 1511,1514 ****
--- 1502,1516 ----
    CONNEXION_HYDRO1D=c.getConnexion();
    SERVEUR_HYDRO1D=ICalculHydraulique1dHelper.narrow(c.getTache());
+   SERVEUR_HYDRO1D.calculCode(SERVEUR_MASCARET);
+   HYDRO_KONVERT=
+     new CConversionHydraulique1d(SERVEUR_HYDRO1D, CONNEXION_MASCARET);
+   if (evtSupport_ != null) {
+     UsineLib.findUsine().removeObjetEventListener(
+       (IObjetEventListenerSupport)evtSupport_.tie());
+   }
+   evtSupport_= DObjetEventListenerSupport.createEventSupport();
+   evtSupport_.clientListener(this);
+   UsineLib.findUsine().addObjetEventListener(
+     (IObjetEventListenerSupport)evtSupport_.tie());
    }