[Fudaa-cvs-commit] fudaa_devel/dodico/src/org/fudaa/dodico/tr TrFileFormat.java,1.2,1.3 TrReaderWriterAbstract.java,1.2,1.3 TrReaderWriterSimpleAbstract.java,1.1,1.2 TrWriterCharSimpleAbstract.java,1.1,1.2

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

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

Modified Files:
	TrFileFormat.java TrReaderWriterAbstract.java 
	TrReaderWriterSimpleAbstract.java 
	TrWriterCharSimpleAbstract.java 
Log Message:
Maj des imports


Index: TrFileFormat.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/tr/TrFileFormat.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TrFileFormat.java	1 Apr 2003 13:47:16 -0000	1.2
--- TrFileFormat.java	11 Apr 2003 16:09:22 -0000	1.3
***************
*** 10,15 ****
  
  import java.io.File;
- import java.io.FileNotFoundException;
- import java.io.FileReader;
  import java.io.IOException;
  
--- 10,13 ----
***************
*** 19,23 ****
  
  /**
-  * 
   * @author deniger
   * @version $Id$
--- 17,20 ----

Index: TrReaderWriterAbstract.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/tr/TrReaderWriterAbstract.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TrReaderWriterAbstract.java	1 Apr 2003 13:47:16 -0000	1.2
--- TrReaderWriterAbstract.java	11 Apr 2003 16:09:23 -0000	1.3
***************
*** 25,29 ****
  {
    protected ProgressionInterface progressReceiver_;
!   
    /**
     * Returns the progressReceiver.
--- 25,29 ----
  {
    protected ProgressionInterface progressReceiver_;
! 
    /**
     * Returns the progressReceiver.
***************
*** 34,40 ****
      return progressReceiver_;
    } /**
!              * Sets the progressReceiver.
!              * @param progressReceiver The progressReceiver to set
!              */
    public final void setProgressReceiver(ProgressionInterface progressReceiver)
    {
--- 34,40 ----
      return progressReceiver_;
    } /**
!               * Sets the progressReceiver.
!               * @param progressReceiver The progressReceiver to set
!               */
    public final void setProgressReceiver(ProgressionInterface progressReceiver)
    {
***************
*** 42,70 ****
      //if(progressReceiver!=null) afficheAvance_=true;
    }
!   
!   public void manageException(FileNotFoundException _e,DodicoAnalyze _analyze)
    {
!       _analyze.addTranslateError("Fichier non trouvé");
!       _analyze.addInfo(_e.getMessage());
!       if(DodicoLib.DEBUG) _e.printStackTrace();    
    }
!   
!   public void manageException(IOException _e,DodicoAnalyze _analyze)
    {
!       _analyze.addTranslateError("Erreur d'entrée/sortie");
!       _analyze.addInfo(_e.getMessage());
!       if(DodicoLib.DEBUG) _e.printStackTrace();    
    }
!   
!   public void manageException(NumberFormatException _e,DodicoAnalyze _analyze,FortranReader _l)
    {
!       _analyze.addError("Format du champ incorrect",_l);
!       _analyze.addInfo(_e.getMessage());
!       if(DodicoLib.DEBUG) _e.printStackTrace();    
    }
-   
-   
-   
-   
  
  }
--- 42,89 ----
      //if(progressReceiver!=null) afficheAvance_=true;
    }
! 
!   public void manageException(FileNotFoundException _e, DodicoAnalyze _analyze)
    {
!     _analyze.addTranslateError("Fichier non trouvé");
!     _analyze.addInfo(_e.getMessage());
!     if (DodicoLib.DEBUG)
!       _e.printStackTrace();
    }
! 
!   public void manageException(IOException _e, DodicoAnalyze _analyze)
    {
!     _analyze.addTranslateError("Erreur d'entrée/sortie");
!     _analyze.addInfo(_e.getMessage());
!     if (DodicoLib.DEBUG)
!       _e.printStackTrace();
    }
! 
!   public void manageException(
!     NumberFormatException _e,
!     DodicoAnalyze _analyze,
!     FortranReader _l)
    {
!     _analyze.addError("Format du champ incorrect", _l);
!     _analyze.addInfo(_e.getMessage());
!     if (DodicoLib.DEBUG)
!       _e.printStackTrace();
!   }
!   public void manageException(
!     IllegalArgumentException _e,
!     DodicoAnalyze _analyze)
!   {
!     _analyze.addTranslateError("Erreur interne d'argument");
!     _analyze.addInfo(_e.getMessage());
!     if (DodicoLib.DEBUG)
!       _e.printStackTrace();
!   }
! 
!   public void manageException(Exception _e, DodicoAnalyze _analyze)
!   {
!     _analyze.addTranslateError("Erreur d'exécution");
!     _analyze.addInfo(_e.getMessage());
!     if (DodicoLib.DEBUG)
!       _e.printStackTrace();
    }
  
  }

Index: TrReaderWriterSimpleAbstract.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/tr/TrReaderWriterSimpleAbstract.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TrReaderWriterSimpleAbstract.java	1 Apr 2003 13:47:16 -0000	1.1
--- TrReaderWriterSimpleAbstract.java	11 Apr 2003 16:09:23 -0000	1.2
***************
*** 9,19 ****
  package org.fudaa.dodico.tr;
  
- import java.io.File;
- import java.io.FileNotFoundException;
- import java.io.FileReader;
- 
  import org.fudaa.dodico.commun.DodicoAnalyze;
- import org.fudaa.dodico.commun.DodicoLib;
- import org.fudaa.dodico.commun.ProgressionInterface;
  
  /**
--- 9,13 ----
***************
*** 22,40 ****
   * @version $Id$
   */
! public abstract class TrReaderWriterSimpleAbstract extends TrReaderWriterAbstract
  {
  
- 
    protected DodicoAnalyze analyze_;
!   
    protected DodicoAnalyze _initAnalyze()
    {
!     if(analyze_==null) analyze_=new DodicoAnalyze();
      return analyze_;
    }
!   
    public void razAnalyzes()
    {
!     if(analyze_!=null) analyze_.clear();
    }
  
--- 16,36 ----
   * @version $Id$
   */
! public abstract class TrReaderWriterSimpleAbstract
!   extends TrReaderWriterAbstract
  {
  
    protected DodicoAnalyze analyze_;
! 
    protected DodicoAnalyze _initAnalyze()
    {
!     if (analyze_ == null)
!       analyze_ = new DodicoAnalyze();
      return analyze_;
    }
! 
    public void razAnalyzes()
    {
!     if (analyze_ != null)
!       analyze_.clear();
    }
  
***************
*** 44,57 ****
    public final DodicoAnalyze getAnalyze()
    {
!      return analyze_;
    }
  
    public final DodicoAnalyze[] getAnalyzes()
    {
!     return analyze_==null?null:new DodicoAnalyze[]{analyze_};
    }
-   
-   
-   
  
  }
--- 40,57 ----
    public final DodicoAnalyze getAnalyze()
    {
!     return analyze_;
    }
  
    public final DodicoAnalyze[] getAnalyzes()
    {
!     return analyze_ == null ? null : new DodicoAnalyze[] { analyze_ };
!   }
! 
!   public boolean analyzeContainsError()
!   {
!     if (analyze_ == null)
!       return false;
!     return analyze_.containsErrors();
    }
  
  }

Index: TrWriterCharSimpleAbstract.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/tr/TrWriterCharSimpleAbstract.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TrWriterCharSimpleAbstract.java	1 Apr 2003 13:47:16 -0000	1.1
--- TrWriterCharSimpleAbstract.java	11 Apr 2003 16:09:24 -0000	1.2
***************
*** 14,18 ****
  import java.io.Writer;
  
- import org.fudaa.dodico.commun.DodicoAnalyze;
  import org.fudaa.dodico.commun.DodicoLib;
  
--- 14,17 ----
***************
*** 88,91 ****
--- 87,91 ----
      return (e==null?null:new IOException[] {e});
    }
+   
  
  }