From: Frederic D. <de...@us...> - 2004-04-27 16:35:05
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/loi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7049/src/org/fudaa/dodico/hydraulique1d/loi Modified Files: DLoiLimnigramme.java DLoiRegulation.java DLoiGeometrique.java DLoiTarage.java DLoiHydrogramme.java DLoiOuvertureVanne.java DLoiLimniHydrogramme.java DLoiSeuil.java Log Message: Maj pour boony Index: DLoiOuvertureVanne.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/loi/DLoiOuvertureVanne.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** DLoiOuvertureVanne.java 27 Apr 2004 16:03:34 -0000 1.6 --- DLoiOuvertureVanne.java 27 Apr 2004 16:34:25 -0000 1.7 *************** *** 9,12 **** --- 9,14 ---- package org.fudaa.dodico.hydraulique1d.loi; import java.util.Arrays; + + import org.fudaa.dodico.boony.BoonyLib; import org.fudaa.dodico.corba.hydraulique1d.loi.ILoiOuvertureVanne; import org.fudaa.dodico.corba.hydraulique1d.loi.ILoiOuvertureVanneOperations; *************** *** 32,36 **** final public IObjet creeClone() { ILoiOuvertureVanne l= ! CDodico.findUsine().creeHydraulique1dLoiOuvertureVanne(); l.initialise(tie()); return l; --- 34,38 ---- final public IObjet creeClone() { ILoiOuvertureVanne l= ! BoonyLib.findUsine().creeHydraulique1dLoiOuvertureVanne(); l.initialise(tie()); return l; *************** *** 60,64 **** if (Arrays.equals(t,t_)) return; t_= t; ! CDodico.findUsine().fireObjetModifie(toString(), tie(), "t"); } private double[] zInf_; --- 62,66 ---- if (Arrays.equals(t,t_)) return; t_= t; ! BoonyLib.findUsine().fireObjetModifie(toString(), tie(), "t"); } private double[] zInf_; *************** *** 69,73 **** if (Arrays.equals(zInf,zInf_)) return; zInf_= zInf; ! CDodico.findUsine().fireObjetModifie(toString(), tie(), "zInf"); } private double[] zSup_; --- 71,75 ---- if (Arrays.equals(zInf,zInf_)) return; zInf_= zInf; ! BoonyLib.findUsine().fireObjetModifie(toString(), tie(), "zInf"); } private double[] zSup_; *************** *** 78,82 **** if (Arrays.equals(zSup,zSup_)) return; zSup_= zSup; ! CDodico.findUsine().fireObjetModifie(toString(), tie(), "zSup"); } // methodes --- 80,84 ---- if (Arrays.equals(zSup,zSup_)) return; zSup_= zSup; ! BoonyLib.findUsine().fireObjetModifie(toString(), tie(), "zSup"); } // methodes Index: DLoiTarage.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/loi/DLoiTarage.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** DLoiTarage.java 27 Apr 2004 16:03:34 -0000 1.6 --- DLoiTarage.java 27 Apr 2004 16:34:25 -0000 1.7 *************** *** 9,12 **** --- 9,14 ---- package org.fudaa.dodico.hydraulique1d.loi; import java.util.Arrays; + + import org.fudaa.dodico.boony.BoonyLib; import org.fudaa.dodico.corba.hydraulique1d.loi.ILoiTarage; import org.fudaa.dodico.corba.hydraulique1d.loi.ILoiTarageOperations; *************** *** 31,35 **** } final public IObjet creeClone() { ! ILoiTarage l= CDodico.findUsine().creeHydraulique1dLoiTarage(); l.initialise(tie()); return l; --- 33,37 ---- } final public IObjet creeClone() { ! ILoiTarage l= BoonyLib.findUsine().creeHydraulique1dLoiTarage(); l.initialise(tie()); return l; *************** *** 58,62 **** public void amont(boolean z) { amonz_= z; ! CDodico.findUsine().fireObjetModifie(toString(), tie(), "amont"); } private double[] z_; --- 60,64 ---- public void amont(boolean z) { amonz_= z; ! BoonyLib.findUsine().fireObjetModifie(toString(), tie(), "amont"); } private double[] z_; *************** *** 67,71 **** if (Arrays.equals(z,z_)) return; z_= z; ! CDodico.findUsine().fireObjetModifie(toString(), tie(), "z"); } private double[] q_; --- 69,73 ---- if (Arrays.equals(z,z_)) return; z_= z; ! BoonyLib.findUsine().fireObjetModifie(toString(), tie(), "z"); } private double[] q_; *************** *** 76,80 **** if (Arrays.equals(q,q_)) return; q_= q; ! CDodico.findUsine().fireObjetModifie(toString(), tie(), "q"); } // methodes --- 78,82 ---- if (Arrays.equals(q,q_)) return; q_= q; ! BoonyLib.findUsine().fireObjetModifie(toString(), tie(), "q"); } // methodes Index: DLoiLimnigramme.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/loi/DLoiLimnigramme.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** DLoiLimnigramme.java 27 Apr 2004 16:03:34 -0000 1.6 --- DLoiLimnigramme.java 27 Apr 2004 16:34:25 -0000 1.7 *************** *** 9,12 **** --- 9,14 ---- package org.fudaa.dodico.hydraulique1d.loi; import java.util.Arrays; + + import org.fudaa.dodico.boony.BoonyLib; import org.fudaa.dodico.corba.hydraulique1d.loi.ILoiLimnigramme; import org.fudaa.dodico.corba.hydraulique1d.loi.ILoiLimnigrammeOperations; *************** *** 30,34 **** } final public IObjet creeClone() { ! ILoiLimnigramme l= CDodico.findUsine().creeHydraulique1dLoiLimnigramme(); l.initialise(tie()); return l; --- 32,36 ---- } final public IObjet creeClone() { ! ILoiLimnigramme l= BoonyLib.findUsine().creeHydraulique1dLoiLimnigramme(); l.initialise(tie()); return l; *************** *** 55,59 **** if (Arrays.equals(t,t_)) return; t_= t; ! CDodico.findUsine().fireObjetModifie(toString(), tie(), "t"); } private double[] z_; --- 57,61 ---- if (Arrays.equals(t,t_)) return; t_= t; ! BoonyLib.findUsine().fireObjetModifie(toString(), tie(), "t"); } private double[] z_; *************** *** 64,68 **** if (Arrays.equals(z,z_)) return; z_= z; ! CDodico.findUsine().fireObjetModifie(toString(), tie(), "z"); } // methodes --- 66,70 ---- if (Arrays.equals(z,z_)) return; z_= z; ! BoonyLib.findUsine().fireObjetModifie(toString(), tie(), "z"); } // methodes Index: DLoiLimniHydrogramme.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/loi/DLoiLimniHydrogramme.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** DLoiLimniHydrogramme.java 27 Apr 2004 16:03:34 -0000 1.6 --- DLoiLimniHydrogramme.java 27 Apr 2004 16:34:25 -0000 1.7 *************** *** 9,12 **** --- 9,14 ---- package org.fudaa.dodico.hydraulique1d.loi; import java.util.Arrays; + + import org.fudaa.dodico.boony.BoonyLib; import org.fudaa.dodico.corba.hydraulique1d.loi.ILoiLimniHydrogramme; import org.fudaa.dodico.corba.hydraulique1d.loi.ILoiLimniHydrogrammeOperations; *************** *** 32,36 **** final public IObjet creeClone() { ILoiLimniHydrogramme l= ! CDodico.findUsine().creeHydraulique1dLoiLimniHydrogramme(); l.initialise(tie()); return l; --- 34,38 ---- final public IObjet creeClone() { ILoiLimniHydrogramme l= ! BoonyLib.findUsine().creeHydraulique1dLoiLimniHydrogramme(); l.initialise(tie()); return l; *************** *** 60,64 **** if (Arrays.equals(t,t_)) return; t_= t; ! CDodico.findUsine().fireObjetModifie(toString(), tie(), "t"); } private double[] z_; --- 62,66 ---- if (Arrays.equals(t,t_)) return; t_= t; ! BoonyLib.findUsine().fireObjetModifie(toString(), tie(), "t"); } private double[] z_; *************** *** 69,73 **** if (Arrays.equals(z,z_)) return; z_= z; ! CDodico.findUsine().fireObjetModifie(toString(), tie(), "z"); } private double[] q_; --- 71,75 ---- if (Arrays.equals(z,z_)) return; z_= z; ! BoonyLib.findUsine().fireObjetModifie(toString(), tie(), "z"); } private double[] q_; *************** *** 78,82 **** if (Arrays.equals(q,q_)) return; q_= q; ! CDodico.findUsine().fireObjetModifie(toString(), tie(), "q"); } // methodes --- 80,84 ---- if (Arrays.equals(q,q_)) return; q_= q; ! BoonyLib.findUsine().fireObjetModifie(toString(), tie(), "q"); } // methodes Index: DLoiRegulation.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/loi/DLoiRegulation.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** DLoiRegulation.java 27 Apr 2004 16:03:34 -0000 1.6 --- DLoiRegulation.java 27 Apr 2004 16:34:25 -0000 1.7 *************** *** 9,12 **** --- 9,14 ---- package org.fudaa.dodico.hydraulique1d.loi; import java.util.Arrays; + + import org.fudaa.dodico.boony.BoonyLib; import org.fudaa.dodico.corba.hydraulique1d.loi.ILoiRegulation; import org.fudaa.dodico.corba.hydraulique1d.loi.ILoiRegulationOperations; *************** *** 30,34 **** } final public IObjet creeClone() { ! ILoiRegulation l= CDodico.findUsine().creeHydraulique1dLoiRegulation(); l.initialise(tie()); return l; --- 32,36 ---- } final public IObjet creeClone() { ! ILoiRegulation l= BoonyLib.findUsine().creeHydraulique1dLoiRegulation(); l.initialise(tie()); return l; *************** *** 56,60 **** if (Arrays.equals(qAmont,qAmont_)) return; qAmont_= qAmont; ! CDodico.findUsine().fireObjetModifie(toString(), tie(), "qAmont"); } private double[] zAval_; --- 58,62 ---- if (Arrays.equals(qAmont,qAmont_)) return; qAmont_= qAmont; ! BoonyLib.findUsine().fireObjetModifie(toString(), tie(), "qAmont"); } private double[] zAval_; *************** *** 65,69 **** if (Arrays.equals(zAval,zAval_)) return; zAval_= zAval; ! CDodico.findUsine().fireObjetModifie(toString(), tie(), "zAval"); } // methodes --- 67,71 ---- if (Arrays.equals(zAval,zAval_)) return; zAval_= zAval; ! BoonyLib.findUsine().fireObjetModifie(toString(), tie(), "zAval"); } // methodes Index: DLoiSeuil.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/loi/DLoiSeuil.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** DLoiSeuil.java 27 Apr 2004 16:03:34 -0000 1.6 --- DLoiSeuil.java 27 Apr 2004 16:34:25 -0000 1.7 *************** *** 9,12 **** --- 9,14 ---- package org.fudaa.dodico.hydraulique1d.loi; import java.util.Arrays; + + import org.fudaa.dodico.boony.BoonyLib; import org.fudaa.dodico.corba.hydraulique1d.loi.ILoiSeuil; import org.fudaa.dodico.corba.hydraulique1d.loi.ILoiSeuilOperations; *************** *** 29,33 **** } final public IObjet creeClone() { ! ILoiSeuil l= CDodico.findUsine().creeHydraulique1dLoiSeuil(); l.initialise(tie()); return l; --- 31,35 ---- } final public IObjet creeClone() { ! ILoiSeuil l= BoonyLib.findUsine().creeHydraulique1dLoiSeuil(); l.initialise(tie()); return l; *************** *** 56,60 **** if (Arrays.equals(zAmont,zAmont_)) return; zAmont_= zAmont; ! CDodico.findUsine().fireObjetModifie(toString(), tie(), "zAmont"); } private double[] zAval_; --- 58,62 ---- if (Arrays.equals(zAmont,zAmont_)) return; zAmont_= zAmont; ! BoonyLib.findUsine().fireObjetModifie(toString(), tie(), "zAmont"); } private double[] zAval_; *************** *** 65,69 **** if (Arrays.equals(zAval,zAval_)) return; zAval_= zAval; ! CDodico.findUsine().fireObjetModifie(toString(), tie(), "zAval"); } private double[] q_; --- 67,71 ---- if (Arrays.equals(zAval,zAval_)) return; zAval_= zAval; ! BoonyLib.findUsine().fireObjetModifie(toString(), tie(), "zAval"); } private double[] q_; *************** *** 74,78 **** if (Arrays.equals(q,q_)) return; q_= q; ! CDodico.findUsine().fireObjetModifie(toString(), tie(), "q"); } // methodes --- 76,80 ---- if (Arrays.equals(q,q_)) return; q_= q; ! BoonyLib.findUsine().fireObjetModifie(toString(), tie(), "q"); } // methodes Index: DLoiHydrogramme.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/loi/DLoiHydrogramme.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** DLoiHydrogramme.java 27 Apr 2004 16:03:34 -0000 1.6 --- DLoiHydrogramme.java 27 Apr 2004 16:34:25 -0000 1.7 *************** *** 9,12 **** --- 9,14 ---- package org.fudaa.dodico.hydraulique1d.loi; import java.util.Arrays; + + import org.fudaa.dodico.boony.BoonyLib; import org.fudaa.dodico.corba.hydraulique1d.loi.ILoiHydrogramme; import org.fudaa.dodico.corba.hydraulique1d.loi.ILoiHydrogrammeOperations; *************** *** 30,34 **** } final public IObjet creeClone() { ! ILoiHydrogramme l= CDodico.findUsine().creeHydraulique1dLoiHydrogramme(); l.initialise(tie()); return l; --- 32,36 ---- } final public IObjet creeClone() { ! ILoiHydrogramme l= BoonyLib.findUsine().creeHydraulique1dLoiHydrogramme(); l.initialise(tie()); return l; *************** *** 56,60 **** if (Arrays.equals(t,t_)) return; t_= t; ! CDodico.findUsine().fireObjetModifie(toString(), tie(), "t"); } private double[] q_; --- 58,62 ---- if (Arrays.equals(t,t_)) return; t_= t; ! BoonyLib.findUsine().fireObjetModifie(toString(), tie(), "t"); } private double[] q_; *************** *** 65,69 **** if (Arrays.equals(q,q_)) return; q_= q; ! CDodico.findUsine().fireObjetModifie(toString(), tie(), "q"); } // methodes --- 67,71 ---- if (Arrays.equals(q,q_)) return; q_= q; ! BoonyLib.findUsine().fireObjetModifie(toString(), tie(), "q"); } // methodes Index: DLoiGeometrique.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/loi/DLoiGeometrique.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** DLoiGeometrique.java 27 Apr 2004 16:03:34 -0000 1.6 --- DLoiGeometrique.java 27 Apr 2004 16:34:25 -0000 1.7 *************** *** 9,12 **** --- 9,14 ---- package org.fudaa.dodico.hydraulique1d.loi; import java.util.Arrays; + + import org.fudaa.dodico.boony.BoonyLib; import org.fudaa.dodico.corba.hydraulique1d.loi.ILoiGeometrique; import org.fudaa.dodico.corba.hydraulique1d.loi.ILoiGeometriqueOperations; *************** *** 30,34 **** } final public IObjet creeClone() { ! ILoiGeometrique l= CDodico.findUsine().creeHydraulique1dLoiGeometrique(); l.initialise(tie()); return l; --- 32,36 ---- } final public IObjet creeClone() { ! ILoiGeometrique l= BoonyLib.findUsine().creeHydraulique1dLoiGeometrique(); l.initialise(tie()); return l; *************** *** 56,60 **** if (Arrays.equals(d,d_)) return; d_= d; ! CDodico.findUsine().fireObjetModifie(toString(), tie(), "d"); } private double[] z_; --- 58,62 ---- if (Arrays.equals(d,d_)) return; d_= d; ! BoonyLib.findUsine().fireObjetModifie(toString(), tie(), "d"); } private double[] z_; *************** *** 65,69 **** if (Arrays.equals(z,z_)) return; z_= z; ! CDodico.findUsine().fireObjetModifie(toString(), tie(), "z"); } // methodes --- 67,71 ---- if (Arrays.equals(z,z_)) return; z_= z; ! BoonyLib.findUsine().fireObjetModifie(toString(), tie(), "z"); } // methodes |