fudaa-cvs-commit

[<jm_...@us...>]

Update of /cvsroot/fudaa//fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/loi
In directory sc8-pr-cvs1:/tmp/cvs-serv29034/dodico/src/org/fudaa/dodico/hydraulique1d/loi

Modified Files:
	DLoiGeometrique.java DLoiHydrogramme.java 
	DLoiLimniHydrogramme.java DLoiLimnigramme.java 
	DLoiOuvertureVanne.java DLoiRegulation.java DLoiSeuil.java 
	DLoiTarage.java 
Log Message:
- Pour dodico hydraulique1d : 
	- tentative de filtrage des évènements de modif.
	- optimisation des imports.
- Pour l'éditeur du catalogue de lois hydraulique, quand on double-clic sur
  une icone, on édite la loi (au lieu de fermer l'éditeur).
- Pour FudaaEditeurRapport : correction de bug de compilation triviale.


Index: DLoiGeometrique.java
===================================================================
RCS file: /cvsroot/fudaa//fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/loi/DLoiGeometrique.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DLoiGeometrique.java	25 Nov 2003 10:11:40 -0000	1.3
--- DLoiGeometrique.java	2 Dec 2003 19:54:40 -0000	1.4
***************
*** 8,20 ****
   */
  package org.fudaa.dodico.hydraulique1d.loi;
! import org.fudaa.dodico.objet.*;
! import org.fudaa.dodico.corba.objet.*;
! import org.fudaa.dodico.corba.geometrie.*;
! import org.fudaa.dodico.hydraulique1d.*;
! import org.fudaa.dodico.corba.hydraulique1d.*;
! import org.fudaa.dodico.corba.hydraulique1d.loi.*;
  /**
   * @version      $Revision$ $Date$ by $Author$
!  * @author       Jean-Marc Lacombe 
   */
  public class DLoiGeometrique
--- 8,20 ----
   */
  package org.fudaa.dodico.hydraulique1d.loi;
! import java.util.Arrays;
! import org.fudaa.dodico.corba.hydraulique1d.loi.ILoiGeometrique;
! import org.fudaa.dodico.corba.hydraulique1d.loi.ILoiGeometriqueOperations;
! import org.fudaa.dodico.corba.objet.IObjet;
! import org.fudaa.dodico.hydraulique1d.DLoiHydraulique;
! import org.fudaa.dodico.objet.CDodico;
  /**
   * @version      $Revision$ $Date$ by $Author$
!  * @author       Jean-Marc Lacombe
   */
  public class DLoiGeometrique
***************
*** 54,57 ****
--- 54,58 ----
    }
    public void d(double[] d) {
+     if (Arrays.equals(d,d_)) return;
      d_= d;
      CDodico.findUsine().fireObjetModifie(toString(), tie(), "d");
***************
*** 62,65 ****
--- 63,67 ----
    }
    public void z(double[] z) {
+     if (Arrays.equals(z,z_)) return;
      z_= z;
      CDodico.findUsine().fireObjetModifie(toString(), tie(), "z");

Index: DLoiHydrogramme.java
===================================================================
RCS file: /cvsroot/fudaa//fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/loi/DLoiHydrogramme.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DLoiHydrogramme.java	25 Nov 2003 10:11:40 -0000	1.3
--- DLoiHydrogramme.java	2 Dec 2003 19:54:40 -0000	1.4
***************
*** 8,20 ****
   */
  package org.fudaa.dodico.hydraulique1d.loi;
! import org.fudaa.dodico.objet.*;
! import org.fudaa.dodico.corba.objet.*;
! import org.fudaa.dodico.corba.geometrie.*;
! import org.fudaa.dodico.hydraulique1d.*;
! import org.fudaa.dodico.corba.hydraulique1d.*;
! import org.fudaa.dodico.corba.hydraulique1d.loi.*;
  /**
   * @version      $Revision$ $Date$ by $Author$
!  * @author       Jean-Marc Lacombe 
   */
  public class DLoiHydrogramme
--- 8,20 ----
   */
  package org.fudaa.dodico.hydraulique1d.loi;
! import java.util.Arrays;
! import org.fudaa.dodico.corba.hydraulique1d.loi.ILoiHydrogramme;
! import org.fudaa.dodico.corba.hydraulique1d.loi.ILoiHydrogrammeOperations;
! import org.fudaa.dodico.corba.objet.IObjet;
! import org.fudaa.dodico.hydraulique1d.DLoiHydraulique;
! import org.fudaa.dodico.objet.CDodico;
  /**
   * @version      $Revision$ $Date$ by $Author$
!  * @author       Jean-Marc Lacombe
   */
  public class DLoiHydrogramme
***************
*** 54,57 ****
--- 54,58 ----
    }
    public void t(double[] t) {
+     if (Arrays.equals(t,t_)) return;
      t_= t;
      CDodico.findUsine().fireObjetModifie(toString(), tie(), "t");
***************
*** 62,65 ****
--- 63,67 ----
    }
    public void q(double[] q) {
+     if (Arrays.equals(q,q_)) return;
      q_= q;
      CDodico.findUsine().fireObjetModifie(toString(), tie(), "q");

Index: DLoiLimniHydrogramme.java
===================================================================
RCS file: /cvsroot/fudaa//fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/loi/DLoiLimniHydrogramme.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DLoiLimniHydrogramme.java	25 Nov 2003 10:11:40 -0000	1.3
--- DLoiLimniHydrogramme.java	2 Dec 2003 19:54:40 -0000	1.4
***************
*** 8,20 ****
   */
  package org.fudaa.dodico.hydraulique1d.loi;
! import org.fudaa.dodico.objet.*;
! import org.fudaa.dodico.corba.objet.*;
! import org.fudaa.dodico.corba.geometrie.*;
! import org.fudaa.dodico.hydraulique1d.*;
! import org.fudaa.dodico.corba.hydraulique1d.*;
! import org.fudaa.dodico.corba.hydraulique1d.loi.*;
  /**
   * @version      $Revision$ $Date$ by $Author$
!  * @author       Jean-Marc Lacombe 
   */
  public class DLoiLimniHydrogramme
--- 8,20 ----
   */
  package org.fudaa.dodico.hydraulique1d.loi;
! import java.util.Arrays;
! import org.fudaa.dodico.corba.hydraulique1d.loi.ILoiLimniHydrogramme;
! import org.fudaa.dodico.corba.hydraulique1d.loi.ILoiLimniHydrogrammeOperations;
! import org.fudaa.dodico.corba.objet.IObjet;
! import org.fudaa.dodico.hydraulique1d.DLoiHydraulique;
! import org.fudaa.dodico.objet.CDodico;
  /**
   * @version      $Revision$ $Date$ by $Author$
!  * @author       Jean-Marc Lacombe
   */
  public class DLoiLimniHydrogramme
***************
*** 58,61 ****
--- 58,62 ----
    }
    public void t(double[] t) {
+     if (Arrays.equals(t,t_)) return;
      t_= t;
      CDodico.findUsine().fireObjetModifie(toString(), tie(), "t");
***************
*** 66,69 ****
--- 67,71 ----
    }
    public void z(double[] z) {
+     if (Arrays.equals(z,z_)) return;
      z_= z;
      CDodico.findUsine().fireObjetModifie(toString(), tie(), "z");
***************
*** 74,77 ****
--- 76,80 ----
    }
    public void q(double[] q) {
+     if (Arrays.equals(q,q_)) return;
      q_= q;
      CDodico.findUsine().fireObjetModifie(toString(), tie(), "q");

Index: DLoiLimnigramme.java
===================================================================
RCS file: /cvsroot/fudaa//fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/loi/DLoiLimnigramme.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DLoiLimnigramme.java	25 Nov 2003 10:11:40 -0000	1.3
--- DLoiLimnigramme.java	2 Dec 2003 19:54:40 -0000	1.4
***************
*** 8,20 ****
   */
  package org.fudaa.dodico.hydraulique1d.loi;
! import org.fudaa.dodico.objet.*;
! import org.fudaa.dodico.corba.objet.*;
! import org.fudaa.dodico.corba.geometrie.*;
! import org.fudaa.dodico.hydraulique1d.*;
! import org.fudaa.dodico.corba.hydraulique1d.*;
! import org.fudaa.dodico.corba.hydraulique1d.loi.*;
  /**
   * @version      $Revision$ $Date$ by $Author$
!  * @author       Jean-Marc Lacombe 
   */
  public class DLoiLimnigramme
--- 8,20 ----
   */
  package org.fudaa.dodico.hydraulique1d.loi;
! import java.util.Arrays;
! import org.fudaa.dodico.corba.hydraulique1d.loi.ILoiLimnigramme;
! import org.fudaa.dodico.corba.hydraulique1d.loi.ILoiLimnigrammeOperations;
! import org.fudaa.dodico.corba.objet.IObjet;
! import org.fudaa.dodico.hydraulique1d.DLoiHydraulique;
! import org.fudaa.dodico.objet.CDodico;
  /**
   * @version      $Revision$ $Date$ by $Author$
!  * @author       Jean-Marc Lacombe
   */
  public class DLoiLimnigramme
***************
*** 53,56 ****
--- 53,57 ----
    }
    public void t(double[] t) {
+     if (Arrays.equals(t,t_)) return;
      t_= t;
      CDodico.findUsine().fireObjetModifie(toString(), tie(), "t");
***************
*** 61,64 ****
--- 62,66 ----
    }
    public void z(double[] z) {
+     if (Arrays.equals(z,z_)) return;
      z_= z;
      CDodico.findUsine().fireObjetModifie(toString(), tie(), "z");

Index: DLoiOuvertureVanne.java
===================================================================
RCS file: /cvsroot/fudaa//fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/loi/DLoiOuvertureVanne.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DLoiOuvertureVanne.java	25 Nov 2003 10:11:40 -0000	1.3
--- DLoiOuvertureVanne.java	2 Dec 2003 19:54:40 -0000	1.4
***************
*** 8,20 ****
   */
  package org.fudaa.dodico.hydraulique1d.loi;
! import org.fudaa.dodico.objet.*;
! import org.fudaa.dodico.corba.objet.*;
! import org.fudaa.dodico.corba.geometrie.*;
! import org.fudaa.dodico.hydraulique1d.*;
! import org.fudaa.dodico.corba.hydraulique1d.*;
! import org.fudaa.dodico.corba.hydraulique1d.loi.*;
  /**
   * @version      $Revision$ $Date$ by $Author$
!  * @author       Jean-Marc Lacombe 
   */
  public class DLoiOuvertureVanne
--- 8,20 ----
   */
  package org.fudaa.dodico.hydraulique1d.loi;
! import java.util.Arrays;
! import org.fudaa.dodico.corba.hydraulique1d.loi.ILoiOuvertureVanne;
! import org.fudaa.dodico.corba.hydraulique1d.loi.ILoiOuvertureVanneOperations;
! import org.fudaa.dodico.corba.objet.IObjet;
! import org.fudaa.dodico.hydraulique1d.DLoiHydraulique;
! import org.fudaa.dodico.objet.CDodico;
  /**
   * @version      $Revision$ $Date$ by $Author$
!  * @author       Jean-Marc Lacombe
   */
  public class DLoiOuvertureVanne
***************
*** 58,61 ****
--- 58,62 ----
    }
    public void t(double[] t) {
+     if (Arrays.equals(t,t_)) return;
      t_= t;
      CDodico.findUsine().fireObjetModifie(toString(), tie(), "t");
***************
*** 66,69 ****
--- 67,71 ----
    }
    public void zInf(double[] zInf) {
+     if (Arrays.equals(zInf,zInf_)) return;
      zInf_= zInf;
      CDodico.findUsine().fireObjetModifie(toString(), tie(), "zInf");
***************
*** 74,77 ****
--- 76,80 ----
    }
    public void zSup(double[] zSup) {
+     if (Arrays.equals(zSup,zSup_)) return;
      zSup_= zSup;
      CDodico.findUsine().fireObjetModifie(toString(), tie(), "zSup");

Index: DLoiRegulation.java
===================================================================
RCS file: /cvsroot/fudaa//fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/loi/DLoiRegulation.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DLoiRegulation.java	25 Nov 2003 10:11:40 -0000	1.3
--- DLoiRegulation.java	2 Dec 2003 19:54:40 -0000	1.4
***************
*** 8,20 ****
   */
  package org.fudaa.dodico.hydraulique1d.loi;
! import org.fudaa.dodico.objet.*;
! import org.fudaa.dodico.corba.objet.*;
! import org.fudaa.dodico.corba.geometrie.*;
! import org.fudaa.dodico.hydraulique1d.*;
! import org.fudaa.dodico.corba.hydraulique1d.*;
! import org.fudaa.dodico.corba.hydraulique1d.loi.*;
  /**
   * @version      $Revision$ $Date$ by $Author$
!  * @author       Jean-Marc Lacombe 
   */
  public class DLoiRegulation
--- 8,20 ----
   */
  package org.fudaa.dodico.hydraulique1d.loi;
! import java.util.Arrays;
! import org.fudaa.dodico.corba.hydraulique1d.loi.ILoiRegulation;
! import org.fudaa.dodico.corba.hydraulique1d.loi.ILoiRegulationOperations;
! import org.fudaa.dodico.corba.objet.IObjet;
! import org.fudaa.dodico.hydraulique1d.DLoiHydraulique;
! import org.fudaa.dodico.objet.CDodico;
  /**
   * @version      $Revision$ $Date$ by $Author$
!  * @author       Jean-Marc Lacombe
   */
  public class DLoiRegulation
***************
*** 54,57 ****
--- 54,58 ----
    }
    public void qAmont(double[] qAmont) {
+     if (Arrays.equals(qAmont,qAmont_)) return;
      qAmont_= qAmont;
      CDodico.findUsine().fireObjetModifie(toString(), tie(), "qAmont");
***************
*** 62,65 ****
--- 63,67 ----
    }
    public void zAval(double[] zAval) {
+     if (Arrays.equals(zAval,zAval_)) return;
      zAval_= zAval;
      CDodico.findUsine().fireObjetModifie(toString(), tie(), "zAval");

Index: DLoiSeuil.java
===================================================================
RCS file: /cvsroot/fudaa//fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/loi/DLoiSeuil.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DLoiSeuil.java	25 Nov 2003 10:11:40 -0000	1.3
--- DLoiSeuil.java	2 Dec 2003 19:54:40 -0000	1.4
***************
*** 8,17 ****
   */
  package org.fudaa.dodico.hydraulique1d.loi;
! import org.fudaa.dodico.objet.*;
! import org.fudaa.dodico.corba.objet.*;
! import org.fudaa.dodico.corba.geometrie.*;
! import org.fudaa.dodico.hydraulique1d.*;
! import org.fudaa.dodico.corba.hydraulique1d.*;
! import org.fudaa.dodico.corba.hydraulique1d.loi.*;
  /**
   * @version      $Revision$ $Date$ by $Author$
--- 8,17 ----
   */
  package org.fudaa.dodico.hydraulique1d.loi;
! import java.util.Arrays;
! import org.fudaa.dodico.corba.hydraulique1d.loi.ILoiSeuil;
! import org.fudaa.dodico.corba.hydraulique1d.loi.ILoiSeuilOperations;
! import org.fudaa.dodico.corba.objet.IObjet;
! import org.fudaa.dodico.hydraulique1d.DLoiHydraulique;
! import org.fudaa.dodico.objet.CDodico;
  /**
   * @version      $Revision$ $Date$ by $Author$
***************
*** 54,57 ****
--- 54,58 ----
    }
    public void zAmont(double[][] zAmont) {
+     if (Arrays.equals(zAmont,zAmont_)) return;
      zAmont_= zAmont;
      CDodico.findUsine().fireObjetModifie(toString(), tie(), "zAmont");
***************
*** 62,65 ****
--- 63,67 ----
    }
    public void zAval(double[] zAval) {
+     if (Arrays.equals(zAval,zAval_)) return;
      zAval_= zAval;
      CDodico.findUsine().fireObjetModifie(toString(), tie(), "zAval");
***************
*** 70,73 ****
--- 72,76 ----
    }
    public void q(double[] q) {
+     if (Arrays.equals(q,q_)) return;
      q_= q;
      CDodico.findUsine().fireObjetModifie(toString(), tie(), "q");

Index: DLoiTarage.java
===================================================================
RCS file: /cvsroot/fudaa//fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/loi/DLoiTarage.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DLoiTarage.java	25 Nov 2003 10:11:40 -0000	1.3
--- DLoiTarage.java	2 Dec 2003 19:54:40 -0000	1.4
***************
*** 8,20 ****
   */
  package org.fudaa.dodico.hydraulique1d.loi;
! import org.fudaa.dodico.objet.*;
! import org.fudaa.dodico.corba.objet.*;
! import org.fudaa.dodico.corba.geometrie.*;
! import org.fudaa.dodico.hydraulique1d.*;
! import org.fudaa.dodico.corba.hydraulique1d.*;
! import org.fudaa.dodico.corba.hydraulique1d.loi.*;
  /**
   * @version      $Revision$ $Date$ by $Author$
!  * @author       Jean-Marc Lacombe 
   */
  public class DLoiTarage
--- 8,20 ----
   */
  package org.fudaa.dodico.hydraulique1d.loi;
! import java.util.Arrays;
! import org.fudaa.dodico.corba.hydraulique1d.loi.ILoiTarage;
! import org.fudaa.dodico.corba.hydraulique1d.loi.ILoiTarageOperations;
! import org.fudaa.dodico.corba.objet.IObjet;
! import org.fudaa.dodico.hydraulique1d.DLoiHydraulique;
! import org.fudaa.dodico.objet.CDodico;
  /**
   * @version      $Revision$ $Date$ by $Author$
!  * @author       Jean-Marc Lacombe
   */
  public class DLoiTarage
***************
*** 65,68 ****
--- 65,69 ----
    }
    public void z(double[] z) {
+     if (Arrays.equals(z,z_)) return;
      z_= z;
      CDodico.findUsine().fireObjetModifie(toString(), tie(), "z");
***************
*** 73,76 ****
--- 74,78 ----
    }
    public void q(double[] q) {
+     if (Arrays.equals(q,q_)) return;
      q_= q;
      CDodico.findUsine().fireObjetModifie(toString(), tie(), "q");