Menu
▾
▴
|
From: Frederic D. <de...@us...> - 2004-04-27 16:10:17
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/dodico In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1589/src/org/fudaa/fudaa/commun/dodico Modified Files: FudaaDodicoSelectionServeur.java FudaaPersonneServeur.java Log Message: Modif DObjets Index: FudaaPersonneServeur.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/dodico/FudaaPersonneServeur.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** FudaaPersonneServeur.java 25 Nov 2003 10:13:33 -0000 1.3 --- FudaaPersonneServeur.java 27 Apr 2004 16:09:32 -0000 1.4 *************** *** 9,17 **** package org.fudaa.fudaa.commun.dodico; import com.memoire.bu.BuPreferences; import org.fudaa.dodico.corba.objet.IOrganisme; import org.fudaa.dodico.corba.objet.IPersonne; - import org.fudaa.dodico.corba.usine.IUsine; import org.fudaa.dodico.objet.CDodico; - import org.fudaa.dodico.usine.UsineHelper; /** * @version $Revision$ $Date$ by $Author$ --- 9,18 ---- package org.fudaa.fudaa.commun.dodico; import com.memoire.bu.BuPreferences; + + import org.fudaa.dodico.boony.BoonyLib; + import org.fudaa.dodico.corba.boony.IUsine; import org.fudaa.dodico.corba.objet.IOrganisme; import org.fudaa.dodico.corba.objet.IPersonne; import org.fudaa.dodico.objet.CDodico; /** * @version $Revision$ $Date$ by $Author$ *************** *** 20,24 **** public class FudaaPersonneServeur { public static void main(String[] args) { ! IUsine u= UsineHelper.findUsine(); IOrganisme o= u.creeObjetOrganisme(); o.sigle("CETMEF"); --- 21,25 ---- public class FudaaPersonneServeur { public static void main(String[] args) { ! IUsine u= BoonyLib.findUsine(); IOrganisme o= u.creeObjetOrganisme(); o.sigle("CETMEF"); *************** *** 30,34 **** p.nom(BuPreferences.BU.getStringProperty("user.lastname", null)); p.mel(BuPreferences.BU.getStringProperty("user.email", null)); ! p.telephone("03.44.92.60.34"); p.organisme(o); String n= "" + p.prenom() + " " + p.nom(); --- 31,35 ---- p.nom(BuPreferences.BU.getStringProperty("user.lastname", null)); p.mel(BuPreferences.BU.getStringProperty("user.email", null)); ! // p.telephone("03.44.92.60.34"); p.organisme(o); String n= "" + p.prenom() + " " + p.nom(); Index: FudaaDodicoSelectionServeur.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/dodico/FudaaDodicoSelectionServeur.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** FudaaDodicoSelectionServeur.java 19 Mar 2004 17:40:34 -0000 1.5 --- FudaaDodicoSelectionServeur.java 27 Apr 2004 16:09:32 -0000 1.6 *************** *** 15,18 **** --- 15,19 ---- import java.lang.reflect.Method; import java.util.StringTokenizer; + import javax.swing.JComponent; import javax.swing.JOptionPane; *************** *** 22,36 **** import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; ! import org.fudaa.dodico.corba.objet.IActivateur; ! import org.fudaa.dodico.corba.objet.IActivateurHelper; ! import org.fudaa.dodico.corba.objet.IObjet; ! import org.fudaa.dodico.corba.objet.IObjetHelper; ! import org.fudaa.dodico.corba.objet.IOrganisme; ! import org.fudaa.dodico.corba.objet.IPersonne; ! import org.fudaa.dodico.corba.objet.IPersonneHelper; ! import org.fudaa.dodico.corba.usine.IUsine; ! import org.fudaa.dodico.objet.CDodico; ! import org.fudaa.dodico.usine.UsineHelper; ! import org.fudaa.fudaa.ressource.FudaaResource; import com.memoire.bu.BuBorderLayout; import com.memoire.bu.BuButton; --- 23,27 ---- import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; ! import com.memoire.bu.BuBorderLayout; import com.memoire.bu.BuButton; *************** *** 47,50 **** --- 38,53 ---- import com.memoire.bu.BuUpdateGUI; import com.memoire.bu.BuVerticalLayout; + + import org.fudaa.dodico.boony.BoonyLib; + import org.fudaa.dodico.corba.boony.IUsine; + import org.fudaa.dodico.corba.objet.IActivateur; + import org.fudaa.dodico.corba.objet.IActivateurHelper; + import org.fudaa.dodico.corba.objet.IObjet; + import org.fudaa.dodico.corba.objet.IObjetHelper; + import org.fudaa.dodico.corba.objet.IOrganisme; + import org.fudaa.dodico.corba.objet.IPersonne; + import org.fudaa.dodico.corba.objet.IPersonneHelper; + import org.fudaa.dodico.objet.CDodico; + import org.fudaa.fudaa.ressource.FudaaResource; /** * A standard dialog to select an active server. *************** *** 213,217 **** } } else { ! IUsine u= UsineHelper.creeUsineLocale(); StringTokenizer tok= new StringTokenizer(new String(interface_), "::"); String packagename= capitalize(tok.nextToken()); --- 216,226 ---- } } else { ! if(!BoonyLib.isUsinePolicySet()){ ! BoonyLib.setAllLocal(true); ! } ! else{ ! if(!BoonyLib.isAllLocal()) new Throwable("pas correct pour l'instant"); ! } ! IUsine u= BoonyLib.findUsine(); StringTokenizer tok= new StringTokenizer(new String(interface_), "::"); String packagename= capitalize(tok.nextToken()); *************** *** 223,226 **** --- 232,236 ---- uc.getMethod("cree" + packagename + classname, new Class[0]); serveur_= (IObjet)um.invoke(u, new Object[0]); + } catch (Throwable t) { new BuDialogError( *************** *** 240,243 **** --- 250,254 ---- } } + // PERSONNE // if( !LOCAL_PERSON.equals(personStr) ) { *************** *** 262,268 **** } } else { ! System.out.println( ! "SelectionPersonne: création de CPersonne(" + LOCAL_PERSON + ")"); ! IUsine u= UsineHelper.findUsine(); IOrganisme o= u.creeObjetOrganisme(); o.sigle(FudaaResource.getS("organisme local")); --- 273,278 ---- } } else { ! ! IUsine u= BoonyLib.findUsine(); IOrganisme o= u.creeObjetOrganisme(); o.sigle(FudaaResource.getS("organisme local")); *************** *** 278,281 **** --- 288,292 ---- setVisible(false); } + if ("RECHERCHER".equals(cmd)) { Thread t= new Thread() { |
