Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/singularite In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7049/src/org/fudaa/dodico/hydraulique1d/singularite Modified Files: DApport.java DPerteCharge.java DSeuilTranscritique.java DSeuilTarageAval.java DDeversoir.java DBarrage.java DSeuilLimniAmont.java DDeversoirComportementZCoefQ.java DSeuilDenoye.java DSeuilLoi.java DDeversoirComportementLoi.java DSeuilNoye.java DSeuilGeometrique.java DSeuil.java DSeuilTarageAmont.java DSeuilVanne.java Log Message: Maj pour boony Index: DSeuilVanne.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/singularite/DSeuilVanne.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** DSeuilVanne.java 27 Apr 2004 16:03:34 -0000 1.6 --- DSeuilVanne.java 27 Apr 2004 16:34:25 -0000 1.7 *************** *** 10,13 **** --- 10,14 ---- import org.fudaa.dodico.objet.*; import org.fudaa.dodico.hydraulique1d.loi.*; + import org.fudaa.dodico.boony.BoonyLib; import org.fudaa.dodico.corba.objet.*; import org.fudaa.dodico.corba.hydraulique1d.*; *************** *** 30,34 **** } final public IObjet creeClone() { ! ISeuilVanne s= CDodico.findUsine().creeHydraulique1dSeuilVanne(); s.initialise(tie()); return s; --- 31,35 ---- } final public IObjet creeClone() { ! ISeuilVanne s= BoonyLib.findUsine().creeHydraulique1dSeuilVanne(); s.initialise(tie()); return s; *************** *** 77,81 **** if (largeur_==largeur) return; largeur_= largeur; ! CDodico.findUsine().fireObjetModifie(toString(), tie(), "largeur"); } private ILoiOuvertureVanne loi_; --- 78,82 ---- if (largeur_==largeur) return; largeur_= largeur; ! BoonyLib.findUsine().fireObjetModifie(toString(), tie(), "largeur"); } private ILoiOuvertureVanne loi_; *************** *** 86,95 **** if (loi_==loi) return; loi_= loi; ! CDodico.findUsine().fireObjetModifie(toString(), tie(), "loi"); } // Methode public ILoiHydraulique creeLoi() { ILoiOuvertureVanne loi= ! CDodico.findUsine().creeHydraulique1dLoiOuvertureVanne(); loi(loi); return loi; --- 87,96 ---- if (loi_==loi) return; loi_= loi; ! BoonyLib.findUsine().fireObjetModifie(toString(), tie(), "loi"); } // Methode public ILoiHydraulique creeLoi() { ILoiOuvertureVanne loi= ! BoonyLib.findUsine().creeHydraulique1dLoiOuvertureVanne(); loi(loi); return loi; Index: DSeuilDenoye.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/singularite/DSeuilDenoye.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** DSeuilDenoye.java 27 Apr 2004 16:03:34 -0000 1.7 --- DSeuilDenoye.java 27 Apr 2004 16:34:25 -0000 1.8 *************** *** 8,11 **** --- 8,12 ---- */ package org.fudaa.dodico.hydraulique1d.singularite; + import org.fudaa.dodico.boony.BoonyLib; import org.fudaa.dodico.corba.hydraulique1d.ILoiHydraulique; import org.fudaa.dodico.corba.hydraulique1d.loi.ILoiTarage; *************** *** 30,34 **** } final public IObjet creeClone() { ! ISeuilDenoye s= CDodico.findUsine().creeHydraulique1dSeuilDenoye(); s.initialise(tie()); return s; --- 31,35 ---- } final public IObjet creeClone() { ! ISeuilDenoye s= BoonyLib.findUsine().creeHydraulique1dSeuilDenoye(); s.initialise(tie()); return s; *************** *** 73,77 **** if(coteMoyenneCrete_== coteMoyenneCrete) return; coteMoyenneCrete_= coteMoyenneCrete; ! CDodico.findUsine().fireObjetModifie(toString(), tie(), "coteMoyenneCrete"); } private double coteCrete_; --- 74,78 ---- if(coteMoyenneCrete_== coteMoyenneCrete) return; coteMoyenneCrete_= coteMoyenneCrete; ! BoonyLib.findUsine().fireObjetModifie(toString(), tie(), "coteMoyenneCrete"); } private double coteCrete_; *************** *** 82,86 **** if(coteCrete_== coteCrete) return; coteCrete_= coteCrete; ! CDodico.findUsine().fireObjetModifie(toString(), tie(), "coteCrete"); } private ILoiTarage loi_; --- 83,87 ---- if(coteCrete_== coteCrete) return; coteCrete_= coteCrete; ! BoonyLib.findUsine().fireObjetModifie(toString(), tie(), "coteCrete"); } private ILoiTarage loi_; *************** *** 91,99 **** if (loi_==loi) return; loi_= loi; ! CDodico.findUsine().fireObjetModifie(toString(), tie(), "loi"); } // Methode public ILoiHydraulique creeLoi() { ! ILoiTarage loi= CDodico.findUsine().creeHydraulique1dLoiTarage(); loi(loi); return loi; --- 92,100 ---- if (loi_==loi) return; loi_= loi; ! BoonyLib.findUsine().fireObjetModifie(toString(), tie(), "loi"); } // Methode public ILoiHydraulique creeLoi() { ! ILoiTarage loi= BoonyLib.findUsine().creeHydraulique1dLoiTarage(); loi(loi); return loi; Index: DApport.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/singularite/DApport.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** DApport.java 27 Apr 2004 16:03:33 -0000 1.6 --- DApport.java 27 Apr 2004 16:34:25 -0000 1.7 *************** *** 8,11 **** --- 8,12 ---- */ package org.fudaa.dodico.hydraulique1d.singularite; + import org.fudaa.dodico.boony.BoonyLib; import org.fudaa.dodico.corba.hydraulique1d.ILoiHydraulique; import org.fudaa.dodico.corba.hydraulique1d.loi.ILoiHydrogramme; *************** *** 33,37 **** } final public IObjet creeClone() { ! IApport a= CDodico.findUsine().creeHydraulique1dApport(); a.initialise(tie()); return a; --- 34,38 ---- } final public IObjet creeClone() { ! IApport a= BoonyLib.findUsine().creeHydraulique1dApport(); a.initialise(tie()); return a; *************** *** 78,82 **** if (coefficient_== coefficient) return; coefficient_= coefficient; ! CDodico.findUsine().fireObjetModifie(toString(), tie(), "coefficient"); } private double longueur_; --- 79,83 ---- if (coefficient_== coefficient) return; coefficient_= coefficient; ! BoonyLib.findUsine().fireObjetModifie(toString(), tie(), "coefficient"); } private double longueur_; *************** *** 87,91 **** if (longueur_== longueur) return; longueur_= longueur; ! CDodico.findUsine().fireObjetModifie(toString(), tie(), "longueur"); } private ILoiHydraulique loi_; --- 88,92 ---- if (longueur_== longueur) return; longueur_= longueur; ! BoonyLib.findUsine().fireObjetModifie(toString(), tie(), "longueur"); } private ILoiHydraulique loi_; *************** *** 96,114 **** if (loi_==loi) return; loi_= loi; ! CDodico.findUsine().fireObjetModifie(toString(), tie(), "loi"); } // Methode public ILoiTarage creeLoiTarage() { ! ILoiTarage tar= CDodico.findUsine().creeHydraulique1dLoiTarage(); loi(tar); return tar; } public ILoiHydrogramme creeLoiHydrogramme() { ! ILoiHydrogramme tar= CDodico.findUsine().creeHydraulique1dLoiHydrogramme(); loi(tar); return tar; } public ILoiLimnigramme creeLoiLimnigramme() { ! ILoiLimnigramme tar= CDodico.findUsine().creeHydraulique1dLoiLimnigramme(); loi(tar); return tar; --- 97,115 ---- if (loi_==loi) return; loi_= loi; ! BoonyLib.findUsine().fireObjetModifie(toString(), tie(), "loi"); } // Methode public ILoiTarage creeLoiTarage() { ! ILoiTarage tar= BoonyLib.findUsine().creeHydraulique1dLoiTarage(); loi(tar); return tar; } public ILoiHydrogramme creeLoiHydrogramme() { ! ILoiHydrogramme tar= BoonyLib.findUsine().creeHydraulique1dLoiHydrogramme(); loi(tar); return tar; } public ILoiLimnigramme creeLoiLimnigramme() { ! ILoiLimnigramme tar= BoonyLib.findUsine().creeHydraulique1dLoiLimnigramme(); loi(tar); return tar; Index: DDeversoirComportementZCoefQ.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/singularite/DDeversoirComportementZCoefQ.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** DDeversoirComportementZCoefQ.java 27 Apr 2004 16:03:34 -0000 1.6 --- DDeversoirComportementZCoefQ.java 27 Apr 2004 16:34:25 -0000 1.7 *************** *** 8,11 **** --- 8,12 ---- */ package org.fudaa.dodico.hydraulique1d.singularite; + import org.fudaa.dodico.boony.BoonyLib; import org.fudaa.dodico.corba.hydraulique1d.ILoiHydraulique; import org.fudaa.dodico.corba.hydraulique1d.singularite.IDeversoirComportementZCoefQ; *************** *** 30,34 **** final public IObjet creeClone() { IDeversoirComportementZCoefQ d= ! CDodico.findUsine().creeHydraulique1dDeversoirComportementZCoefQ(); d.initialise(tie()); return d; --- 31,35 ---- final public IObjet creeClone() { IDeversoirComportementZCoefQ d= ! BoonyLib.findUsine().creeHydraulique1dDeversoirComportementZCoefQ(); d.initialise(tie()); return d; *************** *** 77,81 **** if (coteCrete_== coteCrete) return; coteCrete_= coteCrete; ! CDodico.findUsine().fireObjetModifie(toString(), tie(), "coteCrete"); } private double coefQ_; --- 78,82 ---- if (coteCrete_== coteCrete) return; coteCrete_= coteCrete; ! BoonyLib.findUsine().fireObjetModifie(toString(), tie(), "coteCrete"); } private double coefQ_; *************** *** 86,90 **** if (coefQ_== coefQ) return; coefQ_= coefQ; ! CDodico.findUsine().fireObjetModifie(toString(), tie(), "coefQ"); } } --- 87,91 ---- if (coefQ_== coefQ) return; coefQ_= coefQ; ! BoonyLib.findUsine().fireObjetModifie(toString(), tie(), "coefQ"); } } Index: DSeuilTranscritique.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/singularite/DSeuilTranscritique.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** DSeuilTranscritique.java 27 Apr 2004 16:03:34 -0000 1.8 --- DSeuilTranscritique.java 27 Apr 2004 16:34:25 -0000 1.9 *************** *** 8,11 **** --- 8,12 ---- */ package org.fudaa.dodico.hydraulique1d.singularite; + import org.fudaa.dodico.boony.BoonyLib; import org.fudaa.dodico.corba.hydraulique1d.ILoiHydraulique; import org.fudaa.dodico.corba.hydraulique1d.loi.ILoiHydrogramme; *************** *** 34,38 **** final public IObjet creeClone() { ISeuilTranscritique s= ! CDodico.findUsine().creeHydraulique1dSeuilTranscritique(); s.initialise(tie()); return s; --- 35,39 ---- final public IObjet creeClone() { ISeuilTranscritique s= ! BoonyLib.findUsine().creeHydraulique1dSeuilTranscritique(); s.initialise(tie()); return s; *************** *** 98,102 **** if (ruptureInstantanee_==ruptureInstantanee) return; ruptureInstantanee_= ruptureInstantanee; ! CDodico.findUsine().fireObjetModifie( toString(), tie(), --- 99,103 ---- if (ruptureInstantanee_==ruptureInstantanee) return; ruptureInstantanee_= ruptureInstantanee; ! BoonyLib.findUsine().fireObjetModifie( toString(), tie(), *************** *** 110,114 **** if (paramAvances_==paramAvances) return; paramAvances_= paramAvances; ! CDodico.findUsine().fireObjetModifie(toString(), tie(), "paramAvances"); } private double gradient_; --- 111,115 ---- if (paramAvances_==paramAvances) return; paramAvances_= paramAvances; ! BoonyLib.findUsine().fireObjetModifie(toString(), tie(), "paramAvances"); } private double gradient_; *************** *** 119,123 **** if (gradient_==gradient) return; gradient_= gradient; ! CDodico.findUsine().fireObjetModifie(toString(), tie(), "gradient"); } private ILoiHydrogramme loi_; --- 120,124 ---- if (gradient_==gradient) return; gradient_= gradient; ! BoonyLib.findUsine().fireObjetModifie(toString(), tie(), "gradient"); } private ILoiHydrogramme loi_; *************** *** 128,132 **** if (loi_==loi) return; loi_= loi; ! CDodico.findUsine().fireObjetModifie(toString(), tie(), "loi"); } } --- 129,133 ---- if (loi_==loi) return; loi_= loi; ! BoonyLib.findUsine().fireObjetModifie(toString(), tie(), "loi"); } } Index: DPerteCharge.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/singularite/DPerteCharge.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** DPerteCharge.java 27 Apr 2004 16:03:34 -0000 1.6 --- DPerteCharge.java 27 Apr 2004 16:34:25 -0000 1.7 *************** *** 8,11 **** --- 8,12 ---- */ package org.fudaa.dodico.hydraulique1d.singularite; + import org.fudaa.dodico.boony.BoonyLib; import org.fudaa.dodico.corba.hydraulique1d.ILoiHydraulique; import org.fudaa.dodico.corba.hydraulique1d.singularite.IPerteCharge; *************** *** 29,33 **** } final public IObjet creeClone() { ! IPerteCharge p= CDodico.findUsine().creeHydraulique1dPerteCharge(); p.initialise(tie()); return p; --- 30,34 ---- } final public IObjet creeClone() { ! IPerteCharge p= BoonyLib.findUsine().creeHydraulique1dPerteCharge(); p.initialise(tie()); return p; *************** *** 73,77 **** if (coefficient_==coefficient) return; coefficient_= coefficient; ! CDodico.findUsine().fireObjetModifie(toString(), tie(), "coefficient"); } } --- 74,78 ---- if (coefficient_==coefficient) return; coefficient_= coefficient; ! BoonyLib.findUsine().fireObjetModifie(toString(), tie(), "coefficient"); } } Index: DDeversoirComportementLoi.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/singularite/DDeversoirComportementLoi.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** DDeversoirComportementLoi.java 27 Apr 2004 16:03:34 -0000 1.6 --- DDeversoirComportementLoi.java 27 Apr 2004 16:34:25 -0000 1.7 *************** *** 8,11 **** --- 8,12 ---- */ package org.fudaa.dodico.hydraulique1d.singularite; + import org.fudaa.dodico.boony.BoonyLib; import org.fudaa.dodico.corba.hydraulique1d.ILoiHydraulique; import org.fudaa.dodico.corba.hydraulique1d.loi.ILoiSeuil; *************** *** 31,35 **** final public IObjet creeClone() { IDeversoirComportementLoi s= ! CDodico.findUsine().creeHydraulique1dDeversoirComportementLoi(); s.initialise(tie()); return s; --- 32,36 ---- final public IObjet creeClone() { IDeversoirComportementLoi s= ! BoonyLib.findUsine().creeHydraulique1dDeversoirComportementLoi(); s.initialise(tie()); return s; *************** *** 74,82 **** if (loi_==loi) return; loi_= loi; ! CDodico.findUsine().fireObjetModifie(toString(), tie(), "loi"); } // Methode public ILoiHydraulique creeLoi() { ! ILoiSeuil loi= CDodico.findUsine().creeHydraulique1dLoiSeuil(); loi(loi); return loi; --- 75,83 ---- if (loi_==loi) return; loi_= loi; ! BoonyLib.findUsine().fireObjetModifie(toString(), tie(), "loi"); } // Methode public ILoiHydraulique creeLoi() { ! ILoiSeuil loi= BoonyLib.findUsine().creeHydraulique1dLoiSeuil(); loi(loi); return loi; Index: DSeuilLimniAmont.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/singularite/DSeuilLimniAmont.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** DSeuilLimniAmont.java 27 Apr 2004 16:03:34 -0000 1.6 --- DSeuilLimniAmont.java 27 Apr 2004 16:34:25 -0000 1.7 *************** *** 8,11 **** --- 8,12 ---- */ package org.fudaa.dodico.hydraulique1d.singularite; + import org.fudaa.dodico.boony.BoonyLib; import org.fudaa.dodico.corba.hydraulique1d.ILoiHydraulique; import org.fudaa.dodico.corba.hydraulique1d.loi.ILoiLimnigramme; *************** *** 30,34 **** } final public IObjet creeClone() { ! ISeuilLimniAmont s= CDodico.findUsine().creeHydraulique1dSeuilLimniAmont(); s.initialise(tie()); return s; --- 31,35 ---- } final public IObjet creeClone() { ! ISeuilLimniAmont s= BoonyLib.findUsine().creeHydraulique1dSeuilLimniAmont(); s.initialise(tie()); return s; *************** *** 69,77 **** if (loi_==loi) return; loi_= loi; ! CDodico.findUsine().fireObjetModifie(toString(), tie(), "loi"); } // Methode public ILoiHydraulique creeLoi() { ! ILoiLimnigramme loi= CDodico.findUsine().creeHydraulique1dLoiLimnigramme(); loi(loi); return loi; --- 70,78 ---- if (loi_==loi) return; loi_= loi; ! BoonyLib.findUsine().fireObjetModifie(toString(), tie(), "loi"); } // Methode public ILoiHydraulique creeLoi() { ! ILoiLimnigramme loi= BoonyLib.findUsine().creeHydraulique1dLoiLimnigramme(); loi(loi); return loi; Index: DSeuilNoye.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/singularite/DSeuilNoye.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** DSeuilNoye.java 27 Apr 2004 16:03:34 -0000 1.6 --- DSeuilNoye.java 27 Apr 2004 16:34:25 -0000 1.7 *************** *** 8,11 **** --- 8,12 ---- */ package org.fudaa.dodico.hydraulique1d.singularite; + import org.fudaa.dodico.boony.BoonyLib; import org.fudaa.dodico.corba.hydraulique1d.ILoiHydraulique; import org.fudaa.dodico.corba.hydraulique1d.loi.ILoiSeuil; *************** *** 29,33 **** } final public IObjet creeClone() { ! ISeuilNoye s= CDodico.findUsine().creeHydraulique1dSeuilNoye(); s.initialise(tie()); return s; --- 30,34 ---- } final public IObjet creeClone() { ! ISeuilNoye s= BoonyLib.findUsine().creeHydraulique1dSeuilNoye(); s.initialise(tie()); return s; *************** *** 76,80 **** if (coteMoyenneCrete_==coteMoyenneCrete) return; coteMoyenneCrete_= coteMoyenneCrete; ! CDodico.findUsine().fireObjetModifie(toString(), tie(), "coteMoyenneCrete"); } private ILoiSeuil loi_; --- 77,81 ---- if (coteMoyenneCrete_==coteMoyenneCrete) return; coteMoyenneCrete_= coteMoyenneCrete; ! BoonyLib.findUsine().fireObjetModifie(toString(), tie(), "coteMoyenneCrete"); } private ILoiSeuil loi_; *************** *** 85,93 **** if (loi_==loi) return; loi_= loi; ! CDodico.findUsine().fireObjetModifie(toString(), tie(), "loi"); } // Methode public ILoiHydraulique creeLoi() { ! ILoiSeuil loi= CDodico.findUsine().creeHydraulique1dLoiSeuil(); loi(loi); return loi; --- 86,94 ---- if (loi_==loi) return; loi_= loi; ! BoonyLib.findUsine().fireObjetModifie(toString(), tie(), "loi"); } // Methode public ILoiHydraulique creeLoi() { ! ILoiSeuil loi= BoonyLib.findUsine().creeHydraulique1dLoiSeuil(); loi(loi); return loi; Index: DSeuil.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/singularite/DSeuil.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** DSeuil.java 27 Apr 2004 16:03:34 -0000 1.6 --- DSeuil.java 27 Apr 2004 16:34:25 -0000 1.7 *************** *** 8,11 **** --- 8,12 ---- */ package org.fudaa.dodico.hydraulique1d.singularite; + import org.fudaa.dodico.boony.BoonyLib; import org.fudaa.dodico.corba.hydraulique1d.ILoiHydraulique; import org.fudaa.dodico.corba.hydraulique1d.singularite.ISeuil; *************** *** 69,73 **** if (coteRupture_==coteRupture) return; coteRupture_= coteRupture; ! CDodico.findUsine().fireObjetModifie(toString(), tie(), "coteRupture"); } } --- 70,74 ---- if (coteRupture_==coteRupture) return; coteRupture_= coteRupture; ! BoonyLib.findUsine().fireObjetModifie(toString(), tie(), "coteRupture"); } } Index: DSeuilTarageAval.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/singularite/DSeuilTarageAval.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** DSeuilTarageAval.java 27 Apr 2004 16:03:34 -0000 1.6 --- DSeuilTarageAval.java 27 Apr 2004 16:34:25 -0000 1.7 *************** *** 8,11 **** --- 8,12 ---- */ package org.fudaa.dodico.hydraulique1d.singularite; + import org.fudaa.dodico.boony.BoonyLib; import org.fudaa.dodico.corba.hydraulique1d.ILoiHydraulique; import org.fudaa.dodico.corba.hydraulique1d.loi.ILoiTarage; *************** *** 30,34 **** } final public IObjet creeClone() { ! ISeuilTarageAval s= CDodico.findUsine().creeHydraulique1dSeuilTarageAval(); s.initialise(tie()); return s; --- 31,35 ---- } final public IObjet creeClone() { ! ISeuilTarageAval s= BoonyLib.findUsine().creeHydraulique1dSeuilTarageAval(); s.initialise(tie()); return s; *************** *** 69,77 **** if (loi_==loi) return; loi_= loi; ! CDodico.findUsine().fireObjetModifie(toString(), tie(), "loi"); } // Methode public ILoiHydraulique creeLoi() { ! ILoiTarage loi= CDodico.findUsine().creeHydraulique1dLoiTarage(); loi.amont(false); loi(loi); --- 70,78 ---- if (loi_==loi) return; loi_= loi; ! BoonyLib.findUsine().fireObjetModifie(toString(), tie(), "loi"); } // Methode public ILoiHydraulique creeLoi() { ! ILoiTarage loi= BoonyLib.findUsine().creeHydraulique1dLoiTarage(); loi.amont(false); loi(loi); Index: DBarrage.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/singularite/DBarrage.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DBarrage.java 27 Apr 2004 16:03:34 -0000 1.5 --- DBarrage.java 27 Apr 2004 16:34:25 -0000 1.6 *************** *** 8,11 **** --- 8,12 ---- */ package org.fudaa.dodico.hydraulique1d.singularite; + import org.fudaa.dodico.boony.BoonyLib; import org.fudaa.dodico.corba.hydraulique1d.ILoiHydraulique; import org.fudaa.dodico.corba.hydraulique1d.singularite.IBarrage; *************** *** 26,30 **** } final public IObjet creeClone() { ! IBarrage b= CDodico.findUsine().creeHydraulique1dBarrage(); b.initialise(tie()); return b; --- 27,31 ---- } final public IObjet creeClone() { ! IBarrage b= BoonyLib.findUsine().creeHydraulique1dBarrage(); b.initialise(tie()); return b; *************** *** 55,59 **** if (coteCrete_== coteCrete) return; coteCrete_= coteCrete; ! CDodico.findUsine().fireObjetModifie(toString(), tie(), "coteCrete"); } } --- 56,60 ---- if (coteCrete_== coteCrete) return; coteCrete_= coteCrete; ! BoonyLib.findUsine().fireObjetModifie(toString(), tie(), "coteCrete"); } } Index: DSeuilTarageAmont.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/singularite/DSeuilTarageAmont.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** DSeuilTarageAmont.java 27 Apr 2004 16:03:34 -0000 1.6 --- DSeuilTarageAmont.java 27 Apr 2004 16:34:25 -0000 1.7 *************** *** 8,11 **** --- 8,12 ---- */ package org.fudaa.dodico.hydraulique1d.singularite; + import org.fudaa.dodico.boony.BoonyLib; import org.fudaa.dodico.corba.hydraulique1d.ILoiHydraulique; import org.fudaa.dodico.corba.hydraulique1d.loi.ILoiTarage; *************** *** 31,35 **** final public IObjet creeClone() { ISeuilTarageAmont s= ! CDodico.findUsine().creeHydraulique1dSeuilTarageAmont(); s.initialise(tie()); return s; --- 32,36 ---- final public IObjet creeClone() { ISeuilTarageAmont s= ! BoonyLib.findUsine().creeHydraulique1dSeuilTarageAmont(); s.initialise(tie()); return s; *************** *** 70,78 **** if (loi_==loi) return; loi_= loi; ! CDodico.findUsine().fireObjetModifie(toString(), tie(), "loi"); } // Methode public ILoiHydraulique creeLoi() { ! ILoiTarage loi= CDodico.findUsine().creeHydraulique1dLoiTarage(); loi.amont(true); loi(loi); --- 71,79 ---- if (loi_==loi) return; loi_= loi; ! BoonyLib.findUsine().fireObjetModifie(toString(), tie(), "loi"); } // Methode public ILoiHydraulique creeLoi() { ! ILoiTarage loi= BoonyLib.findUsine().creeHydraulique1dLoiTarage(); loi.amont(true); loi(loi); Index: DDeversoir.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/singularite/DDeversoir.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DDeversoir.java 27 Apr 2004 16:03:34 -0000 1.5 --- DDeversoir.java 27 Apr 2004 16:34:25 -0000 1.6 *************** *** 8,11 **** --- 8,12 ---- */ package org.fudaa.dodico.hydraulique1d.singularite; + import org.fudaa.dodico.boony.BoonyLib; import org.fudaa.dodico.corba.hydraulique1d.ILoiHydraulique; import org.fudaa.dodico.corba.hydraulique1d.singularite.IDeversoir; *************** *** 62,71 **** if (longueur_== longueur) return; longueur_= longueur; ! CDodico.findUsine().fireObjetModifie(toString(), tie(), "longueur"); } // Methode public IDeversoirComportementLoi transformeDeversoirLoi() { IDeversoirComportementLoi deversoir; ! deversoir= CDodico.findUsine().creeHydraulique1dDeversoirComportementLoi(); deversoir.numero(numero_); deversoir.nom(nom_); --- 63,72 ---- if (longueur_== longueur) return; longueur_= longueur; ! BoonyLib.findUsine().fireObjetModifie(toString(), tie(), "longueur"); } // Methode public IDeversoirComportementLoi transformeDeversoirLoi() { IDeversoirComportementLoi deversoir; ! deversoir= BoonyLib.findUsine().creeHydraulique1dDeversoirComportementLoi(); deversoir.numero(numero_); deversoir.nom(nom_); *************** *** 77,81 **** IDeversoirComportementZCoefQ deversoir; deversoir= ! CDodico.findUsine().creeHydraulique1dDeversoirComportementZCoefQ(); deversoir.numero(numero_); deversoir.nom(nom_); --- 78,82 ---- IDeversoirComportementZCoefQ deversoir; deversoir= ! BoonyLib.findUsine().creeHydraulique1dDeversoirComportementZCoefQ(); deversoir.numero(numero_); deversoir.nom(nom_); Index: DSeuilLoi.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/singularite/DSeuilLoi.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** DSeuilLoi.java 27 Apr 2004 16:03:34 -0000 1.9 --- DSeuilLoi.java 27 Apr 2004 16:34:25 -0000 1.10 *************** *** 8,11 **** --- 8,12 ---- */ package org.fudaa.dodico.hydraulique1d.singularite; + import org.fudaa.dodico.boony.BoonyLib; import org.fudaa.dodico.corba.hydraulique1d.ILoiHydraulique; import org.fudaa.dodico.corba.hydraulique1d.singularite.ISeuilLoi; *************** *** 29,33 **** } public IObjet creeClone() { ! ISeuilLoi s= CDodico.findUsine().creeHydraulique1dSeuilLoi(); s.initialise(tie()); return s; --- 30,34 ---- } public IObjet creeClone() { ! ISeuilLoi s= BoonyLib.findUsine().creeHydraulique1dSeuilLoi(); s.initialise(tie()); return s; *************** *** 82,86 **** if (coteCrete_==coteCrete) return; coteCrete_= coteCrete; ! CDodico.findUsine().fireObjetModifie(toString(), tie(), "coteCrete"); } protected double coefQ_; --- 83,87 ---- if (coteCrete_==coteCrete) return; coteCrete_= coteCrete; ! BoonyLib.findUsine().fireObjetModifie(toString(), tie(), "coteCrete"); } protected double coefQ_; *************** *** 91,95 **** if (coefQ_==coefQ) return; coefQ_= coefQ; ! CDodico.findUsine().fireObjetModifie(toString(), tie(), "coefQ"); } protected LEpaisseurSeuil epaisseur_; --- 92,96 ---- if (coefQ_==coefQ) return; coefQ_= coefQ; ! BoonyLib.findUsine().fireObjetModifie(toString(), tie(), "coefQ"); } protected LEpaisseurSeuil epaisseur_; *************** *** 100,104 **** if (epaisseur_.value()==epaisseur.value()) return; epaisseur_= epaisseur; ! CDodico.findUsine().fireObjetModifie(toString(), tie(), "epaisseur"); } } --- 101,105 ---- if (epaisseur_.value()==epaisseur.value()) return; epaisseur_= epaisseur; ! BoonyLib.findUsine().fireObjetModifie(toString(), tie(), "epaisseur"); } } Index: DSeuilGeometrique.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/singularite/DSeuilGeometrique.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** DSeuilGeometrique.java 27 Apr 2004 16:03:34 -0000 1.6 --- DSeuilGeometrique.java 27 Apr 2004 16:34:25 -0000 1.7 *************** *** 8,11 **** --- 8,12 ---- */ package org.fudaa.dodico.hydraulique1d.singularite; + import org.fudaa.dodico.boony.BoonyLib; import org.fudaa.dodico.corba.hydraulique1d.ILoiHydraulique; import org.fudaa.dodico.corba.hydraulique1d.loi.ILoiGeometrique; *************** *** 31,35 **** final public IObjet creeClone() { ISeuilGeometrique s= ! CDodico.findUsine().creeHydraulique1dSeuilGeometrique(); s.initialise(tie()); return s; --- 32,36 ---- final public IObjet creeClone() { ISeuilGeometrique s= ! BoonyLib.findUsine().creeHydraulique1dSeuilGeometrique(); s.initialise(tie()); return s; *************** *** 70,78 **** if (loi_==loi) return; loi_= loi; ! CDodico.findUsine().fireObjetModifie(toString(), tie(), "loi"); } // Methode public ILoiHydraulique creeLoi() { ! ILoiGeometrique loi= CDodico.findUsine().creeHydraulique1dLoiGeometrique(); loi(loi); return loi; --- 71,79 ---- if (loi_==loi) return; loi_= loi; ! BoonyLib.findUsine().fireObjetModifie(toString(), tie(), "loi"); } // Methode public ILoiHydraulique creeLoi() { ! ILoiGeometrique loi= BoonyLib.findUsine().creeHydraulique1dLoiGeometrique(); loi(loi); return loi; |