[Fudaa-cvs-commit] fudaa_devel/dodico/src/org/fudaa/dodico/telemac/io TelemacDicoFileFormatVersion.java,1.9,1.10 TelemacLiquideFileFormat.java,1.9,1.10

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

Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/telemac/io
In directory sc8-pr-cvs1:/tmp/cvs-serv14635/telemac/io

Modified Files:
	TelemacDicoFileFormatVersion.java 
	TelemacLiquideFileFormat.java 
Log Message:
Maj version 0.04


Index: TelemacDicoFileFormatVersion.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/telemac/io/TelemacDicoFileFormatVersion.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** TelemacDicoFileFormatVersion.java	19 Dec 2003 12:10:37 -0000	1.9
--- TelemacDicoFileFormatVersion.java	21 Jan 2004 10:59:10 -0000	1.10
***************
*** 50,54 ****
        _l.add(clEntite_);
      if ((gridEntite_ != null) && (!_i.isValueSetFor(gridEntite_)))
!       _l.add(clEntite_);
    }
    public DicoCasFileFormat getDicoFileFormat() {
--- 50,54 ----
        _l.add(clEntite_);
      if ((gridEntite_ != null) && (!_i.isValueSetFor(gridEntite_)))
!       _l.add(gridEntite_);
    }
    public DicoCasFileFormat getDicoFileFormat() {

Index: TelemacLiquideFileFormat.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/telemac/io/TelemacLiquideFileFormat.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** TelemacLiquideFileFormat.java	19 Dec 2003 12:10:37 -0000	1.9
--- TelemacLiquideFileFormat.java	21 Jan 2004 10:59:10 -0000	1.10
***************
*** 9,12 ****
--- 9,13 ----
  package org.fudaa.dodico.telemac.io;
  import java.io.File;
+ import java.util.Map;
  
  import org.fudaa.dodico.commun.ProgressionInterface;
***************
*** 36,42 ****
    protected TelemacLiquideFileFormat() {
      super(NB_FILE);
!     extensions_= new String[] { "liq" };
      ID_= "TELEMAC_FL";
!     nom_= H2dResource.getS("Frontières Liquides (Télémac)");
      description_=
        H2dResource.getS(
--- 37,43 ----
    protected TelemacLiquideFileFormat() {
      super(NB_FILE);
!     extensions_= new String[] { "liq","txt" };
      ID_= "TELEMAC_FL";
!     nom_= H2dResource.getS("Télémac frontières liquides");
      description_=
        H2dResource.getS(
***************
*** 94,98 ****
      public FileOperationSynthese readEvolutions(
        File _f,
!       ProgressionInterface _prog) {
        FileOperationSynthese op= read(_f, _prog);
        TelemacLiquideInterface source= (TelemacLiquideInterface)op.getSource();
--- 95,99 ----
      public FileOperationSynthese readEvolutions(
        File _f,
!       ProgressionInterface _prog,Map _options) {
        FileOperationSynthese op= read(_f, _prog);
        TelemacLiquideInterface source= (TelemacLiquideInterface)op.getSource();