[Fudaa-cvs-commit] fudaa_devel/dodico/src/org/fudaa/dodico/navmer ClientNavmer.java,1.1,1.2 DResultatsNavmer.java,1.1,1.2 DParametresNavmer.java,1.1,1.2 DCalculNavmer.java,1.1,1.2

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

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

Modified Files:
	ClientNavmer.java DResultatsNavmer.java DParametresNavmer.java 
	DCalculNavmer.java 
Log Message:
suppression des variables inutiles

Index: ClientNavmer.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/navmer/ClientNavmer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ClientNavmer.java	29 Jan 2003 12:14:41 -0000	1.1
--- ClientNavmer.java	18 Mar 2003 13:12:29 -0000	1.2
***************
*** 41,50 ****
    public static void main(String[] argv)
    {
-     //Structures necessaires au test
-     SParametresINI initialisation;
-     SCoefficientsNavire scoefnav;
-     SResultatsDAT[] sdata = new SResultatsDAT[2];
-     SIndexZonesCourant sidxzonescourant;
-     SZoneCourant[] szonescourant;
  
      ICalculNavmer nv = null;
--- 41,44 ----

Index: DResultatsNavmer.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/navmer/DResultatsNavmer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DResultatsNavmer.java	29 Jan 2003 12:14:41 -0000	1.1
--- DResultatsNavmer.java	18 Mar 2003 13:12:29 -0000	1.2
***************
*** 103,107 ****
      SResultatsDAT sdata = null;
      double d;
-     SParametresProgramme prog;
      SCinematiqueNavire cinematique;
      SOrdreNavire ord;
--- 103,106 ----

Index: DParametresNavmer.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/navmer/DParametresNavmer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DParametresNavmer.java	29 Jan 2003 12:14:41 -0000	1.1
--- DParametresNavmer.java	18 Mar 2003 13:12:29 -0000	1.2
***************
*** 588,618 ****
  
        //On crée des string à partir des infos receuillies
!       String line1 = new String(paramprog.periodeSortieResultats + "," + entete.tempsFin
!            + "," + paramprog.periodePriseEnCompteEtat + ",\n");
  
!       String line2 = new String(paramcin.cap + "," + paramcin.x + "," + paramcin.y
             + "," + paramcin.vitesseLongitudinale + "," + paramcin.vitesseLaterale
             + "," + paramcin.vitesseRotationnelle + "," + _Initialisation.entete.navire
!            + "," + _Initialisation.entete.port + ",\n");
  
!       String line3 = new String(1 + "," + paramcom.gouvernail
             + "," + paramcom.nombreToursBabord + "," + paramcom.nombreToursTribord
             + "," + paramcom.pasHeliceBabord + "," + paramcom.pasHeliceTribord
             + "," + paramcom.anglePropulseurAvant + "," + paramcom.forcePropulseurAvant
             + "," + paramcom.anglePropulseurArriere + "," + paramcom.forcePropulseurArriere
!            + ",\n");
  
!       String line4 = new String(1 + "," + paramordre.gouvernail + "," + paramordre.nombreToursBabord
             + "," + paramordre.nombreToursTribord + "," + paramordre.pasHeliceBabord
             + "," + paramordre.pasHeliceTribord + "," + paramordre.anglePropulseurAvant
             + "," + paramordre.forcePropulseurAvant + "," + paramordre.anglePropulseurArriere
!            + "," + paramordre.forcePropulseurArriere + ",\n");
  
        int s = (paramenv.sens == true) ? 1 : 0;
!       String line5 = new String(paramenv.profondeur + "," + paramenv.angleIncidenceVent
             + "," + paramenv.moduleVent + "," + paramenv.vitesseMoyenneX + ","
             + paramenv.vitesseMoyenneY + "," + paramenv.vitesseRotationnelleMoyenne
             + "," + paramenv.distanceBergeBabord + "," + paramenv.distanceBergeTribord
!            + "," + s + ",\n");
  
        int i;
--- 588,618 ----
  
        //On crée des string à partir des infos receuillies
!       String line1 = paramprog.periodeSortieResultats + "," + entete.tempsFin
!            + "," + paramprog.periodePriseEnCompteEtat + ",\n";
  
!       String line2 = paramcin.cap + "," + paramcin.x + "," + paramcin.y
             + "," + paramcin.vitesseLongitudinale + "," + paramcin.vitesseLaterale
             + "," + paramcin.vitesseRotationnelle + "," + _Initialisation.entete.navire
!            + "," + _Initialisation.entete.port + ",\n";
  
!       String line3 = 1 + "," + paramcom.gouvernail
             + "," + paramcom.nombreToursBabord + "," + paramcom.nombreToursTribord
             + "," + paramcom.pasHeliceBabord + "," + paramcom.pasHeliceTribord
             + "," + paramcom.anglePropulseurAvant + "," + paramcom.forcePropulseurAvant
             + "," + paramcom.anglePropulseurArriere + "," + paramcom.forcePropulseurArriere
!            + ",\n";
  
!       String line4 = 1 + "," + paramordre.gouvernail + "," + paramordre.nombreToursBabord
             + "," + paramordre.nombreToursTribord + "," + paramordre.pasHeliceBabord
             + "," + paramordre.pasHeliceTribord + "," + paramordre.anglePropulseurAvant
             + "," + paramordre.forcePropulseurAvant + "," + paramordre.anglePropulseurArriere
!            + "," + paramordre.forcePropulseurArriere + ",\n";
  
        int s = (paramenv.sens == true) ? 1 : 0;
!       String line5 = paramenv.profondeur + "," + paramenv.angleIncidenceVent
             + "," + paramenv.moduleVent + "," + paramenv.vitesseMoyenneX + ","
             + paramenv.vitesseMoyenneY + "," + paramenv.vitesseRotationnelleMoyenne
             + "," + paramenv.distanceBergeBabord + "," + paramenv.distanceBergeTribord
!            + "," + s + ",\n";
  
        int i;

Index: DCalculNavmer.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/navmer/DCalculNavmer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DCalculNavmer.java	29 Jan 2003 12:14:41 -0000	1.1
--- DCalculNavmer.java	18 Mar 2003 13:12:29 -0000	1.2
***************
*** 55,75 ****
  
    /**
-    * Affecte la valeur Progression de DCalculNavmer object
-    *
-    * @param op  La nouvelle valeur Progression
-    * @param pc  La nouvelle valeur Progression
-    */
-   private synchronized void setProgression(String op, int pc)
-   {
-     if(op == null)
-     {
-       op = "";
-     }
-     strOperation_.operation = op;
-     strOperation_.pourcentage = pc;
-   }
- 
- 
-   /**
     * retourne la valeur ExecPath de DCalculNavmer object
     *
--- 55,58 ----
***************
*** 153,159 ****
  
      String os = System.getProperty("os.name");
-     String drive;
      String path = cheminServeur();
-     String fichier = "navmer" + c.numero();
      try
      {
--- 136,140 ----
***************
*** 192,201 ****
          }
  
!         param[0] = new String(path + nomexec);
  
        }
        else
        {
!         param[0] = new String(execPath_);
          path = (new File(param[0])).getAbsolutePath();
  
--- 173,182 ----
          }
  
!         param[0] = path + nomexec;
  
        }
        else
        {
!         param[0] = execPath_;
          path = (new File(param[0])).getAbsolutePath();
  
***************
*** 203,211 ****
  
        //fichier de description du navire
!       param[1] = new String(path + "N" + numeroSession_ + ".nav");
        //fichier ini:ordres
!       param[2] = new String(path + "I" + numeroSession_ + ".ini");
        //fichier resultat:structures etat
!       param[3] = new String(path + "D" + numeroSession_ + ".dat");
        //Si prise en compte des courants
        if(n == 5)
--- 184,192 ----
  
        //fichier de description du navire
!       param[1] = path + "N" + numeroSession_ + ".nav";
        //fichier ini:ordres
!       param[2] = path + "I" + numeroSession_ + ".ini";
        //fichier resultat:structures etat
!       param[3] =path + "D" + numeroSession_ + ".dat";
        //Si prise en compte des courants
        if(n == 5)
***************
*** 213,217 ****
          System.out.println("--Prise en compte des courants--");
          //fichier parametre:index zones courant
!         param[4] = new String(path + "C" + numeroSession_);
        }
  
--- 194,198 ----
          System.out.println("--Prise en compte des courants--");
          //fichier parametre:index zones courant
!         param[4] = path + "C" + numeroSession_;
        }