Menu
▾
▴
[Fudaa-cvs-commit] fudaa_devel/dodico/src/org/fudaa/dodico/vag DCalculVag.java,1.1,1.2 VagClient.java,1.1,1.2 DParametresVag.java,1.1,1.2
|
From: <de...@us...> - 2003-03-18 14:53:12
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/vag
In directory sc8-pr-cvs1:/tmp/cvs-serv3956/dodico/src/org/fudaa/dodico/vag
Modified Files:
DCalculVag.java VagClient.java DParametresVag.java
Log Message:
*** keyword substitution change ***
Index: DCalculVag.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/vag/DCalculVag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DCalculVag.java 29 Jan 2003 12:14:27 -0000 1.1
--- DCalculVag.java 18 Mar 2003 14:53:07 -0000 1.2
***************
*** 78,82 ****
String os=System.getProperty("os.name");
- String drive;
String path=cheminServeur();
--- 78,81 ----
***************
*** 89,95 ****
File fic04=getFichier(c, ".04");
File fic05=getFichier(c, ".05");
! File fic08=getFichier(c, ".06");
! File ficOUT=getFichier(c, ".out");
! File ficLPT=getFichier(c, ".lpt");
String noEtude=fic01.getName().substring(3, 7);
DParametresVag.ecritParametres01(fic01, params.parametres01(), noEtude);
--- 88,94 ----
File fic04=getFichier(c, ".04");
File fic05=getFichier(c, ".05");
! // File fic08=getFichier(c, ".06");
! // File ficOUT=getFichier(c, ".out");
! // File ficLPT=getFichier(c, ".lpt");
String noEtude=fic01.getName().substring(3, 7);
DParametresVag.ecritParametres01(fic01, params.parametres01(), noEtude);
Index: VagClient.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/vag/VagClient.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** VagClient.java 29 Jan 2003 12:14:27 -0000 1.1
--- VagClient.java 18 Mar 2003 14:53:07 -0000 1.2
***************
*** 28,32 ****
ICalculVag vag=null;
System.out.println("VagClient");
- int essai=0;
vag=ICalculVagHelper.narrow(CDodico.findServerByName("un-serveur-vag"));
--- 28,31 ----
***************
*** 34,38 ****
System.out.println("Creation de la connexion");
- IUsine usine=CDodico.creeUsineLocale();
ServeurPersonne sp=new ServeurPersonne("test-personne-vag", "test-organisme-vag");
--- 33,36 ----
Index: DParametresVag.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/vag/DParametresVag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DParametresVag.java 29 Jan 2003 12:14:27 -0000 1.1
--- DParametresVag.java 18 Mar 2003 14:53:07 -0000 1.2
***************
*** 10,22 ****
package org.fudaa.dodico.vag;
! import java.io.*;
! import java.util.*;
! 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.corba.vag.*;
! import org.fudaa.dodico.fortran.*;
/**
--- 10,34 ----
package org.fudaa.dodico.vag;
! import java.io.File;
! import java.io.FileInputStream;
! import java.io.FileOutputStream;
! import java.io.IOException;
! import java.io.InputStream;
! import java.io.InputStreamReader;
! import java.io.OutputStream;
! import java.io.OutputStreamWriter;
! import org.fudaa.dodico.calcul.DParametres;
! import org.fudaa.dodico.commun.DodicoLib;
! import org.fudaa.dodico.corba.vag.IParametresVagOperations;
! import org.fudaa.dodico.corba.vag.SParametres01;
! import org.fudaa.dodico.corba.vag.SParametres02;
! import org.fudaa.dodico.corba.vag.SParametres03;
! import org.fudaa.dodico.corba.vag.SParametres04;
! import org.fudaa.dodico.corba.vag.SParametresLigne02;
! import org.fudaa.dodico.fortran.FortranReader;
! import org.fudaa.dodico.fortran.FortranWriter;
! import org.fudaa.dodico.fortran.NativeBinaryInputStream;
! import org.fudaa.dodico.fortran.NativeBinaryOutputStream;
/**
***************
*** 60,66 ****
System.out.println("Ecriture des parametres 01");
FortranWriter f01=new FortranWriter(new OutputStreamWriter(_f01));
! if( System.getProperty("os.name").startsWith("Windows") )
! f01.setLineSeparator("\r\n"); // fichiers DOS (\r)
! else f01.setLineSeparator("\n");
int fmtI[], fmtD[];
--- 72,77 ----
System.out.println("Ecriture des parametres 01");
FortranWriter f01=new FortranWriter(new OutputStreamWriter(_f01));
! f01.setLineSeparator(DodicoLib.LINE_SEP);
! String vide="";
int fmtI[], fmtD[];
***************
*** 75,81 ****
f01.doubleField(0, _params.echelle);
! f01.stringField(1, ""); // remplissage des colonnes vides
! f01.stringField(2, "");
! f01.stringField(3, "");
f01.stringField(4, "ECHELLE DE LA CARTE");
f01.writeFields(fmtD);
--- 86,92 ----
f01.doubleField(0, _params.echelle);
! f01.stringField(1, vide); // remplissage des colonnes vides
! f01.stringField(2, vide);
! f01.stringField(3, vide);
f01.stringField(4, "ECHELLE DE LA CARTE");
f01.writeFields(fmtD);
***************
*** 83,88 ****
f01.doubleField(0, _params.rectLargeur);
f01.doubleField(1, _params.rectHauteur);
! f01.stringField(2, "");
! f01.stringField(3, "");
f01.stringField(4, "DIMENSION DU RECTANGLE");
f01.writeFields(fmtD);
--- 94,99 ----
f01.doubleField(0, _params.rectLargeur);
f01.doubleField(1, _params.rectHauteur);
! f01.stringField(2, vide);
! f01.stringField(3, vide);
f01.stringField(4, "DIMENSION DU RECTANGLE");
f01.writeFields(fmtD);
***************
*** 91,95 ****
f01.intField (1, _params.digitaliseur);
f01.intField (2, _params.traceur);
! f01.stringField(3, "");
f01.stringField(4, "TERMINAL, DIGITALISEUR ET TRACEUR");
f01.writeFields(fmtI);
--- 102,106 ----
f01.intField (1, _params.digitaliseur);
f01.intField (2, _params.traceur);
! f01.stringField(3, vide);
f01.stringField(4, "TERMINAL, DIGITALISEUR ET TRACEUR");
f01.writeFields(fmtI);
***************
*** 97,102 ****
f01.intField (0, _params.nbMaillesX);
f01.intField (1, _params.nbMaillesY);
! f01.stringField(2, "");
! f01.stringField(3, "");
f01.stringField(4, "NOMBRE DE MAILLES SUIVANT OX ET OY");
f01.writeFields(fmtI);
--- 108,113 ----
f01.intField (0, _params.nbMaillesX);
f01.intField (1, _params.nbMaillesY);
! f01.stringField(2, vide);
! f01.stringField(3, vide);
f01.stringField(4, "NOMBRE DE MAILLES SUIVANT OX ET OY");
f01.writeFields(fmtI);
***************
*** 104,109 ****
f01.doubleField(0, _params.segArretDebutX);
f01.doubleField(1, _params.segArretDebutY);
! f01.stringField(2, "");
! f01.stringField(3, "");
f01.stringField(4, "COOR. DE DEBUT DU SEGMENT D'ARRET");
f01.writeFields(fmtD);
--- 115,120 ----
f01.doubleField(0, _params.segArretDebutX);
f01.doubleField(1, _params.segArretDebutY);
! f01.stringField(2, vide);
! f01.stringField(3, vide);
f01.stringField(4, "COOR. DE DEBUT DU SEGMENT D'ARRET");
f01.writeFields(fmtD);
***************
*** 111,116 ****
f01.doubleField(0, _params.segArretFinX);
f01.doubleField(1, _params.segArretFinY);
! f01.stringField(2, "");
! f01.stringField(3, "");
f01.stringField(4, "COOR. DE FIN DU SEGMENT D'ARRET");
f01.writeFields(fmtD);
--- 122,127 ----
f01.doubleField(0, _params.segArretFinX);
f01.doubleField(1, _params.segArretFinY);
! f01.stringField(2, vide);
! f01.stringField(3, vide);
f01.stringField(4, "COOR. DE FIN DU SEGMENT D'ARRET");
f01.writeFields(fmtD);
***************
*** 119,123 ****
f01.doubleField(1, _params.flecheNordY);
f01.doubleField(2, _params.flecheNordDir);
! f01.stringField(3, "");
f01.stringField(4, "COOR. ET DIREC. DE LA FLECHE NORD");
f01.writeFields(fmtD);
--- 130,134 ----
f01.doubleField(1, _params.flecheNordY);
f01.doubleField(2, _params.flecheNordDir);
! f01.stringField(3, vide);
f01.stringField(4, "COOR. ET DIREC. DE LA FLECHE NORD");
f01.writeFields(fmtD);
***************
*** 125,137 ****
f01.intField (0, _params.codeImp);
f01.intField (1, _params.pasCalcul);
! f01.stringField(2, "");
! f01.stringField(3, "");
f01.stringField(4, "CODE D'IMP. ET PAS DE CALCUL");
f01.writeFields(fmtI);
f01.doubleField(0, _params.echTracePapier);
! f01.stringField(1, "");
! f01.stringField(2, "");
! f01.stringField(3, "");
f01.stringField(4, "ECHELLE DES TRACES SUR PAPIER");
f01.writeFields(fmtD);
--- 136,148 ----
f01.intField (0, _params.codeImp);
f01.intField (1, _params.pasCalcul);
! f01.stringField(2, vide);
! f01.stringField(3, vide);
f01.stringField(4, "CODE D'IMP. ET PAS DE CALCUL");
f01.writeFields(fmtI);
f01.doubleField(0, _params.echTracePapier);
! f01.stringField(1, vide);
! f01.stringField(2, vide);
! f01.stringField(3, vide);
f01.stringField(4, "ECHELLE DES TRACES SUR PAPIER");
f01.writeFields(fmtD);
***************
*** 139,144 ****
f01.doubleField(0, _params.coinInfGX);
f01.doubleField(1, _params.coinInfGY);
! f01.stringField(2, "");
! f01.stringField(3, "");
f01.stringField(4, "COOR. DU COIN INFERIEUR GAUCHE");
f01.writeFields(fmtD);
--- 150,155 ----
f01.doubleField(0, _params.coinInfGX);
f01.doubleField(1, _params.coinInfGY);
! f01.stringField(2, vide);
! f01.stringField(3, vide);
f01.stringField(4, "COOR. DU COIN INFERIEUR GAUCHE");
f01.writeFields(fmtD);
***************
*** 146,165 ****
f01.doubleField(0, _params.coinInfDX);
f01.doubleField(1, _params.coinInfDY);
! f01.stringField(2, "");
! f01.stringField(3, "");
f01.stringField(4, "COOR. DU COIN INFERIEUR DROIT");
f01.writeFields(fmtD);
f01.doubleField(0, _params.cadreTracesHauteur);
! f01.stringField(1, "");
! f01.stringField(2, "");
! f01.stringField(3, "");
f01.stringField(4, "HAUTEUR DU CADRE DES TRACES");
f01.writeFields(fmtD);
f01.intField (0, _params.cartoucheTracesPosition);
! f01.stringField(1, "");
! f01.stringField(2, "");
! f01.stringField(3, "");
f01.stringField(4, "POSITION DU CARTOUCHE DES TRACES");
f01.writeFields(fmtI);
--- 157,176 ----
f01.doubleField(0, _params.coinInfDX);
f01.doubleField(1, _params.coinInfDY);
! f01.stringField(2, vide);
! f01.stringField(3, vide);
f01.stringField(4, "COOR. DU COIN INFERIEUR DROIT");
f01.writeFields(fmtD);
f01.doubleField(0, _params.cadreTracesHauteur);
! f01.stringField(1, vide);
! f01.stringField(2, vide);
! f01.stringField(3, vide);
f01.stringField(4, "HAUTEUR DU CADRE DES TRACES");
f01.writeFields(fmtD);
f01.intField (0, _params.cartoucheTracesPosition);
! f01.stringField(1, vide);
! f01.stringField(2, vide);
! f01.stringField(3, vide);
f01.stringField(4, "POSITION DU CARTOUCHE DES TRACES");
f01.writeFields(fmtI);
|
