[Fudaa-cvs-commit] fudaa_devel/dodico/src/org/fudaa/dodico/telemac/io SerafinExtract.java,1.1,1.2 SerafinReader.java,1.2,1.3 SerafinWriter.java,1.2,1.3 TelemacCLReader.java,1.2,1.3

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

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

Modified Files:
	SerafinExtract.java SerafinReader.java SerafinWriter.java 
	TelemacCLReader.java 
Log Message:
Maj des imports


Index: SerafinExtract.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/telemac/io/SerafinExtract.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SerafinExtract.java	1 Apr 2003 13:45:44 -0000	1.1
--- SerafinExtract.java	11 Apr 2003 16:09:19 -0000	1.2
***************
*** 10,17 ****
  
  import org.fudaa.dodico.commun.DodicoLib;
- import org.fudaa.dodico.corba.tr.STrConditionLimite;
  import org.fudaa.dodico.corba.tr.STrProprieteNodale;
  import org.fudaa.dodico.corba.tr.STrProprieteNodaleValeur;
- import org.fudaa.dodico.tr.TrProjetH2d;
  
  /**
--- 10,15 ----

Index: SerafinReader.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/telemac/io/SerafinReader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SerafinReader.java	1 Apr 2003 13:45:44 -0000	1.2
--- SerafinReader.java	11 Apr 2003 16:09:20 -0000	1.3
***************
*** 252,256 ****
      inter_.setIparam(iparam);
      //Idate
!     if (format_.isIdateDefini(iparam))
      {
        in.readRecord();
--- 252,256 ----
      inter_.setIparam(iparam);
      //Idate
!     if (SerafinKeyWord.isIdateDefini(iparam))
      {
        in.readRecord();
***************
*** 362,366 ****
       *  (sauf le premier car deja lus par la methode in.readRecord())
       */
!     if (format_.isFormatEnColonne(iparam))
      {
  
--- 362,366 ----
       *  (sauf le premier car deja lus par la methode in.readRecord())
       */
!     if (SerafinKeyWord.isFormatEnColonne(iparam))
      {
  
***************
*** 402,406 ****
        for (int i = 0; i < nbv1; i++)
        {
!         if (format_.isFormatEnColonne(iparam))
            in.readRecord();
          donnees = new double[npoin1];
--- 402,406 ----
        for (int i = 0; i < nbv1; i++)
        {
!         if (SerafinKeyWord.isFormatEnColonne(iparam))
            in.readRecord();
          donnees = new double[npoin1];

Index: SerafinWriter.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/telemac/io/SerafinWriter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SerafinWriter.java	1 Apr 2003 13:45:44 -0000	1.2
--- SerafinWriter.java	11 Apr 2003 16:09:21 -0000	1.3
***************
*** 10,13 ****
--- 10,14 ----
  import java.io.File;
  import java.io.FileNotFoundException;
+ import java.io.FileOutputStream;
  import java.io.IOException;
  import java.io.OutputStream;
***************
*** 24,29 ****
  import org.fudaa.dodico.tr.TrWriterInterface;
  
- import java.io.FileOutputStream;
- 
  /**
   * Classe permettant d'ecrire un fichier serafin (utilise un buffer pour
--- 25,28 ----
***************
*** 143,148 ****
          _initAnalyze().addTranslateError(
            "Le tableau des parametres est invalide");
!       boolean isIdateDefini = format_.isIdateDefini(iparam);
!       boolean isFormatColonne = format_.isFormatEnColonne(iparam);
        int nbPasTemps = donnees_.getNbPasDeTemps();
        if (nbPasTemps <= 0)
--- 142,147 ----
          _initAnalyze().addTranslateError(
            "Le tableau des parametres est invalide");
!       boolean isIdateDefini = SerafinKeyWord.isIdateDefini(iparam);
!       boolean isFormatColonne = SerafinKeyWord.isFormatEnColonne(iparam);
        int nbPasTemps = donnees_.getNbPasDeTemps();
        if (nbPasTemps <= 0)

Index: TelemacCLReader.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/telemac/io/TelemacCLReader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TelemacCLReader.java	1 Apr 2003 13:45:44 -0000	1.2
--- TelemacCLReader.java	11 Apr 2003 16:09:21 -0000	1.3
***************
*** 21,26 ****
  import org.fudaa.dodico.tr.TrReaderCharSimpleAbstract;
  
- import com.memoire.fu.FuVectorint;
- 
  /**
   * 
--- 21,24 ----