fudaa-cvs-commit

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

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

Modified Files:
	ServeurPersonne.java CDodico.java 
Log Message:
Maj pour boony

Index: CDodico.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/objet/CDodico.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** CDodico.java	27 Apr 2004 16:05:36 -0000	1.9
--- CDodico.java	27 Apr 2004 16:34:25 -0000	1.10
***************
*** 64,69 ****
  
  import org.fudaa.ctulu.CtuluLib;
- import org.fudaa.dodico.boony.BoonyLib;
- import org.fudaa.dodico.corba.boony.IUsine;
  import org.fudaa.dodico.corba.objet.IObjet;
  import org.fudaa.dodico.corba.planification.IHorloge;
--- 64,67 ----
***************
*** 190,221 ****
    }
  
-   /**
-    * @deprecated use class UsineHelper
-    */
-   public final static IUsine findUsine(int _time) {
-     //    if( localUsine_!=null ) return localUsine_;
-     //    int n=0;
-     //    IUsine u=null;
-     //    while( n<3 && u==null ) {
-     //      u=IUsineHelper.narrow(findServerByInterface("::usine::IUsine", _time));
-     //      n++;
-     //    }
-     //    return u;
-     return BoonyLib.findUsine(_time);
-   }
- 
-   /**
-    * @deprecated use class UsineHelper
-    */
-   public final static IUsine findUsine() {
-     return BoonyLib.findUsine();
-     //return findUsine(2000);
-     /*
-      * if( localUsine_!=null ) return localUsine_; int n=0; IUsine u=null; while( n <3 && u==null ) {
-      * u=IUsineHelper.narrow(findServerByInterface("::usine::IUsine", 2000)); n++; } return u;
-      */
-   }
- 
-  
    public final static String[] findServerNames(String _interface, long _delai) {
      String[] r = DDiffuseur.findServerNames(_interface, _delai);
--- 188,191 ----

Index: ServeurPersonne.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/objet/ServeurPersonne.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ServeurPersonne.java	27 Apr 2004 16:05:36 -0000	1.7
--- ServeurPersonne.java	27 Apr 2004 16:34:25 -0000	1.8
***************
*** 10,13 ****
--- 10,14 ----
  import java.util.Date;
  
+ import org.fudaa.dodico.boony.BoonyLib;
  import org.fudaa.dodico.corba.boony.IUsine;
  import org.fudaa.dodico.corba.objet.IOrganisme;
***************
*** 24,28 ****
    public IOrganisme o;
    public ServeurPersonne(String ps, String os) {
!     IUsine usine= CDodico.findUsine();
      if (usine == null) {
        System.out.println("il n'y a pas d'usine");
--- 25,29 ----
    public IOrganisme o;
    public ServeurPersonne(String ps, String os) {
!     IUsine usine= BoonyLib.findUsine();
      if (usine == null) {
        System.out.println("il n'y a pas d'usine");