[Fudaa-cvs-commit] fudaa_devel/dodico/src/org/fudaa/dodico/fichiers FileFormatVersion.java,1.2,1.3 FileOpReadCharSimpleAbstract.java,1.2,1.3 FileReadOperationAbstract.java,1.1,1.2 FileWriteOperationAbstract.java,1.1,1.2 MaillageCORELEBTH.java,1.4,1.5

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

Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/fichiers
In directory sc8-pr-cvs1:/tmp/cvs-serv9006/fichiers

Modified Files:
	FileFormatVersion.java FileOpReadCharSimpleAbstract.java 
	FileReadOperationAbstract.java FileWriteOperationAbstract.java 
	MaillageCORELEBTH.java 
Log Message:
Correction bug 797184
Amelioration lecture format reflux/telemac


Index: FileFormatVersion.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/fichiers/FileFormatVersion.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FileFormatVersion.java	22 Aug 2003 15:51:12 -0000	1.2
--- FileFormatVersion.java	2 Sep 2003 08:41:24 -0000	1.3
***************
*** 84,90 ****
    public FileOperationSynthese read(File _f, ProgressionInterface _prog) {
      FileReadOperationAbstract i= createReader();
!     i.setFile(_f);
!     i.setProgressReceiver(_prog);
!     FileOperationSynthese r= i.read();
      i.setProgressReceiver(null);
      return r;
--- 84,88 ----
    public FileOperationSynthese read(File _f, ProgressionInterface _prog) {
      FileReadOperationAbstract i= createReader();
!     FileOperationSynthese r= i.read(_f,_prog);
      i.setProgressReceiver(null);
      return r;
***************
*** 96,102 ****
      ProgressionInterface _prog) {
      FileWriteOperationAbstract i= createWriter();
!     i.setFile(_f);
!     i.setProgressReceiver(_prog);
!     FileOperationSynthese r= i.write(_source);
      i.setProgressReceiver(null);
      return r;
--- 94,98 ----
      ProgressionInterface _prog) {
      FileWriteOperationAbstract i= createWriter();
!     FileOperationSynthese r= i.write(_source,_f,_prog);
      i.setProgressReceiver(null);
      return r;

Index: FileOpReadCharSimpleAbstract.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/fichiers/FileOpReadCharSimpleAbstract.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FileOpReadCharSimpleAbstract.java	22 Aug 2003 15:51:12 -0000	1.2
--- FileOpReadCharSimpleAbstract.java	2 Sep 2003 08:41:24 -0000	1.3
***************
*** 29,33 ****
    protected FortranReader in_;
  
!   public final void setFile(File _f) {
      analyze_= new DodicoAnalyze.Editor();
      analyze_.setRessource(_f.getAbsolutePath());
--- 29,33 ----
    protected FortranReader in_;
  
!   public void setFile(File _f) {
      analyze_= new DodicoAnalyze.Editor();
      analyze_.setRessource(_f.getAbsolutePath());

Index: FileReadOperationAbstract.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/fichiers/FileReadOperationAbstract.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FileReadOperationAbstract.java	22 Aug 2003 15:51:12 -0000	1.1
--- FileReadOperationAbstract.java	2 Sep 2003 08:41:24 -0000	1.2
***************
*** 9,13 ****
--- 9,16 ----
  package org.fudaa.dodico.fichiers;
  
+ import java.io.File;
+ 
  import org.fudaa.dodico.commun.DodicoLib;
+ import org.fudaa.dodico.commun.ProgressionInterface;
  
  /**
***************
*** 15,19 ****
   * @version $Id$
   */
! public abstract class FileReadOperationAbstract extends FileOperationAbstract{
  
    protected abstract Object _read();
--- 18,22 ----
   * @version $Id$
   */
! public abstract class FileReadOperationAbstract extends FileOperationAbstract {
  
    protected abstract Object _read();
***************
*** 23,29 ****
--- 26,41 ----
     */
    public final FileOperationSynthese read() {
+     if (progress_ != null)
+       progress_.setDesc(
+         getOperationDescription() + DodicoLib.ESPACE + getVersion());
      return closeOperation(_read());
    }
    
+   public final FileOperationSynthese read(File _f,ProgressionInterface _inter){
+     setFile(_f);
+     setProgressReceiver(_inter);
+     return read();
+   }
+ 
    /**
     *
***************
*** 32,37 ****
      return DodicoLib.geti18n("Lecture");
    }
- 
-   
  
  }
--- 44,47 ----

Index: FileWriteOperationAbstract.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/fichiers/FileWriteOperationAbstract.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FileWriteOperationAbstract.java	22 Aug 2003 15:51:12 -0000	1.1
--- FileWriteOperationAbstract.java	2 Sep 2003 08:41:24 -0000	1.2
***************
*** 9,13 ****
--- 9,16 ----
  package org.fudaa.dodico.fichiers;
  
+ import java.io.File;
+ 
  import org.fudaa.dodico.commun.DodicoLib;
+ import org.fudaa.dodico.commun.ProgressionInterface;
  
  /**
***************
*** 24,30 ****
    */
    public final FileOperationSynthese write(Object _o) {
! 
      _write(_o);
      return closeOperation(_o);
    }
  
--- 27,41 ----
    */
    public final FileOperationSynthese write(Object _o) {
!     if (progress_ != null)
!       progress_.setDesc(
!         getOperationDescription() + DodicoLib.ESPACE + getVersion());
      _write(_o);
      return closeOperation(_o);
+   }
+   
+   public final FileOperationSynthese write(Object _o,File _f,ProgressionInterface _inter){
+     setFile(_f);
+     setProgressReceiver(_inter);
+     return write(_o);
    }
  

Index: MaillageCORELEBTH.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/fichiers/MaillageCORELEBTH.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MaillageCORELEBTH.java	4 Jul 2003 12:39:45 -0000	1.4
--- MaillageCORELEBTH.java	2 Sep 2003 08:41:24 -0000	1.5
***************
*** 10,25 ****
  package org.fudaa.dodico.fichiers;
  
! import java.io.*;
! import java.util.*;
  
! import org.fudaa.dodico.objet.*;
! import org.fudaa.dodico.usine.UsineHelper;
! import org.fudaa.dodico.corba.objet.*;
  import org.fudaa.dodico.corba.usine.IUsine;
! import org.fudaa.dodico.corba.geometrie.*;
! import org.fudaa.dodico.fortran.*;
! import org.fudaa.dodico.ef.*;
! import org.fudaa.dodico.geometrie.*;
! import org.fudaa.dodico.corba.ef.*;
  
  /**
--- 10,35 ----
  package org.fudaa.dodico.fichiers;
  
! import java.io.File;
! import java.io.FileNotFoundException;
! import java.io.FileReader;
! import java.io.FileWriter;
! import java.io.IOException;
! import java.util.ArrayList;
! import java.util.Collections;
! import java.util.Comparator;
! import java.util.Iterator;
! import java.util.List;
  
! import org.fudaa.dodico.corba.ef.IElement;
! import org.fudaa.dodico.corba.ef.IMaillage;
! import org.fudaa.dodico.corba.ef.INoeud;
! import org.fudaa.dodico.corba.geometrie.IPoint;
! import org.fudaa.dodico.corba.geometrie.LTypeElement;
  import org.fudaa.dodico.corba.usine.IUsine;
! 
! import org.fudaa.dodico.fortran.FortranReader;
! import org.fudaa.dodico.fortran.FortranWriter;
! import org.fudaa.dodico.objet.CDodico;
! import org.fudaa.dodico.usine.UsineHelper;
  
  /**