[Fudaa-cvs-commit] fudaa_devel/dodico/src/org/fudaa/dodico/fortran CsvDoubleReader.java,NONE,1.1 CsvReader.java,1.6,1.7 FortranReader.java,1.10,1.11

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

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

Modified Files:
	CsvReader.java FortranReader.java 
Added Files:
	CsvDoubleReader.java 
Log Message:
Maj version 0.05 prepro


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

Index: CsvReader.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/fortran/CsvReader.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CsvReader.java	25 Nov 2003 10:11:34 -0000	1.6
--- CsvReader.java	12 Feb 2004 15:32:44 -0000	1.7
***************
*** 123,143 ****
      return r;
    }
!   public static void main(String[] _args) {
!     try {
!       CsvReader rin= new CsvReader(new FileReader(_args[0]));
!       rin.readFields(2);
!       while (true) {
!         rin.readFields(2);
!         System.out.println(
!           ""
!             + rin.getLineNumber()
!             + ": "
!             + rin.doubleField(0)
!             + " "
!             + rin.doubleField(1));
!       }
!     } catch (EOFException ex) {} catch (Exception ex) {
!       ex.printStackTrace();
!     }
!   }
  }
--- 123,126 ----
      return r;
    }
! 
  }

Index: FortranReader.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/fortran/FortranReader.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** FortranReader.java	25 Nov 2003 10:11:34 -0000	1.10
--- FortranReader.java	12 Feb 2004 15:32:44 -0000	1.11
***************
*** 127,130 ****
--- 127,142 ----
      commentChar_= _c;
    }
+   
+   private boolean jumpCommentLine_;
+   /**
+    * Si true, les lignes commencant par un commentaire
+    * seront ignoree lors d'un readField.
+    * ATTENTION : ne marche qui se setCommentInOneField a ete
+    * appele avec une valeur non nulle.
+    */
+   public void setJumpCommentLine(boolean _b){
+     jumpCommentLine_=_b;
+     
+   }
    /**
     * Retourne l'état de l'équivalence champ blanc/Zero
***************
*** 232,238 ****
        }
      }
      if (commentChar_ != null) {
        if (line.startsWith(commentChar_)) {
!         fields= new String[] { line };
          return;
        }
--- 244,259 ----
        }
      }
+     //si le caractere de commentaire a ete defini
      if (commentChar_ != null) {
+       //si la ligne commence par le caractere
        if (line.startsWith(commentChar_)) {
!         //on veut ignorer les lignes de commentaire
!         if(jumpCommentLine_){
!           this.readFields();
!         }
!         //on stocke la ligne ...
!         else{
!           fields= new String[] { line };
!         }
          return;
        }