[Fudaa-cvs-commit] fudaa_devel/dodico/src/org/fudaa/dodico/oscar DParametresOscar.java,1.1,1.2 DResultatsOscar.java,1.1,1.2 DCalculOscar.java,1.2,1.3

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

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

Modified Files:
	DParametresOscar.java DResultatsOscar.java DCalculOscar.java 
Log Message:
suppression des variables inutiles

Index: DParametresOscar.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/oscar/DParametresOscar.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DParametresOscar.java	29 Jan 2003 12:14:30 -0000	1.1
--- DParametresOscar.java	18 Mar 2003 13:27:04 -0000	1.2
***************
*** 104,109 ****
  	int fmtI[];
  	double _v;
- 	String _t;
- 	Double _tc;
  
  	System.out.println(_nomFichier);
--- 104,107 ----
***************
*** 690,694 ****
  	SParametresOscar _p = new SParametresOscar();
  
! 	FortranReader _fr = new FortranReader(new FileReader(_nomFichier));
  
  	// .................... à faire ......................
--- 688,692 ----
  	SParametresOscar _p = new SParametresOscar();
  
! //	FortranReader _fr = new FortranReader(new FileReader(_nomFichier));
  
  	// .................... à faire ......................

Index: DResultatsOscar.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/oscar/DResultatsOscar.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DResultatsOscar.java	29 Jan 2003 12:14:30 -0000	1.1
--- DResultatsOscar.java	18 Mar 2003 13:27:04 -0000	1.2
***************
*** 10,24 ****
  package org.fudaa.dodico.oscar;
  
! import java.io.*;
! import java.util.*;
! import java.lang.*;
  
! import org.fudaa.dodico.objet.*;
! import org.fudaa.dodico.corba.objet.*;
! import org.fudaa.dodico.calcul.*;
! import org.fudaa.dodico.corba.calcul.*;
! import org.fudaa.dodico.fortran.*;
! import org.fudaa.dodico.mathematiques.*;
! import org.fudaa.dodico.corba.oscar.*;
  
  /**
--- 10,30 ----
  package org.fudaa.dodico.oscar;
  
! import java.io.EOFException;
! import java.io.FileNotFoundException;
! import java.io.FileReader;
! import java.io.IOException;
  
! import org.fudaa.dodico.calcul.DResultats;
! import org.fudaa.dodico.corba.oscar.IResultatsOscarOperations;
! import org.fudaa.dodico.corba.oscar.SPointCoteValeur;
! import org.fudaa.dodico.corba.oscar.SResultatsDeformees;
! import org.fudaa.dodico.corba.oscar.SResultatsEffortsTranchants;
! import org.fudaa.dodico.corba.oscar.SResultatsErreursXplan;
! import org.fudaa.dodico.corba.oscar.SResultatsMomentsFlechissants;
! import org.fudaa.dodico.corba.oscar.SResultatsOscar;
! import org.fudaa.dodico.corba.oscar.SResultatsPredimensionnement;
! import org.fudaa.dodico.corba.oscar.SResultatsPressions;
! import org.fudaa.dodico.corba.oscar.VALEUR_NULLE;
! import org.fudaa.dodico.fortran.FortranReader;
  
  /**
***************
*** 135,140 ****
      public static SResultatsOscar resultatsOscar(String _etude) {
  
- 	int i=0;
- 	int fmtI[];
  	Object[] _valeurs;
  
--- 141,144 ----
***************
*** 210,214 ****
  		while(true){
  		    _t=_fr.readLine();
! 		    if(_t==null) throw new EOFException();
  		    _nblines++;
  		}	    
--- 214,218 ----
  		while(true){
  		    _t=_fr.readLine();
! //		    if(_t==null) throw new EOFException(); inutile
  		    _nblines++;
  		}	    
***************
*** 225,230 ****
  		for(i=0;i<_nblines;i++){
  		    _t=_fr.readLine();
! 		    if(_t==null) throw new EOFException();
! 		    _e.messages[i] = new String(_t);
  		}
  	    }catch(Exception _e3){
--- 229,234 ----
  		for(i=0;i<_nblines;i++){
  		    _t=_fr.readLine();
! //		    if(_t==null) throw new EOFException();
! 		    _e.messages[i] = _t;
  		}
  	    }catch(Exception _e3){
***************
*** 337,341 ****
      public static SResultatsPredimensionnement resultatsOscarPredimensionnement(String _nomFichier){
  
- 	int i=0;
  	int nb=0;
  	int fmtI[];
--- 341,344 ----
***************
*** 440,444 ****
  
  	int i=0;
- 	int nb=0;
  	SPointCoteValeur[] _r;
  	String _titre;
--- 443,446 ----

Index: DCalculOscar.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/oscar/DCalculOscar.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DCalculOscar.java	6 Feb 2003 16:53:10 -0000	1.2
--- DCalculOscar.java	18 Mar 2003 13:27:04 -0000	1.3
***************
*** 113,117 ****
  
  	String os=System.getProperty("os.name");
- 	String drive;
  	String path=cheminServeur();
  
--- 113,116 ----