[Fudaa-cvs-commit] fudaa_devel/dodico/src/org/fudaa/dodico/fichiers FileOpReadCharSimpleAbstract.java,1.5,1.6 FileOpWriterCharSimpleAbstract.java,1.5,1.6 FileOperationAbstract.java,1.6,1.7 FileOperationSynthese.java,1.6,1.7 FileReadOperationAbstract.java,1.5,1.6 FileWriteOperationAbstract.java,1.6,1.7

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

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

Modified Files:
	FileOpReadCharSimpleAbstract.java 
	FileOpWriterCharSimpleAbstract.java FileOperationAbstract.java 
	FileOperationSynthese.java FileReadOperationAbstract.java 
	FileWriteOperationAbstract.java 
Log Message:
Maj version 0.05 prepro


Index: FileOpReadCharSimpleAbstract.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/fichiers/FileOpReadCharSimpleAbstract.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** FileOpReadCharSimpleAbstract.java	25 Nov 2003 10:11:34 -0000	1.5
--- FileOpReadCharSimpleAbstract.java	12 Feb 2004 15:32:44 -0000	1.6
***************
*** 25,34 ****
    extends FileReadOperationAbstract {
    protected FortranReader in_;
    public void setFile(File _f) {
!     analyze_= new DodicoAnalyze.Editor();
      analyze_.setRessource(_f.getAbsolutePath());
      FileReader r= null;
      try {
        r= new FileReader(_f);
      } catch (FileNotFoundException _e) {
        analyze_.addFatalError(DodicoResource.getS("Fichier inconnu"));
--- 25,36 ----
    extends FileReadOperationAbstract {
    protected FortranReader in_;
+   
    public void setFile(File _f) {
!     analyze_= new DodicoAnalyze();
      analyze_.setRessource(_f.getAbsolutePath());
      FileReader r= null;
      try {
        r= new FileReader(_f);
+       processFile(_f);
      } catch (FileNotFoundException _e) {
        analyze_.addFatalError(DodicoResource.getS("Fichier inconnu"));
***************
*** 37,40 ****
--- 39,46 ----
        setFile(r);
    }
+   
+   protected void processFile(File _f){
+     
+   }
    public final void setFile(File[] _f) {
      setFile(_f[0]);

Index: FileOpWriterCharSimpleAbstract.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/fichiers/FileOpWriterCharSimpleAbstract.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** FileOpWriterCharSimpleAbstract.java	12 Dec 2003 10:30:53 -0000	1.5
--- FileOpWriterCharSimpleAbstract.java	12 Feb 2004 15:32:44 -0000	1.6
***************
*** 60,64 ****
    }
    public final void setFile(File _f) {
!     analyze_= new DodicoAnalyze.Editor();
      analyze_.setRessource(_f.getAbsolutePath());
      FileWriter out= null;
--- 60,64 ----
    }
    public final void setFile(File _f) {
!     analyze_= new DodicoAnalyze();
      analyze_.setRessource(_f.getAbsolutePath());
      FileWriter out= null;

Index: FileOperationAbstract.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/fichiers/FileOperationAbstract.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** FileOperationAbstract.java	12 Dec 2003 10:30:53 -0000	1.6
--- FileOperationAbstract.java	12 Feb 2004 15:32:44 -0000	1.7
***************
*** 27,31 ****
  public abstract class FileOperationAbstract {
    protected ProgressionInterface progress_;
!   protected DodicoAnalyze.Editor analyze_;
    public void setProgressReceiver(ProgressionInterface _progressReceiver) {
      progress_= _progressReceiver;
--- 27,31 ----
  public abstract class FileOperationAbstract {
    protected ProgressionInterface progress_;
!   protected DodicoAnalyze analyze_;
    public void setProgressReceiver(ProgressionInterface _progressReceiver) {
      progress_= _progressReceiver;
***************
*** 34,38 ****
    protected abstract FortranInterface getFortranInterface();
    public abstract void setFile(File _f);
!   public abstract FileFormatVersion getVersion();
    protected final FileOperationSynthese closeOperation(Object _o) {
      FileOperationSynthese r= new FileOperationSynthese();
--- 34,38 ----
    protected abstract FortranInterface getFortranInterface();
    public abstract void setFile(File _f);
! //  public abstract FileFormatVersion getVersion();
    protected final FileOperationSynthese closeOperation(Object _o) {
      FileOperationSynthese r= new FileOperationSynthese();
***************
*** 41,49 ****
      r.setFileOp(out);
      analyze_.setDesc(
!       getOperationDescription()
!         + CtuluLib.EMPTY_STRING
!         + DodicoResource.getS("Format")
!         + ": "
!         + getVersion());
      r.setAnalyze(analyze_);
      r.setSource(_o);
--- 41,46 ----
      r.setFileOp(out);
      analyze_.setDesc(
!       getOperationDescription());
! 
      r.setAnalyze(analyze_);
      r.setSource(_o);

Index: FileOperationSynthese.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/fichiers/FileOperationSynthese.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** FileOperationSynthese.java	25 Nov 2003 10:11:34 -0000	1.6
--- FileOperationSynthese.java	12 Feb 2004 15:32:44 -0000	1.7
***************
*** 19,28 ****
  public class FileOperationSynthese {
    private String exClose_;
!   private DodicoAnalyze.Editor analyze_;
    FortranInterface fileOp_;
    private Object source_;
    public void printAnalyze() {
      if (analyze_ != null)
!       analyze_.toAnalyze().printResume();
      else
        System.out.println("No error");
--- 19,28 ----
  public class FileOperationSynthese {
    private String exClose_;
!   private DodicoAnalyze analyze_;
    FortranInterface fileOp_;
    private Object source_;
    public void printAnalyze() {
      if (analyze_ != null)
!       analyze_.printResume();
      else
        System.out.println("No error");
***************
*** 36,40 ****
    //  }
    public FileOperationSynthese() {}
!   public DodicoAnalyze.Editor getAnalyze() {
      return analyze_;
    }
--- 36,40 ----
    //  }
    public FileOperationSynthese() {}
!   public DodicoAnalyze getAnalyze() {
      return analyze_;
    }
***************
*** 81,85 ****
     *
     */
!   public void setAnalyze(DodicoAnalyze.Editor _editor) {
      analyze_= _editor;
    }
--- 81,85 ----
     *
     */
!   public void setAnalyze(DodicoAnalyze _editor) {
      analyze_= _editor;
    }

Index: FileReadOperationAbstract.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/fichiers/FileReadOperationAbstract.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** FileReadOperationAbstract.java	12 Dec 2003 10:30:53 -0000	1.5
--- FileReadOperationAbstract.java	12 Feb 2004 15:32:44 -0000	1.6
***************
*** 21,30 ****
    protected abstract Object _read();
    /**
!    *
     */
    public final FileOperationSynthese read() {
      if (progress_ != null)
!       progress_.setDesc(
!         getOperationDescription() + CtuluLib.ESPACE + getVersion());
      return closeOperation(_read());
    }
--- 21,30 ----
    protected abstract Object _read();
    /**
!    * lit le fichier et ferme le flux. Pour recuperer les donnees,
!    * il suffit d'utiliser getSource.
     */
    public final FileOperationSynthese read() {
      if (progress_ != null)
!       progress_.setDesc(getOperationDescription());
      return closeOperation(_read());
    }
***************
*** 40,44 ****
     */
    protected String getOperationDescription() {
!     return DodicoResource.getS("Lecture");
    }
  }
--- 40,46 ----
     */
    protected String getOperationDescription() {
!     return DodicoResource.getS("Lecture")
!       + CtuluLib.EMPTY_STRING
!       + analyze_.getResource();
    }
  }

Index: FileWriteOperationAbstract.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/fichiers/FileWriteOperationAbstract.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** FileWriteOperationAbstract.java	12 Dec 2003 10:30:53 -0000	1.6
--- FileWriteOperationAbstract.java	12 Feb 2004 15:32:44 -0000	1.7
***************
*** 26,31 ****
    public final FileOperationSynthese write(Object _o) {
      if (progress_ != null)
!       progress_.setDesc(
!         getOperationDescription() + CtuluLib.ESPACE + getVersion());
      _write(_o);
      return closeOperation(_o);
--- 26,30 ----
    public final FileOperationSynthese write(Object _o) {
      if (progress_ != null)
!       progress_.setDesc(getOperationDescription());
      _write(_o);
      return closeOperation(_o);
***************
*** 43,51 ****
     */
    protected String getOperationDescription() {
!     return DodicoResource.getS("Ecriture");
    }
    protected void _donneesInvalides(Object _o) {
      analyze_.addFatalError(DodicoResource.getS("Données invalides"));
!     analyze_.addInfo(_o.getClass().toString());
    }
  }
--- 42,52 ----
     */
    protected String getOperationDescription() {
!     return DodicoResource.getS("Ecriture")
!       + CtuluLib.EMPTY_STRING
!       + analyze_.getResource();
    }
    protected void _donneesInvalides(Object _o) {
      analyze_.addFatalError(DodicoResource.getS("Données invalides"));
!     analyze_.addInfo(_o.getClass().toString(), 0);
    }
  }