[Fudaa-cvs-commit] fudaa_devel/dodico/src/org/fudaa/dodico/fichiers FileReadOperationAbstract.java,NONE,1.1 FileWriteOperationAbstract.java,NONE,1.1 FileFormatSoftware.java,1.1,1.2 FileFormatVersion.java,1.1,1.2 FileOpReadCharSimpleAbstract.java,1.1,1.2 FileOpWriterCharSimpleAbstract.java,1.1,1.2 FileOperationAbstract.java,1.1,1.2 FileOperationSynthese.java,1.2,1.3 FileOperationInterface.java,1.2,NONE

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

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

Modified Files:
	FileFormatSoftware.java FileFormatVersion.java 
	FileOpReadCharSimpleAbstract.java 
	FileOpWriterCharSimpleAbstract.java FileOperationAbstract.java 
	FileOperationSynthese.java 
Added Files:
	FileReadOperationAbstract.java FileWriteOperationAbstract.java 
Removed Files:
	FileOperationInterface.java 
Log Message:
Creation des dossiers h2d/reflux et h2d/telemac et deplacement des 
fichiers concerne.
Gestion des cl et des bords ( a refaire ..)
Amelioration des gestions des versions de fichiers


--- NEW FILE: FileReadOperationAbstract.java ---
/*
 *  @file         FileInterface.java
 *  @creation     6 juin 2003
 *  @modification $Date: 2003/08/22 15:51:12 $
 *  @license      GNU General Public License 2
 *  @copyright    (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
 *  @mail         de...@fu...
 */
package org.fudaa.dodico.fichiers;

import org.fudaa.dodico.commun.DodicoLib;

/**
 * @author deniger
 * @version $Id: FileReadOperationAbstract.java,v 1.1 2003/08/22 15:51:12 deniger Exp $
 */
public abstract class FileReadOperationAbstract extends FileOperationAbstract{

  protected abstract Object _read();

  /**
   *
   */
  public final FileOperationSynthese read() {
    return closeOperation(_read());
  }
  
  /**
   *
   */
  protected String getOperationDescription() {
    return DodicoLib.geti18n("Lecture");
  }

  

}

--- NEW FILE: FileWriteOperationAbstract.java ---
(This appears to be a binary file; contents omitted.)

Index: FileFormatSoftware.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/fichiers/FileFormatSoftware.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FileFormatSoftware.java	18 Aug 2003 11:48:02 -0000	1.1
--- FileFormatSoftware.java	22 Aug 2003 15:51:12 -0000	1.2
***************
*** 21,26 ****
    public final static BuInformationsSoftware REFLUX_IS=
      new BuInformationsSoftware();
-   public final static BuInformationsSoftware DICO_IS=
-     new BuInformationsSoftware();
      
    static {
--- 21,24 ----
***************
*** 36,43 ****
      REFLUX_IS.contact= "pat...@eq...";
      
-     DICO_IS.name= "dico";
-     DICO_IS.http= "http://telemacsystem.com";
-     DICO_IS.rights= "LNHE";
-     DICO_IS.contact= "in...@te...";
    }
  
--- 34,37 ----

Index: FileFormatVersion.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/fichiers/FileFormatVersion.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FileFormatVersion.java	18 Aug 2003 11:48:02 -0000	1.1
--- FileFormatVersion.java	22 Aug 2003 15:51:12 -0000	1.2
***************
*** 17,21 ****
   * @version $Id$
   */
! public class FileFormatVersion {
    String version_;
    FileFormat ft_;
--- 17,21 ----
   * @version $Id$
   */
! public abstract class FileFormatVersion {
    String version_;
    FileFormat ft_;
***************
*** 24,33 ****
     * 
     */
!   public FileFormatVersion(FileFormat _ft,String _nom) {
      version_= _nom;
!     ft_=_ft;
    }
!   
!   public FileFormat getFileFormat(){
      return ft_;
    }
--- 24,33 ----
     * 
     */
!   public FileFormatVersion(FileFormat _ft, String _nom) {
      version_= _nom;
!     ft_= _ft;
    }
! 
!   public FileFormat getFileFormat() {
      return ft_;
    }
***************
*** 36,46 ****
      return version_;
    }
!   
!   public String getFormatName(){
      return ft_.getName();
    }
  
    public String toString() {
!     return getFormatName()+" "+version_;
    }
  
--- 36,51 ----
      return version_;
    }
! 
!   public String getFormatName() {
      return ft_.getName();
    }
+   
+   public String getName(){
+     return getFormatName() + " " + version_;
+   }
  
    public String toString() {
!     return getName();
!     
    }
  
***************
*** 55,59 ****
  
    /**
!    * Compare selon le nom de le nom de l'enumeration
     */
    public int compareTo(Object o) {
--- 60,64 ----
  
    /**
!    * Compare selon le num de version
     */
    public int compareTo(Object o) {
***************
*** 66,87 ****
    }
  
!   public static void initOperation(
!     FileOperationSynthese _synt,
!     FileOperationInterface _op,
!     ProgressionInterface _progress,
!     File _f) {
!     _op.setProgressReceiver(_progress);
!     _op.setFile(_f);
!     _synt.setMainFile(_f);
    }
  
!   public static FileOperationSynthese initOperation(
!     FileOperationInterface _op,
!     ProgressionInterface _progress,
!     File _f) {
!     FileOperationSynthese r= new FileOperationSynthese();
!     initOperation(r, _op, _progress, _f);
      return r;
    }
  
  }
--- 71,107 ----
    }
  
!   //  public static void initOperation(
!   //    FileOperationSynthese _synt,
!   //    FileOperationInterface _op,
!   //    ProgressionInterface _progress,
!   //    File _f) {
!   //
!   //  }
!   
!   public abstract FileReadOperationAbstract createReader();
!   public abstract FileWriteOperationAbstract createWriter();
!   
!   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;
    }
  
!   public FileOperationSynthese write(
!     File _f,
!     Object _source,
!     ProgressionInterface _prog) {
!     FileWriteOperationAbstract i= createWriter();
!     i.setFile(_f);
!     i.setProgressReceiver(_prog);
!     FileOperationSynthese r= i.write(_source);
!     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.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FileOpReadCharSimpleAbstract.java	4 Jul 2003 12:41:19 -0000	1.1
--- FileOpReadCharSimpleAbstract.java	22 Aug 2003 15:51:12 -0000	1.2
***************
*** 17,20 ****
--- 17,21 ----
  import org.fudaa.dodico.commun.DodicoAnalyze;
  import org.fudaa.dodico.commun.DodicoLib;
+ import org.fudaa.dodico.fortran.FortranInterface;
  import org.fudaa.dodico.fortran.FortranReader;
  
***************
*** 25,66 ****
   */
  public abstract class FileOpReadCharSimpleAbstract
!   extends FileOperationAbstract
! {
    protected FortranReader in_;
  
!   public final void setFile(File _f)
!   {
      FileReader r= null;
!     try
!     {
        r= new FileReader(_f);
!     }
!     catch (FileNotFoundException _e)
!     {
!       //manageException(_e, analyze_);
      }
      if (r != null)
        setFile(r);
    }
  
!   public final void setFile(File[] _f)
!   {
      setFile(_f[0]);
    }
  
!   public final void setFile(Reader _r)
!   {
      in_= new FortranReader(_r);
    }
  
!   public final void close() throws IOException
!   {
!     in_.close();
    }
  
!    protected void addAnalyzeLigneLue(DodicoAnalyze.Editor _analyze)
!     {
!       _analyze.addInfo(DodicoLib.geti18n("Ligne lue") + ": " + in_.getLine(), in_);
!     }
  
  }
--- 26,71 ----
   */
  public abstract class FileOpReadCharSimpleAbstract
!   extends FileReadOperationAbstract{
    protected FortranReader in_;
  
!   public final 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(DodicoLib.geti18n("Fichier inconnu"));
      }
      if (r != null)
        setFile(r);
    }
+   
+   
  
!   public final void setFile(File[] _f) {
      setFile(_f[0]);
    }
  
!   private final void setFile(Reader _r) {
      in_= new FortranReader(_r);
    }
  
! 
!   protected void addAnalyzeLigneLue() {
!     analyze_.addInfo(
!       DodicoLib.geti18n("Ligne lue") + ": " + in_.getLine(),
!       in_);
    }
+   
+   protected abstract Object _read();
  
! 
!   /**
!    *
!    */
!   protected FortranInterface getFortranInterface() {
!     return in_;
!   }
  
  }

Index: FileOpWriterCharSimpleAbstract.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/fichiers/FileOpWriterCharSimpleAbstract.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FileOpWriterCharSimpleAbstract.java	4 Jul 2003 12:41:19 -0000	1.1
--- FileOpWriterCharSimpleAbstract.java	22 Aug 2003 15:51:12 -0000	1.2
***************
*** 14,18 ****
--- 14,20 ----
  import java.io.Writer;
  
+ import org.fudaa.dodico.commun.DodicoAnalyze;
  import org.fudaa.dodico.commun.DodicoLib;
+ import org.fudaa.dodico.fortran.FortranInterface;
  import org.fudaa.dodico.fortran.FortranLib;
  
***************
*** 22,59 ****
   * @version $Id$
   */
! public abstract class FileOpWriterCharSimpleAbstract extends FileOperationAbstract
! {
  
    protected String lineSep_;
    protected Writer out_;
  
!   public FileOpWriterCharSimpleAbstract()
!   {
!     lineSep_ = DodicoLib.LINE_SEP;
    }
  
!   public void writeln() throws IOException
!   {
      out_.write(lineSep_);
    }
  
!   public void writeln(StringBuffer _b) throws IOException
!   {
      write(_b.append(lineSep_));
    }
  
!   public void write(StringBuffer _b) throws IOException
!   {
      out_.write(_b.toString());
      _b.setLength(0);
    }
  
!   public void writeln(String _b) throws IOException
!   {
      write(_b + lineSep_);
    }
  
!   public void write(String _b) throws IOException
!   {
      out_.write(_b);
    }
--- 24,55 ----
   * @version $Id$
   */
! public abstract class FileOpWriterCharSimpleAbstract
!   extends FileWriteOperationAbstract {
  
    protected String lineSep_;
    protected Writer out_;
  
!   public FileOpWriterCharSimpleAbstract() {
!     lineSep_= DodicoLib.LINE_SEP;
    }
  
!   public void writeln() throws IOException {
      out_.write(lineSep_);
    }
  
!   public void writeln(StringBuffer _b) throws IOException {
      write(_b.append(lineSep_));
    }
  
!   public void write(StringBuffer _b) throws IOException {
      out_.write(_b.toString());
      _b.setLength(0);
    }
  
!   public void writeln(String _b) throws IOException {
      write(_b + lineSep_);
    }
  
!   public void write(String _b) throws IOException {
      out_.write(_b);
    }
***************
*** 63,68 ****
     * @return separateur de ligne
     */
!   public final String getLineSeparator()
!   {
      return lineSep_;
    }
--- 59,63 ----
     * @return separateur de ligne
     */
!   public final String getLineSeparator() {
      return lineSep_;
    }
***************
*** 72,90 ****
     * @param lineSep The lineSep to set
     */
!   public final void setLineSeparator(String lineSep)
!   {
!     lineSep_ = lineSep;
    }
  
!   public final void setFile(File _f)
!   {
!     FileWriter out = null;
!     try
!     {
!       out = new FileWriter(_f);
!     }
!     catch (IOException _e)
!     {
! //      manageException(_e, analyze_);
      }
      if (out != null)
--- 67,81 ----
     * @param lineSep The lineSep to set
     */
!   public final void setLineSeparator(String lineSep) {
!     lineSep_= lineSep;
    }
  
!   public final void setFile(File _f) {
!     analyze_= new DodicoAnalyze.Editor();
!     analyze_.setRessource(_f.getAbsolutePath());
!     FileWriter out= null;
!     try {
!       out= new FileWriter(_f);
!     } catch (IOException _e) {
      }
      if (out != null)
***************
*** 93,109 ****
    }
  
!   public final void setFile(File[] _f)
!   {
      setFile(_f[0]);
    }
  
!   public final void setFile(Writer _f)
!   {
!     out_ = _f;
    }
  
!   public final void close() throws IOException
!   {
!     out_.close();
    }
  
--- 84,103 ----
    }
  
!   public final void setFile(File[] _f) {
      setFile(_f[0]);
    }
  
!   private final void setFile(Writer _f) {
!     out_= _f;
    }
  
!   protected FortranInterface getFortranInterface() {
!     return new FortranInterface() {
! 
!       public void close() throws IOException {
!         if (out_ != null)
!           out_.close();
!       }
!     };
    }
  

Index: FileOperationAbstract.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/fichiers/FileOperationAbstract.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FileOperationAbstract.java	4 Jul 2003 12:41:19 -0000	1.1
--- FileOperationAbstract.java	22 Aug 2003 15:51:12 -0000	1.2
***************
*** 1,5 ****
  /*
!  *  @file         FileOperationAbstract.java
!  *  @creation     8 juin 2003
   *  @modification $Date$
   *  @license      GNU General Public License 2
--- 1,5 ----
  /*
!  *  @file         FileWriteOperation.java
!  *  @creation     22 août 2003
   *  @modification $Date$
   *  @license      GNU General Public License 2
***************
*** 16,74 ****
  
  import org.fudaa.dodico.commun.DodicoAnalyze;
  import org.fudaa.dodico.commun.ProgressionInterface;
  
  /**
!  * @author fred deniger
   * @version $Id$
-  *
   */
! public abstract class FileOperationAbstract implements FileOperationInterface
! {
  
    protected ProgressionInterface progress_;
  
!   public ProgressionInterface getProgressReceiver()
!   {
!     return progress_;
!   }
!   public void setProgressReceiver(ProgressionInterface _progressReceiver)
!   {
      progress_= _progressReceiver;
    }
  
!   protected final DodicoAnalyze.Editor[] initAnalyze(int _nb)
!   {
!     DodicoAnalyze.Editor[] analyze_= new DodicoAnalyze.Editor[_nb];
!     for (int i= _nb - 1; i >= 0; i--)
!     {
!       analyze_[i]= new DodicoAnalyze.Editor();
!     }
!     return analyze_;
    }
  
!   public static final FileReader initFileReader(File _f)
!   {
      FileReader r= null;
!     try
!     {
        r= new FileReader(_f);
!     }
!     catch (FileNotFoundException _e)
!     {
!       //manageException(_e, analyze_[_i]);
      }
      return r;
    }
  
!   public static final FileWriter initFileWriter(File _f)
!   {
      FileWriter r= null;
!     try
!     {
        r= new FileWriter(_f);
!     }
!     catch (IOException _e)
!     {
!       //manageException(_e, analyze_[_i]);
      }
      return r;
--- 16,75 ----
  
  import org.fudaa.dodico.commun.DodicoAnalyze;
+ import org.fudaa.dodico.commun.DodicoLib;
  import org.fudaa.dodico.commun.ProgressionInterface;
+ import org.fudaa.dodico.fortran.FortranInterface;
+ import org.fudaa.dodico.fortran.FortranLib;
  
  /**
!  * @author deniger
   * @version $Id$
   */
! public abstract class FileOperationAbstract {
  
    protected ProgressionInterface progress_;
+   protected DodicoAnalyze.Editor analyze_;
  
!   public void setProgressReceiver(ProgressionInterface _progressReceiver) {
      progress_= _progressReceiver;
    }
  
!   protected abstract String getOperationDescription();
!   protected abstract FortranInterface getFortranInterface();
! 
!   public abstract void setFile(File _f);
!   public abstract FileFormatVersion getVersion();
! 
!   protected final FileOperationSynthese closeOperation(Object _o) {
!     FileOperationSynthese r= new FileOperationSynthese();
!     FortranInterface out= getFortranInterface();
!     r.setClosingOperation(FortranLib.closeState(out));
!     r.setFileOp(out);
!     analyze_.setDesc(
!       getOperationDescription()
!         + DodicoLib.EMPTY_STRING
!         + DodicoLib.geti18n("Format")
!         + ": "
!         + getVersion());
!     r.setAnalyze(analyze_);
!     r.setSource(_o);
!     progress_= null;
!     analyze_= null;
!     return r;
    }
  
!   public static final FileReader initFileReader(File _f) {
      FileReader r= null;
!     try {
        r= new FileReader(_f);
!     } catch (FileNotFoundException _e) {
      }
      return r;
    }
  
!   public static final FileWriter initFileWriter(File _f) {
      FileWriter r= null;
!     try {
        r= new FileWriter(_f);
!     } catch (IOException _e) {
      }
      return r;

Index: FileOperationSynthese.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/fichiers/FileOperationSynthese.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FileOperationSynthese.java	18 Aug 2003 11:05:19 -0000	1.2
--- FileOperationSynthese.java	22 Aug 2003 15:51:12 -0000	1.3
***************
*** 12,15 ****
--- 12,16 ----
  
  import org.fudaa.dodico.commun.DodicoAnalyze;
+ import org.fudaa.dodico.fortran.FortranInterface;
  import org.fudaa.dodico.fortran.FortranLib;
  
***************
*** 19,115 ****
   * @version $Id$
   */
! public class FileOperationSynthese
! {
!   private File[] files_;
!   private File mainFile_;
    private String exClose_;
!   private DodicoAnalyze analyze_;
!   FileOperationInterface fileOp_;
!   private String desc_;
!   private long opTime_;
! 
! 
!   public void printAnalyze(){
!     if(analyze_!=null) analyze_.printResume();
!     else System.out.println("Pas d'erreur");
!   }
!   
!   /**
!    *
!    */
!   public final String getDesc()
!   {
!     return desc_;
!   }
! 
!   /**
!    *
!    */
!   public final void setDesc(String _string)
!   {
!     desc_= _string;
!   }
! 
!   /**
!    *
!    */
!   public long getOpTime()
!   {
!     return opTime_;
!   }
! 
!   /**
!    *
!    */
!   public void setOpTime(long _l)
!   {
!     opTime_= _l;
!   }
  
!   public void initOpTime()
!   {
!     opTime_= System.currentTimeMillis();
    }
  
!   public FileOperationSynthese()
!   {
!   }
!   
!   public void setRessource(File[] _f)
!   {
!     files_=_f;
    }
  
!   public static void initAndClose(
!     FileOperationSynthese _opResults,
!     DodicoAnalyze.Editor _analyze,
!     FileOperationInterface _op,
!     String _desc)
!   {
!     _opResults.setAnalyze(_analyze.toAnalyze());
!     _opResults.setFileOp(_op);
!     _opResults.setOpTime(System.currentTimeMillis());
!     _opResults.setDesc(_desc);
!     _opResults.setExClose(FortranLib.closeState(_op));
  
    }
  
!   public DodicoAnalyze getAnalyze()
!   {
      return analyze_;
    }
  
!   public String getClosingException()
!   {
      return exClose_;
    }
  
!   public boolean containsFatalError()
!   {
      return ((analyze_ != null) && (analyze_.containsFatalError()));
    }
  
!   public boolean containsClosingError()
!   {
      return exClose_ != null;
    }
--- 20,61 ----
   * @version $Id$
   */
! 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("Pas d'erreur");
    }
  
!   public Object getSource() {
!     return source_;
    }
  
!   //  public void initOpTime()
!   //  {
!   //    opTime_= System.currentTimeMillis();
!   //  }
  
+   public FileOperationSynthese() {
    }
  
!   public DodicoAnalyze.Editor getAnalyze() {
      return analyze_;
    }
  
!   public String getClosingException() {
      return exClose_;
    }
  
!   public boolean containsFatalError() {
      return ((analyze_ != null) && (analyze_.containsFatalError()));
    }
  
!   public boolean containsClosingError() {
      return exClose_ != null;
    }
***************
*** 118,140 ****
     *
     */
!   public boolean containsMessages()
!   {
!     return analyze_ != null;
!   }
! 
!   /**
!    *
!    */
!   public String getExClose()
!   {
!     return exClose_;
!   }
! 
!   /**
!    *
!    */
!   public File getFile()
!   {
!     return mainFile_;
    }
  
--- 64,69 ----
     *
     */
!   public boolean containsMessages() {
!     return (analyze_ != null) && (!analyze_.isEmpty());
    }
  
***************
*** 142,163 ****
     *
     */
!   public FileOperationInterface getFileOp()
!   {
      return fileOp_;
    }
  
-   /**
-    *
-    */
-   public void setAnalyze(DodicoAnalyze _analyze)
-   {
-     analyze_= _analyze;
-   }
  
    /**
     *
     */
!   public void setExClose(String _exception)
!   {
      exClose_= _exception;
    }
--- 71,83 ----
     *
     */
!   public FortranInterface getFileOp() {
      return fileOp_;
    }
  
  
    /**
     *
     */
!   public void setClosingOperation(String _exception) {
      exClose_= _exception;
    }
***************
*** 166,204 ****
     *
     */
!   public void setFileOp(FileOperationInterface _interface)
!   {
      fileOp_= _interface;
    }
  
    /**
!    * @return
!    */
!   public File[] getFiles()
!   {
!     return files_;
!   }
! 
!   /**
!    * @return
!    */
!   public File getMainFile()
!   {
!     return mainFile_;
!   }
! 
!   /**
!    * @param _files
     */
!   public void setFiles(File[] _files)
!   {
!     files_= _files;
    }
  
    /**
!    * @param _file
     */
!   public void setMainFile(File _file)
!   {
!     mainFile_= _file;
    }
  
--- 86,105 ----
     *
     */
!   public void setFileOp(FortranInterface _interface) {
      fileOp_= _interface;
    }
  
    /**
!    *
     */
!   public void setSource(Object _object) {
!     source_= _object;
    }
  
    /**
!    *
     */
!   public void setAnalyze(DodicoAnalyze.Editor _editor) {
!     analyze_= _editor;
    }
  

--- FileOperationInterface.java DELETED ---