fudaa-cvs-commit — Mailing list for CVS commit messages

[Fudaa-cvs-commit] fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre DiapreImplementation.java,1.9,1.10

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

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

Modified Files:
	DiapreImplementation.java 
Log Message:


Index: DiapreImplementation.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre/DiapreImplementation.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** DiapreImplementation.java	5 May 2004 12:42:42 -0000	1.9
--- DiapreImplementation.java	1 Jun 2004 11:27:47 -0000	1.10
***************
*** 89,93 ****
    static private boolean                  ouvert           = false;
    protected BuAssistant                   assistant_;
-   protected BuPreferencesFrame            preferences_;
    protected EbliFillePrevisualisation     previsuFille_;
    protected BuHelpFrame                   aide_;
--- 89,92 ----
***************
*** 143,147 ****
      fp_ = null;
      projet_ = null;
-     preferences_ = null;
      aide_ = null;
      try {
--- 142,145 ----
***************
*** 483,488 ****
  
    /* Création ou affichage de la fentre pour les préférences. */
!   protected void buildPreferences() {
!     preferences_ = new BuPreferencesFrame();
      preferences_.addTab(new BuUserPreferencesPanel(this));
      preferences_.addTab(new BuDesktopPreferencesPanel(this));
--- 481,486 ----
  
    /* Création ou affichage de la fentre pour les préférences. */
!   protected BuPreferencesEditorPanel buildPreferences() {
!     BuPreferencesEditorPanel preferences_ = new BuPreferencesEditorPanel();
      preferences_.addTab(new BuUserPreferencesPanel(this));
      preferences_.addTab(new BuDesktopPreferencesPanel(this));
***************
*** 492,495 ****
--- 490,494 ----
      preferences_.addTab(new FudaaAidePreferencesPanel(this, DiaprePreferences.DIAPRE));
      preferences_.addTab(new EbliMiseEnPagePreferencesPanel());
+     return preferences_;
    }
  

[Fudaa-cvs-commit] fudaa_devel/fudaa/src/org/fudaa/fudaa/reflux RefluxModeleNoeud.java,1.5,1.6 RefluxImplementation.java,1.12,1.13 RefluxMaillage.java,1.6,1.7

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

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

Modified Files:
	RefluxModeleNoeud.java RefluxImplementation.java 
	RefluxMaillage.java 
Log Message:


Index: RefluxImplementation.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/reflux/RefluxImplementation.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** RefluxImplementation.java	30 Apr 2004 13:52:20 -0000	1.12
--- RefluxImplementation.java	1 Jun 2004 11:27:46 -0000	1.13
***************
*** 932,944 ****
      }
    }
!   protected void buildPreferences() {
!     if (preferences_ == null) {
!       preferences_= new BuPreferencesFrame();
        preferences_.addTab(new BuLookPreferencesPanel(this));
        preferences_.addTab(new BuDesktopPreferencesPanel(this));
        preferences_.addTab(new EbliCalquesPreferencesPanel(this));
        preferences_.addTab(new PRPnPreferences(this));
!     }
!     addInternalFrame(preferences_);
    }
    /**
--- 932,942 ----
      }
    }
!   protected BuPreferencesEditorPanel buildPreferences() {
!     BuPreferencesEditorPanel preferences_= new BuPreferencesEditorPanel();
        preferences_.addTab(new BuLookPreferencesPanel(this));
        preferences_.addTab(new BuDesktopPreferencesPanel(this));
        preferences_.addTab(new EbliCalquesPreferencesPanel(this));
        preferences_.addTab(new PRPnPreferences(this));
!       return preferences_;
    }
    /**

Index: RefluxModeleNoeud.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/reflux/RefluxModeleNoeud.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** RefluxModeleNoeud.java	12 Feb 2004 16:15:20 -0000	1.5
--- RefluxModeleNoeud.java	1 Jun 2004 11:27:46 -0000	1.6
***************
*** 41,43 ****
--- 41,49 ----
    public void setListener(ZModeleDonneesListener _l) {}
  
+   /**
+    * @see org.fudaa.ebli.calque.ZModeleDonnees#getDonneesBoite(org.fudaa.ebli.geometrie.GrDataBoite)
+    */
+   public  boolean getDonneesBoite(GrDataBoite _b) {
+     return false;
+   }
  }
\ No newline at end of file

Index: RefluxMaillage.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/reflux/RefluxMaillage.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** RefluxMaillage.java	15 Apr 2004 07:38:08 -0000	1.6
--- RefluxMaillage.java	1 Jun 2004 11:27:47 -0000	1.7
***************
*** 57,59 ****
--- 57,65 ----
    public void setListener(ZModeleDonneesListener _l) {}
  
+   /**
+    * @see org.fudaa.ebli.calque.ZModeleDonnees#getDonneesBoite(org.fudaa.ebli.geometrie.GrDataBoite)
+    */
+   public  boolean getDonneesBoite(GrDataBoite _b) {
+     return false;
+   }
  }

[Fudaa-cvs-commit] fudaa_devel/fudaa/src/org/fudaa/fudaa/vag VagImplementation.java,1.13,1.14

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

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

Modified Files:
	VagImplementation.java 
Log Message:


Index: VagImplementation.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/vag/VagImplementation.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** VagImplementation.java	5 May 2004 12:42:40 -0000	1.13
--- VagImplementation.java	1 Jun 2004 11:27:47 -0000	1.14
***************
*** 8,11 ****
--- 8,12 ----
   */
  package org.fudaa.fudaa.vag;
+ 
  import java.awt.Color;
  import java.awt.Container;
***************
*** 41,44 ****
--- 42,46 ----
  import com.memoire.bu.BuMenuRecentFiles;
[...2679 lines suppressed...]
!     FudaaDodicoTacheConnexion c = (FudaaDodicoTacheConnexion) _r.get(DCalculVag.class);
!     CONNEXION_VAG = c.getConnexion();
!     SERVEUR_VAG = ICalculVagHelper.narrow(c.getTache());
!     c = (FudaaDodicoTacheConnexion) _r.get(DCalculDunes.class);
!     CONNEXION_DUNES = c.getConnexion();
!     SERVEUR_DUNES = ICalculDunesHelper.narrow(c.getTache());
    }
! 
    /**
     * @see org.fudaa.fudaa.commun.FudaaCommonImplementation#cmdOuvrirFile(java.io.File)
***************
*** 1680,1682 ****
      ouvrir(_f.getAbsolutePath());
    }
! }
--- 1538,1540 ----
      ouvrir(_f.getAbsolutePath());
    }
! }
\ No newline at end of file

[Fudaa-cvs-commit] fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/controle MvControlOverstressed.java,1.2,1.3

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

Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/controle
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23809/src/org/fudaa/fudaa/meshviewer/controle

Modified Files:
	MvControlOverstressed.java 
Log Message:


Index: MvControlOverstressed.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/controle/MvControlOverstressed.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MvControlOverstressed.java	5 May 2004 12:42:36 -0000	1.2
--- MvControlOverstressed.java	1 Jun 2004 11:27:47 -0000	1.3
***************
*** 12,25 ****
  import javax.swing.JPanel;
  
- import com.memoire.bu.BuGridLayout;
- import com.memoire.bu.BuLabel;
- 
  import org.fudaa.dodico.commun.DodicoResource;
  import org.fudaa.dodico.commun.ProgressionInterface;
  import org.fudaa.dodico.ef.EfGrid;
- 
  import org.fudaa.fudaa.meshviewer.action.MvItemAction;
  import org.fudaa.fudaa.meshviewer.action.MvItemActionUI;
  
  /**
   * @author deniger
--- 12,24 ----
  import javax.swing.JPanel;
  
  import org.fudaa.dodico.commun.DodicoResource;
  import org.fudaa.dodico.commun.ProgressionInterface;
  import org.fudaa.dodico.ef.EfGrid;
  import org.fudaa.fudaa.meshviewer.action.MvItemAction;
  import org.fudaa.fudaa.meshviewer.action.MvItemActionUI;
  
+ import com.memoire.bu.BuGridLayout;
+ import com.memoire.bu.BuLabel;
+ 
  /**
   * @author deniger
***************
*** 46,67 ****
      private OverstressedUI() {
        setLayout(new BuGridLayout(1, 5, 0));
!       add(
!         new BuLabel(
!           DodicoResource.getS(
!             "Recherche valable uniquement pour les triangles")));
!       add(
!         new BuLabel(
!           DodicoResource.getS(
!             "Triangle surcontraint= triangle dont dont les 3 extrémités appartiennent à une frontière")));
      }
  
      /**
!     *
!     */
      public MvControlResult execute(EfGrid _g, ProgressionInterface _progress) {
!       MvControlResult r= new MvControlElementResult();
!       r.description_=
!         DodicoResource.getS("Eléments surcontraints");
!       r.idx_= _g.getOverstressedElement(_progress);
        return r;
      }
--- 45,61 ----
      private OverstressedUI() {
        setLayout(new BuGridLayout(1, 5, 0));
!       add(new BuLabel(DodicoResource.getS("Recherche valable uniquement pour les triangles")));
!       add(new BuLabel(
!           DodicoResource
!               .getS("Triangle surcontraint= triangle dont les 3 extrémités appartiennent à une frontière")));
      }
  
      /**
!      *
!      */
      public MvControlResult execute(EfGrid _g, ProgressionInterface _progress) {
!       MvControlResult r = new MvControlElementResult();
!       r.description_ = DodicoResource.getS("Eléments surcontraints");
!       r.idx_ = _g.getOverstressedElement(_progress);
        return r;
      }
***************
*** 76,78 ****
    }
  
! }
--- 70,72 ----
    }
  
! }
\ No newline at end of file

[Fudaa-cvs-commit] fudaa_devel/fudaa/src/org/fudaa/fudaa/navmer NavmerImplementation.java,1.11,1.12

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

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

Modified Files:
	NavmerImplementation.java 
Log Message:


Index: NavmerImplementation.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/navmer/NavmerImplementation.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** NavmerImplementation.java	5 May 2004 12:42:45 -0000	1.11
--- NavmerImplementation.java	1 Jun 2004 11:27:46 -0000	1.12
***************
*** 49,52 ****
--- 49,53 ----
  import com.memoire.bu.BuPreferences;
  import com.memoire.bu.BuPreferencesFrame;
+ import com.memoire.bu.BuPreferencesEditorPanel;
  import com.memoire.bu.BuPrinter;
  import com.memoire.bu.BuResource;
***************
*** 131,135 ****
    public final static String REMOTE_MAN=
      "http://www.utc.fr/fudaa/aide/aide_html/";
-   private BuPreferencesFrame preferences_; //fenetre de preferences
    private NavmerFilleCalques ffCalques_; // Fenetre principale
    private BArbreCalque arbre_; // Arbre des calques
--- 132,135 ----
***************
*** 261,267 ****
              + "Veuillez en definir un.")
            .activate();
!         preferences();
!         //Activer l'onglet choix de l'executable
!         preferences_.selectTab(6);
        }
      } catch (Throwable t) {
--- 261,265 ----
              + "Veuillez en definir un.")
            .activate();
!         preferences().selectTab(6);
        }
      } catch (Throwable t) {
***************
*** 1541,1546 ****
      NavmerPreferences.NAVMER.writeIniFile();
    }
!   public void buildPreferences() {
!       preferences_= new BuPreferencesFrame();
        preferences_.addTab(new BuLookPreferencesPanel(this));
        preferences_.addTab(new BuDesktopPreferencesPanel(this));
--- 1539,1544 ----
      NavmerPreferences.NAVMER.writeIniFile();
    }
!   public BuPreferencesEditorPanel buildPreferences() {
!     BuPreferencesEditorPanel preferences_= new BuPreferencesEditorPanel();
        preferences_.addTab(new BuLookPreferencesPanel(this));
        preferences_.addTab(new BuDesktopPreferencesPanel(this));
***************
*** 1551,1554 ****
--- 1549,1553 ----
          new FudaaAidePreferencesPanel(this, NavmerPreferences.NAVMER));
        preferences_.addTab(new NavmerPreferencesPanel(this));
+       return preferences_;
    }
    public void exit() {

[Fudaa-cvs-commit] fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/undo FudaaUndoPaneFille.java,1.6,1.7 FudaaUndoCmdMngListener.java,1.6,1.7

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

Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/undo
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23809/src/org/fudaa/fudaa/commun/undo

Modified Files:
	FudaaUndoPaneFille.java FudaaUndoCmdMngListener.java 
Log Message:


Index: FudaaUndoPaneFille.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/undo/FudaaUndoPaneFille.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** FudaaUndoPaneFille.java	27 Apr 2004 16:09:35 -0000	1.6
--- FudaaUndoPaneFille.java	1 Jun 2004 11:27:45 -0000	1.7
***************
*** 1,11 ****
  /*
!  *  @file         FudaaPaneUndoFille.java
!  *  @creation     12 nov. 2003
!  *  @modification $Date$
!  *  @license      GNU General Public License 2
!  *  @copyright    (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
!  *  @mail         de...@fu...
   */
  package org.fudaa.fudaa.commun.undo;
  import java.awt.Component;
  
--- 1,9 ----
  /*
!  * @file FudaaPaneUndoFille.java @creation 12 nov. 2003 @modification $Date$
!  * @license GNU General Public License 2 @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231
!  * Compiegne @mail de...@fu...
   */
  package org.fudaa.fudaa.commun.undo;
+ 
  import java.awt.Component;
  
***************
*** 23,40 ****
   * @version $Id$
   */
! public class FudaaUndoPaneFille
!   extends BuInternalFrame
!   implements ChangeListener, BuUndoRedoInterface,FudaaUndoCmdMngContainer {
!   private BuTabbedPane pane_;
    FudaaUndoCmdMngListener l_;
    /**
     * 
     */
    public FudaaUndoPaneFille(FudaaUndoCmdMngListener _l) {
!     pane_= new BuTabbedPane();
      setContentPane(pane_);
!     l_=_l;
      pane_.getModel().addChangeListener(this);
    }
    /**
     * @param _title
--- 21,40 ----
   * @version $Id$
   */
! public class FudaaUndoPaneFille extends BuInternalFrame implements ChangeListener,
!     BuUndoRedoInterface, FudaaUndoCmdMngContainer {
! 
!   private BuTabbedPane    pane_;
    FudaaUndoCmdMngListener l_;
+ 
    /**
     * 
     */
    public FudaaUndoPaneFille(FudaaUndoCmdMngListener _l) {
!     pane_ = new BuTabbedPane();
      setContentPane(pane_);
!     l_ = _l;
      pane_.getModel().addChangeListener(this);
    }
+ 
    /**
     * @param _title
***************
*** 44,102 ****
     * @param _iconifiable
     */
!   public FudaaUndoPaneFille(
!     String _title,
!     boolean _resizable,
!     boolean _closable,
!     boolean _maximizable,
!     boolean _iconifiable,FudaaUndoCmdMngListener _l) {
      super(_title, _resizable, _closable, _maximizable, _iconifiable);
!     pane_= new BuTabbedPane();
      setContentPane(pane_);
!     l_=_l;
      pane_.getModel().addChangeListener(this);
    }
!   protected final void addTab(
!     String title,
!     Icon icon,
!     Component c,
!     String tooltip,
!     DodicoCommandManager _mng) {
!     pane_.addTab(title, icon, c, tooltip);
!    if(_mng!=null) _mng.setListener(l_);
!     
    }
    public Component getSelectedComponent() {
!     return pane_==null?null:pane_.getSelectedComponent();
    }
    public DodicoCommandManager getActiveCmdMng() {
!     FudaaUndoCmdMngContainer cpt=
!       (FudaaUndoCmdMngContainer)pane_.getSelectedComponent();
      return cpt.getCmdMng();
    }
    /**
     *
     */
    public void stateChanged(ChangeEvent e) {
!     int i= pane_.getSelectedIndex();
!     FudaaUndoCmdMngContainer selected=
!       (FudaaUndoCmdMngContainer)pane_.getComponent(i);
!     Component[] c= pane_.getComponents();
!     for (int j= c.length - 1; j >= 0; j--) {
!       if (j != i)
!          ((FudaaUndoCmdMngContainer)pane_.getComponent(j)).setActive(false);
      }
!     l_.setActive(selected,true);
    }
    public void redo() {
!     DodicoCommandManager mng= getActiveCmdMng();
      if (mng != null) {
        mng.redo();
      }
    }
    /**
     *
     */
    public void undo() {
!     DodicoCommandManager mng= getActiveCmdMng();
      if (mng != null) {
        mng.undo();
--- 44,105 ----
     * @param _iconifiable
     */
!   public FudaaUndoPaneFille(String _title, boolean _resizable, boolean _closable,
!       boolean _maximizable, boolean _iconifiable, FudaaUndoCmdMngListener _l) {
      super(_title, _resizable, _closable, _maximizable, _iconifiable);
!     pane_ = new BuTabbedPane();
      setContentPane(pane_);
!     l_ = _l;
      pane_.getModel().addChangeListener(this);
    }
! 
! 
!   /**
!    * Si c est une instance de FudaaUndoCmdMngContainer, le listener est mis à jour.
!    * @param title le titre
!    * @param icon l'icone
!    * @param c le composant
!    * @param tooltip le tooltip
!    */
!   public final void addTab(String title, Icon icon, FudaaUndoCmdMngContainer c, String tooltip) {
!     pane_.addTab(title, icon, (Component)c, tooltip);
!       if (c.getCmdMng() != null) {
!         c.getCmdMng().setListener(l_);
!       }
    }
+ 
    public Component getSelectedComponent() {
!     return pane_ == null ? null : pane_.getSelectedComponent();
    }
+ 
    public DodicoCommandManager getActiveCmdMng() {
!     FudaaUndoCmdMngContainer cpt = (FudaaUndoCmdMngContainer) pane_.getSelectedComponent();
      return cpt.getCmdMng();
    }
+ 
    /**
     *
     */
    public void stateChanged(ChangeEvent e) {
!     int i = pane_.getSelectedIndex();
!     FudaaUndoCmdMngContainer selected = (FudaaUndoCmdMngContainer) pane_.getSelectedComponent();
!     Component[] c = pane_.getComponents();
!     for (int j = c.length - 1; j >= 0; j--) {
!       if (pane_.getComponent(j) != selected) ((FudaaUndoCmdMngContainer) pane_.getComponent(j)).setActive(false);
      }
!     l_.setActive(selected, true);
    }
+ 
    public void redo() {
!     DodicoCommandManager mng = getActiveCmdMng();
      if (mng != null) {
        mng.redo();
      }
    }
+ 
    /**
     *
     */
    public void undo() {
!     DodicoCommandManager mng = getActiveCmdMng();
      if (mng != null) {
        mng.undo();
***************
*** 115,119 ****
     */
    public void setActive(boolean _b) {
!     ((FudaaUndoCmdMngContainer)pane_.getSelectedComponent()).setActive(_b);
    }
  
--- 118,122 ----
     */
    public void setActive(boolean _b) {
!     ((FudaaUndoCmdMngContainer) pane_.getSelectedComponent()).setActive(_b);
    }
  
***************
*** 122,132 ****
     */
    public void clearCmd(DodicoCommandManager _source) {
!     Component[] c= pane_.getComponents();
!     for (int j= c.length - 1; j >= 0; j--) {
!       if(pane_.getComponent(j)!=this)
!       ((FudaaUndoCmdMngContainer)pane_.getComponent(j)).clearCmd(_source);
      }
!     
    }
  
! }
--- 125,135 ----
     */
    public void clearCmd(DodicoCommandManager _source) {
!     Component[] c = pane_.getComponents();
!     for (int j = c.length - 1; j >= 0; j--) {
!       if (pane_.getComponent(j) != this)
!           ((FudaaUndoCmdMngContainer) pane_.getComponent(j)).clearCmd(_source);
      }
! 
    }
  
! }
\ No newline at end of file

Index: FudaaUndoCmdMngListener.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/undo/FudaaUndoCmdMngListener.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** FudaaUndoCmdMngListener.java	5 May 2004 12:42:43 -0000	1.6
--- FudaaUndoCmdMngListener.java	1 Jun 2004 11:27:45 -0000	1.7
***************
*** 40,45 ****
    public void internalFrameActivated(InternalFrameEvent _e) {
      if (_e.getInternalFrame() instanceof FudaaUndoCmdMngContainer) {
-       System.out.println("yes activated");
        FudaaUndoCmdMngContainer c = (FudaaUndoCmdMngContainer) _e.getInternalFrame();
        if (c.getCmdMng().getListener() != this) {
          c.getCmdMng().setListener(this);
--- 40,45 ----
    public void internalFrameActivated(InternalFrameEvent _e) {
      if (_e.getInternalFrame() instanceof FudaaUndoCmdMngContainer) {
        FudaaUndoCmdMngContainer c = (FudaaUndoCmdMngContainer) _e.getInternalFrame();
+       if(c.getCmdMng()==null) return;
        if (c.getCmdMng().getListener() != this) {
          c.getCmdMng().setListener(this);

[Fudaa-cvs-commit] fudaa_devel/fudaa/src/org/fudaa/fudaa/seuil SeuilImplementation.java,1.9,1.10

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

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

Modified Files:
	SeuilImplementation.java 
Log Message:


Index: SeuilImplementation.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/seuil/SeuilImplementation.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** SeuilImplementation.java	5 May 2004 12:42:41 -0000	1.9
--- SeuilImplementation.java	1 Jun 2004 11:27:46 -0000	1.10
***************
*** 40,43 ****
--- 40,44 ----
  import com.memoire.bu.BuPreferences;
  import com.memoire.bu.BuPreferencesFrame;
+ import com.memoire.bu.BuPreferencesEditorPanel;
  import com.memoire.bu.BuPrinter;
  import com.memoire.bu.BuResource;
***************
*** 110,114 ****
    protected JFrame                        ts_;
    protected BuAssistant                   assistant_;
-   protected BuPreferencesFrame            preferences_;
    protected BuHelpFrame                   aide_;
    protected BuTaskView                    taches_;
--- 111,114 ----
***************
*** 167,171 ****
      fp_ = null;
      projet_ = null;
-     preferences_ = null;
      aide_ = null;
      try {
--- 167,170 ----
***************
*** 709,714 ****
    }
  
!   protected void buildPreferences() {
!     preferences_ = new BuPreferencesFrame();
      preferences_.addTab(new BuUserPreferencesPanel(this));
      preferences_.addTab(new BuDesktopPreferencesPanel(this));
--- 708,713 ----
    }
  
!   protected BuPreferencesEditorPanel buildPreferences() {
!     BuPreferencesEditorPanel preferences_ = new BuPreferencesEditorPanel();
      preferences_.addTab(new BuUserPreferencesPanel(this));
      preferences_.addTab(new BuDesktopPreferencesPanel(this));
***************
*** 716,720 ****
      preferences_.addTab(new BuBrowserPreferencesPanel(this));
      preferences_.addTab(new BuLanguagePreferencesPanel(this));
!     preferences_.addInternalFrameListener(this);
    }
  
--- 715,720 ----
      preferences_.addTab(new BuBrowserPreferencesPanel(this));
      preferences_.addTab(new BuLanguagePreferencesPanel(this));
!     //preferences_.addInternalFrameListener(this);
!     return preferences_;
    }
  

[Fudaa-cvs-commit] fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor SiporImplementation.java,1.7,1.8

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

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

Modified Files:
	SiporImplementation.java 
Log Message:


Index: SiporImplementation.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporImplementation.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** SiporImplementation.java	30 Apr 2004 13:52:16 -0000	1.7
--- SiporImplementation.java	1 Jun 2004 11:27:46 -0000	1.8
***************
*** 68,72 ****
    protected SiporFilleResultatsSimulations fResultatsSimulations_;
    protected BuAssistant assistant_;
-   protected BuPreferencesFrame preferences_;
    protected BuHelpFrame aide_;
    protected BuTaskView taches_;
--- 68,71 ----
***************
*** 115,119 ****
      fp_= null;
      projet_= null;
-     preferences_= null;
      aide_= null;
      try {
--- 114,117 ----
***************
*** 709,718 ****
    }
    /** Création ou affichage de la fentre pour les préférences.*/
!   protected void buildPreferences() {
!       preferences_= new BuPreferencesFrame();
        preferences_.addTab(new BuBrowserPreferencesPanel(this));
        preferences_.addTab(new BuDesktopPreferencesPanel(this));
        preferences_.addTab(new BuLanguagePreferencesPanel(this));
        preferences_.addTab(new SiporPreferencesPanel());
    }
    /** Création ou affichage d'une fenetre pour saisir les paramètres.*/
--- 707,717 ----
    }
    /** Création ou affichage de la fentre pour les préférences.*/
!   protected BuPreferencesEditorPanel buildPreferences() {
!     BuPreferencesEditorPanel preferences_= new BuPreferencesEditorPanel();
        preferences_.addTab(new BuBrowserPreferencesPanel(this));
        preferences_.addTab(new BuDesktopPreferencesPanel(this));
        preferences_.addTab(new BuLanguagePreferencesPanel(this));
        preferences_.addTab(new SiporPreferencesPanel());
+       return preferences_;
    }
    /** Création ou affichage d'une fenetre pour saisir les paramètres.*/

[Fudaa-cvs-commit] fudaa_devel/fudaa distribution.xml,1.19,1.20

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

Update of /cvsroot/fudaa/fudaa_devel/fudaa
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23809

Modified Files:
	distribution.xml 
Log Message:


Index: distribution.xml
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/distribution.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** distribution.xml	5 May 2004 12:42:44 -0000	1.19
--- distribution.xml	1 Jun 2004 11:27:46 -0000	1.20
***************
*** 73,77 ****
    <echo message="debug=${build.compiler.debug}"/>
    <echo message="optimize=${build.compiler.optimize}"/>
!   <echo message="Vous devez utiliser java 1.3"/>
    <echo message="version utilisee: ${ant.java.version}"/>
  
--- 73,77 ----
    <echo message="debug=${build.compiler.debug}"/>
    <echo message="optimize=${build.compiler.optimize}"/>
!   <echo message="Vous devez utiliser java 1.4"/>
    <echo message="version utilisee: ${ant.java.version}"/>
  
***************
*** 408,411 ****
--- 408,414 ----
      <classpath path="${fudaaDist.classpath}"/>
      <class name="org.fudaa.fudaa.tr.Tr"/>
+     <class name="org.fudaa.fudaa.tr.TrMesh"/>
+     <class name="org.fudaa.fudaa.tr.TrPost"/>
+     <class name="org.fudaa.fudaa.tr.TrSupervisor"/>
  
      <class>
***************
*** 429,432 ****
--- 432,436 ----
  	 <include name="org/fudaa/fudaa/tr/"/>
  	 <include name="org/fudaa/fudaa/dico/"/>
+ 	 <include name="org/fudaa/fudaa/meshviewer/"/>
  	 <include name="ghm/followgui/"/>
          </fileset>

[Fudaa-cvs-commit] fudaa_devel/fudaa/etc prepro-mesh.ico,NONE,1.1 prepro-ed.ico,NONE,1.1 prepro-all.xcf,NONE,1.1 prepro-post.ico,NONE,1.1 prepro-post.png,NONE,1.1 prepro-banner.png,NONE,1.1 prepro-ed.png,NONE,1.1 prepro-mesh.png,NONE,1.1 prepro-super.png,NONE,1.1 prepro-super.ico,NONE,1.1 prepro.ico,1.1,1.2 prepro.png,1.1,1.2 prepro.xcf,1.1,NONE prepro.jpg,1.1,NONE prepro_banner.png,1.1,NONE

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

Update of /cvsroot/fudaa/fudaa_devel/fudaa/etc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23698/etc

Modified Files:
	prepro.ico prepro.png 
Added Files:
	prepro-mesh.ico prepro-ed.ico prepro-all.xcf prepro-post.ico 
	prepro-post.png prepro-banner.png prepro-ed.png 
	prepro-mesh.png prepro-super.png prepro-super.ico 
Removed Files:
	prepro.xcf prepro.jpg prepro_banner.png 
Log Message:


--- NEW FILE: prepro-mesh.ico ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: prepro-post.ico ---
(This appears to be a binary file; contents omitted.)

--- prepro.xcf DELETED ---

Index: prepro.png
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/etc/prepro.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvsLFzgwc and /tmp/cvsMIPqxt differ

--- NEW FILE: prepro-super.png ---
(This appears to be a binary file; contents omitted.)

Index: prepro.ico
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/etc/prepro.ico,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvsBEaICg and /tmp/cvss5s2Ex differ

--- NEW FILE: prepro-post.png ---
(This appears to be a binary file; contents omitted.)

--- prepro.jpg DELETED ---

--- NEW FILE: prepro-ed.ico ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: prepro-all.xcf ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: prepro-super.ico ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: prepro-mesh.png ---
(This appears to be a binary file; contents omitted.)

--- prepro_banner.png DELETED ---

--- NEW FILE: prepro-ed.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: prepro-banner.png ---
(This appears to be a binary file; contents omitted.)

[Fudaa-cvs-commit] fudaa_devel/ebli/src/org/fudaa/ebli/calque ZCalqueAffichageDonneesInterface.java,1.7,1.8 ZCalqueAffichageDonneesAbstract.java,1.6,1.7 ActionSelectionPalette.java,1.1,1.2 ZModeleDonnees.java,1.7,1.8 ZModeleDonnesAbstract.java,1.2,1.3 ZCalquePoint.java,1.14,1.15 ZModelePoint.java,1.4,1.5 ZDonneesBoite.java,1.1,NONE

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

Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23395/src/org/fudaa/ebli/calque

Modified Files:
	ZCalqueAffichageDonneesInterface.java 
	ZCalqueAffichageDonneesAbstract.java 
	ActionSelectionPalette.java ZModeleDonnees.java 
	ZModeleDonnesAbstract.java ZCalquePoint.java ZModelePoint.java 
Removed Files:
	ZDonneesBoite.java 
Log Message:


Index: ZModeleDonnees.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZModeleDonnees.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ZModeleDonnees.java	14 May 2004 10:24:09 -0000	1.7
--- ZModeleDonnees.java	1 Jun 2004 11:24:53 -0000	1.8
***************
*** 8,11 ****
--- 8,12 ----
   */
  package org.fudaa.ebli.calque;
+ import org.fudaa.ebli.geometrie.*;
  import org.fudaa.ebli.geometrie.GrBoite;
  /**
***************
*** 38,40 ****
--- 39,48 ----
     */
    void setListener(ZModeleDonneesListener _l);
+   
+   /**
+    * Permet de connaitre les bornes des donnees affichees.
+    * @param _b la boite a modifier
+    * @return false si non adapte.
+    */
+   boolean getDonneesBoite(GrDataBoite _b);
  }

--- ZDonneesBoite.java DELETED ---

Index: ZCalqueAffichageDonneesInterface.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesInterface.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ZCalqueAffichageDonneesInterface.java	14 May 2004 10:24:08 -0000	1.7
--- ZCalqueAffichageDonneesInterface.java	1 Jun 2004 11:24:53 -0000	1.8
***************
*** 19,36 ****
--- 19,90 ----
   */
  public interface ZCalqueAffichageDonneesInterface extends ZModeleDonneesListener {
+   /**
+    * Efface la selection du calque
+    */
    public void clearSelection();
+   /**
+    * Permet de modifier la selection du calque à partir d'un selection ponctuelle
+    * @param _p le point de selection
+    * @param _tolerancePixel la tolerance utilisee pour determiner si un objet est selectionne
+    * @param _action voir les action de ZCalqueSelectionInteraction
+    * @return true si la selection a ete modifiee
+    * @see ZCalqueSelectionInteraction
+    */
    public boolean changeSelection(GrPoint _p, int _tolerancePixel, int _action);
+   /**
+    * Permet de modifier la selection du calque à partir d'un poly de selection
+    * @param _p le polygone englobant
+    * @param _action l'action sur la selection (voir les action de ZCalqueSelectionInteraction)
+    * @return true si selection modifiee
+    * @see ZCalqueSelectionInteraction
+    */
    public boolean changeSelection(GrPolygone _p, int _action);
+   /**
+    * @return true si la selection est vide
+    */
    public boolean isSelectionEmpty();
+   /**
+    * @return le modele utilise
+    */
    public ZModeleDonnees modeleDonnees();
+   /**
+    * @param _l un listener pour la selection
+    */
    public void addSelectionListener(ZSelectionListener _l) ;
+   /**
+    * @param _l le listener a enlever
+    */
    public void removeSelectionListener(ZSelectionListener _l);
+   /**
+    * @return l'id du calque
+    */ 
    public String getName();
+   /**
+    * @return le titre du calque
+    */
    public String getTitle();
+   /**
+    * @return true si la selection sur une selection entre 2 points est possible.
+    */
    public boolean  isSpecialSelectionAllowed();
    
+   /**
+    * Ajout d'un listener de propriete.
+    * @param _l le listener
+    */
    public void addPropertyChangeListener(PropertyChangeListener _l);
+   /**
+    * @param _prop la propriete a ecouter
+    * @param _l le listener a ajoute
+    */
    public void addPropertyChangeListener(String _prop,PropertyChangeListener _l);
+   /**
+    * @param _l le listener a enlever
+    */
    public void removePropertyChangeListener(PropertyChangeListener _l);
+   /**
+    * @param _prop la prop du listener a enlever
+    * @param _l le listener a enlever
+    */
    public void removePropertyChangeListener(String _prop,PropertyChangeListener _l);
    
***************
*** 45,48 ****
--- 99,105 ----
     */
    public void setPaletteCouleurPlages(BPlageInterface[] _newPlage);
+   /**
+    * @return true si l'outil palette peut-etre utilise pour ce calque
+    */
    public boolean isPaletteCouleurEnable();
  }

Index: ZCalqueAffichageDonneesAbstract.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesAbstract.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ZCalqueAffichageDonneesAbstract.java	14 May 2004 10:24:08 -0000	1.6
--- ZCalqueAffichageDonneesAbstract.java	1 Jun 2004 11:24:53 -0000	1.7
***************
*** 100,103 ****
--- 100,110 ----
      }
    }
+   
+   protected void updateLegendeTitre(){
+     if(paletteLegende_!=null) paletteLegende_.paletteTitreModified(paletteCouleur_);
+     if((getLegende()!=null) && (getLegende().isVisible())){
+       getLegende().revalidate();
+     }
+   }
  
    /**

Index: ZModeleDonnesAbstract.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZModeleDonnesAbstract.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ZModeleDonnesAbstract.java	14 May 2004 10:24:09 -0000	1.2
--- ZModeleDonnesAbstract.java	1 Jun 2004 11:24:53 -0000	1.3
***************
*** 9,12 ****
--- 9,14 ----
  package org.fudaa.ebli.calque;
  
+ import org.fudaa.ebli.geometrie.*;
+ 
  
  /**
***************
*** 17,31 ****
--- 19,50 ----
  
    ZModeleDonneesListener l_;
+   /**
+    * @see org.fudaa.ebli.calque.ZModeleDonnees#getObject(int)
+    */
    public Object getObject(int _ind) {
      return null;
    }
  
+   /**
+    * @see org.fudaa.ebli.calque.ZModeleDonnees#setListener(org.fudaa.ebli.calque.ZModeleDonneesListener)
+    */
    public void setListener(ZModeleDonneesListener _l) {
    l_=_l;
    }
    
+   /**
+    * Envoie un evt
+    */
    public final void fireChange(){
      if(l_!=null) l_.modeleDonneesChanged(this);
    }
+   
+   
  
+   /**
+    * @see org.fudaa.ebli.calque.ZModeleDonnees#getDonneesBoite(org.fudaa.ebli.geometrie.GrDataBoite)
+    */
+   public  boolean getDonneesBoite(GrDataBoite _b) {
+     return false;
+   }
  }

Index: ZModelePoint.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZModelePoint.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ZModelePoint.java	25 Nov 2003 10:06:39 -0000	1.4
--- ZModelePoint.java	1 Jun 2004 11:24:53 -0000	1.5
***************
*** 24,26 ****
--- 24,28 ----
     */
    boolean point(GrPoint _p, int _i);
+   
+   
  }

Index: ZCalquePoint.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalquePoint.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** ZCalquePoint.java	14 May 2004 10:24:09 -0000	1.14
--- ZCalquePoint.java	1 Jun 2004 11:24:53 -0000	1.15
***************
*** 115,121 ****
        if (!clip.contientXY(p))
          continue;
!       double z= 0.;
!       if (domaine.e.z > domaine.o.z)
!         z= (p.z - domaine.o.z) / (domaine.e.z - domaine.o.z);
        p.autoApplique(versEcran);
        Color c= foreground;
--- 115,119 ----
        if (!clip.contientXY(p))
          continue;
!       double z= p.z;
        p.autoApplique(versEcran);
        Color c= foreground;
***************
*** 123,136 ****
        if (!rapide) {
          if (paletteCouleur_ != null) {
!           c= paletteCouleur_.getColorFor(p.z);
            if (attenue)
              c= attenueCouleur(c);
          }
        }
!       if (paletteIcone != null) {
          s= paletteIcone.icone(z);
          if (attenue)
            s= attenueIcone(s);
!       }
        if ((c != null) && (s != null)) {
          _g.setColor(c);
--- 121,134 ----
        if (!rapide) {
          if (paletteCouleur_ != null) {
!           c= paletteCouleur_.getColorFor(z);
            if (attenue)
              c= attenueCouleur(c);
          }
        }
! /*      if (paletteIcone != null) {
          s= paletteIcone.icone(z);
          if (attenue)
            s= attenueIcone(s);
!       }*/
        if ((c != null) && (s != null)) {
          _g.setColor(c);

Index: ActionSelectionPalette.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ActionSelectionPalette.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ActionSelectionPalette.java	14 May 2004 10:24:08 -0000	1.1
--- ActionSelectionPalette.java	1 Jun 2004 11:24:53 -0000	1.2
***************
*** 71,75 ****
     */
    public void updateBeforeShow() {
-     System.out.println("la palette est updatee");
      BSelecteurCouleurPlage selecteur = getSelecteur();
      if ((calqueActif_ == null) || (!calqueActif_.isPaletteCouleurEnable())) selecteur
--- 71,74 ----
***************
*** 79,82 ****
--- 78,83 ----
        selecteur.setTitre(calqueActif_.getTitle());
      }
+     //mise a jour de la boite
+    selecteur.setDataBoiteAvailable(calqueActif_.modeleDonnees().getDonneesBoite(selecteur.getDataBoite()));
  
    }

[Fudaa-cvs-commit] fudaa_devel/ebli/src/org/fudaa/ebli/calque/action EbliActionInterface.java,1.2,1.3 EbliAbstractAction.java,1.2,1.3

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

Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23395/src/org/fudaa/ebli/calque/action

Modified Files:
	EbliActionInterface.java EbliAbstractAction.java 
Log Message:


Index: EbliAbstractAction.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/EbliAbstractAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** EbliAbstractAction.java	25 Nov 2003 10:06:39 -0000	1.2
--- EbliAbstractAction.java	1 Jun 2004 11:24:52 -0000	1.3
***************
*** 1,3 ****
! /*
   *  @file         EbliAbstractAction.java
   *  @creation     2 oct. 2003
--- 1,3 ----
! /**
   *  @file         EbliAbstractAction.java
   *  @creation     2 oct. 2003
***************
*** 8,12 ****
   */
  package org.fudaa.ebli.calque.action;
- import java.awt.event.ActionEvent;
  import javax.swing.AbstractAction;
  import javax.swing.Action;
--- 8,11 ----
***************
*** 19,23 ****
    extends AbstractAction
    implements EbliActionInterface {
!   public EbliAbstractAction(String name, Icon icon, String _command) {
      super(name, icon);
      putValue(Action.ACTION_COMMAND_KEY, _command);
--- 18,27 ----
    extends AbstractAction
    implements EbliActionInterface {
!   /**
!  * @param name le nom de l'action
!  * @param icon l'icone
!  * @param _command la commande
!  */
! public EbliAbstractAction(String name, Icon icon, String _command) {
      super(name, icon);
      putValue(Action.ACTION_COMMAND_KEY, _command);

Index: EbliActionInterface.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/EbliActionInterface.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** EbliActionInterface.java	25 Nov 2003 10:06:39 -0000	1.2
--- EbliActionInterface.java	1 Jun 2004 11:24:52 -0000	1.3
***************
*** 1,3 ****
! /*
   *  @file         EbliAction.java
   *  @creation     2 oct. 2003
--- 1,3 ----
! /**
   *  @file         EbliAction.java
   *  @creation     2 oct. 2003
***************
*** 8,13 ****
--- 8,15 ----
   */
  package org.fudaa.ebli.calque.action;
+ 
  import javax.swing.AbstractButton;
  import javax.swing.Action;
+ 
  /**
   * @author deniger
***************
*** 15,20 ****
   */
  public interface EbliActionInterface extends Action {
!   public AbstractButton buildToolButton(EbliComponentFactory _f);
!   public AbstractButton buildButton(EbliComponentFactory _f);
!   public AbstractButton buildMenuItem(EbliComponentFactory _f);
! }
--- 17,37 ----
   */
  public interface EbliActionInterface extends Action {
! 
!     /**
!      * @param _f l'usine des JComponent
!      * @return un bouton adapte aux toolbars
!      */
!     AbstractButton buildToolButton(EbliComponentFactory _f);
! 
!     /**
!      * @param _f l'usine des JComponent
!      * @return un bouton pour les panels normaux
!      */
!     AbstractButton buildButton(EbliComponentFactory _f);
! 
!     /**
!      * @param _f l'usine des JComponent
!      * @return un bouton adapte pour les menus
!      */
!     AbstractButton buildMenuItem(EbliComponentFactory _f);
! }
\ No newline at end of file

[Fudaa-cvs-commit] fudaa_devel/ebli/src/org/fudaa/ebli/geometrie GrDataBoite.java,NONE,1.1 GrBoite.java,1.7,1.8

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

Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/geometrie
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23395/src/org/fudaa/ebli/geometrie

Modified Files:
	GrBoite.java 
Added Files:
	GrDataBoite.java 
Log Message:


Index: GrBoite.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/geometrie/GrBoite.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** GrBoite.java	12 Feb 2004 15:58:52 -0000	1.7
--- GrBoite.java	1 Jun 2004 11:25:00 -0000	1.8
***************
*** 8,13 ****
   */
  package org.fudaa.ebli.geometrie;
! import java.awt.*;
! import org.fudaa.ebli.mathematiques.*;
  /**
   * GrBoite
--- 8,13 ----
   */
  package org.fudaa.ebli.geometrie;
! import java.awt.Point;
! import java.awt.Polygon;
  /**
   * GrBoite

--- NEW FILE: GrDataBoite.java ---
/**
 *  @file         ZDonneesBoite.java
 *  @creation     14 mai 2004
 *  @modification $Date: 2004/06/01 11:25:00 $
 *  @license      GNU General Public License 2
 *  @copyright    (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
 *  @mail         fud...@li...
 */
package org.fudaa.ebli.geometrie;


/**
 * Cette classe permet de déterminer le type des données gerées par un modele. Il s'agit de fournir
 * les bornes min, max des données affichees. De plus, s'il s'agit d'un modele comportant des donnees 
 * variant avec le temps, les max et min locaux sont donnees.
 * @author Fred Deniger
 * @version $Id: GrDataBoite.java,v 1.1 2004/06/01 11:25:00 deniger Exp $
 */
public class GrDataBoite {
  
  private double min_;
  private double max_;
  private double minTime_;
  private double maxTime_;
  private boolean isDataTime_;

  /**
   * 
   */
  public GrDataBoite() {
    super();
  }

  /**
   * @return Returns true si les variables du modele peuvent varier avec le temps.
   */
  public boolean isDataTime() {
    return isDataTime_;
  }
  /**
   * @param _isDataTime The isDataTime to set.
   */
  public void setDataTime(boolean _isDataTime) {
    isDataTime_ = _isDataTime;
  }
  /**
   * @return Returns the max.
   */
  public double getMax() {
    return max_;
  }
  /**
   * @param _max The max to set.
   */
  public void setMax(double _max) {
    max_ = _max;
  }
  /**
   * Est utilise si dataTime est mis a true
   * @return Returns la valeur max des donnees sur le pas de temps en cours
   */
  public double getMaxTime() {
    return maxTime_;
  }
  /**
   * @param _maxTime The maxTime to set.
   */
  public void setMaxTime(double _maxTime) {
    maxTime_ = _maxTime;
  }
  /**
   * @return Returns the min.
   */
  public double getMin() {
    return min_;
  }
  /**
   * @param _min The min to set.
   */
  public void setMin(double _min) {
    min_ = _min;
  }
  /**
   * Est utilise si dataTime est mis a true
   * @return la valeur min sur le pas de temps en cours.
   */
  public double getMinTime() {
    return minTime_;
  }
  /**
   * @param _minTime The minTime to set.
   */
  public void setMinTime(double _minTime) {
    minTime_ = _minTime;
  }
}

[Fudaa-cvs-commit] fudaa_devel/ebli/src/org/fudaa/ebli/volume BGroupeStandard.java,1.6,1.7 BVolume.java,1.5,1.6

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

Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/volume
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23395/src/org/fudaa/ebli/volume

Modified Files:
	BGroupeStandard.java BVolume.java 
Log Message:


Index: BVolume.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/volume/BVolume.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** BVolume.java	5 May 2004 12:40:05 -0000	1.5
--- BVolume.java	1 Jun 2004 11:25:01 -0000	1.6
***************
*** 1,3 ****
! /*
   * @file         BVolume.java
   * @creation     1999-11-29
--- 1,3 ----
! /**
   * @file         BVolume.java
   * @creation     1999-11-29
***************
*** 8,21 ****
   */
  package org.fudaa.ebli.volume;
! import javax.media.j3d.*;
! import javax.vecmath.*;
! import org.fudaa.ebli.geometrie.*;
! import org.fudaa.ebli.volume.common.*;
  
! import java.awt.*;
! import javax.swing.*;
! import java.beans.*;
! import java.util.*;
! import java.lang.reflect.*;
  /**
   * @version      $Revision$ $Date$ by $Author$
--- 8,25 ----
   */
  package org.fudaa.ebli.volume;
! import java.beans.PropertyChangeEvent;
! import java.beans.PropertyChangeListener;
! import java.lang.reflect.Method;
  
! import javax.media.j3d.BranchGroup;
! import javax.media.j3d.Transform3D;
! import javax.media.j3d.TransformGroup;
! import javax.vecmath.Vector3d;
! 
! import org.fudaa.ebli.geometrie.GrBoite;
! import org.fudaa.ebli.geometrie.GrPoint;
! import org.fudaa.ebli.volume.common.BVolumeAbstract;
! import org.fudaa.ebli.volume.common.GroupeInterface;
! import org.fudaa.ebli.volume.common.ParametresVolumes;
  /**
   * @version      $Revision$ $Date$ by $Author$
***************
*** 123,126 ****
--- 127,134 ----
    }
    public abstract void setRapide(boolean _rapide);
+   
+   /**
+    * @see org.fudaa.ebli.volume.common.Objet3DInterface#getPere()
+    */
    public GroupeInterface getPere() {
      return pere_;

Index: BGroupeStandard.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/volume/BGroupeStandard.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** BGroupeStandard.java	5 May 2004 12:40:05 -0000	1.6
--- BGroupeStandard.java	1 Jun 2004 11:25:01 -0000	1.7
***************
*** 8,23 ****
   */
  package org.fudaa.ebli.volume;
! import java.applet.Applet;
! import java.awt.*;
! import javax.swing.*;
! import com.sun.j3d.utils.geometry.*;
! import com.sun.j3d.utils.universe.*;
! import com.sun.j3d.utils.behaviors.mouse.*;
! import javax.media.j3d.*;
! import javax.vecmath.*;
! import java.util.*;
! import java.lang.reflect.*;
! import org.fudaa.ebli.geometrie.*;
! import org.fudaa.ebli.volume.common.*;
  /**
   * Groupe d'objets quelconques.
--- 8,16 ----
   */
  package org.fudaa.ebli.volume;
! import java.lang.reflect.Method;
! import java.util.Vector;
! 
! import org.fudaa.ebli.volume.common.GroupeInterface;
! import org.fudaa.ebli.volume.common.Objet3DInterface;
  /**
   * Groupe d'objets quelconques.

[Fudaa-cvs-commit] fudaa_devel/ebli/src/org/fudaa/ebli/palette BPlage.java,1.1,1.2 BPalettePlage.java,1.1,1.2 BSelecteurCouleurPlage.java,1.1,1.2

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

Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/palette
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23395/src/org/fudaa/ebli/palette

Modified Files:
	BPlage.java BPalettePlage.java BSelecteurCouleurPlage.java 
Log Message:


Index: BPlage.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/palette/BPlage.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BPlage.java	14 May 2004 10:24:11 -0000	1.1
--- BPlage.java	1 Jun 2004 11:25:00 -0000	1.2
***************
*** 26,33 ****
--- 26,40 ----
     */
    public static NumberFormat PLAGE_NUMBER_FORMAT;
+   /**
+    * Le format utilisé pour le mode long 
+    */
+   public static NumberFormat PLAGE_NUMBER_FORMAT_LONG;
    static {
      PLAGE_NUMBER_FORMAT = NumberFormat.getInstance(Locale.US);
      PLAGE_NUMBER_FORMAT.setMaximumFractionDigits(2);
      PLAGE_NUMBER_FORMAT.setMinimumFractionDigits(2);
+     PLAGE_NUMBER_FORMAT_LONG = NumberFormat.getInstance(Locale.US);
+     PLAGE_NUMBER_FORMAT.setMaximumFractionDigits(6);
+     PLAGE_NUMBER_FORMAT.setMinimumFractionDigits(2);
    }
  

Index: BPalettePlage.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/palette/BPalettePlage.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BPalettePlage.java	14 May 2004 10:24:11 -0000	1.1
--- BPalettePlage.java	1 Jun 2004 11:25:00 -0000	1.2
***************
*** 255,265 ****
     */
    public void initPlages(int _nb, double _min, double _max) {
      int nb = Math.max(_nb, 1);
      if(_min==_max) nb=1;
      
!     plages_.clear();
      //initialisation des plages
      for (int i = 0; i < nb; i++) {
!       plages_.add(new BPlage());
      }
      double max = _max;
--- 255,282 ----
     */
    public void initPlages(int _nb, double _min, double _max) {
+     initPlages(_nb,_min,_max,plages_);
+     //mis a jour legende et autre
+     fireAllPaletteModified();
+   }
+   
+   /**
+    * Définition du nombre de plages.
+    * <p>
+    * Les plages sont redéfinies automatiquement entre les 2 bornes min. et max., de manière
+    * régulière. Les couleurs sont redéfinies, les symboles et les tailles, les légendes également.
+    * 
+    * @param _nb Le nombre de plages, supérieur ou égal à 1. Si inférieur, palette par défaut.
+    * @param _min la borne min des plages
+    * @param _max la borne max des plages
+    * @param _l la liste a modifier
+    */
+   public static void initPlages(int _nb, double _min, double _max,List _l) {
      int nb = Math.max(_nb, 1);
      if(_min==_max) nb=1;
      
!     _l.clear();
      //initialisation des plages
      for (int i = 0; i < nb; i++) {
!       _l.add(new BPlage());
      }
      double max = _max;
***************
*** 270,274 ****
      //pour eviter la division par 0
      if (nb == 1) {
!       BPlage p0=getPlage(0);
        p0.setMin( min);
        p0.setMax(max);
--- 287,291 ----
      //pour eviter la division par 0
      if (nb == 1) {
!       BPlage p0=(BPlage)_l.get(0);
        p0.setMin( min);
        p0.setMax(max);
***************
*** 278,282 ****
        //par construction les plages sont dans le bon ordre !
        for (int i = 0; i < nb; i++) {
!         BPlage pi=getPlage(i);
          pi.setMin( min + i * (max - min) / nb);
          pi.setMax( min + (i + 1) * (max - min) / nb);
--- 295,299 ----
        //par construction les plages sont dans le bon ordre !
        for (int i = 0; i < nb; i++) {
!         BPlage pi=(BPlage)_l.get(i);
          pi.setMin( min + i * (max - min) / nb);
          pi.setMax( min + (i + 1) * (max - min) / nb);
***************
*** 286,294 ****
        }
      }
-     //mis a jour legende et autre
-     fireAllPaletteModified();
- 
    }
  
    /**
     * Retourne si les valeurs "autres" sont visibles.
--- 303,309 ----
        }
      }
    }
  
+ 
    /**
     * Retourne si les valeurs "autres" sont visibles.

Index: BSelecteurCouleurPlage.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/palette/BSelecteurCouleurPlage.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BSelecteurCouleurPlage.java	14 May 2004 10:24:11 -0000	1.1
--- BSelecteurCouleurPlage.java	1 Jun 2004 11:25:00 -0000	1.2
***************
*** 11,14 ****
--- 11,15 ----
  import java.awt.Color;
  import java.awt.Component;
+ import java.awt.Dimension;
  import java.awt.event.ActionEvent;
  import java.awt.event.ActionListener;
***************
*** 21,24 ****
--- 22,26 ----
  
  import javax.swing.AbstractListModel;
+ import javax.swing.BorderFactory;
  import javax.swing.JButton;
  import javax.swing.JColorChooser;
***************
*** 26,37 ****
--- 28,44 ----
  import javax.swing.JList;
  import javax.swing.JPanel;
+ import javax.swing.JScrollPane;
  import javax.swing.JTextField;
  import javax.swing.ListCellRenderer;
  import javax.swing.ListSelectionModel;
+ import javax.swing.event.DocumentEvent;
+ import javax.swing.event.DocumentListener;
  import javax.swing.event.ListSelectionEvent;
  import javax.swing.event.ListSelectionListener;
+ import javax.swing.text.Document;
  
  import com.memoire.bu.BuBorderLayout;
  import com.memoire.bu.BuButton;
+ import com.memoire.bu.BuButtonLayout;
  import com.memoire.bu.BuEmptyList;
  import com.memoire.bu.BuGridLayout;
***************
*** 43,49 ****
--- 50,59 ----
  import com.memoire.bu.BuScrollPane;
  import com.memoire.bu.BuTextField;
+ import com.memoire.bu.BuVerticalLayout;
  
  import org.fudaa.ctulu.CtuluLib;
  import org.fudaa.ebli.commun.EbliLib;
+ import org.fudaa.ebli.dialog.EbliSimpleDialogPanel;
+ import org.fudaa.ebli.geometrie.GrDataBoite;
  import org.fudaa.ebli.ressource.EbliResource;
  import org.fudaa.ebli.trace.BPalettePlageInterface;
***************
*** 56,60 ****
   */
  public class BSelecteurCouleurPlage extends JPanel implements PropertyChangeListener,
!     ListSelectionListener, ActionListener, MouseListener {
  
    List             plages_;
--- 66,70 ----
   */
  public class BSelecteurCouleurPlage extends JPanel implements PropertyChangeListener,
!     ListSelectionListener, ActionListener, MouseListener, DocumentListener {
  
    List             plages_;
***************
*** 66,69 ****
--- 76,80 ----
    JTextField       txtMax_;
    JButton          btApply_;
+   JButton          btRefresh_;
    JLabel           title_;
    BPlage           plageEnCours_;
***************
*** 71,74 ****
--- 82,88 ----
    BuMenuItem       itemSplit_;
    PlageTableModel  model_;
+   GrDataBoite      dataBoite_;
+   boolean          isDataBoiteAvailable_;
+   JScrollPane      sp_;
  
    /**
***************
*** 87,91 ****
      list_.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
      list_.addMouseListener(this);
!     add(new BuScrollPane(list_), BuBorderLayout.WEST);
      panelData_ = new BuPanel();
      panelData_.setLayout(new BuGridLayout(2));
--- 101,108 ----
      list_.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
      list_.addMouseListener(this);
!     sp_ = new BuScrollPane(list_);
!     Dimension d = sp_.getPreferredSize();
!     sp_.setPreferredSize(new Dimension(120, d.height));
!     add(sp_, BuBorderLayout.WEST);
      panelData_ = new BuPanel();
      panelData_.setLayout(new BuGridLayout(2));
***************
*** 102,111 ****
      txtMax_ = BuTextField.createDoubleField();
      panelData_.add(txtMax_);
      add(panelData_, BuBorderLayout.CENTER);
      btApply_ = new BuButton(BuResource.BU.getIcon("appliquer"));
      btApply_.setText(BuResource.BU.getString("Appliquer"));
      btApply_.addActionListener(this);
      btApply_.setEnabled(false);
!     add(btApply_, BuBorderLayout.SOUTH);
    }
  
--- 119,273 ----
      txtMax_ = BuTextField.createDoubleField();
      panelData_.add(txtMax_);
+     txtMax_.getDocument().addDocumentListener(this);
+     txtMin_.getDocument().addDocumentListener(this);
      add(panelData_, BuBorderLayout.CENTER);
      btApply_ = new BuButton(BuResource.BU.getIcon("appliquer"));
      btApply_.setText(BuResource.BU.getString("Appliquer"));
+     btApply_.setToolTipText(EbliResource.getS("Appliquer les modifications"));
      btApply_.addActionListener(this);
      btApply_.setEnabled(false);
!     btRefresh_ = new BuButton(BuResource.BU.getIcon("rafraichir"));
!     btRefresh_.setText(BuResource.BU.getString("initialiser"));
!     btRefresh_.setToolTipText(EbliResource.getS("Initialiser les plages des couleurs"));
!     btRefresh_.addActionListener(this);
!     btRefresh_.setEnabled(true);
!     BuPanel btpn = new BuPanel();
!     btpn.setLayout(new BuButtonLayout(5, BuButtonLayout.RIGHT));
!     btpn.add(btApply_);
!     btpn.add(btRefresh_);
!     add(btpn, BuBorderLayout.SOUTH);
!   }
! 
!   double[] getMinMax() {
!     double[] r = new double[2];
!     r[0] = Double.MAX_VALUE;
!     r[1] = Double.MIN_VALUE;
!     BPlage p;
!     for (int i = plages_.size() - 1; i >= 0; i--) {
!       p = (BPlage) plages_.get(i);
!       double d = p.getMin();
!       if (d < r[0]) r[0] = d;
!       d = p.getMax();
!       if (d > r[1]) r[1] = d;
!     }
!     if (r[0] >= Double.MAX_VALUE) r[0] = 0;
!     if (r[1] <= Double.MIN_VALUE) r[1] = 1;
!     if (r[0] > r[1]) {
!       double t = r[0];
!       r[0] = r[1];
!       r[1] = t;
!     }
! 
!     return r;
!   }
! 
!   private class RefreshPanel extends EbliSimpleDialogPanel {
! 
!     JTextField         newMin_;
!     JTextField         newMax_;
!     private JTextField newNb_;
! 
!     /**
!      * Construit le panneau
!      */
!     public RefreshPanel() {
!       super(false);
!       setLayout(new BuBorderLayout(10, 5));
!       BuPanel center = new BuPanel();
!       center.setLayout(new BuGridLayout(2));
!       newNb_ = addLabelIntegerText(center, EbliResource.getS("Nombre de plages"));
!       newNb_.setText("10");
!       newMin_ = addLabelDoubleText(center, EbliResource.getS("Min"));
!       newMax_ = addLabelDoubleText(center, EbliResource.getS("Max"));
!       double[] ds = getMinMax();
!       newMax_.setText(BPlage.PLAGE_NUMBER_FORMAT.format(ds[1]));
!       newMin_.setText(BPlage.PLAGE_NUMBER_FORMAT.format(ds[0]));
!       add(center, BuBorderLayout.CENTER);
!       if (isDataBoiteAvailable_ && (dataBoite_ != null)) {
!         BuPanel right = new BuPanel();
!         right.setLayout(new BuVerticalLayout());
!         right.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(),
!             EbliResource.getS("Récupérer") + ":"));
!         BuButton bt = new BuButton();
!         bt.setText(EbliResource.getS("Maximum/Minimum"));
!         bt.setToolTipText(EbliResource
!             .getS("Initialiser les champs avec le maximum et le minimum des données"));
!         bt.addActionListener(new ActionListener() {
! 
!           /**
!            * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
!            */
!           public void actionPerformed(ActionEvent _e) {
!             newMax_.setText(Double.toString(dataBoite_.getMax()));
!             newMin_.setText(Double.toString(dataBoite_.getMin()));
!           }
!         });
!         right.add(bt);
!         if (dataBoite_.isDataTime()) {
!           bt = new BuButton();
!           bt.setText(EbliResource.getS("Pas de temps: maximum/minimum"));
!           bt
!               .setToolTipText(EbliResource
!                   .getS("Initialiser les champs avec le maximum et le minimum des données sur la pas de temps"));
!           bt.addActionListener(new ActionListener() {
! 
!             /**
!              * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
!              */
!             public void actionPerformed(ActionEvent _e) {
!               newMax_.setText(Double.toString(dataBoite_.getMaxTime()));
!               newMin_.setText(Double.toString(dataBoite_.getMinTime()));
!             }
!           });
!           right.add(bt);
!         }
!         add(right, BuBorderLayout.NORTH);
!       }
!     }
! 
!     /**
!      * @see org.fudaa.ebli.dialog.EbliSimpleDialogPanel#apply()
!      */
!     public void apply() {
!       double min = Double.parseDouble(newMin_.getText());
!       double max = Double.parseDouble(newMax_.getText());
!       int nb = Integer.parseInt(newNb_.getText());
!       int oldSize = plages_.size();
!       BPalettePlage.initPlages(nb, min, max, plages_);
!       model_.fireAllSupr(oldSize);
!       model_.fireAdd(0, plages_.size());
!       if (plages_.size() > 0) {
!         plageEnCours_ = null;
!         list_.setSelectedIndex(0);
!         plageEnCours_ = getSelectedPlage();
!         updatePanel();
!       }
!       setModified();
!     }
! 
!     /**
!      * @see org.fudaa.ebli.dialog.EbliSimpleDialogPanel#valide()
!      */
!     public boolean valide() {
!       boolean r = true;
!       if (newMax_.getText().trim().length() == 0) {
!         r = false;
!         newMax_.setForeground(Color.LIGHT_GRAY);
!       }
!       if (newMin_.getText().trim().length() == 0) {
!         r = false;
!         newMin_.setForeground(Color.LIGHT_GRAY);
!       }
!       if (newNb_.getText().trim().length() == 0) {
!         r = false;
!         newNb_.setForeground(Color.LIGHT_GRAY);
!       }
!       return r;
!     }
!   }
! 
!   private void reinitPlages() {
!     EbliSimpleDialogPanel pn = new RefreshPanel();
!     pn.afficheModale(this, EbliResource.getS("Initialiser"));
    }
  
***************
*** 128,133 ****
        ic_.taille(plageEnCours_.getIconeTaille());
        ic_.type(plageEnCours_.getIconeType());
!       txtMin_.setText(BPlage.PLAGE_NUMBER_FORMAT.format(plageEnCours_.getMin()));
!       txtMax_.setText(BPlage.PLAGE_NUMBER_FORMAT.format(plageEnCours_.getMax()));
      }
      btColor_.repaint();
--- 290,299 ----
        ic_.taille(plageEnCours_.getIconeTaille());
        ic_.type(plageEnCours_.getIconeType());
!       String s = BPlage.PLAGE_NUMBER_FORMAT_LONG.format(plageEnCours_.getMin());
!       txtMin_.setText(s);
!       txtMin_.setToolTipText(s);
!       s = BPlage.PLAGE_NUMBER_FORMAT_LONG.format(plageEnCours_.getMax());
!       txtMax_.setText(s);
!       txtMax_.setToolTipText(s);
      }
      btColor_.repaint();
***************
*** 151,154 ****
--- 317,327 ----
  
      /**
+      * Met a jour les plages
+      */
+     public PlageTableModel() {
+       plages_ = new ArrayList();
+     }
+ 
+     /**
       * @see javax.swing.ListModel#getElementAt(int)
       */
***************
*** 167,176 ****
  
      protected void fireAllSupr(int _oldSize) {
!       if(_oldSize>0)
!       fireIntervalRemoved(this, 0, _oldSize - 1);
      }
!     
!     protected void fireRemoved(int idx){
!       fireIntervalRemoved(this,idx,idx);
      }
  
--- 340,348 ----
  
      protected void fireAllSupr(int _oldSize) {
!       if (_oldSize > 0) fireIntervalRemoved(this, 0, _oldSize - 1);
      }
! 
!     protected void fireRemoved(int idx) {
!       fireIntervalRemoved(this, idx, idx);
      }
  
***************
*** 183,191 ****
  
        if (_pal == null) {
!         if (plages_ != null){
!           int oldSize=plages_.size();
!           plages_.clear();
!           fireAllSupr(oldSize);
!         }
  
          enable = false;
--- 355,361 ----
  
        if (_pal == null) {
!         int oldSize = plages_.size();
!         plages_.clear();
!         fireAllSupr(oldSize);
  
          enable = false;
***************
*** 193,202 ****
        else {
          int nb = _pal.getNbPlages();
!         if (plages_ != null){
!           int oldSize=plages_.size();
!           plages_.clear();
!           fireAllSupr(oldSize);
!         }
!         else plages_ = new ArrayList(nb);
          for (int i = 0; i < nb; i++) {
            plages_.add(new BPlage(_pal.getPlageInterface(i)));
--- 363,369 ----
        else {
          int nb = _pal.getNbPlages();
!         int oldSize = plages_.size();
!         plages_.clear();
!         fireAllSupr(oldSize);
          for (int i = 0; i < nb; i++) {
            plages_.add(new BPlage(_pal.getPlageInterface(i)));
***************
*** 207,211 ****
  
        }
- 
        updatePanel();
        setUnmodified();
--- 374,377 ----
***************
*** 220,227 ****
       */
      public int getSize() {
!       return plages_.size();
      }
    }
  
    public static class PlageCellRenderer extends JLabel implements ListCellRenderer {
  
--- 386,399 ----
       */
      public int getSize() {
!       return plages_ == null ? 0 : plages_.size();
      }
    }
  
+   /**
+    * Un cell renderer pour afficher une plage.
+    * 
+    * @author Fred Deniger
+    * @version $Id$
+    */
    public static class PlageCellRenderer extends JLabel implements ListCellRenderer {
  
***************
*** 256,259 ****
--- 428,432 ----
        icone_.type(p.getIconeType());
        setText(p.getLegende());
+       setToolTipText(p.getLegende());
        return this;
      }
***************
*** 288,291 ****
--- 461,469 ----
        double nmax = Double.parseDouble(txtMax_.getText());
        if ((nmin != p.getMin()) || (nmax != p.getMax())) {
+         if (nmin > nmax) {
+           double t = nmin;
+           nmin = nmax;
+           nmax = t;
+         }
          p.setMin(nmin);
          p.setMax(nmax);
***************
*** 317,325 ****
        firePropertyChange("paletteCouleurPlages", null, vp);
      }
      else if (s == itemRemove_) {
        //pour garder la bonne selection
        int i = list_.getSelectedIndex();
        plages_.remove(i);
!       model_.fireRemoved(i);      
        plageEnCours_ = null;
        int nb = plages_.size();
--- 495,506 ----
        firePropertyChange("paletteCouleurPlages", null, vp);
      }
+     else if (s == btRefresh_) {
+       reinitPlages();
+     }
      else if (s == itemRemove_) {
        //pour garder la bonne selection
        int i = list_.getSelectedIndex();
        plages_.remove(i);
!       model_.fireRemoved(i);
        plageEnCours_ = null;
        int nb = plages_.size();
***************
*** 347,351 ****
        if (i < (plages_.size() - 1)) {
          sup = ((BPlage) plages_.get(i + 1)).getCouleur();
!         plages_.add(i+1, nplage);
        }
        else {
--- 528,532 ----
        if (i < (plages_.size() - 1)) {
          sup = ((BPlage) plages_.get(i + 1)).getCouleur();
!         plages_.add(i + 1, nplage);
        }
        else {
***************
*** 356,362 ****
          sup = Color.gray;
        }
!      
        nplage.setCouleur(BPalettePlage.getCouleur(plageEnCours_.getCouleur(), sup, 0.5));
!       model_.fireAdd(i+1,i+1);
        updatePanel();
        setModified();
--- 537,543 ----
          sup = Color.gray;
        }
! 
        nplage.setCouleur(BPalettePlage.getCouleur(plageEnCours_.getCouleur(), sup, 0.5));
!       model_.fireAdd(i + 1, i + 1);
        updatePanel();
        setModified();
***************
*** 406,408 ****
--- 587,649 ----
      }
    }
+ 
+   /**
+    * @return Returns the isDataBoiteAvailable.
+    */
+   public boolean isDataBoiteAvailable() {
+     return isDataBoiteAvailable_;
+   }
+ 
+   /**
+    * @param _isDataBoiteAvailable The isDataBoiteAvailable to set.
+    */
+   public void setDataBoiteAvailable(boolean _isDataBoiteAvailable) {
+     isDataBoiteAvailable_ = _isDataBoiteAvailable;
+   }
+ 
+   /**
+    * @return Returns the dataBoite.
+    */
+   public GrDataBoite getDataBoite() {
+     if (dataBoite_ == null) dataBoite_ = new GrDataBoite();
+     return dataBoite_;
+   }
+ 
+   private void update(DocumentEvent _e) {
+     if (plageEnCours_ != null) {
+       Document doc = _e.getDocument();
+       if ((doc == txtMax_.getDocument()) && (txtMax_.getText().trim().length() > 0)) {
+         if (Double.parseDouble(txtMax_.getText()) != plageEnCours_.getMax()) {
+           setModified();
+         }
+       }
+ 
+       else if ((doc == txtMin_.getDocument()) && (txtMin_.getText().trim().length() > 0)) {
+         if (Double.parseDouble(txtMin_.getText()) != plageEnCours_.getMin()) {
+           setModified();
+         }
+       }
+     }
+   }
+ 
+   /**
+    * @see javax.swing.event.DocumentListener#changedUpdate(javax.swing.event.DocumentEvent)
+    */
+   public void changedUpdate(DocumentEvent _e) {
+     update(_e);
+   }
+ 
+   /**
+    * @see javax.swing.event.DocumentListener#insertUpdate(javax.swing.event.DocumentEvent)
+    */
+   public void insertUpdate(DocumentEvent _e) {
+     update(_e);
+   }
+ 
+   /**
+    * @see javax.swing.event.DocumentListener#removeUpdate(javax.swing.event.DocumentEvent)
+    */
+   public void removeUpdate(DocumentEvent _e) {
+     update(_e);
+   }
  }
\ No newline at end of file

[Fudaa-cvs-commit] fudaa_devel/ebli/src/org/fudaa/ebli/dialog EbliSimpleDialogPanel.java,1.17,1.18 EnhancedDialog.java,1.4,1.5 BDialog.java,1.6,1.7 EbliFavoriteFiles.java,1.2,1.3 EbliSimpleDialog.java,1.10,1.11 IDialogInterface.java,1.5,1.6

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

Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/dialog
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23395/src/org/fudaa/ebli/dialog

Modified Files:
	EbliSimpleDialogPanel.java EnhancedDialog.java BDialog.java 
	EbliFavoriteFiles.java EbliSimpleDialog.java 
	IDialogInterface.java 
Log Message:


Index: EbliSimpleDialog.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/dialog/EbliSimpleDialog.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** EbliSimpleDialog.java	30 Apr 2004 07:22:42 -0000	1.10
--- EbliSimpleDialog.java	1 Jun 2004 11:25:00 -0000	1.11
***************
*** 1,6 ****
! /*
!  * @file EbliSimpleDialog.java @creation 23 juin 2003 @modification $Date$
!  * @license GNU General Public License 2 @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231
!  * Compiegne @mail de...@fu...
   */
  package org.fudaa.ebli.dialog;
--- 1,9 ----
! /**
!  * @file EbliSimpleDialog.java 
!  * @creation 23 juin 2003 
!  * @modification $Date$
!  * @license GNU General Public License 2 
!  * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne 
!  * @mail fud...@li...
   */
  package org.fudaa.ebli.dialog;
***************
*** 21,26 ****
  import javax.swing.BorderFactory;
  import javax.swing.JButton;
! import javax.swing.JDialog;
  import javax.swing.JOptionPane;
  
  import com.memoire.bu.BuBorderLayout;
--- 24,32 ----
  import javax.swing.BorderFactory;
  import javax.swing.JButton;
! import javax.swing.JComponent;
  import javax.swing.JOptionPane;
+ import javax.swing.WindowConstants;
+ 
+ import org.fudaa.ebli.ressource.EbliResource;
  
  import com.memoire.bu.BuBorderLayout;
***************
*** 28,33 ****
  import com.memoire.bu.BuPanel;
  import com.memoire.bu.BuScrollPane;
- 
- import org.fudaa.ebli.ressource.EbliResource;
  /**
   * @author deniger
--- 34,37 ----
***************
*** 36,42 ****
--- 40,58 ----
  public class EbliSimpleDialog extends EnhancedDialog implements WindowListener, ActionListener {
  
+   /**
+    * Option bouton cancel uniquement
+    */
    public static final int CANCEL_OPTION          = 4;
+   /**
+    * Option boutons apply,ok 
+    */
    public static final int OK_APPLY_OPTION        = 2;
+   /**
+    * Option boutons cancel,apply,ok 
+    */
    public static final int OK_CANCEL_APPLY_OPTION = 3;
+   /**
+    * Option boutons cancel,ok 
+    */
    public static final int OK_CANCEL_OPTION       = 1;
  
***************
*** 75,78 ****
--- 91,97 ----
    /**
     * Affiche le dialogue et le positionne par rapport a <code>_parent</code>.
+    * 
+    * @return le choix de l'utilisateur JOptionPane.DEFAULT_OPTION,JOptionPane.OK_OPTION,
+    *         JOptionPane.CANCEL_OPTION
     */
    public int afficheDialogModal() {
***************
*** 81,89 ****
      return response_;
    }
!   
!   public int afficheDialogModal(Point _loc,Dimension _d) {
      setModal(true);
      setLocation(_loc);
-     System.out.println(_d);
      setSize(_d);
      doLayout();
--- 100,113 ----
      return response_;
    }
! 
!   /**
!    * @param _loc le point en haut a gauche de la nouvelle fenetre
!    * @param _d la dimension de la nouvelle fenetre
!    * @return le choix de l'utilisateur JOptionPane.DEFAULT_OPTION,JOptionPane.OK_OPTION,
!    *         JOptionPane.CANCEL_OPTION
!    */
!   public int afficheDialogModal(Point _loc, Dimension _d) {
      setModal(true);
      setLocation(_loc);
      setSize(_d);
      doLayout();
***************
*** 93,118 ****
    }
  
    public void afficheDialog() {
      afficheDialog(true);
    }
!   
    public void afficheDialog(boolean _modify) {
      setContentPane(construitDialogPanel());
!     if(_modify){
        pack();
!     Dimension dialogSize = getSize();
!     Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
!     boolean set = false;
!     if (dialogSize.width > screenSize.width * 3 / 4) {
!       dialogSize.width = screenSize.width * 3 / 4;
!       set = true;
!     }
!     if (dialogSize.height > screenSize.height * 3 / 4) {
!       set = true;
!       dialogSize.height = screenSize.height * 3 / 4;
!     }
!     if (set) setSize(dialogSize);
!     setLocation((screenSize.width - dialogSize.width) / 2,
!         (screenSize.height - dialogSize.height) / 2);
      }
      show();
--- 117,148 ----
    }
  
+   /**
+    * Affiche en mode non modale
+    */
    public void afficheDialog() {
      afficheDialog(true);
    }
! 
!   /**
!    * @param _modify true si la fenetre doit etre modifiee pour etre adapte au parent
!    */
    public void afficheDialog(boolean _modify) {
      setContentPane(construitDialogPanel());
!     if (_modify) {
        pack();
!       Dimension dialogSize = getSize();
!       Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
!       boolean set = false;
!       if (dialogSize.width > screenSize.width * 3 / 4) {
!         dialogSize.width = screenSize.width * 3 / 4;
!         set = true;
!       }
!       if (dialogSize.height > screenSize.height * 3 / 4) {
!         set = true;
!         dialogSize.height = screenSize.height * 3 / 4;
!       }
!       if (set) setSize(dialogSize);
!       setLocation((screenSize.width - dialogSize.width) / 2,
!           (screenSize.height - dialogSize.height) / 2);
      }
      show();
***************
*** 131,139 ****
      BuPanel princ = new BuPanel();
      princ.setLayout(new BuBorderLayout());
!     BuScrollPane sc=new BuScrollPane(dial_.getError());
!     sc.setBorder(null);
!     FontMetrics fm=getFontMetrics(dial_.getError().getFont());
!     sc.setPreferredHeight(fm.getHeight()*2);
!     princ.add(sc, BuBorderLayout.NORTH);
      princ.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
      princ.add(dial_, BuBorderLayout.CENTER);
--- 161,173 ----
      BuPanel princ = new BuPanel();
      princ.setLayout(new BuBorderLayout());
!     JComponent error = dial_.getError();
!     if (error != null) {
!       BuScrollPane sc = new BuScrollPane(error);
!       sc.setBorder(null);
!       FontMetrics fm = getFontMetrics(error.getFont());
!       sc.setPreferredHeight(fm.getHeight() * 2);
!       princ.add(sc, BuBorderLayout.NORTH);
!     }
! 
      princ.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
      princ.add(dial_, BuBorderLayout.CENTER);
***************
*** 148,152 ****
        break;
      case OK_CANCEL_OPTION:
-       System.out.println("ok cancel");
        pnAction.add(construireOk());
        pnAction.add(construireCancel());
--- 182,185 ----
***************
*** 171,175 ****
      dial_ = _dial;
      addWindowListener(this);
!     setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
      response_ = JOptionPane.DEFAULT_OPTION;
      option_ = OK_CANCEL_OPTION;
--- 204,208 ----
      dial_ = _dial;
      addWindowListener(this);
!     setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
      response_ = JOptionPane.DEFAULT_OPTION;
      option_ = OK_CANCEL_OPTION;
***************
*** 215,222 ****
--- 248,261 ----
    }
  
+   /**
+    * Appelle la methode apply du panneau
+    */
    public void apply() {
      dial_.apply();
    }
  
+   /**
+    * @see org.fudaa.ebli.dialog.EnhancedDialog#cancel()
+    */
    public void cancel() {
      response_ = JOptionPane.CANCEL_OPTION;
***************
*** 228,237 ****
     * Renvoie true si la reponse est egale a JOptionPane.DEFAULT_OPTION. Cela veut dire que
     * l'utilisateur n'a pas valide ou annule son choix.
     */
    public boolean isResponseUndefinied() {
      return response_ == JOptionPane.DEFAULT_OPTION;
    }
-   
  
    public void ok() {
      if (dial_.valide()) {
--- 267,280 ----
     * Renvoie true si la reponse est egale a JOptionPane.DEFAULT_OPTION. Cela veut dire que
     * l'utilisateur n'a pas valide ou annule son choix.
+    * 
+    * @return si la reponse n'est pas ok ou cancel
     */
    public boolean isResponseUndefinied() {
      return response_ == JOptionPane.DEFAULT_OPTION;
    }
  
+   /**
+    * @see org.fudaa.ebli.dialog.EnhancedDialog#ok()
+    */
    public void ok() {
      if (dial_.valide()) {
***************
*** 241,253 ****
      }
    }
-   
  
    /**
!    * *
     */
!   public void windowActivated(WindowEvent e) {}
  
    /**
!    * *
     */
    public void windowClosed(WindowEvent e) {
--- 284,295 ----
      }
    }
  
    /**
!    * @see java.awt.event.WindowListener#windowActivated(java.awt.event.WindowEvent)
     */
!   public void windowActivated(WindowEvent es) {}
  
    /**
!    * @see java.awt.event.WindowListener#windowClosed(java.awt.event.WindowEvent)
     */
    public void windowClosed(WindowEvent e) {
***************
*** 256,280 ****
  
    /**
!    * *
     */
    public void windowClosing(WindowEvent e) {}
  
    /**
!    * *
     */
    public void windowDeactivated(WindowEvent e) {}
  
    /**
!    * *
     */
    public void windowDeiconified(WindowEvent e) {}
  
    /**
!    * *
     */
    public void windowIconified(WindowEvent e) {}
  
    /**
!    * *
     */
    public void windowOpened(WindowEvent e) {}
--- 298,324 ----
  
    /**
!    * @see java.awt.event.WindowListener#windowClosing(java.awt.event.WindowEvent)
     */
    public void windowClosing(WindowEvent e) {}
  
    /**
!    * @see java.awt.event.WindowListener#windowDeactivated(java.awt.event.WindowEvent)
     */
    public void windowDeactivated(WindowEvent e) {}
  
    /**
!    * @see java.awt.event.WindowListener#windowDeiconified(java.awt.event.WindowEvent)
     */
    public void windowDeiconified(WindowEvent e) {}
  
+ 
    /**
!    * @see java.awt.event.WindowListener#windowIconified(java.awt.event.WindowEvent)
     */
    public void windowIconified(WindowEvent e) {}
  
+ 
    /**
!    * @see java.awt.event.WindowListener#windowOpened(java.awt.event.WindowEvent)
     */
    public void windowOpened(WindowEvent e) {}

Index: EbliSimpleDialogPanel.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/dialog/EbliSimpleDialogPanel.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** EbliSimpleDialogPanel.java	5 May 2004 12:40:04 -0000	1.17
--- EbliSimpleDialogPanel.java	1 Jun 2004 11:24:53 -0000	1.18
***************
*** 13,17 ****
  import java.awt.Container;
  import java.awt.Dialog;
- import java.awt.Dimension;
  import java.awt.Font;
  import java.awt.Frame;
--- 13,16 ----
***************
*** 31,35 ****
  import com.memoire.bu.BuButton;
  import com.memoire.bu.BuCharValidator;
- import com.memoire.bu.BuCommonInterface;
  import com.memoire.bu.BuFileChooser;
  import com.memoire.bu.BuHorizontalLayout;
--- 30,33 ----
***************
*** 41,45 ****
  import com.memoire.bu.BuPicture;
  import com.memoire.bu.BuStringValidator;
- import com.memoire.bu.BuTextArea;
  import com.memoire.bu.BuTextField;
  import com.memoire.bu.BuValueValidator;
--- 39,42 ----
***************
*** 281,285 ****
          bf.setMultiSelectionEnabled(false);
          int r = bf.showOpenDialog(this);
!         if (r == BuFileChooser.APPROVE_OPTION) {
            File out = bf.getSelectedFile();
            if ((initFile == null) || (!out.equals(initFile))) {
--- 278,282 ----
          bf.setMultiSelectionEnabled(false);
          int r = bf.showOpenDialog(this);
!         if (r == JFileChooser.APPROVE_OPTION) {
            File out = bf.getSelectedFile();
            if ((initFile == null) || (!out.equals(initFile))) {

Index: BDialog.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/dialog/BDialog.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** BDialog.java	25 Nov 2003 10:06:40 -0000	1.6
--- BDialog.java	1 Jun 2004 11:25:00 -0000	1.7
***************
*** 12,16 ****
--- 12,18 ----
  import java.awt.event.WindowEvent;
  import java.util.Vector;
+ 
  import javax.swing.JDialog;
+ 
  import com.memoire.bu.BuCommonInterface;
  /**

Index: EbliFavoriteFiles.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/dialog/EbliFavoriteFiles.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** EbliFavoriteFiles.java	14 May 2004 10:24:11 -0000	1.2
--- EbliFavoriteFiles.java	1 Jun 2004 11:25:00 -0000	1.3
***************
*** 110,113 ****
--- 110,120 ----
      }
    }
+   
+   /**
+    * @return l'observeur principal
+    */
+   public Observer getObserver(){
+     return observer_;
+   }
  
    private void loadFavorites() {

Index: IDialogInterface.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/dialog/IDialogInterface.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** IDialogInterface.java	25 Nov 2003 10:06:41 -0000	1.5
--- IDialogInterface.java	1 Jun 2004 11:25:00 -0000	1.6
***************
*** 1,3 ****
! /*
   * @file         IDialogInterface.java
   * @creation     2000-01-12
--- 1,3 ----
! /**
   * @file         IDialogInterface.java
   * @creation     2000-01-12
***************
*** 8,13 ****
   */
  package org.fudaa.ebli.dialog;
! import java.awt.*;
! import java.beans.*;
  /**
   * @version      $Id$
--- 8,14 ----
   */
  package org.fudaa.ebli.dialog;
! import java.awt.Component;
! import java.awt.Container;
! import java.beans.PropertyChangeListener;
  /**
   * @version      $Id$

Index: EnhancedDialog.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/dialog/EnhancedDialog.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** EnhancedDialog.java	31 Mar 2004 08:15:43 -0000	1.4
--- EnhancedDialog.java	1 Jun 2004 11:25:00 -0000	1.5
***************
*** 18,24 ****
   */
  package org.fudaa.ebli.dialog;
! import javax.swing.*;
! import java.awt.event.*;
! import java.awt.*;
  /**
   * A dialog box that handles window closing, the ENTER key and the ESCAPE
--- 18,33 ----
   */
  package org.fudaa.ebli.dialog;
! import java.awt.Component;
! import java.awt.Container;
! import java.awt.Dialog;
! import java.awt.Frame;
! import java.awt.event.ContainerAdapter;
! import java.awt.event.ContainerEvent;
! import java.awt.event.KeyAdapter;
! import java.awt.event.KeyEvent;
! import java.awt.event.WindowAdapter;
! import java.awt.event.WindowEvent;
! 
! import javax.swing.JDialog;
  /**
   * A dialog box that handles window closing, the ENTER key and the ESCAPE

[Fudaa-cvs-commit] fudaa_devel/ebli/src/org/fudaa/ebli/ressource ebli_en.fr_txt,1.10,1.11

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

Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/ressource
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23395/src/org/fudaa/ebli/ressource

Modified Files:
	ebli_en.fr_txt 
Log Message:


Index: ebli_en.fr_txt
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/ressource/ebli_en.fr_txt,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ebli_en.fr_txt	14 May 2004 10:24:11 -0000	1.10
--- ebli_en.fr_txt	1 Jun 2004 11:25:01 -0000	1.11
***************
*** 112,114 ****
  Modifier la couleur de tracé des courbes sélectionnées=Modify the foreground color for the selected curves
  Modifier la barre d'outils=Modify the toolbar
! scinder=split
\ No newline at end of file
--- 112,124 ----
  Modifier la couleur de tracé des courbes sélectionnées=Modify the foreground color for the selected curves
  Modifier la barre d'outils=Modify the toolbar
! scinder=split
! Appliquer les modifications=Apply modifications
! initialiser=initialize
! Initialiser=Initialize
! Initialiser les plages des couleurs=Initialize color ranges
! Nombre de plages=Number of ranges
! maximum/minimum=maximum/minimum
! Pas de temps\: maximum/minimum=Time step\: maximum/minimum
! Initialiser les champs avec le maximum et le minimum des données=Initialize the fields with the maximum/minimum 
! Initialiser les champs avec le maximum et le minimum des données sur la pas de temps=Initialize the fields with the maximum/minimum  of this time step
! Récupérer=Recover
\ No newline at end of file

[Fudaa-cvs-commit] fudaa_devel/dodico/src/org/fudaa/dodico/telemac TelemacDicoManager.java,1.18,1.19

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

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

Modified Files:
	TelemacDicoManager.java 
Log Message:


Index: TelemacDicoManager.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/telemac/TelemacDicoManager.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** TelemacDicoManager.java	5 May 2004 12:38:17 -0000	1.18
--- TelemacDicoManager.java	1 Jun 2004 11:23:27 -0000	1.19
***************
*** 22,42 ****
  public class TelemacDicoManager extends DicoManager {
    public final static TelemacDicoManager INSTANCE= new TelemacDicoManager();
    static {
      HashMap map= new HashMap(11);
!     map.put(new TelemacDicoFileFormat("artemis"), new String[] { "v5p3" });
!     map.put(new TelemacDicoFileFormat("estel2d"), new String[] { "v5p3" });
!     map.put(new TelemacDicoFileFormat("estel3d"), new String[] { "v5p3" });
!     map.put(new TelemacDicoFileFormat("postel3d"), new String[] { "v5p3" });
!     map.put(new TelemacDicoFileFormat("sisyphe"), new String[] { "v5p3" });
!     map.put(new TelemacDicoFileFormat("stbtel"), new String[] { "v5p3" });
!     map.put(new TelemacDicoFileFormat("subief2d"), new String[] { "v5p3" });
!     map.put(Telemac2dFileFormat.getInstance(), new String[] { "v5p3" });
!     map.put(new TelemacDicoFileFormat("telemac3d"), new String[] { "v5p3" });
!     map.put(new TelemacDicoFileFormat("tomawac"), new String[] { "v5p3" });
      INSTANCE.init(map);
      INSTANCE.load();
    }
    //pour eviter d'instancier ce format a chaque fois.
!   private Telemac2dFileFormat.TelemacVersion telemac2dv5p3_;
    public final static TelemacDicoManager getINSTANCE() {
      return INSTANCE;
--- 22,43 ----
  public class TelemacDicoManager extends DicoManager {
    public final static TelemacDicoManager INSTANCE= new TelemacDicoManager();
+   private final static String LAST_VERSION="v5p4";
    static {
      HashMap map= new HashMap(11);
!     map.put(new TelemacDicoFileFormat("artemis"), new String[] { LAST_VERSION });
!     map.put(new TelemacDicoFileFormat("estel2d"), new String[] { LAST_VERSION });
!     map.put(new TelemacDicoFileFormat("estel3d"), new String[] { LAST_VERSION });
!     map.put(new TelemacDicoFileFormat("postel3d"), new String[] { LAST_VERSION });
!     map.put(new TelemacDicoFileFormat("sisyphe"), new String[] { LAST_VERSION });
!     map.put(new TelemacDicoFileFormat("stbtel"), new String[] { LAST_VERSION });
!     map.put(new TelemacDicoFileFormat("subief2d"), new String[] { LAST_VERSION });
!     map.put(Telemac2dFileFormat.getInstance(), new String[] { LAST_VERSION });
!     map.put(new TelemacDicoFileFormat("telemac3d"), new String[] { LAST_VERSION });
!     map.put(new TelemacDicoFileFormat("tomawac"), new String[] { LAST_VERSION });
      INSTANCE.init(map);
      INSTANCE.load();
    }
    //pour eviter d'instancier ce format a chaque fois.
!   private Telemac2dFileFormat.TelemacVersion telemac2dv5p4_;
    public final static TelemacDicoManager getINSTANCE() {
      return INSTANCE;
***************
*** 70,81 ****
      int _language) {
      String name= Telemac2dFileFormat.getInstance().getName();
!     String lastVersion= "v5p3";
      if ((lastVersion.equals(_v))
        && (DicoLanguage.getCurrentID() == _language)) {
        if (CtuluLib.DEBUG)
        CtuluLib.debug("new instance for telemac 2d");
!       if (telemac2dv5p3_ == null)
!         telemac2dv5p3_= _ft.createVersion(createDico(name, _v, _language));
!       return telemac2dv5p3_;
      }
      return _ft.createVersion(createDico(name, _v, _language));
--- 71,82 ----
      int _language) {
      String name= Telemac2dFileFormat.getInstance().getName();
!     String lastVersion= LAST_VERSION;
      if ((lastVersion.equals(_v))
        && (DicoLanguage.getCurrentID() == _language)) {
        if (CtuluLib.DEBUG)
        CtuluLib.debug("new instance for telemac 2d");
!       if (telemac2dv5p4_ == null)
!         telemac2dv5p4_= _ft.createVersion(createDico(name, _v, _language));
!       return telemac2dv5p4_;
      }
      return _ft.createVersion(createDico(name, _v, _language));

[Fudaa-cvs-commit] fudaa_devel/dodico/src/org/fudaa/dodico/h2d/reflux H2dRefluxElementProperty.java,1.2,1.3 H2dRefluxBoundaryCondition.java,1.4,1.5 H2dRefluxBcManager.java,1.8,1.9 H2dRefluxBoundary.java,1.3,1.4 H2dRefluxBoundaryConditionMiddleFriction.java,1.4,1.5

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

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

Modified Files:
	H2dRefluxElementProperty.java H2dRefluxBoundaryCondition.java 
	H2dRefluxBcManager.java H2dRefluxBoundary.java 
	H2dRefluxBoundaryConditionMiddleFriction.java 
Log Message:


Index: H2dRefluxBcManager.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/reflux/H2dRefluxBcManager.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** H2dRefluxBcManager.java	5 May 2004 12:38:36 -0000	1.8
--- H2dRefluxBcManager.java	1 Jun 2004 11:23:26 -0000	1.9
***************
*** 403,416 ****
      return new RefluxMiddleFrontier(_maillageindex, cls);
    }
!   protected void fireBcChange(H2dBoundary _b, H2dBoundaryType _old) {
!     super.fireBcChange(_b, _old);
!   }
!   protected void fireBoundaryParametersChanged(H2dBoundary _b) {
      setModified(true);
!     super.fireBoundaryParametersChanged(_b);
    }
!   protected void fireFrontierStructureChange(H2dBcFrontierInterface _frontier) {
      setModified(true);
!     super.fireFrontierStructureChange(_frontier);
    }
    protected void fireParametersForBoundaryPtsChange() {
--- 403,414 ----
      return new RefluxMiddleFrontier(_maillageindex, cls);
    }
!   
!   public void fireBcParametersChanged(H2dBoundary _b) {
      setModified(true);
!     super.fireBcParametersChanged(_b);
    }
!   public void fireBcFrontierStructureChanged(H2dBcFrontierInterface _frontier) {
      setModified(true);
!     super.fireBcFrontierStructureChanged(_frontier);
    }
    protected void fireParametersForBoundaryPtsChange() {
***************
*** 749,753 ****
        if ((sauv == null) || (sauv.size() == 0))
          return null;
!       fireFrontierStructureChange(this);
        return new DodicoCommand() {
          public void undo() {
--- 747,751 ----
        if ((sauv == null) || (sauv.size() == 0))
          return null;
!       fireBcFrontierStructureChanged(this);
        return new DodicoCommand() {
          public void undo() {
***************
*** 768,772 ****
        if ((sauv == null) || (sauv.size() == 0))
          return null;
!       fireFrontierStructureChange(this);
        return new DodicoCommand() {
          public void undo() {
--- 766,770 ----
        if ((sauv == null) || (sauv.size() == 0))
          return null;
!       fireBcFrontierStructureChanged(this);
        return new DodicoCommand() {
          public void undo() {
***************
*** 870,874 ****
        }
        if(structureChanged)
!       fireFrontierStructureChange(this);
        else fireParametersForBoundaryPtsChange();
      }
--- 868,872 ----
        }
        if(structureChanged)
!       fireBcFrontierStructureChanged(this);
        else fireParametersForBoundaryPtsChange();
      }
***************
*** 1037,1041 ****
          modified|=hasToBeSaved;
        }
!       if(modified) fireFrontierStructureChange(this);
        return sauv;
      }
--- 1035,1039 ----
          modified|=hasToBeSaved;
        }
!       if(modified) fireBcFrontierStructureChanged(this);
        return sauv;
      }

Index: H2dRefluxBoundary.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/reflux/H2dRefluxBoundary.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** H2dRefluxBoundary.java	11 Dec 2003 12:41:27 -0000	1.3
--- H2dRefluxBoundary.java	1 Jun 2004 11:23:26 -0000	1.4
***************
*** 8,11 ****
--- 8,12 ----
   */
  package org.fudaa.dodico.h2d.reflux;
+ import org.fudaa.dodico.h2d.H2dBcListenerDispatcher;
  import org.fudaa.dodico.h2d.H2dBoundary;
  import org.fudaa.dodico.h2d.type.H2dBoundaryType;
***************
*** 94,99 ****
     *
     */
!   protected boolean setBoundaryType(H2dBoundaryType _type) {
!     return super.setBoundaryType(_type);
    }
    /**
--- 95,100 ----
     *
     */
!   protected boolean setBoundaryType(H2dBoundaryType _type,H2dBcListenerDispatcher _l) {
!     return super.setBoundaryType(_type,_l);
    }
    /**

Index: H2dRefluxBoundaryConditionMiddleFriction.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/reflux/H2dRefluxBoundaryConditionMiddleFriction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** H2dRefluxBoundaryConditionMiddleFriction.java	19 Dec 2003 12:10:36 -0000	1.4
--- H2dRefluxBoundaryConditionMiddleFriction.java	1 Jun 2004 11:23:26 -0000	1.5
***************
*** 45,69 ****
      if (uTransitoireCourbe_ != _newBoundary.uTransitoireCourbe_) {
        if (uTransitoireCourbe_ != null)
!         uTransitoireCourbe_.setUnUsed();
        if (_newBoundary.uTransitoireCourbe_ != null)
!         _newBoundary.uTransitoireCourbe_.setUsed();
      }
      if (vTransitoireCourbe_ != _newBoundary.vTransitoireCourbe_) {
        if (vTransitoireCourbe_ != null)
!         vTransitoireCourbe_.setUnUsed();
        if (_newBoundary.vTransitoireCourbe_ != null)
!         _newBoundary.vTransitoireCourbe_.setUsed();
      }
      if (hTransitoireCourbe_ != _newBoundary.hTransitoireCourbe_) {
        if (hTransitoireCourbe_ != null)
!         hTransitoireCourbe_.setUnUsed();
        if (_newBoundary.hTransitoireCourbe_ != null)
!         _newBoundary.hTransitoireCourbe_.setUsed();
      }
      if (qTransitoireCourbe_ != _newBoundary.qTransitoireCourbe_) {
        if (qTransitoireCourbe_ != null)
!         qTransitoireCourbe_.setUnUsed();
        if (_newBoundary.qTransitoireCourbe_ != null)
!         _newBoundary.qTransitoireCourbe_.setUsed();
      }
      if (_newBoundary.isMiddleWithFriction()) {
--- 45,69 ----
      if (uTransitoireCourbe_ != _newBoundary.uTransitoireCourbe_) {
        if (uTransitoireCourbe_ != null)
!         uTransitoireCourbe_.setUnUsed(false);
        if (_newBoundary.uTransitoireCourbe_ != null)
!         _newBoundary.uTransitoireCourbe_.setUsed(false);
      }
      if (vTransitoireCourbe_ != _newBoundary.vTransitoireCourbe_) {
        if (vTransitoireCourbe_ != null)
!         vTransitoireCourbe_.setUnUsed(false);
        if (_newBoundary.vTransitoireCourbe_ != null)
!         _newBoundary.vTransitoireCourbe_.setUsed(false);
      }
      if (hTransitoireCourbe_ != _newBoundary.hTransitoireCourbe_) {
        if (hTransitoireCourbe_ != null)
!         hTransitoireCourbe_.setUnUsed(false);
        if (_newBoundary.hTransitoireCourbe_ != null)
!         _newBoundary.hTransitoireCourbe_.setUsed(false);
      }
      if (qTransitoireCourbe_ != _newBoundary.qTransitoireCourbe_) {
        if (qTransitoireCourbe_ != null)
!         qTransitoireCourbe_.setUnUsed(false);
        if (_newBoundary.qTransitoireCourbe_ != null)
!         _newBoundary.qTransitoireCourbe_.setUsed(false);
      }
      if (_newBoundary.isMiddleWithFriction()) {
***************
*** 72,78 ****
        if (frictionEvol_ != fr.frictionEvol_) {
          if (frictionEvol_ != null)
!           frictionEvol_.setUnUsed();
          if (fr.frictionEvol_ != null)
!           frictionEvol_.setUsed();
        }
  
--- 72,78 ----
        if (frictionEvol_ != fr.frictionEvol_) {
          if (frictionEvol_ != null)
!           frictionEvol_.setUnUsed(false);
          if (fr.frictionEvol_ != null)
!           frictionEvol_.setUsed(false);
        }
  
***************
*** 213,217 ****
        && (evolEquivEvol.containsKey(frictionEvol_))) {
        frictionEvol_= (H2dEvolution)evolEquivEvol.get(frictionEvol_);
!       frictionEvol_.setUsed();
      }
      super.replaceEvol(evolEquivEvol);
--- 213,217 ----
        && (evolEquivEvol.containsKey(frictionEvol_))) {
        frictionEvol_= (H2dEvolution)evolEquivEvol.get(frictionEvol_);
!       frictionEvol_.setUsed(false);
      }
      super.replaceEvol(evolEquivEvol);
***************
*** 267,271 ****
      super.initUsedEvol();
      if (frictionEvol_ != null)
!       frictionEvol_.setUsed();
    }
  
--- 267,271 ----
      super.initUsedEvol();
      if (frictionEvol_ != null)
!       frictionEvol_.setUsed(false);
    }
  

Index: H2dRefluxBoundaryCondition.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/reflux/H2dRefluxBoundaryCondition.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** H2dRefluxBoundaryCondition.java	19 Dec 2003 12:10:36 -0000	1.4
--- H2dRefluxBoundaryCondition.java	1 Jun 2004 11:23:26 -0000	1.5
***************
*** 58,77 ****
        && (evolEquivEvol.containsKey(uTransitoireCourbe_))) {
        uTransitoireCourbe_= (H2dEvolution)evolEquivEvol.get(uTransitoireCourbe_);
!       uTransitoireCourbe_.setUsed();
      }
      if ((vTransitoireCourbe_ != null)
        && (evolEquivEvol.containsKey(vTransitoireCourbe_))) {
        vTransitoireCourbe_= (H2dEvolution)evolEquivEvol.get(vTransitoireCourbe_);
!       vTransitoireCourbe_.setUsed();
      }
      if ((hTransitoireCourbe_ != null)
        && (evolEquivEvol.containsKey(hTransitoireCourbe_))) {
        hTransitoireCourbe_= (H2dEvolution)evolEquivEvol.get(hTransitoireCourbe_);
!       hTransitoireCourbe_.setUsed();
      }
      if ((qTransitoireCourbe_ != null)
        && (evolEquivEvol.containsKey(qTransitoireCourbe_))) {
        qTransitoireCourbe_= (H2dEvolution)evolEquivEvol.get(qTransitoireCourbe_);
!       qTransitoireCourbe_.setUsed();
      }
  
--- 58,77 ----
        && (evolEquivEvol.containsKey(uTransitoireCourbe_))) {
        uTransitoireCourbe_= (H2dEvolution)evolEquivEvol.get(uTransitoireCourbe_);
!       uTransitoireCourbe_.setUsed(false);
      }
      if ((vTransitoireCourbe_ != null)
        && (evolEquivEvol.containsKey(vTransitoireCourbe_))) {
        vTransitoireCourbe_= (H2dEvolution)evolEquivEvol.get(vTransitoireCourbe_);
!       vTransitoireCourbe_.setUsed(false);
      }
      if ((hTransitoireCourbe_ != null)
        && (evolEquivEvol.containsKey(hTransitoireCourbe_))) {
        hTransitoireCourbe_= (H2dEvolution)evolEquivEvol.get(hTransitoireCourbe_);
!       hTransitoireCourbe_.setUsed(false);
      }
      if ((qTransitoireCourbe_ != null)
        && (evolEquivEvol.containsKey(qTransitoireCourbe_))) {
        qTransitoireCourbe_= (H2dEvolution)evolEquivEvol.get(qTransitoireCourbe_);
!       qTransitoireCourbe_.setUsed(false);
      }
  
***************
*** 80,90 ****
    public void initUsedEvol() {
      if (uTransitoireCourbe_ != null)
!       uTransitoireCourbe_.setUsed();
      if (vTransitoireCourbe_ != null)
!       vTransitoireCourbe_.setUsed();
      if (hTransitoireCourbe_ != null)
!       hTransitoireCourbe_.setUsed();
      if (qTransitoireCourbe_ != null)
!       qTransitoireCourbe_.setUsed();
  
    }
--- 80,90 ----
    public void initUsedEvol() {
      if (uTransitoireCourbe_ != null)
!       uTransitoireCourbe_.setUsed(false);
      if (vTransitoireCourbe_ != null)
!       vTransitoireCourbe_.setUsed(false);
      if (hTransitoireCourbe_ != null)
!       hTransitoireCourbe_.setUsed(false);
      if (qTransitoireCourbe_ != null)
!       qTransitoireCourbe_.setUsed(false);
  
    }
***************
*** 112,140 ****
      if (uTransitoireCourbe_ != _newBoundary.uTransitoireCourbe_) {
        if (uTransitoireCourbe_ != null)
!         uTransitoireCourbe_.setUnUsed();
        if (_newBoundary.uTransitoireCourbe_ != null)
!         _newBoundary.uTransitoireCourbe_.setUsed();
      }
      if (vTransitoireCourbe_ != _newBoundary.vTransitoireCourbe_) {
        if (vTransitoireCourbe_ != null)
!         vTransitoireCourbe_.setUnUsed();
        if (_newBoundary.vTransitoireCourbe_ != null)
!         _newBoundary.vTransitoireCourbe_.setUsed();
      }
      if (hTransitoireCourbe_ != _newBoundary.hTransitoireCourbe_) {
        if (hTransitoireCourbe_ != null)
!         hTransitoireCourbe_.setUnUsed();
        if (_newBoundary.hTransitoireCourbe_ != null)
!         _newBoundary.hTransitoireCourbe_.setUsed();
      }
      if (qTransitoireCourbe_ != _newBoundary.qTransitoireCourbe_) {
        if (qTransitoireCourbe_ != null)
!         qTransitoireCourbe_.setUnUsed();
        if (_newBoundary.qTransitoireCourbe_ != null)
!         _newBoundary.qTransitoireCourbe_.setUsed();
      }
      if (_newBoundary.isMiddleWithFriction()
        && (_newBoundary.getMiddleFriction().getFrictionEvolution() != null)) {
!       _newBoundary.getMiddleFriction().getFrictionEvolution().setUsed();
      }
    }
--- 112,140 ----
      if (uTransitoireCourbe_ != _newBoundary.uTransitoireCourbe_) {
        if (uTransitoireCourbe_ != null)
!         uTransitoireCourbe_.setUnUsed(false);
        if (_newBoundary.uTransitoireCourbe_ != null)
!         _newBoundary.uTransitoireCourbe_.setUsed(false);
      }
      if (vTransitoireCourbe_ != _newBoundary.vTransitoireCourbe_) {
        if (vTransitoireCourbe_ != null)
!         vTransitoireCourbe_.setUnUsed(false);
        if (_newBoundary.vTransitoireCourbe_ != null)
!         _newBoundary.vTransitoireCourbe_.setUsed(false);
      }
      if (hTransitoireCourbe_ != _newBoundary.hTransitoireCourbe_) {
        if (hTransitoireCourbe_ != null)
!         hTransitoireCourbe_.setUnUsed(false);
        if (_newBoundary.hTransitoireCourbe_ != null)
!         _newBoundary.hTransitoireCourbe_.setUsed(false);
      }
      if (qTransitoireCourbe_ != _newBoundary.qTransitoireCourbe_) {
        if (qTransitoireCourbe_ != null)
!         qTransitoireCourbe_.setUnUsed(false);
        if (_newBoundary.qTransitoireCourbe_ != null)
!         _newBoundary.qTransitoireCourbe_.setUsed(false);
      }
      if (_newBoundary.isMiddleWithFriction()
        && (_newBoundary.getMiddleFriction().getFrictionEvolution() != null)) {
!       _newBoundary.getMiddleFriction().getFrictionEvolution().setUsed(false);
      }
    }
***************
*** 368,372 ****
      hType_= H2dBcType.LIBRE;
      if (hTransitoireCourbe_ != null)
!       hTransitoireCourbe_.setUnUsed();
      hTransitoireCourbe_= null;
      h_= 0;
--- 368,372 ----
      hType_= H2dBcType.LIBRE;
      if (hTransitoireCourbe_ != null)
!       hTransitoireCourbe_.setUnUsed(false);
      hTransitoireCourbe_= null;
      h_= 0;
***************
*** 378,382 ****
      uType_= H2dBcType.LIBRE;
      if (uTransitoireCourbe_ != null)
!       uTransitoireCourbe_.setUnUsed();
      uTransitoireCourbe_= null;
      u_= 0;
--- 378,382 ----
      uType_= H2dBcType.LIBRE;
      if (uTransitoireCourbe_ != null)
!       uTransitoireCourbe_.setUnUsed(false);
      uTransitoireCourbe_= null;
      u_= 0;
***************
*** 388,392 ****
      vType_= H2dBcType.LIBRE;
      if (vTransitoireCourbe_ != null)
!       vTransitoireCourbe_.setUnUsed();
      vTransitoireCourbe_= null;
      v_= 0;
--- 388,392 ----
      vType_= H2dBcType.LIBRE;
      if (vTransitoireCourbe_ != null)
!       vTransitoireCourbe_.setUnUsed(false);
      vTransitoireCourbe_= null;
      v_= 0;
***************
*** 398,402 ****
      qType_= H2dBcType.LIBRE;
      if (qTransitoireCourbe_ != null)
!       qTransitoireCourbe_.setUnUsed();
      qTransitoireCourbe_= null;
      q_= 0;
--- 398,402 ----
      qType_= H2dBcType.LIBRE;
      if (qTransitoireCourbe_ != null)
!       qTransitoireCourbe_.setUnUsed(false);
      qTransitoireCourbe_= null;
      q_= 0;
***************
*** 436,442 ****
        hType_= H2dBcType.TRANSITOIRE;
        if (hTransitoireCourbe_ != null)
!         hTransitoireCourbe_.setUnUsed();
        hTransitoireCourbe_= _evol;
!       hTransitoireCourbe_.setUsed();
        return true;
      }
--- 436,442 ----
        hType_= H2dBcType.TRANSITOIRE;
        if (hTransitoireCourbe_ != null)
!         hTransitoireCourbe_.setUnUsed(false);
        hTransitoireCourbe_= _evol;
!       hTransitoireCourbe_.setUsed(false);
        return true;
      }
***************
*** 448,454 ****
        uType_= H2dBcType.TRANSITOIRE;
        if (uTransitoireCourbe_ != null)
!         uTransitoireCourbe_.setUnUsed();
        uTransitoireCourbe_= _evol;
!       uTransitoireCourbe_.setUsed();
        return true;
      }
--- 448,454 ----
        uType_= H2dBcType.TRANSITOIRE;
        if (uTransitoireCourbe_ != null)
!         uTransitoireCourbe_.setUnUsed(false);
        uTransitoireCourbe_= _evol;
!       uTransitoireCourbe_.setUsed(false);
        return true;
      }
***************
*** 460,466 ****
        vType_= H2dBcType.TRANSITOIRE;
        if (vTransitoireCourbe_ != null)
!         vTransitoireCourbe_.setUnUsed();
        vTransitoireCourbe_= _evol;
!       vTransitoireCourbe_.setUsed();
        return true;
      }
--- 460,466 ----
        vType_= H2dBcType.TRANSITOIRE;
        if (vTransitoireCourbe_ != null)
!         vTransitoireCourbe_.setUnUsed(false);
        vTransitoireCourbe_= _evol;
!       vTransitoireCourbe_.setUsed(false);
        return true;
      }
***************
*** 472,478 ****
        qType_= H2dBcType.TRANSITOIRE;
        if (qTransitoireCourbe_ != null)
!         qTransitoireCourbe_.setUnUsed();
        qTransitoireCourbe_= _evol;
!       qTransitoireCourbe_.setUsed();
        return true;
      }
--- 472,478 ----
        qType_= H2dBcType.TRANSITOIRE;
        if (qTransitoireCourbe_ != null)
!         qTransitoireCourbe_.setUnUsed(false);
        qTransitoireCourbe_= _evol;
!       qTransitoireCourbe_.setUsed(false);
        return true;
      }
***************
*** 490,494 ****
        h_= _d;
        if (hTransitoireCourbe_ != null)
!         hTransitoireCourbe_.setUnUsed();
        hTransitoireCourbe_= null;
        return true;
--- 490,494 ----
        h_= _d;
        if (hTransitoireCourbe_ != null)
!         hTransitoireCourbe_.setUnUsed(false);
        hTransitoireCourbe_= null;
        return true;
***************
*** 501,505 ****
        u_= _d;
        if (uTransitoireCourbe_ != null)
!         uTransitoireCourbe_.setUnUsed();
        uTransitoireCourbe_= null;
        return true;
--- 501,505 ----
        u_= _d;
        if (uTransitoireCourbe_ != null)
!         uTransitoireCourbe_.setUnUsed(false);
        uTransitoireCourbe_= null;
        return true;
***************
*** 512,516 ****
        v_= _d;
        if (vTransitoireCourbe_ != null)
!         vTransitoireCourbe_.setUnUsed();
        vTransitoireCourbe_= null;
        return true;
--- 512,516 ----
        v_= _d;
        if (vTransitoireCourbe_ != null)
!         vTransitoireCourbe_.setUnUsed(false);
        vTransitoireCourbe_= null;
        return true;
***************
*** 523,527 ****
        q_= _d;
        if (qTransitoireCourbe_ != null)
!         qTransitoireCourbe_.setUnUsed();
        qTransitoireCourbe_= null;
        return true;
--- 523,527 ----
        q_= _d;
        if (qTransitoireCourbe_ != null)
!         qTransitoireCourbe_.setUnUsed(false);
        qTransitoireCourbe_= null;
        return true;

Index: H2dRefluxElementProperty.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/reflux/H2dRefluxElementProperty.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** H2dRefluxElementProperty.java	19 Dec 2003 12:10:36 -0000	1.2
--- H2dRefluxElementProperty.java	1 Jun 2004 11:23:26 -0000	1.3
***************
*** 82,86 ****
        Object[] o=_indiceEvol.getValues();
        for(int i=o.length-1;i>=0;i--){
!         ((H2dEvolution)o[i]).setUsed();
        }
      }
--- 82,86 ----
        Object[] o=_indiceEvol.getValues();
        for(int i=o.length-1;i>=0;i--){
!         ((H2dEvolution)o[i]).setUsed(false);
        }
      }
***************
*** 165,169 ****
          for (int i= transitoireToRemove.size(); i-- > 0;) {
            evol=(H2dEvolution)target.remove(it.next());
!           evol.setUnUsed();
          }
        }
--- 165,169 ----
          for (int i= transitoireToRemove.size(); i-- > 0;) {
            evol=(H2dEvolution)target.remove(it.next());
!           evol.setUnUsed(false);
          }
        }
***************
*** 192,196 ****
            it.advance();
            evol=(H2dEvolution)it.value();
!           evol.setUsed();
            target.put(it.key(),evol);
          }
--- 192,196 ----
            it.advance();
            evol=(H2dEvolution)it.value();
!           evol.setUsed(false);
            target.put(it.key(),evol);
          }
***************
*** 222,226 ****
          H2dEvolution newE=(H2dEvolution)evolEquivEvol.get(intObject.value());
          if(newE!=null){
!           newE.setUsed();
            indiceTransitoireEvolution_.put(intObject.key(), newE);
          }
--- 222,226 ----
          H2dEvolution newE=(H2dEvolution)evolEquivEvol.get(intObject.value());
          if(newE!=null){
!           newE.setUsed(false);
            indiceTransitoireEvolution_.put(intObject.key(), newE);
          }
***************
*** 255,259 ****
            indicePermanentValeur_.put(t, _v.getValue());
            evol=(H2dEvolution)indiceTransitoireEvolution_.remove(t);
!           evol.setUnUsed();
            modified= true;
            if (save) {
--- 255,259 ----
            indicePermanentValeur_.put(t, _v.getValue());
            evol=(H2dEvolution)indiceTransitoireEvolution_.remove(t);
!           evol.setUnUsed(false);
            modified= true;
            if (save) {
***************
*** 292,296 ****
                  new TIntObjectHashMap(nbElt_ > 0 ? nbElt_ : 100);
              indiceTransitoireEvolution_.put(t, _v.getEvolution());
!             _v.getEvolution().setUsed();
              modified= true;
              if (save) {
--- 292,296 ----
                  new TIntObjectHashMap(nbElt_ > 0 ? nbElt_ : 100);
              indiceTransitoireEvolution_.put(t, _v.getEvolution());
!             _v.getEvolution().setUsed(false);
              modified= true;
              if (save) {
***************
*** 306,311 ****
              && (indiceTransitoireEvolution_.get(t) != _v.getEvolution())) {
              evol= (H2dEvolution)indiceTransitoireEvolution_.put(t, _v.getEvolution());
!             _v.getEvolution().setUsed();
!             evol.setUnUsed();
              modified= true;
              if (save)
--- 306,311 ----
              && (indiceTransitoireEvolution_.get(t) != _v.getEvolution())) {
              evol= (H2dEvolution)indiceTransitoireEvolution_.put(t, _v.getEvolution());
!             _v.getEvolution().setUsed(false);
!             evol.setUnUsed(false);
              modified= true;
              if (save)
***************
*** 314,318 ****
          } else if (_v.isEvolutionFixed()) {
            indiceTransitoireEvolution_.put(t, _v.getEvolution());
!           _v.getEvolution().setUsed();
            modified= true;
            if (save)
--- 314,318 ----
          } else if (_v.isEvolutionFixed()) {
            indiceTransitoireEvolution_.put(t, _v.getEvolution());
!           _v.getEvolution().setUsed(false);
            modified= true;
            if (save)
***************
*** 334,338 ****
              && (indiceTransitoireEvolution_.contains(t))) {
            evol= (H2dEvolution)indiceTransitoireEvolution_.remove(t);
!           evol.setUnUsed();
            modified= true;
            if (save) {
--- 334,338 ----
              && (indiceTransitoireEvolution_.contains(t))) {
            evol= (H2dEvolution)indiceTransitoireEvolution_.remove(t);
!           evol.setUnUsed(false);
            modified= true;
            if (save) {

[Fudaa-cvs-commit] fudaa_devel/dodico/src/org/fudaa/dodico/h2d H2dBoundaryTypeControllerInterface.java,NONE,1.1 H2dBcListenerDispatcher.java,NONE,1.1 H2dEvolution.java,1.7,1.8 H2dEvolutionListenerDispatcherDefault.java,1.1,1.2 H2dBcManagerAbstract.java,1.4,1.5 H2dBoundary.java,1.6,1.7 H2dBcManagerBlockAbstract.java,1.4,1.5 H2dEvolutionListenerDispatcher.java,1.2,1.3 H2dEvolutionListener.java,1.2,1.3 H2dBoundaryMutable.java,1.3,1.4 H2dBcFrontierBlockAbstract.java,1.4,1.5 H2dBcListener.java,1.3,1.4

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

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

Modified Files:
	H2dEvolution.java H2dEvolutionListenerDispatcherDefault.java 
	H2dBcManagerAbstract.java H2dBoundary.java 
	H2dBcManagerBlockAbstract.java 
	H2dEvolutionListenerDispatcher.java H2dEvolutionListener.java 
	H2dBoundaryMutable.java H2dBcFrontierBlockAbstract.java 
	H2dBcListener.java 
Added Files:
	H2dBoundaryTypeControllerInterface.java 
	H2dBcListenerDispatcher.java 
Log Message:


Index: H2dBoundary.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dBoundary.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** H2dBoundary.java	5 May 2004 12:38:36 -0000	1.6
--- H2dBoundary.java	1 Jun 2004 11:23:26 -0000	1.7
***************
*** 141,147 ****
      return type_;
    }
!   protected boolean setBoundaryType(H2dBoundaryType _type) {
      if ((_type != null) && (_type != type_)) {
        type_= _type;
        return true;
      }
--- 141,151 ----
      return type_;
    }
!   
!   
!   protected boolean setBoundaryType(H2dBoundaryType _type,H2dBcListenerDispatcher _l) {
      if ((_type != null) && (_type != type_)) {
+       H2dBoundaryType old=type_;
        type_= _type;
+       if(_l!=null) _l.fireBcTypeChanged(this,old);
        return true;
      }

Index: H2dBcFrontierBlockAbstract.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dBcFrontierBlockAbstract.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** H2dBcFrontierBlockAbstract.java	12 Dec 2003 10:30:53 -0000	1.4
--- H2dBcFrontierBlockAbstract.java	1 Jun 2004 11:23:26 -0000	1.5
***************
*** 67,71 ****
        b.setIdxFin(_min);
        H2dBoundary bsolid= createBord(H2dBoundaryType.SOLIDE);
!       bsolid.setBoundaryType(H2dBoundaryType.SOLIDE);
        bsolid.setIdxDeb(_min);
        bsolid.setIdxFin(_max);
--- 67,71 ----
        b.setIdxFin(_min);
        H2dBoundary bsolid= createBord(H2dBoundaryType.SOLIDE);
!       bsolid.setBoundaryType(H2dBoundaryType.SOLIDE,null);
        bsolid.setIdxDeb(_min);
        bsolid.setIdxFin(_max);
***************
*** 146,149 ****
--- 146,155 ----
      return true;
    }
+   /**
+    * @param _min l'indice min du nouveau bord liquide
+    * @param _max l'indice max du nouveau bord liquide
+    * @param _b le type du bord a inserer
+    * @return null si pas de bord insere ou le bord insere
+    */
    protected boolean insertLiquid(int _min, int _max, H2dBoundaryType _b) {
      int n= bords_.size();
***************
*** 225,228 ****
--- 231,237 ----
     */
    public final H2dBoundary getBord(int _idxBord) {
+     if(_idxBord>=bords_.size())
+       return null;
+     else
      return (H2dBoundary)bords_.get(_idxBord);
    }
***************
*** 413,417 ****
        return false;
      if (n == 1) {
!       ((H2dBoundary)bords_.get(0)).setBoundaryType(H2dBoundaryType.SOLIDE);
      } else if (n == 2) {
        bords_.remove(_idx);
--- 422,426 ----
        return false;
      if (n == 1) {
!       ((H2dBoundary)bords_.get(0)).setBoundaryType(H2dBoundaryType.SOLIDE,null);
      } else if (n == 2) {
        bords_.remove(_idx);

Index: H2dBoundaryMutable.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dBoundaryMutable.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** H2dBoundaryMutable.java	11 Dec 2003 12:41:27 -0000	1.3
--- H2dBoundaryMutable.java	1 Jun 2004 11:23:26 -0000	1.4
***************
*** 39,44 ****
     *
     */
!   public boolean setBoundaryType(H2dBoundaryType _type) {
!     return super.setBoundaryType(_type);
    }
  }
--- 39,44 ----
     *
     */
!   public boolean setBoundaryType(H2dBoundaryType _type,H2dBcListenerDispatcher _l) {
!     return super.setBoundaryType(_type,_l);
    }
  }

Index: H2dEvolution.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dEvolution.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** H2dEvolution.java	19 Dec 2003 12:10:36 -0000	1.7
--- H2dEvolution.java	1 Jun 2004 11:23:26 -0000	1.8
***************
*** 50,69 ****
    }
  
!   protected void fireEvolutionUsedChanged(int _old) {
      if (listener_ != null)
        ((H2dEvolutionListenerDispatcher)listener_).evolutionUsedChanged(
          this,
          _old,
!         used_);
    }
!   public void setUsed() {
      int old= used_;
      used_++;
!     fireEvolutionUsedChanged(old);
    }
!   public void setUnUsed() {
      int old= used_;
      used_--;
!     fireEvolutionUsedChanged(old);
    }
  
--- 50,69 ----
    }
  
!   protected void fireEvolutionUsedChanged(int _old,boolean _isAdjusting) {
      if (listener_ != null)
        ((H2dEvolutionListenerDispatcher)listener_).evolutionUsedChanged(
          this,
          _old,
!         used_,_isAdjusting);
    }
!   public void setUsed(boolean isAdjusting) {
      int old= used_;
      used_++;
!     fireEvolutionUsedChanged(old,isAdjusting);
    }
!   public void setUnUsed(boolean isAdjusting) {
      int old= used_;
      used_--;
!     fireEvolutionUsedChanged(old,isAdjusting);
    }
  

Index: H2dBcManagerAbstract.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dBcManagerAbstract.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** H2dBcManagerAbstract.java	12 Feb 2004 15:32:44 -0000	1.4
--- H2dBcManagerAbstract.java	1 Jun 2004 11:23:26 -0000	1.5
***************
*** 1,3 ****
! /*
   *  @file         H2dClManagerCommonAbstract.java
   *  @creation     20 nov. 2003
--- 1,3 ----
! /**
   *  @file         H2dClManagerCommonAbstract.java
   *  @creation     20 nov. 2003
***************
*** 11,23 ****
  import java.util.Iterator;
  
! import org.fudaa.dodico.ef.*;
  import org.fudaa.dodico.h2d.type.H2dBoundaryType;
  import org.fudaa.dodico.h2d.type.H2dVariableType;
! import org.fudaa.dodico.mnt.*;
  /**
   * @author deniger
   * @version $Id$
   */
! public class H2dBcManagerAbstract {
    protected EfGrid maillage_;
    protected ArrayList listeners_;
--- 11,23 ----
  import java.util.Iterator;
  
! import org.fudaa.dodico.ef.EfGrid;
  import org.fudaa.dodico.h2d.type.H2dBoundaryType;
  import org.fudaa.dodico.h2d.type.H2dVariableType;
! import org.fudaa.dodico.mnt.MNTPoint;
  /**
   * @author deniger
   * @version $Id$
   */
! public class H2dBcManagerAbstract implements H2dBcListenerDispatcher{
    protected EfGrid maillage_;
    protected ArrayList listeners_;
***************
*** 46,50 ****
      return maillage_.getFrontiers().getNbTotalPt();
    }
!   protected void fireBcChange(H2dBoundary _b, H2dBoundaryType _old) {
      if (listeners_ != null) {
        for (Iterator it= listeners_.iterator(); it.hasNext();) {
--- 46,53 ----
      return maillage_.getFrontiers().getNbTotalPt();
    }
!   /**
!    * @see org.fudaa.dodico.h2d.H2dBcListenerDispatcher#fireBcTypeChanged(org.fudaa.dodico.h2d.H2dBoundary, org.fudaa.dodico.h2d.type.H2dBoundaryType)
!    */
!   public void fireBcTypeChanged(H2dBoundary _b, H2dBoundaryType _old) {
      if (listeners_ != null) {
        for (Iterator it= listeners_.iterator(); it.hasNext();) {
***************
*** 53,57 ****
      }
    }
!   protected void fireBoundaryParametersChanged(H2dBoundary _b) {
      if (listeners_ != null) {
        for (Iterator it= listeners_.iterator(); it.hasNext();) {
--- 56,60 ----
      }
    }
!   public void fireBcParametersChanged(H2dBoundary _b) {
      if (listeners_ != null) {
        for (Iterator it= listeners_.iterator(); it.hasNext();) {
***************
*** 60,64 ****
      }
    }
!   protected void fireBoundaryParametersChanged(
      H2dBoundary _b,
      H2dVariableType _t) {
--- 63,70 ----
      }
    }
!   /**
!    * @see org.fudaa.dodico.h2d.H2dBcListenerDispatcher#fireBcParametersChanged(org.fudaa.dodico.h2d.H2dBoundary, org.fudaa.dodico.h2d.type.H2dVariableType)
!    */
!   public void fireBcParametersChanged(
      H2dBoundary _b,
      H2dVariableType _t) {
***************
*** 69,73 ****
      }
    }
!   protected void fireFrontierStructureChange(H2dBcFrontierInterface _frontier) {
      if (listeners_ != null) {
        for (Iterator it= listeners_.iterator(); it.hasNext();) {
--- 75,83 ----
      }
    }
!   
!   /**
!    * @see org.fudaa.dodico.h2d.H2dBcListenerDispatcher#fireBcFrontierStructureChanged(org.fudaa.dodico.h2d.H2dBcFrontierInterface)
!    */
!   public void fireBcFrontierStructureChanged(H2dBcFrontierInterface _frontier) {
      if (listeners_ != null) {
        for (Iterator it= listeners_.iterator(); it.hasNext();) {
***************
*** 83,87 ****
      }
    }
!   protected void fireParametersForBoundaryPtsChange(H2dVariableType _t) {
      if (listeners_ != null) {
        for (Iterator it= listeners_.iterator(); it.hasNext();) {
--- 93,100 ----
      }
    }
!   /**
!    * @see org.fudaa.dodico.h2d.H2dBcListenerDispatcher#fireBcPointsParametersChanged(org.fudaa.dodico.h2d.type.H2dVariableType)
!    */
!   public void fireBcPointsParametersChanged(H2dVariableType _t) {
      if (listeners_ != null) {
        for (Iterator it= listeners_.iterator(); it.hasNext();) {

Index: H2dBcManagerBlockAbstract.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dBcManagerBlockAbstract.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** H2dBcManagerBlockAbstract.java	12 Feb 2004 15:32:44 -0000	1.4
--- H2dBcManagerBlockAbstract.java	1 Jun 2004 11:23:26 -0000	1.5
***************
*** 8,17 ****
   */
  package org.fudaa.dodico.h2d;
! import java.util.ArrayList;
! import java.util.Iterator;
! 
! import org.fudaa.dodico.ef.*;
  import org.fudaa.dodico.h2d.type.H2dBoundaryType;
- import org.fudaa.dodico.h2d.type.H2dVariableType;
  /**
   * @author deniger
--- 8,13 ----
   */
  package org.fudaa.dodico.h2d;
! import org.fudaa.dodico.ef.EfGrid;
  import org.fudaa.dodico.h2d.type.H2dBoundaryType;
  /**
   * @author deniger
***************
*** 83,91 ****
    }
    protected boolean setBordType(H2dBoundary _b, H2dBoundaryType _type) {
!     H2dBoundaryType old= _b.getType();
!     boolean r= _b.setBoundaryType(_type);
!     if (r)
!       fireBcChange(_b, old);
!     return r;
    }
  }
--- 79,83 ----
    }
    protected boolean setBordType(H2dBoundary _b, H2dBoundaryType _type) {
!     return _b.setBoundaryType(_type,this);
    }
  }

--- NEW FILE: H2dBcListenerDispatcher.java ---
/**
 *  @creation     18 mai 2004
 *  @modification $Date: 2004/06/01 11:23:26 $
 *  @license      GNU General Public License 2
 *  @copyright    (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
 *  @mail         fud...@li...
 */
package org.fudaa.dodico.h2d;

import org.fudaa.dodico.h2d.type.H2dBoundaryType;
import org.fudaa.dodico.h2d.type.H2dVariableType;


/**
 * @author Fred Deniger
 * @version $Id: H2dBcListenerDispatcher.java,v 1.1 2004/06/01 11:23:26 deniger Exp $
 */
public interface H2dBcListenerDispatcher {
  
  public void fireBcParametersChanged(H2dBoundary _b, H2dVariableType _t);
  /**
   * Call when the parameters (friction,velocity,..) is changed for some points.
   * @param _t if not null, represent the variable changed
   */
  public void fireBcPointsParametersChanged(H2dVariableType _t);
  public void fireBcTypeChanged(H2dBoundary b, H2dBoundaryType _old);
  /**
   * Call when the boundary disposition is changed for a frontier
   */
  public void fireBcFrontierStructureChanged(H2dBcFrontierInterface _b);

}

Index: H2dEvolutionListenerDispatcherDefault.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dEvolutionListenerDispatcherDefault.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** H2dEvolutionListenerDispatcherDefault.java	19 Dec 2003 12:10:36 -0000	1.1
--- H2dEvolutionListenerDispatcherDefault.java	1 Jun 2004 11:23:26 -0000	1.2
***************
*** 1,3 ****
! /*
   *  @file         H2dEvolutionListenerDispatcherDefault.java
   *  @creation     16 déc. 2003
--- 1,3 ----
! /**
   *  @file         H2dEvolutionListenerDispatcherDefault.java
   *  @creation     16 déc. 2003
***************
*** 39,45 ****
    
    /**
!    *
     */
!   public void evolutionUsedChanged(H2dEvolution _e, int _old, int _new) {
      if (listener_ != null) {
        synchronized (listener_) {
--- 39,45 ----
    
    /**
!    * @see org.fudaa.dodico.h2d.H2dEvolutionListener#evolutionUsedChanged(org.fudaa.dodico.h2d.H2dEvolution, int, int, boolean)
     */
!   public void evolutionUsedChanged(H2dEvolution _e, int _old, int _new,boolean _isAdjusting) {
      if (listener_ != null) {
        synchronized (listener_) {
***************
*** 48,52 ****
              _e,
              _old,
!             _new);
          }
        }
--- 48,52 ----
              _e,
              _old,
!             _new,_isAdjusting);
          }
        }

Index: H2dEvolutionListener.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dEvolutionListener.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** H2dEvolutionListener.java	19 Dec 2003 12:10:36 -0000	1.2
--- H2dEvolutionListener.java	1 Jun 2004 11:23:26 -0000	1.3
***************
*** 1,3 ****
! /*
   *  @file         H2dEvolutionListener.java
   *  @creation     2 déc. 2003
--- 1,3 ----
! /**
   *  @file         H2dEvolutionListener.java
   *  @creation     2 déc. 2003
***************
*** 16,19 ****
   */
  public interface H2dEvolutionListener extends EvolutionListener{
!   public void evolutionUsedChanged(H2dEvolution _e,int _old,int _new);
  }
--- 16,26 ----
   */
  public interface H2dEvolutionListener extends EvolutionListener{
!   /**
!    * @param _e l'evolution dont l'utilisation a ete modifiee
!    * @param _old l'ancienne valeur d'utilisation
!    * @param _new la nouvelle valeur d'utilisation
!    * @param _isAdjusting true si la modification est juste un ajustement
!    */
!   public void evolutionUsedChanged(H2dEvolution _e,int _old,int _new,boolean _isAdjusting);
!   
  }

Index: H2dBcListener.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dBcListener.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** H2dBcListener.java	11 Dec 2003 12:41:27 -0000	1.3
--- H2dBcListener.java	1 Jun 2004 11:23:26 -0000	1.4
***************
*** 1,3 ****
! /*
   *  @file         H2dClChangeListener.java
   *  @creation     29 sept. 2003
--- 1,3 ----
! /**
   *  @file         H2dClChangeListener.java
   *  @creation     29 sept. 2003
***************
*** 26,29 ****
--- 26,33 ----
     */
    public void bcPointsParametersChanged(H2dVariableType _t);
+   /**
+    * @param b le bord modifie
+    * @param _old l'ancien type du bord
+    */
    public void bcBoundaryTypeChanged(H2dBoundary b, H2dBoundaryType _old);
    /**
***************
*** 31,33 ****
--- 35,39 ----
     */
    public void bcFrontierStructureChanged(H2dBcFrontierInterface _b);
+   
+   
  }

--- NEW FILE: H2dBoundaryTypeControllerInterface.java ---
/**
 *  @creation     18 mai 2004
 *  @modification $Date: 2004/06/01 11:23:26 $
 *  @license      GNU General Public License 2
 *  @copyright    (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
 *  @mail         fud...@li...
 */
package org.fudaa.dodico.h2d;

import java.util.List;

import org.fudaa.dodico.h2d.type.H2dBoundaryType;


/**
 * Cette interface a pour but de controler les variables autorisees
 * pour un type de bord
 * @author Fred Deniger
 * @version $Id: H2dBoundaryTypeControllerInterface.java,v 1.1 2004/06/01 11:23:26 deniger Exp $
 */
public interface H2dBoundaryTypeControllerInterface {
  
  /**
   * @param _t le type de bord en question
   * @return une liste non modifiable des variables autorisees pour ce type de 
   * bord
   */
  public List getVariableFor(H2dBoundaryType _t);

}

Index: H2dEvolutionListenerDispatcher.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dEvolutionListenerDispatcher.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** H2dEvolutionListenerDispatcher.java	19 Dec 2003 12:10:36 -0000	1.2
--- H2dEvolutionListenerDispatcher.java	1 Jun 2004 11:23:26 -0000	1.3
***************
*** 1,3 ****
! /*
   *  @file         H2dEvolutionListenerDispatcher.java
   *  @creation     16 déc. 2003
--- 1,3 ----
! /**
   *  @file         H2dEvolutionListenerDispatcher.java
   *  @creation     16 déc. 2003
***************
*** 16,18 ****
   */
  public interface H2dEvolutionListenerDispatcher
!   extends EvolutionListenerDispatcher,H2dEvolutionListener {}
--- 16,20 ----
   */
  public interface H2dEvolutionListenerDispatcher
!   extends EvolutionListenerDispatcher,H2dEvolutionListener {
!   
! }

[Fudaa-cvs-commit] fudaa_devel/dodico/src/org/fudaa/dodico/commun DodicoCommandManager.java,1.4,1.5 DodicoCommandComposite.java,1.4,1.5 dodico_en.fr_txt,1.10,1.11

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

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

Modified Files:
	DodicoCommandManager.java DodicoCommandComposite.java 
	dodico_en.fr_txt 
Log Message:


Index: DodicoCommandComposite.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/commun/DodicoCommandComposite.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DodicoCommandComposite.java	11 Dec 2003 12:41:26 -0000	1.4
--- DodicoCommandComposite.java	1 Jun 2004 11:23:26 -0000	1.5
***************
*** 1,11 ****
  /*
!  *  @file         DodicoCommandComposite.java
!  *  @creation     21 oct. 2003
!  *  @modification $Date$
!  *  @license      GNU General Public License 2
!  *  @copyright    (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
!  *  @mail         de...@fu...
   */
  package org.fudaa.dodico.commun;
  import java.util.ArrayList;
  import java.util.Iterator;
--- 1,9 ----
  /*
!  * @file DodicoCommandComposite.java @creation 21 oct. 2003 @modification $Date$
!  * @license GNU General Public License 2 @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231
!  * Compiegne @mail de...@fu...
   */
  package org.fudaa.dodico.commun;
+ 
  import java.util.ArrayList;
  import java.util.Iterator;
***************
*** 16,20 ****
--- 14,20 ----
   */
  public class DodicoCommandComposite implements DodicoCommand {
+ 
    private List command_;
+ 
    /**
     * 
***************
*** 23,33 ****
      super();
    }
    public boolean isEmpty() {
      return ((command_ == null) || (command_.size() == 0));
    }
    public boolean addCmd(DodicoCommand _cmd) {
      if (_cmd != null) {
!       if (command_ == null)
!         command_= new ArrayList(10);
        command_.add(_cmd);
        return true;
--- 23,45 ----
      super();
    }
+ 
    public boolean isEmpty() {
      return ((command_ == null) || (command_.size() == 0));
    }
+ 
+   /**
+    * @return la commande simplifiee
+    */
+   public DodicoCommand getSimplify() {
+     int n = getNbCmd();
+     if (n == 0) return null;
+     else if (n == 1) return (DodicoCommand) command_.get(0);
+     else return this;
+ 
+   }
+ 
    public boolean addCmd(DodicoCommand _cmd) {
      if (_cmd != null) {
!       if (command_ == null) command_ = new ArrayList(10);
        command_.add(_cmd);
        return true;
***************
*** 35,38 ****
--- 47,51 ----
      return false;
    }
+ 
    public void removeCmd(DodicoCommand _cmd) {
      if ((command_ != null) && (_cmd != null)) {
***************
*** 40,46 ****
--- 53,61 ----
      }
    }
+ 
    public int getNbCmd() {
      return command_ == null ? 0 : command_.size();
    }
+ 
    /**
     *
***************
*** 48,56 ****
    public void undo() {
      if (command_ != null) {
!       for (int i= command_.size() - 1; i >= 0; i--) {
!         ((DodicoCommand)command_.get(i)).undo();
        }
      }
    }
    /**
     *
--- 63,73 ----
    public void undo() {
      if (command_ != null) {
!       int n = command_.size();
!       for (int i = 0; i < n; i++) {
!         ((DodicoCommand) command_.get(i)).undo();
        }
      }
    }
+ 
    /**
     *
***************
*** 58,65 ****
    public void redo() {
      if (command_ != null) {
!       for (Iterator it= command_.iterator(); it.hasNext();) {
!         ((DodicoCommand)it.next()).redo();
        }
      }
    }
! }
--- 75,83 ----
    public void redo() {
      if (command_ != null) {
!       int n = command_.size();
!       for (int i = 0; i < n; i++) {
!         ((DodicoCommand) command_.get(i)).redo();
        }
      }
    }
! }
\ No newline at end of file

Index: DodicoCommandManager.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/commun/DodicoCommandManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DodicoCommandManager.java	31 Mar 2004 08:14:32 -0000	1.4
--- DodicoCommandManager.java	1 Jun 2004 11:23:26 -0000	1.5
***************
*** 31,34 ****
--- 31,35 ----
    public void setListener(DodicoCmdMngListener _l) {
      if ((_l != null) && (_l != listener_)) {
+       if(listener_!=null) new Throwable().printStackTrace();
        listener_= _l;
      }

Index: dodico_en.fr_txt
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/commun/dodico_en.fr_txt,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** dodico_en.fr_txt	31 Mar 2004 08:14:32 -0000	1.10
--- dodico_en.fr_txt	1 Jun 2004 11:23:26 -0000	1.11
***************
*** 92,96 ****
  Eléments surcontraints=Overstressed elements
  Recherche valable uniquement pour les triangles=Search available only in the case of triangle
! Triangle surcontraint\: triangle dont dont les 3 extrémités appartiennent à une frontière=Overstressed triangle\: triangle which 3 extremities belonging to a frontier
  Recherche des éléments surcontraints=Search for overstressed elements
  Recherche des éléments dont l'aire est inférieure à {0}=Search for elements wich area is less than {0}
--- 92,96 ----
  Eléments surcontraints=Overstressed elements
  Recherche valable uniquement pour les triangles=Search available only in the case of triangle
! Triangle surcontraint\= triangle dont les 3 extrémités appartiennent à une frontière=Overstressed triangle\= triangle which 3 extremities belonging to a frontier
  Recherche des éléments surcontraints=Search for overstressed elements
  Recherche des éléments dont l'aire est inférieure à {0}=Search for elements wich area is less than {0}

[Fudaa-cvs-commit] fudaa_devel/dodico/src/org/fudaa/dodico/h2d/resource h2d_en.fr_txt,1.1,1.2

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

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

Modified Files:
	h2d_en.fr_txt 
Log Message:


Index: h2d_en.fr_txt
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/resource/h2d_en.fr_txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** h2d_en.fr_txt	5 May 2004 12:38:35 -0000	1.1
--- h2d_en.fr_txt	1 Jun 2004 11:23:27 -0000	1.2
***************
*** 201,205 ****
  {0} n'est pas un mot-clé contenant des réels={0} is not a keyword for real
  Bord de type {0}=The boundary's type is {0}
! Le mot-clé {0} doit contenir au maximun {1} champs (soit le nombre de frontières liquides)=The keyword {0} must contains at most {1} fields ( the number of liquid boundaries)
  Les indices de points de bords sont incorrects=The boundary indices are not valids
  Le traceur n'est pas homogène sur le même bord (point {0} dans la numérotation des points de bords)=The tracer is not homogenous for the entire border(point {0} in the boundary point numbering)
--- 201,205 ----
  {0} n'est pas un mot-clé contenant des réels={0} is not a keyword for real
  Bord de type {0}=The boundary's type is {0}
! Le mot-clé {0} doit contenir {1} champs (soit le nombre de frontières liquides)=The keyword {0} must contains {1} fields ( the number of liquid boundaries)
  Les indices de points de bords sont incorrects=The boundary indices are not valids
  Le traceur n'est pas homogène sur le même bord (point {0} dans la numérotation des points de bords)=The tracer is not homogenous for the entire border(point {0} in the boundary point numbering)

[Fudaa-cvs-commit] fudaa_devel/dodico/src/org/fudaa/dodico/dico DicoParamsLinkedSource.java,NONE,1.1 dico_en.fr_txt,1.5,1.6 DicoParamsInterface.java,1.4,1.5 DicoParams.java,1.17,1.18 DicoEntite.java,1.11,1.12 DicoExec.java,1.6,1.7 DicoGenerator.java,1.8,1.9

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

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

Modified Files:
	dico_en.fr_txt DicoParamsInterface.java DicoParams.java 
	DicoEntite.java DicoExec.java DicoGenerator.java 
Added Files:
	DicoParamsLinkedSource.java 
Log Message:


Index: DicoParamsInterface.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoParamsInterface.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DicoParamsInterface.java	12 Feb 2004 15:32:43 -0000	1.4
--- DicoParamsInterface.java	1 Jun 2004 11:23:25 -0000	1.5
***************
*** 97,99 ****
--- 97,101 ----
    public boolean isEntiteWithComportBehavior(DicoEntite _ent);
    public void addModelListener(DicoParamsListener _l);
+   
+   public String getInvalidMessage(DicoEntite _ent);
  }
\ No newline at end of file

Index: DicoEntite.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoEntite.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** DicoEntite.java	12 Dec 2003 10:30:53 -0000	1.11
--- DicoEntite.java	1 Jun 2004 11:23:25 -0000	1.12
***************
*** 43,46 ****
--- 43,47 ----
    private int index_;
    private int niveau_;
+   private boolean isModifiable_=true;
    private boolean isRequired_;
    private String rubrique_= DicoResource.getS("Aucune");
***************
*** 60,64 ****
    public abstract String getControleDescription();
    public boolean isModifiable() {
!     return niveau_ >= 0;
    }
    public String getNiveauDesc() {
--- 61,69 ----
    public abstract String getControleDescription();
    public boolean isModifiable() {
!     return (niveau_ >= 0) && (isModifiable_);
!   }
!   
!   public void setModifiable(boolean _b){
!     isModifiable_=_b;
    }
    public String getNiveauDesc() {
***************
*** 481,485 ****
          String s= fillListWithValidValues(_data, l);
          if (s == null) {
!           return l.size() <= nbElem;
          }
          return false;
--- 486,490 ----
          String s= fillListWithValidValues(_data, l);
          if (s == null) {
!           return l.size() == nbElem;
          }
          return false;
***************
*** 490,498 ****
        String s= fillListWithValidValues(_data, _l);
        if ((s == null) && (nbElem >= 0)) {
!         if (_l.size() > nbElem) {
            if (nbElem == 0)
              return DicoResource.getS("Ce mot-clé est inutile");
            return DicoResource.getS(
!             "Le nombre d'éléments doit être inférieur à {0}",
              CtuluLib.getString(nbElem));
          }
--- 495,503 ----
        String s= fillListWithValidValues(_data, _l);
        if ((s == null) && (nbElem >= 0)) {
!         if (_l.size() != nbElem) {
            if (nbElem == 0)
              return DicoResource.getS("Ce mot-clé est inutile");
            return DicoResource.getS(
!             "Le nombre d'éléments doit être égal à {0}",
              CtuluLib.getString(nbElem));
          }
***************
*** 507,511 ****
          return DicoResource.getS("non modifiable");
        else if (nbElem >= 0) {
!         return DicoResource.getS("Nombre maximal de champs") + ": " + nbElem;
        }
        return null;
--- 512,516 ----
          return DicoResource.getS("non modifiable");
        else if (nbElem >= 0) {
!         return DicoResource.getS("Nombre de champs") + ": " + nbElem;
        }
        return null;

--- NEW FILE: DicoParamsLinkedSource.java ---
/**
 *  @creation     18 mai 2004
 *  @modification $Date: 2004/06/01 11:23:25 $
 *  @license      GNU General Public License 2
 *  @copyright    (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
 *  @mail         fud...@li...
 */
package org.fudaa.dodico.dico;

import org.fudaa.dodico.commun.DodicoCommand;


/**
 * Une classe qui est liee a un projet DicoParams: la modification d'un mot-clé
 * @author Fred Deniger
 * @version $Id: DicoParamsLinkedSource.java,v 1.1 2004/06/01 11:23:25 deniger Exp $
 */
public interface DicoParamsLinkedSource {
  
  /**
   * @param ent le mot-cle ajoute
   * @return la commande effectue par le source lie
   */
  DodicoCommand keywordAddedOrUpdated(DicoEntite ent);
  /**
   * @param ent le mot-cle enleve
   * @param _oldVal l'ancienne valeur
   * @return la commande effectue par le source lie
   */
  DodicoCommand keywordRemoved(DicoEntite ent);

}

Index: DicoExec.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoExec.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** DicoExec.java	12 Mar 2004 10:16:11 -0000	1.6
--- DicoExec.java	1 Jun 2004 11:23:26 -0000	1.7
***************
*** 27,35 ****
      setChangeWorkingDirectory(true);
      setLauchInNewTerm(true);
!     String exe=
!       DodicoPreferences.DODICO.getStringProperty(
!         getPrefIdFor(_execName),
!         _execName);
!     execName_= exe;
    }
    public String getExecName() {
--- 27,31 ----
      setChangeWorkingDirectory(true);
      setLauchInNewTerm(true);
!     execName_= _execName;
    }
    public String getExecName() {

Index: dico_en.fr_txt
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/dico/dico_en.fr_txt,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** dico_en.fr_txt	11 Dec 2003 12:41:26 -0000	1.5
--- dico_en.fr_txt	1 Jun 2004 11:23:25 -0000	1.6
***************
*** 47,50 ****
--- 47,51 ----
  La valeur possède trop de champs=The value contains too many fields
  Nombre maximal de champs=Maximum number of fields
+ Nombre de champs=Number of fields
  fonction de comportement non supportée=COMPORT function not supported
  erreur lors de l'analyse de COMPORT=error while processing the field COMPORT
***************
*** 80,81 ****
--- 81,83 ----
  Le nombre d'éléments doit être inférieur à {0}=The number of elements must be lower than {0}
  Ce mot-clé est inutile=This keyword is unused
+ Le nombre d'éléments doit être égal à {0}=The number of elements must be equals to {0}
\ No newline at end of file

Index: DicoGenerator.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoGenerator.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** DicoGenerator.java	12 Feb 2004 15:32:43 -0000	1.8
--- DicoGenerator.java	1 Jun 2004 11:23:26 -0000	1.9
***************
*** 8,11 ****
--- 8,12 ----
   */
  package org.fudaa.dodico.dico;
+ 
  import java.io.File;
  import java.io.FileReader;
***************
*** 25,29 ****
  
  import org.fudaa.ctulu.CtuluLib;
[...1217 lines suppressed...]
    /**
     *
     */
    public void close() throws IOException {}
! }
--- 704,716 ----
      return null;
    }
+ 
    /**
     *
     */
    public void setFile(File _f) {}
+ 
    /**
     *
     */
    public void close() throws IOException {}
! }
\ No newline at end of file

Index: DicoParams.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoParams.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** DicoParams.java	12 Mar 2004 10:16:11 -0000	1.17
--- DicoParams.java	1 Jun 2004 11:23:25 -0000	1.18
***************
*** 1,11 ****
  /*
!  *  @file         H2dDicoTelemac.java
!  *  @creation     25 juin 2003
!  *  @modification $Date$
!  *  @license      GNU General Public License 2
!  *  @copyright    (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
!  *  @mail         de...@fu...
   */
  package org.fudaa.dodico.dico;
  import java.io.File;
[...1542 lines suppressed...]
      return new HashSet(entitesFiles_);
    }
    public Set getEntiteFileSetAndRequiredList() {
!     HashSet s= new HashSet(entitesFiles_);
      getDicoFileFormatVersion().fillListWithNotSetRequiredEntite(this, s);
      return s;
    }
! }
--- 865,874 ----
      return new HashSet(entitesFiles_);
    }
+ 
    public Set getEntiteFileSetAndRequiredList() {
!     HashSet s = new HashSet(entitesFiles_);
      getDicoFileFormatVersion().fillListWithNotSetRequiredEntite(this, s);
      return s;
    }
! 
! }
\ No newline at end of file

[Fudaa-cvs-commit] fudaa_devel/dodico/src/org/fudaa/dodico/calcul CalculExec.java,1.6,1.7

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

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

Modified Files:
	CalculExec.java 
Log Message:


Index: CalculExec.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/calcul/CalculExec.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CalculExec.java	12 Mar 2004 10:16:13 -0000	1.6
--- CalculExec.java	1 Jun 2004 11:23:25 -0000	1.7
***************
*** 68,71 ****
--- 68,72 ----
        ex.exec();
      } catch (RuntimeException _e) {
+       _e.printStackTrace();
        ui_.error("Calcul termine avec erreur", _e.getMessage());
      }

[Fudaa-cvs-commit] fudaa_devel/dodico/src/org/fudaa/dodico/telemac/dico DicoEstel3dv5p4.java,NONE,1.1 DicoSisyphev5p4.java,NONE,1.1 DicoStbtelv5p4.java,NONE,1.1 DicoEstel2dv5p4.java,NONE,1.1 DicoTelemac2dv5p4.java,NONE,1.1 DicoSubief3dv5p4.java,NONE,1.1 DicoArtemisv5p4.java,NONE,1.1 DicoTelemac3dv5p4.java,NONE,1.1 DicoSubief2dv5p4.java,NONE,1.1 DicoTomawacv5p4.java,NONE,1.1 DicoPostel3dv5p4.java,NONE,1.1 DicoSubief2dv5p3.java,1.4,NONE DicoSubief3dv5p3.java,1.2,NONE DicoTelemac3dv5p3.java,1.2,NONE DicoEstel2dv5p3.java,1.4,NONE DicoTomawacv5p3.java,1.4,NONE DicoEstel3dv5p3.java,1.4,NONE DicoPostel3dv5p3.java,1.4,NONE DicoTelemac2dv5p3.java,1.6,NONE DicoSisyphev5p3.java,1.4,NONE DicoArtemisv5p3.java,1.4,NONE DicoStbtelv5p3.java,1.4,NONE

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

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

Added Files:
	DicoEstel3dv5p4.java DicoSisyphev5p4.java DicoStbtelv5p4.java 
	DicoEstel2dv5p4.java DicoTelemac2dv5p4.java 
	DicoSubief3dv5p4.java DicoArtemisv5p4.java 
	DicoTelemac3dv5p4.java DicoSubief2dv5p4.java 
	DicoTomawacv5p4.java DicoPostel3dv5p4.java 
Removed Files:
	DicoSubief2dv5p3.java DicoSubief3dv5p3.java 
	DicoTelemac3dv5p3.java DicoEstel2dv5p3.java 
	DicoTomawacv5p3.java DicoEstel3dv5p3.java 
	DicoPostel3dv5p3.java DicoTelemac2dv5p3.java 
	DicoSisyphev5p3.java DicoArtemisv5p3.java DicoStbtelv5p3.java 
Log Message:


--- NEW FILE: DicoEstel3dv5p4.java ---
/* 
 *File generated by fudaa
 */

package 
    org.fudaa.dodico.telemac.dico;

import org.fudaa.dodico.dico.*;
/**
 * @author deniger
 */

public class 
    DicoEstel3dv5p4
    extends DicoModelAbstract
{
 public
    DicoEstel3dv5p4
               ()
[...2038 lines suppressed...]
    valueByLanguage[0]="REMISE DU TEMPS AU MOT CLE TEMPS INITIAL";
    valueByLanguage[1]="INITIAL TIME SET ACCORDING TO KEYWORD INITIAL TIME";
    entiteSimple=new DicoEntite.Simple(valueByLanguage[languageIndex_],typeBinaire);
    entiteSimple.setNiveau(2);
    valueByLanguage[0]="Remet le temps au mot cle temps initial en cas de suite"
    +"\nde calcul";
    valueByLanguage[1]="Initial time set to the intial time keyword  in case"
    +"\nof restart";
    entiteSimple.setAide(valueByLanguage[languageIndex_]);
    valueByLanguage[0]="Parametres de la simulation";
    valueByLanguage[1]="Computation parameters";
    entiteSimple.setRubrique(valueByLanguage[languageIndex_]);
    valueByLanguage[0]="false";
    valueByLanguage[1]="false";
    entiteSimple.setDefautValue(valueByLanguage[languageIndex_]);
    entites[90]=entiteSimple.getImmutable();

    return entites;
  }
}

--- DicoPostel3dv5p3.java DELETED ---

--- NEW FILE: DicoStbtelv5p4.java ---
/* 
 *File generated by fudaa
 */

package 
    org.fudaa.dodico.telemac.dico;

import org.fudaa.dodico.dico.*;
/**
 * @author deniger
 */

public class 
    DicoStbtelv5p4
    extends DicoModelAbstract
{
 public
    DicoStbtelv5p4
               ()
[...1060 lines suppressed...]

    valueByLanguage[0]="EXECUTABLE PARALLELE PAR DEFAUT";
    valueByLanguage[1]="DEFAULT PARALLEL EXECUTABLE";
    entiteTableau=new DicoEntite.Tableau(valueByLanguage[languageIndex_],typeChaine);
    entiteTableau.setTaille(1);
    entiteTableau.setNiveau(1);
    valueByLanguage[0]="Executable parallele par defaut de Stbtel";
    valueByLanguage[1]="Default parallel executable for Stbtel";
    entiteTableau.setAide(valueByLanguage[languageIndex_]);
    valueByLanguage[0]="ENTREES-SORTIES, GENERALITES";
    valueByLanguage[1]="INPUT-OUTPUT, INFORMATION";
    entiteTableau.setRubrique(valueByLanguage[languageIndex_]);
    valueByLanguage[0]="stbtel|stbtel_VVV|PPP|stbtelMMMVVV_MP.exe";
    valueByLanguage[1]="stbtel|stbtel_VVV|PPP|stbtelMMMVVV_MP.exe";
    entiteTableau.setDefautValue(valueByLanguage[languageIndex_]);
    entites[42]=entiteTableau.getImmutable();

    return entites;
  }
}

--- DicoEstel2dv5p3.java DELETED ---

--- DicoTelemac3dv5p3.java DELETED ---

--- DicoArtemisv5p3.java DELETED ---

--- DicoSubief2dv5p3.java DELETED ---

--- NEW FILE: DicoTomawacv5p4.java ---
/* 
 *File generated by fudaa
 */

package 
    org.fudaa.dodico.telemac.dico;

import org.fudaa.dodico.dico.*;
/**
 * @author deniger
 */

public class 
    DicoTomawacv5p4
    extends DicoModelAbstract
{
 public
    DicoTomawacv5p4
               ()
[...5442 lines suppressed...]
    valueByLanguage[0]="Indique si l'utilisateur souhaite discretiser"
    +"\nle spectre en frequences"
    +"\n**Mots-cles associes :**"
    +"\nNOMBRE DE FREQUENCES DE DISCRETISATION";
    valueByLanguage[1]="Indicates whether the user wants to discretize"
    +"\nthe spectrum in frequencies"
    +"\n**Related keyword :**"
    +"\nNUMBER OF FREQUENCIES";
    entiteSimple.setAide(valueByLanguage[languageIndex_]);
    valueByLanguage[0]="PARAMETRAGE GENERAL";
    valueByLanguage[1]="GENERAL PARAMATERIZATION";
    entiteSimple.setRubrique(valueByLanguage[languageIndex_]);
    valueByLanguage[0]="false";
    valueByLanguage[1]="false";
    entiteSimple.setDefautValue(valueByLanguage[languageIndex_]);
    entites[182]=entiteSimple.getImmutable();

    return entites;
  }
}

--- NEW FILE: DicoSubief3dv5p4.java ---
/* 
 *File generated by fudaa
 */

package 
    org.fudaa.dodico.telemac.dico;

import org.fudaa.dodico.dico.*;
/**
 * @author deniger
 */

public class 
    DicoSubief3dv5p4
    extends DicoModelAbstract
{
 public
    DicoSubief3dv5p4
               ()
[...2291 lines suppressed...]
    typeBinaire=DicoDataType.Binaire.EMPTY;

    valueByLanguage[0]="VITESSE DE CHUTE VARIABLE";
    valueByLanguage[1]="VARIABLE SETTLING VELOCITY";
    entiteSimple=new DicoEntite.Simple(valueByLanguage[languageIndex_],typeBinaire);
    entiteSimple.setNiveau(1);
    valueByLanguage[0]="Determine si la vitesse de chute est variable en espace";
    valueByLanguage[1]="Determine si la vitesse de chute est variable en espace";
    entiteSimple.setAide(valueByLanguage[languageIndex_]);
    valueByLanguage[0]="general";
    valueByLanguage[1]="general";
    entiteSimple.setRubrique(valueByLanguage[languageIndex_]);
    valueByLanguage[0]="false";
    valueByLanguage[1]="false";
    entiteSimple.setDefautValue(valueByLanguage[languageIndex_]);
    entites[103]=entiteSimple.getImmutable();

    return entites;
  }
}

--- NEW FILE: DicoPostel3dv5p4.java ---
/* 
 *File generated by fudaa
 */

package 
    org.fudaa.dodico.telemac.dico;

import org.fudaa.dodico.dico.*;
/**
 * @author deniger
 */

public class 
    DicoPostel3dv5p4
    extends DicoModelAbstract
{
 public
    DicoPostel3dv5p4
               ()
[...977 lines suppressed...]
    valueByLanguage[0]="EXECUTABLE PAR DEFAUT";
    valueByLanguage[1]="DEFAULT EXECUTABLE";
    entiteTableau=new DicoEntite.Tableau(valueByLanguage[languageIndex_],typeChaine);
    entiteTableau.setTaille(1);
    entiteTableau.setDynamique(true);
    entiteTableau.setNiveau(1);
    valueByLanguage[0]="Executable par defaut de POSTEL-3D";
    valueByLanguage[1]="default executable for POSTEL-3D";
    entiteTableau.setAide(valueByLanguage[languageIndex_]);
    valueByLanguage[0]="ENTREES-SORTIES, GENERALITES";
    valueByLanguage[1]="INPUT-OUTPUT, INFORMATION";
    entiteTableau.setRubrique(valueByLanguage[languageIndex_]);
    valueByLanguage[0]="postel3d|postel3d_VVV|PPP|postel3dMMMVVV.exe";
    valueByLanguage[1]="postel3d|postel3d_VVV|PPP|postel3dMMMVVV.exe";
    entiteTableau.setDefautValue(valueByLanguage[languageIndex_]);
    entites[46]=entiteTableau.getImmutable();

    return entites;
  }
}

--- DicoEstel3dv5p3.java DELETED ---

--- DicoSisyphev5p3.java DELETED ---

--- DicoSubief3dv5p3.java DELETED ---

--- DicoStbtelv5p3.java DELETED ---

--- NEW FILE: DicoEstel2dv5p4.java ---
/* 
 *File generated by fudaa
 */

package 
    org.fudaa.dodico.telemac.dico;

import org.fudaa.dodico.dico.*;
/**
 * @author deniger
 */

public class 
    DicoEstel2dv5p4
    extends DicoModelAbstract
{
 public
    DicoEstel2dv5p4
               ()
[...1931 lines suppressed...]
    valueByLanguage[1]="false";
    entiteSimple.setDefautValue(valueByLanguage[languageIndex_]);
    entites[135]=entiteSimple.getImmutable();


    //start VITESSE IMPOSEE UNIFORME POUR LE TRANSPORT 1D DANS UNE COLONNE
    typeBinaire=DicoDataType.Binaire.EMPTY;

    valueByLanguage[0]="VITESSE IMPOSEE UNIFORME POUR LE TRANSPORT 1D DANS UNE COLONNE";
    valueByLanguage[1]="UNIFORM IMPOSED VELOCITY FOR 1D TRANSPORT IN A COLUMN";
    entiteSimple=new DicoEntite.Simple(valueByLanguage[languageIndex_],typeBinaire);
    entiteSimple.setNiveau(0);
    valueByLanguage[0]="false";
    valueByLanguage[1]="false";
    entiteSimple.setDefautValue(valueByLanguage[languageIndex_]);
    entites[136]=entiteSimple.getImmutable();

    return entites;
  }
}

--- DicoTomawacv5p3.java DELETED ---

--- NEW FILE: DicoTelemac2dv5p4.java ---
/* 
 *File generated by fudaa
 */

package 
    org.fudaa.dodico.telemac.dico;

import org.fudaa.dodico.dico.*;
/**
 * @author deniger
 */

public class 
    DicoTelemac2dv5p4
    extends DicoModelAbstract
{
 public
    DicoTelemac2dv5p4
               ()
[...4779 lines suppressed...]
    valueByLanguage[0]="EXECUTABLE PAR DEFAUT";
    valueByLanguage[1]="DEFAULT EXECUTABLE";
    entiteTableau=new DicoEntite.Tableau(valueByLanguage[languageIndex_],typeChaine);
    entiteTableau.setTaille(1);
    entiteTableau.setDynamique(true);
    entiteTableau.setNiveau(1);
    valueByLanguage[0]="Executable par defaut de T2D";
    valueByLanguage[1]="Default executable for T2D";
    entiteTableau.setAide(valueByLanguage[languageIndex_]);
    valueByLanguage[0]="ENTREES-SORTIES, GENERALITES";
    valueByLanguage[1]="INPUT-OUTPUT, INFORMATION";
    entiteTableau.setRubrique(valueByLanguage[languageIndex_]);
    valueByLanguage[0]="telemac2d|tel2d_VVV|PPP|telemac2dMMMVVV.exe";
    valueByLanguage[1]="telemac2d|tel2d_VVV|PPP|telemac2dMMMVVV.exe";
    entiteTableau.setDefautValue(valueByLanguage[languageIndex_]);
    entites[196]=entiteTableau.getImmutable();

    return entites;
  }
}

--- NEW FILE: DicoTelemac3dv5p4.java ---
/* 
 *File generated by fudaa
 */

package 
    org.fudaa.dodico.telemac.dico;

import org.fudaa.dodico.dico.*;
/**
 * @author deniger
 */

public class 
    DicoTelemac3dv5p4
    extends DicoModelAbstract
{
 public
    DicoTelemac3dv5p4
               ()
[...5118 lines suppressed...]
    valueByLanguage[0]="EXECUTABLE PAR DEFAUT";
    valueByLanguage[1]="DEFAULT EXECUTABLE";
    entiteTableau=new DicoEntite.Tableau(valueByLanguage[languageIndex_],typeChaine);
    entiteTableau.setTaille(1);
    entiteTableau.setDynamique(true);
    entiteTableau.setNiveau(1);
    valueByLanguage[0]="Executable par defaut de T3D";
    valueByLanguage[1]="Default executable for T3D";
    entiteTableau.setAide(valueByLanguage[languageIndex_]);
    valueByLanguage[0]="ENTREES-SORTIES, GENERALITES";
    valueByLanguage[1]="INPUT-OUTPUT, INFORMATION";
    entiteTableau.setRubrique(valueByLanguage[languageIndex_]);
    valueByLanguage[0]="telemac3d|tel3d_VVV|PPP|telemac3dMMMVVV.exe";
    valueByLanguage[1]="telemac3d|tel3d_VVV|PPP|telemac3dMMMVVV.exe";
    entiteTableau.setDefautValue(valueByLanguage[languageIndex_]);
    entites[220]=entiteTableau.getImmutable();

    return entites;
  }
}

--- NEW FILE: DicoSubief2dv5p4.java ---
/* 
 *File generated by fudaa
 */

package 
    org.fudaa.dodico.telemac.dico;

import org.fudaa.dodico.dico.*;
/**
 * @author deniger
 */

public class 
    DicoSubief2dv5p4
    extends DicoModelAbstract
{
 public
    DicoSubief2dv5p4
               ()
[...1581 lines suppressed...]
    valueByLanguage[0]="EXECUTABLE PAR DEFAUT";
    valueByLanguage[1]="DEFAULT EXECUTABLE";
    entiteTableau=new DicoEntite.Tableau(valueByLanguage[languageIndex_],typeChaine);
    entiteTableau.setTaille(1);
    entiteTableau.setDynamique(true);
    entiteTableau.setNiveau(1);
    valueByLanguage[0]="Executable par defaut de SUBIEF2D";
    valueByLanguage[1]="Default executable for SUBIEF2D";
    entiteTableau.setAide(valueByLanguage[languageIndex_]);
    valueByLanguage[0]="ENTREES-SORTIES, GENERALITES";
    valueByLanguage[1]="INPUT-OUTPUT, INFORMATION";
    entiteTableau.setRubrique(valueByLanguage[languageIndex_]);
    valueByLanguage[0]="subief2d|subief2d_VVV|PPP|subief2dMMMVVV.exe";
    valueByLanguage[1]="subief2d|subief2d_VVV|PPP|subief2dMMMVVV.exe";
    entiteTableau.setDefautValue(valueByLanguage[languageIndex_]);
    entites[86]=entiteTableau.getImmutable();

    return entites;
  }
}

--- DicoTelemac2dv5p3.java DELETED ---

--- NEW FILE: DicoArtemisv5p4.java ---
/* 
 *File generated by fudaa
 */

package 
    org.fudaa.dodico.telemac.dico;

import org.fudaa.dodico.dico.*;
/**
 * @author deniger
 */

public class 
    DicoArtemisv5p4
    extends DicoModelAbstract
{
 public
    DicoArtemisv5p4
               ()
[...2561 lines suppressed...]
    valueByLanguage[0]="EXECUTABLE PAR DEFAUT";
    valueByLanguage[1]="DEFAULT EXECUTABLE";
    entiteTableau=new DicoEntite.Tableau(valueByLanguage[languageIndex_],typeChaine);
    entiteTableau.setTaille(1);
    entiteTableau.setDynamique(true);
    entiteTableau.setNiveau(1);
    valueByLanguage[0]="Executable par defaut de ARTEMIS";
    valueByLanguage[1]="Default executable for ARTEMIS";
    entiteTableau.setAide(valueByLanguage[languageIndex_]);
    valueByLanguage[0]="ENTREES-SORTIES, GENERALITES";
    valueByLanguage[1]="INPUT-OUTPUT, INFORMATION";
    entiteTableau.setRubrique(valueByLanguage[languageIndex_]);
    valueByLanguage[0]="artemis|arte_VVV|PPP|artemisMMMVVV.exe";
    valueByLanguage[1]="artemis|arte_VVV|PPP|artemisMMMVVV.exe";
    entiteTableau.setDefautValue(valueByLanguage[languageIndex_]);
    entites[100]=entiteTableau.getImmutable();

    return entites;
  }
}

--- NEW FILE: DicoSisyphev5p4.java ---
/* 
 *File generated by fudaa
 */

package 
    org.fudaa.dodico.telemac.dico;

import org.fudaa.dodico.dico.*;
/**
 * @author deniger
 */

public class 
    DicoSisyphev5p4
    extends DicoModelAbstract
{
 public
    DicoSisyphev5p4
               ()
[...2625 lines suppressed...]
    typeBinaire=DicoDataType.Binaire.EMPTY;

    valueByLanguage[0]="PRISE EN COMPTE DE LA HOULE";
    valueByLanguage[1]="EFFECT OF WAVES";
    entiteSimple=new DicoEntite.Simple(valueByLanguage[languageIndex_],typeBinaire);
    entiteSimple.setNiveau(1);
    valueByLanguage[0]="Prend en compte l'effet de la houle sur le transport solide";
    valueByLanguage[1]="Takes into account the effect of waves";
    entiteSimple.setAide(valueByLanguage[languageIndex_]);
    valueByLanguage[0]="PARAMETRES NUMERIQUES";
    valueByLanguage[1]="PARAMETRES NUMERIQUES";
    entiteSimple.setRubrique(valueByLanguage[languageIndex_]);
    valueByLanguage[0]="false";
    valueByLanguage[1]="false";
    entiteSimple.setDefautValue(valueByLanguage[languageIndex_]);
    entites[106]=entiteSimple.getImmutable();

    return entites;
  }
}