Menu
▾
▴
fudaa-cvs-commit — Mailing list for CVS commit messages
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
(89) |
Mar
(219) |
Apr
(82) |
May
(33) |
Jun
(11) |
Jul
(129) |
Aug
(357) |
Sep
(34) |
Oct
(37) |
Nov
(42) |
Dec
(182) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(59) |
Feb
(74) |
Mar
(196) |
Apr
(205) |
May
(109) |
Jun
(268) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <de...@us...> - 2003-02-21 16:39:59
|
Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/state
In directory sc8-pr-cvs1:/tmp/cvs-serv32411/ebli/src/org/fudaa/ebli/calque/state
Modified Files:
EbliStateSelection.java
Log Message:
Modifs mineures
Index: EbliStateSelection.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/state/EbliStateSelection.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** EbliStateSelection.java 30 Jan 2003 11:42:31 -0000 1.1
--- EbliStateSelection.java 21 Feb 2003 16:39:56 -0000 1.2
***************
*** 14,25 ****
import org.fudaa.ebli.calque.BCalque;
! import org.fudaa.ebli.calque.ZCalqueAffichageDonnees;
! import org.fudaa.ebli.calque.ZCalqueSelectionInteraction;
! import org.fudaa.ebli.calque.ZEbliFilleCalques;
import org.fudaa.ebli.calque.state.*;
import org.fudaa.ebli.commun.EbliLib;
/**
! *
* @author deniger
* @version $Id$
--- 14,23 ----
import org.fudaa.ebli.calque.BCalque;
! import org.fudaa.ebli.calque.*;
import org.fudaa.ebli.calque.state.*;
import org.fudaa.ebli.commun.EbliLib;
/**
! *
* @author deniger
* @version $Id$
***************
*** 30,50 ****
protected AbstractButton button_;
protected int mode_;
! ZEbliFilleCalques f_;
! public EbliStateSelection(ZEbliFilleCalques _f,int _mode,AbstractButton _bu)
{
! cqS_=_f.getCalqueSelection();
button_=_bu;
mode_=_mode;
! f_=_f;
}
!
public synchronized void activate()
{
cqS_.setGele(false);
cqS_.setModeSelection(mode_);
! f_.getArbreCalque().addTreeSelectionListener(this);
! majCalqueSelection(f_.getCalqueActif());
}
!
private void majCalqueSelection(BCalque _b)
{
--- 28,52 ----
protected AbstractButton button_;
protected int mode_;
! protected BArbreCalque arbre_;
! public EbliStateSelection(ZCalqueSelectionInteraction _inter,BArbreCalque _arbre,
! int _mode,AbstractButton _bu)
! // public EbliStateSelection(ZEbliFilleCalques _f,int _mode,AbstractButton _bu)
{
! cqS_=_inter;
button_=_bu;
mode_=_mode;
! arbre_=_arbre;
}
!
public synchronized void activate()
{
cqS_.setGele(false);
cqS_.setModeSelection(mode_);
! arbre_.addTreeSelectionListener(this);
! BCalque[] cqs=arbre_.getSelection();
! if((cqs!=null) && (cqs.length>0))
! majCalqueSelection(cqs[cqs.length-1]);
}
!
private void majCalqueSelection(BCalque _b)
{
***************
*** 55,65 ****
if (z.modeleDonnees().getNombre() != 0)
{
! System.out.println("calque ajoute");
cqS_.add(z);
}
}
}
!
!
/**
* @see org.fudaa.ebli.calque.EbliState#destroy()
--- 57,67 ----
if (z.modeleDonnees().getNombre() != 0)
{
! if(EbliLib.DEBUG) System.out.println("calque ajoute");
cqS_.add(z);
}
}
}
!
!
/**
* @see org.fudaa.ebli.calque.EbliState#destroy()
***************
*** 72,76 ****
}
!
public synchronized void valueChanged(TreeSelectionEvent _evt)
{
--- 74,78 ----
}
!
public synchronized void valueChanged(TreeSelectionEvent _evt)
{
***************
*** 78,90 ****
majCalqueSelection((BCalque) cqs[cqs.length - 1]);
}
!
public static class Ponctuelle extends EbliStateSelection
{
!
! public Ponctuelle(ZEbliFilleCalques _f,AbstractButton _b)
{
! super(_f,ZCalqueSelectionInteraction.PONCTUEL,_b);
}
!
public String getDescription()
{
--- 80,92 ----
majCalqueSelection((BCalque) cqs[cqs.length - 1]);
}
!
public static class Ponctuelle extends EbliStateSelection
{
!
! public Ponctuelle(ZCalqueSelectionInteraction _inter,BArbreCalque _arbre,AbstractButton _b)
{
! super(_inter,_arbre,ZCalqueSelectionInteraction.PONCTUEL,_b);
}
!
public String getDescription()
{
***************
*** 96,105 ****
public static class Rectangle extends EbliStateSelection
{
!
! public Rectangle(ZEbliFilleCalques _f,AbstractButton _b)
{
! super(_f,ZCalqueSelectionInteraction.RECTANGLE,_b);
}
!
public String getDescription()
{
--- 98,107 ----
public static class Rectangle extends EbliStateSelection
{
!
! public Rectangle(ZCalqueSelectionInteraction _inter,BArbreCalque _arbre,AbstractButton _b)
{
! super(_inter,_arbre,ZCalqueSelectionInteraction.RECTANGLE,_b);
}
!
public String getDescription()
{
***************
*** 110,119 ****
public static class Polygone extends EbliStateSelection
{
!
! public Polygone(ZEbliFilleCalques _f,AbstractButton _b)
{
! super(_f,ZCalqueSelectionInteraction.POLYGONE,_b);
}
!
public String getDescription()
{
--- 112,121 ----
public static class Polygone extends EbliStateSelection
{
!
! public Polygone(ZCalqueSelectionInteraction _inter,BArbreCalque _arbre,AbstractButton _b)
{
! super(_inter,_arbre,ZCalqueSelectionInteraction.POLYGONE,_b);
}
!
public String getDescription()
{
|
|
From: <de...@us...> - 2003-02-21 16:39:59
|
Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque
In directory sc8-pr-cvs1:/tmp/cvs-serv32411/ebli/src/org/fudaa/ebli/calque
Modified Files:
ZEbliFilleCalques.java
Log Message:
Modifs mineures
Index: ZEbliFilleCalques.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZEbliFilleCalques.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ZEbliFilleCalques.java 30 Jan 2003 17:27:39 -0000 1.2
--- ZEbliFilleCalques.java 21 Feb 2003 16:39:56 -0000 1.3
***************
*** 652,656 ****
public EbliState createState()
{
! return new EbliStateSelection.Ponctuelle(ZEbliFilleCalques.this, this);
}
};
--- 652,659 ----
public EbliState createState()
{
! return new EbliStateSelection.Ponctuelle(
! ZEbliFilleCalques.this.getCalqueSelection(),
! ZEbliFilleCalques.this.getArbreCalque(),
! this);
}
};
***************
*** 668,672 ****
public EbliState createState()
{
! return new EbliStateSelection.Rectangle(ZEbliFilleCalques.this, this);
}
};
--- 671,678 ----
public EbliState createState()
{
! return new EbliStateSelection.Rectangle(
! ZEbliFilleCalques.this.getCalqueSelection(),
! ZEbliFilleCalques.this.getArbreCalque()
! , this);
}
};
***************
*** 684,688 ****
public EbliState createState()
{
! return new EbliStateSelection.Polygone(ZEbliFilleCalques.this, this);
}
};
--- 690,697 ----
public EbliState createState()
{
! return new EbliStateSelection.Polygone(
! ZEbliFilleCalques.this.getCalqueSelection(),
! ZEbliFilleCalques.this.getArbreCalque(),
! this);
}
};
|
|
From: <de...@us...> - 2003-02-21 16:32:25
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/usine In directory sc8-pr-cvs1:/tmp/cvs-serv29484/dodico/src/org/fudaa/dodico/usine Added Files: .cvsignore Log Message: Modifs mineures --- NEW FILE: .cvsignore --- DUsine.java |
|
From: <de...@us...> - 2003-02-21 16:30:11
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/telemac
In directory sc8-pr-cvs1:/tmp/cvs-serv28615/dodico/src/org/fudaa/dodico/test/telemac
Modified Files:
TestSerafin.java TestSinusx.java
Log Message:
Modifs mineures
Index: TestSerafin.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/telemac/TestSerafin.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestSerafin.java 29 Jan 2003 12:14:44 -0000 1.1
--- TestSerafin.java 21 Feb 2003 16:30:07 -0000 1.2
***************
*** 15,19 ****
import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.fortran.*;
! import org.fudaa.dodico.telemac.*;
import org.fudaa.dodico.mnt.*;
/**
--- 15,20 ----
import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.fortran.*;
! import org.fudaa.dodico.tr.*;
! import org.fudaa.dodico.tr.telemac.*;
import org.fudaa.dodico.mnt.*;
/**
***************
*** 22,27 ****
*/
! public class TestSerafin
! extends TestCase
{
--- 23,27 ----
*/
! public class TestSerafin extends TestCase
{
***************
*** 30,43 ****
SerafinInterface t_;
-
/** */
public TestSerafin()
{
eps_ = 1E-15;
! t_=lecture(getFile("exemple.res"));
}
-
-
/**
* @param _f
--- 30,40 ----
SerafinInterface t_;
/** */
public TestSerafin()
{
eps_ = 1E-15;
! t_ = lecture(getFile("exemple.res"));
}
/**
* @param _f
***************
*** 46,56 ****
private File getFile(String _f)
{
! URL url = getClass().getResource(_f);
! if(url == null)
return null;
return new File(url.getPath());
}
-
/**
* Lit le fichier passe en argument.
--- 43,52 ----
private File getFile(String _f)
{
! URL url = getClass().getResource(_f);
! if (url == null)
return null;
return new File(url.getPath());
}
/**
* Lit le fichier passe en argument.
***************
*** 62,77 ****
try
{
! File fic = new File(args[args.length - 1]);
! InputStream in = new FileInputStream(fic);
! SerafinReader t = new SerafinReader(in);
System.out.println("");
System.out.println("les champs");
System.out.println("");
! DodicoLib.printStringArray(t.read());
in.close();
! DodicoLib.printFields(t, false);
}
! catch(IOException _e)
{
_e.printStackTrace();
--- 58,74 ----
try
{
! File fic = new File(args[args.length - 1]);
! InputStream in = new FileInputStream(fic);
! SerafinReader t = new SerafinReader(in);
System.out.println("");
System.out.println("les champs");
System.out.println("");
! SerafinInterface si = t.read();
! DodicoLib.printStringArray(t.getMessages());
in.close();
! DodicoLib.printFields(si, false);
}
! catch (IOException _e)
{
_e.printStackTrace();
***************
*** 80,96 ****
}
!
! private final static SerafinInterface lecture(File _f)
{
! SerafinReader t=null;
try
{
assertNotNull(_f);
! InputStream in = new FileInputStream(_f);
! t = new SerafinReader(in);
! t.read();
in.close();
}
! catch(IOException _e)
{
_e.printStackTrace();
--- 77,91 ----
}
! private final static synchronized SerafinInterface lecture(File _f)
{
! SerafinInterface t = null;
try
{
assertNotNull(_f);
! InputStream in = new FileInputStream(_f);
! t = new SerafinReader(in).read();
in.close();
}
! catch (IOException _e)
{
_e.printStackTrace();
***************
*** 103,111 ****
assertNotNull(t_);
//TITRE
! assertEquals(t_.getTitre(), "MODELE MARITIME - CALCUL1 SERAPHIN");
//NBV1
assertEquals(t_.getNbv1(), 6);
//TEXT
! String temp = t_.getNomVariables(0);
assertEquals(temp, "VITESSE U");
temp = t_.getNomVariables(5);
--- 98,108 ----
assertNotNull(t_);
//TITRE
! assertEquals(
! t_.getTitre(),
! "MODELE MARITIME - CALCUL1 SERAPHIN");
//NBV1
assertEquals(t_.getNbv1(), 6);
//TEXT
! String temp = t_.getNomVariables(0);
assertEquals(temp, "VITESSE U");
temp = t_.getNomVariables(5);
***************
*** 127,149 ****
assertEquals(t_.getNppel1(), 3);
//IKLE1
! assertEquals(t_.getIkle1(0,1), 1546);
! assertEquals(t_.getIkle1(t_.getNelem1()-1,0), 220);
//IPOBO1
assertEquals(t_.getIpobo1(4), 1);
//X1
! assertEquals(t_.getX1(9), (double)Float.intBitsToFloat(1160462115), eps_);
//Y1
! assertEquals(t_.getY1(11), (double)Float.intBitsToFloat(1140111573), eps_);
//Nombre de pas temps
! int tempInt = t_.getNbPasTemps();
assertEquals(tempInt, 2);
! double tempDouble = t_.getPasTemps()[1];
! assertEquals(tempDouble, (double)Float.intBitsToFloat(1153138688), eps_);
//pas de temps 1, variable 3
//premiere variable
! assertEquals(t_.getDonnees(0, 2,0), (double)Float.intBitsToFloat(1076258406), eps_);
//pas de temps 2, variable 4
//derniere variable
! assertEquals(t_.getDonnees(1, 3,t_.getNpoin1() - 1), (double)Float.intBitsToFloat(1093124747), eps_);
}
--- 124,152 ----
assertEquals(t_.getNppel1(), 3);
//IKLE1
! assertEquals(t_.getIkle1(0, 1), 1546);
! assertEquals(t_.getIkle1(t_.getNelem1() - 1, 0), 220);
//IPOBO1
assertEquals(t_.getIpobo1(4), 1);
//X1
! assertEquals(t_.getX1(9), (double) Float.intBitsToFloat(1160462115), eps_);
//Y1
! assertEquals(t_.getY1(11), (double) Float.intBitsToFloat(1140111573), eps_);
//Nombre de pas temps
! int tempInt = t_.getNbPasDeTemps();
assertEquals(tempInt, 2);
! double tempDouble = t_.getPasDeTemps()[1];
! assertEquals(tempDouble, (double) Float.intBitsToFloat(1153138688), eps_);
//pas de temps 1, variable 3
//premiere variable
! assertEquals(
! t_.getDonnees(0, 2, 0),
! (double) Float.intBitsToFloat(1076258406),
! eps_);
//pas de temps 2, variable 4
//derniere variable
! assertEquals(
! t_.getDonnees(1, 3, t_.getNpoin1() - 1),
! (double) Float.intBitsToFloat(1093124747),
! eps_);
}
***************
*** 151,167 ****
public void testEcriture()
{
! File f = null;
try
{
f = File.createTempFile("testSerafin", ".ser");
assertNotNull(f);
! OutputStream out=new FileOutputStream(f);
! SerafinWriter w = new SerafinWriter(t_,out);
! String[] r=w.write();
assertNull(r);
! t_=lecture(f);
testLecture();
}
! catch(Exception _e)
{
fail(_e.toString());
--- 154,170 ----
public void testEcriture()
{
! File f = null;
try
{
f = File.createTempFile("testSerafin", ".ser");
assertNotNull(f);
! OutputStream out = new FileOutputStream(f);
! SerafinWriter w = new SerafinWriter(t_, out);
! String[] r = w.write();
assertNull(r);
! t_ = lecture(f);
testLecture();
}
! catch (Exception _e)
{
fail(_e.toString());
***************
*** 169,202 ****
finally
{
! if(f != null)
f.delete();
}
}
! public void testMntAdapter()
{
assertNotNull(t_);
! int id=SerafinMNTAdapter.getIndex(t_, "HAUTEUR D'EAU");
! assertEquals(id,2);
! SerafinMNTAdapter a=new SerafinMNTAdapter(t_,id,0);
try
{
! String[] r=a.read();
! System.out.println("la conversion");
! DodicoLib.printStringArray(r);
assertNull(r);
! MNTZone[] zones= a.getMNTZones();
assertNotNull(zones);
assertNotNull(zones[0]);
! MNTSemis semis=zones[0].getSemis();
assertNotNull(semis);
//X1
! assertEquals(semis.getX(9), (double)Float.intBitsToFloat(1160462115), eps_);
//Y1
! assertEquals(semis.getY(11), (double)Float.intBitsToFloat(1140111573), eps_);
! assertEquals(semis.getZ(0), (double)Float.intBitsToFloat(1076258406), eps_);
}
! catch(Exception _e)
{
_e.printStackTrace();
--- 172,214 ----
finally
{
! if (f != null)
f.delete();
}
}
! public void testMntAdapter()
{
assertNotNull(t_);
! int id = SerafinMNTAdapter.getIndex(t_, "HAUTEUR D'EAU");
! assertEquals(id, 2);
! SerafinMNTAdapter a = new SerafinMNTAdapter(t_, id, 0);
try
{
! String[] r = a.read();
! if (r != null)
! DodicoLib.printStringArray(r);
assertNull(r);
! MNTZone[] zones = a.getMNTZones();
assertNotNull(zones);
assertNotNull(zones[0]);
! MNTSemis semis = zones[0].getSemis();
assertNotNull(semis);
//X1
! assertEquals(
! semis.getX(9),
! (double) Float.intBitsToFloat(1160462115),
! eps_);
//Y1
! assertEquals(
! semis.getY(11),
! (double) Float.intBitsToFloat(1140111573),
! eps_);
! assertEquals(
! semis.getZ(0),
! (double) Float.intBitsToFloat(1076258406),
! eps_);
}
! catch (Exception _e)
{
_e.printStackTrace();
***************
*** 206,209 ****
}
-
-
--- 218,219 ----
Index: TestSinusx.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/telemac/TestSinusx.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestSinusx.java 29 Jan 2003 12:14:44 -0000 1.1
--- TestSinusx.java 21 Feb 2003 16:30:07 -0000 1.2
***************
*** 18,22 ****
import org.fudaa.dodico.mnt.*;
! import org.fudaa.dodico.telemac.*;
/**
--- 18,23 ----
import org.fudaa.dodico.mnt.*;
! import org.fudaa.dodico.tr.*;
! import org.fudaa.dodico.tr.telemac.*;
/**
|
|
From: <de...@us...> - 2003-02-21 16:28:03
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/reflux In directory sc8-pr-cvs1:/tmp/cvs-serv27695/dodico/src/org/fudaa/dodico/test/reflux Added Files: TestDunes.java mesh.mail Log Message: Ajout de test pour le lecteur du format dunes --- NEW FILE: TestDunes.java --- (This appears to be a binary file; contents omitted.) --- NEW FILE: mesh.mail --- NOEUD 9 2 1 0 0 0.25 0.1 2 5 0 0.25 1 3 5 2 0.25 1 4 4 3 0.25 1 5 0 3 0.25 0.1 6 1 1 0.1 0.01 7 1 2 0.1 0.01 8 2 2 0.1 1 9 2 1 0.1 1 ELEMENT 9 1 3 3 4 8 2 3 5 1 6 3 3 3 8 9 4 3 9 1 2 5 3 5 8 4 6 3 5 7 8 7 3 5 6 7 8 3 9 2 3 9 3 1 9 6 0 0 0 0 |
|
From: <de...@us...> - 2003-02-21 16:24:58
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/reflux In directory sc8-pr-cvs1:/tmp/cvs-serv26354/dodico/src/org/fudaa/dodico/test/reflux Log Message: Directory /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/reflux added to the repository |
|
From: <de...@us...> - 2003-02-21 16:24:17
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test
In directory sc8-pr-cvs1:/tmp/cvs-serv26026/dodico/src/org/fudaa/dodico/test
Added Files:
TestStructure.java fichierTest.txt FortranReaderTest.java
Log Message:
deplacement depuis le package fortran
--- NEW FILE: TestStructure.java ---
/*
* @file TestClient.java
* @creation 1998-06-15
* @modification $Date: 2003/02/21 16:24:13 $
* @license GNU General Public License 2
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
* @mail de...@fu...
*/
package org.fudaa.dodico.test;
import org.fudaa.dodico.corba.geometrie.*;
import org.fudaa.dodico.corba.usine.*;
import org.fudaa.dodico.objet.*;
/**
* @version $Revision: 1.1 $ $Date: 2003/02/21 16:24:13 $ by $Author: deniger $
* @author Fred Deniger
*/
public class TestStructure
{
SPoint[] sPts;
int[][] poly_;
public TestStructure(int N)
{
sPts=new SPoint[3*N];
poly_=new int[N][3];
for(int i=0;i<N;i++)
{
sPts[3*i]=new SPoint();
sPts[3*i].x=i;
sPts[3*i].y=i;
sPts[3*i].z=i;
sPts[3*i+1]=new SPoint();
sPts[3*i+1].x=i;
sPts[3*i+1].y=i;
sPts[3*i+1].z=i;
sPts[3*i+2]=new SPoint();
sPts[3*i+2].x=i;
sPts[3*i+2].y=i;
sPts[3*i+2].z=i;
poly_[i][0]=3*i;
poly_[i][1]=3*i+1;
poly_[i][2]=3*i+2;
}
}
public static void main(String [] args)
{
TestStructure t=new TestStructure(10000);
while(true)
{
}
}
}
--- NEW FILE: fichierTest.txt ---
1234
1 2 3 4
1 2 3 4
'1' '2'
'1' '2' '4'
'1
'1''
--- NEW FILE: FortranReaderTest.java ---
/*
* @file FortranReaderTest.java
* @creation 2002-06-28
* @modification $Date: 2003/02/21 16:24:14 $
* @license GNU General Public License 2
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
* @mail de...@fu...
*/
package org.fudaa.dodico.test;
import java.io.*;
import java.util.*;
import org.fudaa.dodico.fortran.FortranReader;
/**
*
* @version $Id: FortranReaderTest.java,v 1.1 2003/02/21 16:24:14 deniger Exp $
* @author Fred Deniger
*/
public class FortranReaderTest
{
public static void main(String[] args)
{
try
{
String s=FortranReaderTest.class.getResource("fichierTest.txt").getFile();
System.out.println("fichier "+s);
FortranReader f=new FortranReader(new FileReader(new File(s)));
System.out.println("fichier trouve");
int NB=7;
for(int i=0;i<NB;i++)
{
f.readFieldsOld();
for(int j=0;j<f.getNumberOfFields();j++)
System.out.print("\""+f.stringField(j)+"\""+" ");
System.out.println("");
}
System.out.println("nouvelle Version");
f=new FortranReader(new FileReader(new File(s)));
for(int i=0;i<NB;i++)
{
f.readFields();
for(int j=0;j<f.getNumberOfFields();j++)
System.out.print("\""+f.stringField(j)+"\""+" ");
System.out.println("");
}
}
catch(Exception e)
{
System.out.println(e);
}
}
}
|
|
From: <de...@us...> - 2003-02-21 16:21:57
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/objet In directory sc8-pr-cvs1:/tmp/cvs-serv25068/dodico/src/org/fudaa/dodico/objet Removed Files: DodicoPreferencesPanel.java Log Message: deplacement dans la partie commune --- DodicoPreferencesPanel.java DELETED --- |
|
From: <de...@us...> - 2003-02-21 16:19:41
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/fortran In directory sc8-pr-cvs1:/tmp/cvs-serv24210/dodico/src/org/fudaa/dodico/fortran Removed Files: fichierTest.txt FortranReaderTest.java Log Message: deplacement dans la partie test --- fichierTest.txt DELETED --- --- FortranReaderTest.java DELETED --- |
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/objet
In directory sc8-pr-cvs1:/tmp/cvs-serv22374/dodico/src/org/fudaa/dodico/objet
Modified Files:
RequeteServeurDodicoGUI.java DDiffuseur.java CDodico.java
RequeteServeurDodico.java
Log Message:
Modifications mineures
Index: RequeteServeurDodicoGUI.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/objet/RequeteServeurDodicoGUI.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RequeteServeurDodicoGUI.java 29 Jan 2003 12:14:24 -0000 1.1
--- RequeteServeurDodicoGUI.java 21 Feb 2003 16:15:02 -0000 1.2
***************
*** 103,107 ****
/* pnMain_.setBackground(Color.white);
pnMain_.setOpaque(true); */
! pnMain_.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createLineBorder(Color.red),
BorderFactory.createEmptyBorder(10, 10, 10, 10)));
pnMain_.setPreferredSize(new Dimension(640, 480));
--- 103,107 ----
/* pnMain_.setBackground(Color.white);
pnMain_.setOpaque(true); */
! pnMain_.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createEtchedBorder(),
BorderFactory.createEmptyBorder(10, 10, 10, 10)));
pnMain_.setPreferredSize(new Dimension(640, 480));
***************
*** 159,163 ****
pack();
pnMain_.repaint();
!
}
--- 159,163 ----
pack();
pnMain_.repaint();
!
}
***************
*** 192,196 ****
}
!
public void listeServeur()
{
--- 192,196 ----
}
!
public void listeServeur()
{
***************
*** 212,216 ****
pnMain_.repaint();
}
!
public void listeOrganisme()
{
--- 212,216 ----
pnMain_.repaint();
}
!
public void listeOrganisme()
{
***************
*** 384,388 ****
affiche(moteur_.creePersonne(_txt, _org), "Création de la personne " + _txt);
}
!
public void creeOrganisme(String _org)
{
--- 384,388 ----
affiche(moteur_.creePersonne(_txt, _org), "Création de la personne " + _txt);
}
!
public void creeOrganisme(String _org)
{
Index: DDiffuseur.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/objet/DDiffuseur.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DDiffuseur.java 29 Jan 2003 12:14:25 -0000 1.1
--- DDiffuseur.java 21 Feb 2003 16:15:02 -0000 1.2
***************
*** 18,21 ****
--- 18,22 ----
import org.fudaa.dodico.corba.objet.*;
+ import org.fudaa.dodico.commun.*;
import org.fudaa.dodico.commun.DodicoPreferences;
***************
*** 100,109 ****
createClient(NS_ADDR,TCP_PORT).start();
}
! catch(Exception ex) { }
}
catch(Exception ex)
{
// System.err.println("Can not run registry on UDP network");
! // System.err.println("Use TCP connection to localhost");
// createReader().start();
createClient(LOCAL_ADDR,TCP_PORT).start();
--- 101,111 ----
createClient(NS_ADDR,TCP_PORT).start();
}
! catch(Exception ex) {
! }
}
catch(Exception ex)
{
// System.err.println("Can not run registry on UDP network");
! // System.err.println("Use TCP connection to localhost");
// createReader().start();
createClient(LOCAL_ADDR,TCP_PORT).start();
***************
*** 128,140 ****
if(iobjet!=null)
{
! String m="";
! try
! {
! String[] l=iobjet.interfacesCorba();
! for(int i=0;i<l.length;i++)
! { if(i>0) m+=","; m+=l[i]; }
! }
! catch(Exception ex) { }
! itfs_.put(_name,m);
}
--- 130,142 ----
if(iobjet!=null)
{
! String m="";
! try
! {
! String[] l=iobjet.interfacesCorba();
! for(int i=0;i<l.length;i++)
! { if(i>0) m+=","; m+=l[i]; }
! }
! catch(Exception ex) { }
! itfs_.put(_name,m);
}
***************
*** 358,362 ****
/**
! * Recherche un serveur par le nom. Exemple
* @param _nom
* @param _delai le temps max de recherche en seconde
--- 360,364 ----
/**
! * Recherche un serveur par le nom.
* @param _nom
* @param _delai le temps max de recherche en seconde
***************
*** 369,373 ****
/**
! * Recherche un serveur par son interface. Exemple
* @param _interface
* @param _delai le temps max de recherche en seconde
--- 371,375 ----
/**
! * Recherche un serveur par son interface.
* @param _interface
* @param _delai le temps max de recherche en seconde
***************
*** 820,824 ****
{
// private InetAddress addr_;
! private ServerSocket sock_;
public Server() throws Exception
--- 822,826 ----
{
// private InetAddress addr_;
! private ServerSocket serverSock_;
public Server() throws Exception
***************
*** 827,831 ****
// addr_=InetAddress.getLocalHost();
! sock_=new ServerSocket(TCP_PORT);
}
--- 829,833 ----
// addr_=InetAddress.getLocalHost();
! serverSock_=new ServerSocket(TCP_PORT);
}
***************
*** 836,840 ****
try
{
! Socket s=sock_.accept();
s.setSoTimeout(5*CYCLE);
--- 838,842 ----
try
{
! Socket s=serverSock_.accept();
s.setSoTimeout(5*CYCLE);
***************
*** 907,957 ****
while(true)
{
! boolean listing=(ps!=objs_.size());
! ps=objs_.size();
!
! // System.out.println("publish "+iors_.size()+" refs");
! String info="";
!
! for(Enumeration e=objs_.keys(); e.hasMoreElements(); )
! {
! String name=(String)e.nextElement();
! if(!"null".equals(_internal_ior(name)))
! {
! org.omg.CORBA.Object obj=(org.omg.CORBA.Object)objs_.get(name);
! if(obj._non_existent())
! {
! info+=name+" was killed\n";
! unbind(name,obj);
! listing=true;
! }
! }
! }
! for(Enumeration e=iors_.keys(); e.hasMoreElements(); )
! {
! String name=(String)e.nextElement();
! if("null".equals(iors_.get(name)))
! {
! long t=((Long)ttls_.get(name)).longValue();
! if(t>0) ttls_.put(name,new Long(t-1));
! else iors_.remove(name);
! }
! }
! if(listing&&interactive_)
! {
! System.out.println("");
! _internal_list();
! if(!"".equals(info)) System.out.println(info);
! System.out.print(">>> ");
! System.out.flush();
! }
! try { Thread.currentThread().sleep(5*CYCLE); }
! catch(InterruptedException ex) { }
}
}
}
public class Client extends Thread
--- 909,958 ----
while(true)
{
! boolean listing=(ps!=objs_.size());
! ps=objs_.size();
! // System.out.println("publish "+iors_.size()+" refs");
! String info="";
! for(Enumeration e=objs_.keys(); e.hasMoreElements(); )
! {
! String name=(String)e.nextElement();
! if(!"null".equals(_internal_ior(name)))
! {
! org.omg.CORBA.Object obj=(org.omg.CORBA.Object)objs_.get(name);
! if(obj._non_existent())
! {
! info+=name+" was killed\n";
! unbind(name,obj);
! listing=true;
! }
! }
! }
! for(Enumeration e=iors_.keys(); e.hasMoreElements(); )
! {
! String name=(String)e.nextElement();
! if("null".equals(iors_.get(name)))
! {
! long t=((Long)ttls_.get(name)).longValue();
! if(t>0) ttls_.put(name,new Long(t-1));
! else iors_.remove(name);
! }
! }
! if(listing&&interactive_)
! {
! System.out.println("");
! _internal_list();
! if(!"".equals(info)) System.out.println(info);
! System.out.print(">>> ");
! System.out.flush();
}
+
+ try { Thread.currentThread().sleep(5*CYCLE); }
+ catch(InterruptedException ex) { }
}
}
+ }
public class Client extends Thread
***************
*** 1040,1045 ****
catch(ConnectException ce)
{
! //System.err.println("Client: can not connect");
! //System.err.println("Try to launch receiver, emiter and server");
try
{
--- 1041,1047 ----
catch(ConnectException ce)
{
! ce.printStackTrace();
! System.err.println("Client: can not connect");
! System.err.println("Try to launch receiver, emiter and server");
try
{
***************
*** 1058,1067 ****
catch(Exception ex) { }
! //System.err.println("Succeed");
break;
}
catch(Exception ex)
{
! //System.err.println("Failed");
}
}
--- 1060,1069 ----
catch(Exception ex) { }
! System.err.println("Succeed");
break;
}
catch(Exception ex)
{
! System.err.println("Failed");
}
}
Index: CDodico.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/objet/CDodico.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CDodico.java 29 Jan 2003 12:14:24 -0000 1.1
--- CDodico.java 21 Feb 2003 16:15:02 -0000 1.2
***************
*** 144,148 ****
}
! public final static IUsine findUsine()
{
if( localUsine_!=null ) return localUsine_;
--- 144,148 ----
}
! public final static IUsine findUsine(int _time)
{
if( localUsine_!=null ) return localUsine_;
***************
*** 150,157 ****
IUsine u=null;
while( n<3 && u==null ) {
! u=IUsineHelper.narrow(findServerByInterface("::usine::IUsine", 2000));
n++;
}
return u;
}
--- 150,170 ----
IUsine u=null;
while( n<3 && u==null ) {
! u=IUsineHelper.narrow(findServerByInterface("::usine::IUsine", _time));
n++;
}
return u;
+ }
+
+ public final static IUsine findUsine()
+ {
+ return findUsine(2000);
+ /* if( localUsine_!=null ) return localUsine_;
+ int n=0;
+ IUsine u=null;
+ while( n<3 && u==null ) {
+ u=IUsineHelper.narrow(findServerByInterface("::usine::IUsine", 2000));
+ n++;
+ }
+ return u; */
}
Index: RequeteServeurDodico.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/objet/RequeteServeurDodico.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RequeteServeurDodico.java 29 Jan 2003 12:14:25 -0000 1.1
--- RequeteServeurDodico.java 21 Feb 2003 16:15:02 -0000 1.2
***************
*** 63,70 ****
private void creeUsine()
{
! // IUsine u = CDodico.findUsine();
! IUsine u = null;
if(u == null)
u = CDodico.creeUsineLocale();
u.reconnecte(CDodico.generateName("objet::IUsine"));
}
--- 63,72 ----
private void creeUsine()
{
! IUsine u = CDodico.findUsine();
if(u == null)
+ {
u = CDodico.creeUsineLocale();
+ System.out.println("Attention usine locale : elle sera détruite avec la machine virtuelle");
+ }
u.reconnecte(CDodico.generateName("objet::IUsine"));
}
***************
*** 118,121 ****
--- 120,132 ----
}
+ /**
+ * @param _type
+ * @return
+ */
+ /* private org.omg.CORBA.Object[] _listByInterface(String _type)
+ {
+ return DDiffuseur.chercheServeurParInterface(_type, 5);
+ }
+ */
/**
***************
*** 372,380 ****
{
String[] tachesInit = _list("::objet::ITache");
Vector v = new Vector();
for(int i = 0; i < tachesInit.length; i++)
{
! if(tachesInit[i].indexOf("Diffuseur") < 0)
! v.add(tachesInit[i]);
}
taches_ = new String[v.size()];
--- 383,394 ----
{
String[] tachesInit = _list("::objet::ITache");
+ System.out.println(tachesInit.length);
Vector v = new Vector();
+ String s;
for(int i = 0; i < tachesInit.length; i++)
{
! s=tachesInit[i];
! if(s.indexOf("Diffuseur") < 0)
! v.add(s);
}
taches_ = new String[v.size()];
***************
*** 444,448 ****
String nom = CDodico.generateName(getInterfaceCalcul(serv));
! CDodico.rebind(nom, o);
String[] r = new String[4];
r[0] =
--- 458,463 ----
String nom = CDodico.generateName(getInterfaceCalcul(serv));
! IObjet io=IObjetHelper.narrow(o);
! io.reconnecte(nom);
String[] r = new String[4];
r[0] =
|
|
From: <de...@us...> - 2003-02-21 16:07:37
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/commun
In directory sc8-pr-cvs1:/tmp/cvs-serv19712/dodico/src/org/fudaa/dodico/commun
Added Files:
DodicoPreferencesPanel.java
Log Message:
Deplacement du panneau de preferences
--- NEW FILE: DodicoPreferencesPanel.java ---
/*
* @file DodicoPreferencesPanel.java
* @creation 2002-12-02
* @modification $Date: 2003/02/21 16:07:34 $
* @license GNU General Public License 2
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
* @mail de...@fu...
*/
package org.fudaa.dodico.commun;
import javax.swing.JFrame;
import javax.swing.event.InternalFrameAdapter;
import javax.swing.event.InternalFrameEvent;
import com.memoire.bu.BuAbstractPreferencesPanel;
import com.memoire.bu.BuCheckBox;
import com.memoire.bu.BuGridLayout;
import com.memoire.bu.BuLabel;
import com.memoire.bu.BuPreferencesFrame;
import com.memoire.bu.BuTextField;
/**
* Un panel d'edition pour les preferences des serveurs Dodico. Permet de
*spécifier l'adresse du serveur, les numeros de ports utilises, le masque de
*sous-reseau... Il sera possible de specifier la connexion automatique au
*serveur local.
*
* @version $Id: DodicoPreferencesPanel.java,v 1.1 2003/02/21 16:07:34 deniger Exp $
* @author Fred Deniger
*/
public class DodicoPreferencesPanel
extends BuAbstractPreferencesPanel
{
/** Le champ texte contenant l'adresse du serveur */
BuTextField nsAddr_;
/** Le champ texte pour l'adresse du sous-reseau */
BuTextField udpAddr_;
/** L'adresse de la machine locale. */
BuTextField localAddr_;
/** Le numero de port TCP */
BuTextField TCPPort_;
/** Le numero de port UDP */
BuTextField UDPPort_;
/** Valide la connexion locale automatique */
BuCheckBox connexionLocale_;
/** Construit le panel et initialise les preferences. */
public DodicoPreferencesPanel()
{
super();
initPanel();
}
private BuLabel createLabel(String _s)
{
BuLabel r=new BuLabel(DodicoLib.geti18n(_s));
r.setVerticalTextPosition(BuLabel.CENTER);
return r;
}
private BuTextField createTextField(String _s)
{
BuTextField r=new BuTextField();
r.setToolTipText(DodicoLib.geti18n(_s));
return r;
}
private BuTextField createIntegerField(String _s)
{
BuTextField r=BuTextField.createIntegerField();
r.setToolTipText(DodicoLib.geti18n(_s));
return r;
}
/** Construction du panel */
private final void initPanel()
{
setLayout(new BuGridLayout(2, 5, 5));
/*
BuLabel cl = createTextField("Connexion locale par défaut"));
//Pour l'instant
cl.setEnabled(false);
add(cl);
connexionLocale_ = new BuCheckBox();
connexionLocale_.setEnabled(false);
connexionLocale_.setToolTipText("Si activé, le serveur local sera automatiquement choisi"));
add(connexionLocale_); */
/* add(createLabel("Adresse locale"));
localAddr_ = createTextField("L'adresse locale de la machine");
add(localAddr_); */
add(createLabel("Adresse du serveur principal"));
nsAddr_ = createTextField("L'adresse IP du serveur principal");
add(nsAddr_);
add(createLabel("Port TCP"));
TCPPort_ = createIntegerField("Le port TCP (réception et envoi)");
add(TCPPort_);
add(createLabel("Adresse UDP"));
udpAddr_ = createTextField("L'adresse sur laquelle les datagrammes d'informations seront envoyés par le protocole UDP");
add(udpAddr_);
add(createLabel("Port UDP"));
UDPPort_ = createIntegerField("Le port UDP (réception et envoi)");
add(UDPPort_);
updateComponents();
}
// Methodes privees
/** Enregistrement dans la hastables des preferences editees par ce panel */
private void fillTable()
{
putNS_ADDR(nsAddr_.getText());
putLOCAL_ADDR(localAddr_.getText());
putUDP_ADDR(udpAddr_.getText());
putTCP_PORT(Integer.parseInt(TCPPort_.getText()));
putUDP_PORT(Integer.parseInt(UDPPort_.getText()));
putCONNEXION_LOCAL(connexionLocale_.isSelected());
}
/** Maj des champs de ce panel a partir des preferences. */
private void updateComponents()
{
nsAddr_.setText(getNS_ADDR());
udpAddr_.setText(getUDP_ADDR());
// localAddr_.setText(getLOCAL_ADDR());
TCPPort_.setText(String.valueOf(getTCP_PORT()));
UDPPort_.setText(String.valueOf(getUDP_PORT()));
// connexionLocale_.setSelected(getCONNEXION_LOCAL());
}
/**
* Mise a jour du type de connexion. Si true, le serveur local sera
* automatiquement choisi.
*
* @param _b
*/
public final static void putCONNEXION_LOCAL(boolean _b)
{
DodicoPreferences.DODICO.putBooleanProperty("dodico.local.connexion", _b);
}
/**
* Mise a jour du port udp dans les preferences ( il faut effectuer la commande
* writeIniFile ensuite pour mettre a jour le fichier )
*
* @param _n
*/
public final static void putUDP_PORT(int _n)
{
DodicoPreferences.DODICO.putIntegerProperty("dodico.udp.port", _n);
}
/**
* Mise a jour du port tcp dans les preferences ( il faut effectuer la commande
* writeIniFile ensuite pour mettre a jour le fichier )
*
* @param _n
*/
public final static void putTCP_PORT(int _n)
{
DodicoPreferences.DODICO.putIntegerProperty("dodico.tcp.port", _n);
}
/**
* Mise a jour de l'adresse UDP dans les preferences ( il faut effectuer la commande
* writeIniFile ensuite pour mettre a jour le fichier )
*
* @param _addr
*/
public final static void putUDP_ADDR(String _addr)
{
if(_addr != null)
DodicoPreferences.DODICO.putStringProperty("dodico.udp.addr", _addr);
}
/**
* Mise a jour de l'adresse locale dans les preferences ( il faut effectuer la commande
* preferences.writeIniFile ensuite pour mettre a jour le fichier )
*
* @param _addr
*/
public final static void putLOCAL_ADDR(String _addr)
{
if(_addr != null)
DodicoPreferences.DODICO.putStringProperty("dodico.local.addr", _addr);
}
/**
* Mise a jour de l'adresse du serveur dans les preferences ( il faut effectuer la commande
* writeIniFile ensuite pour mettre a jour le fichier )
*
* @param _addr
*/
public final static void putNS_ADDR(String _addr)
{
if(_addr != null)
DodicoPreferences.DODICO.putStringProperty("dodico.ns.addr", _addr);
}
/** Maj a jour la hastable des preferences et le fichier. */
public void validatePreferences()
{
fillTable();
DodicoPreferences.DODICO.writeIniFile();
}
/** Relit le fichier des prefs et met a jour l'affichage. */
public void cancelPreferences()
{
DodicoPreferences.DODICO.readIniFile();
updateComponents();
}
/**
* Renvoie, a partir des preferences, du type de connexion par defaut. Si true la
* connexion sera par defaut local.
*
* @return le ypte de connexion ( valeur par defaut true).
*/
public final static boolean getCONNEXION_LOCAL()
{
return DodicoPreferences.DODICO.getBooleanProperty("dodico.local.connexion", true);
}
/**
* Renvoie, a partir des preferences, le port UDP du diffuseur.
*
* @return le port UDP lu dans les preferences ( defaut =14001).
*/
public final static int getUDP_PORT()
{
return DodicoPreferences.DODICO.getIntegerProperty("dodico.udp.port", 14001);
}
/**
* Renvoie, a partir des preferences, le port TCP du diffuseur.
*
* @return le port TCP lu dans les preferences ( defaut =14001).
*/
public final static int getTCP_PORT()
{
return DodicoPreferences.DODICO.getIntegerProperty("dodico.tcp.port", 14001);
}
/**
* Renvoie, a partir des preferences, l'adresse IP pour la diffusion UDP.
* Elle correspond au masque de sous-reseau.
*
* @return l'adresse du sous-reseau ( par defaut "172.17.0.0").
*/
public final static String getUDP_ADDR()
{
return DodicoPreferences.DODICO.getStringProperty("dodico.udp.addr", "172.17.0.0");
}
/**
* Renvoie, a partir des preferences, l'adresse locale de la machine de
* l'utilisateur.
*
* @return l'adresse local ( "127.0.0.1" par defaut).
*/
public final static String getLOCAL_ADDR()
{
return DodicoPreferences.DODICO.getStringProperty("dodico.local.addr", "127.0.0.1");
}
/**
* Renvoie, a partir des preferences, l'adresse du serveur de calcul.
*
* @return l'adresse du serveur ( "171.17.250.82" par defaut).
*/
public final static String getNS_ADDR()
{
return DodicoPreferences.DODICO.getStringProperty("dodico.ns.addr", "172.17.250.82");
}
/**
* @return Title
*/
public String getTitle()
{
return "Serveur de calcul";
}
/**
* @return PreferencesValidable
*/
public boolean isPreferencesValidable()
{
return true;
}
/**
* les preferences sont-elles applicables
*
* @return PreferencesApplyable
*/
public boolean isPreferencesApplyable()
{
return false;
}
/**
* Renvoie true si les preferences peuvent etre annulees.
*
* @return PreferencesCancelable
*/
public boolean isPreferencesCancelable()
{
return true;
}
/**
* Permet d'editer le panneau de preferences.
*
* @param args
*/
public static void main(String[] args)
{
final JFrame frame = new JFrame("Preferences des serveurs");
frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
BuPreferencesFrame iframe = new BuPreferencesFrame();
iframe.addInternalFrameListener(new InternalFrameAdapter()
{
public void internalFrameClosed(InternalFrameEvent _e)
{
if(frame!=null) frame.dispose();
}
}
);
iframe.addTab(new DodicoPreferencesPanel());
iframe.setClosable(false);
iframe.setIconifiable(false);
frame.setContentPane(iframe);
iframe.setTitle("Dodico");
iframe.pack();
iframe.show();
frame.pack();
frame.show();
}
}
|
|
From: <de...@us...> - 2003-02-21 16:00:47
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/fortran In directory sc8-pr-cvs1:/tmp/cvs-serv16947/dodico/src/org/fudaa/dodico/fortran Modified Files: NativeBinaryInputStream.java FortranWriter.java FortranReader.java FortranBinaryOutputStream.java ConversionStringDouble.java NativeBinaryOutputStream.java CsvReader.java FortranBinaryInputStream.java Log Message: *** keyword substitution change *** Index: NativeBinaryInputStream.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/fortran/NativeBinaryInputStream.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: FortranWriter.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/fortran/FortranWriter.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: FortranReader.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/fortran/FortranReader.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Index: FortranBinaryOutputStream.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/fortran/FortranBinaryOutputStream.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: ConversionStringDouble.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/fortran/ConversionStringDouble.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: NativeBinaryOutputStream.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/fortran/NativeBinaryOutputStream.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: CsvReader.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/fortran/CsvReader.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: FortranBinaryInputStream.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/fortran/FortranBinaryInputStream.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 |
|
From: <de...@us...> - 2003-02-21 15:58:38
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/fortran In directory sc8-pr-cvs1:/tmp/cvs-serv15980/dodico/src/org/fudaa/dodico/fortran Modified Files: FortranReader.java Log Message: Modifications mineures Index: FortranReader.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/fortran/FortranReader.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FortranReader.java 29 Jan 2003 12:14:28 -0000 1.1 --- FortranReader.java 21 Feb 2003 15:58:35 -0000 1.2 *************** *** 10,15 **** package org.fudaa.dodico.fortran; ! import java.io.*; ! import java.util.*; /** --- 10,20 ---- package org.fudaa.dodico.fortran; ! import java.io.EOFException; ! import java.io.IOException; ! import java.io.LineNumberReader; ! import java.io.Reader; ! import java.util.Vector; ! ! import org.fudaa.dodico.commun.DodicoLib; /** *************** *** 31,36 **** protected String[] fields; protected String line; ! protected int number; protected boolean blankIsZero; public FortranReader(Reader _reader) --- 36,43 ---- protected String[] fields; protected String line; ! // protected int number; protected boolean blankIsZero; + String commentChar_; + boolean jumpBlankLine_; public FortranReader(Reader _reader) *************** *** 39,43 **** fields=null; line =null; ! number=-1; blankIsZero=false; } --- 46,50 ---- fields=null; line =null; ! // number=-1; blankIsZero=false; } *************** *** 78,81 **** --- 85,100 ---- */ public void setBlankZero(boolean _state) { blankIsZero=_state; } + + /** + * Definit si les lignes commencant par le caractere '_c' + * sont traites comme un seul champ ou non. Par defaut, toutes les + * lignes sont traites champs par champs (_c=null). + * Cette optimisation n'est utilisee que par la methode readFields(); + * @param _c le caractere indiquant un commentaire + */ + public void setCommentInOneField(String _c) + { + commentChar_=_c; + } /** *************** *** 125,129 **** } } ! /** * Lit une ligne et l'analyse selon le format libre (espaces). --- 144,166 ---- } } ! ! /** ! * Cette methode ne peut etre appelee que si le caractere ! * de commentaire a ete initialise avec la methode ! * setCommentInOneField(). Dans ce cas, renvoie true si la ligne ! * lue commence par le caractere de commentaire. ! * non testee. ! * ! * @see #setCommentInOneField(String) ! */ ! public boolean isCommentLine() ! { ! if(commentChar_==null) ! throw new IllegalArgumentException( ! DodicoLib.geti18n("le caractere de commentaire doit etre defini par setCommandInOneField()")); ! if((fields.length==1) && ( fields[0].startsWith(commentChar_))) ! return true; ! return false; ! } /** * Lit une ligne et l'analyse selon le format libre (espaces). *************** *** 134,137 **** --- 171,190 ---- line=s; if(line==null) throw new EOFException(); + if(jumpBlankLine_) + { + if("".equals(line.trim())) + { + this.readFields(); + return; + } + } + if(commentChar_!=null) + { + if(line.startsWith(commentChar_)) + { + fields=new String[]{line}; + } + return; + } int i,l; *************** *** 361,364 **** --- 414,437 ---- return r; } + /** + * Renvoie la propriete jumpBlankLine. + * @return boolean + */ + public boolean isJumpBlankLine() + { + return jumpBlankLine_; + } + + /** + * Affecte la propriete jumbblankLine. Si true, les lignes 'blanches' sont + * ignorees. Cette proprietes n'est utilisee que pour la methode + * readFields(). + * @param jumpBlankLine The jumpBlankLine to set + */ + public void setJumpBlankLine(boolean jumpBlankLine) + { + jumpBlankLine_ = jumpBlankLine; + } + } |
|
From: <de...@us...> - 2003-02-21 15:56:26
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/commun
In directory sc8-pr-cvs1:/tmp/cvs-serv15150/dodico/src/org/fudaa/dodico/commun
Modified Files:
ProgressionBuAdapter.java
Log Message:
Modifications mineures
Index: ProgressionBuAdapter.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/commun/ProgressionBuAdapter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ProgressionBuAdapter.java 21 Feb 2003 15:54:11 -0000 1.3
--- ProgressionBuAdapter.java 21 Feb 2003 15:56:21 -0000 1.4
***************
*** 39,43 ****
public void setProgression(int _v)
{
! System.out.println("progression : "+_v);
if(t_!=null) t_.setProgression(_v);
}
--- 39,43 ----
public void setProgression(int _v)
{
! //System.out.println("progression : "+_v);
if(t_!=null) t_.setProgression(_v);
}
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/commun In directory sc8-pr-cvs1:/tmp/cvs-serv14175/dodico/src/org/fudaa/dodico/commun Modified Files: ProgressionBuAdapter.java DodicoPreferences.java DodicoResource.java FieldsAnalyse.java ProgressionDodicoAdapter.java ProgressionInterface.java Log Message: *** keyword substitution change *** Index: ProgressionBuAdapter.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/commun/ProgressionBuAdapter.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Index: DodicoPreferences.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/commun/DodicoPreferences.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: DodicoResource.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/commun/DodicoResource.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: FieldsAnalyse.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/commun/FieldsAnalyse.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Index: ProgressionDodicoAdapter.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/commun/ProgressionDodicoAdapter.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Index: ProgressionInterface.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/commun/ProgressionInterface.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 |
|
From: <de...@us...> - 2003-02-21 15:53:10
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/commun In directory sc8-pr-cvs1:/tmp/cvs-serv13687/dodico/src/org/fudaa/dodico/commun Modified Files: DodicoLib.java Log Message: *** keyword substitution change *** Index: DodicoLib.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/commun/DodicoLib.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 |
|
From: <de...@us...> - 2003-02-21 15:50:18
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/commun
In directory sc8-pr-cvs1:/tmp/cvs-serv12513/dodico/src/org/fudaa/dodico/commun
Modified Files:
ProgressionBuAdapter.java DodicoLib.java
ProgressionDodicoAdapter.java
Log Message:
Modifications mineures
Index: ProgressionBuAdapter.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/commun/ProgressionBuAdapter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ProgressionBuAdapter.java 29 Jan 2003 12:14:35 -0000 1.1
--- ProgressionBuAdapter.java 21 Feb 2003 15:50:15 -0000 1.2
***************
*** 39,42 ****
--- 39,43 ----
public void setProgression(int _v)
{
+ System.out.println("progression : "+_v);
if(t_!=null) t_.setProgression(_v);
}
Index: DodicoLib.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/commun/DodicoLib.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DodicoLib.java 29 Jan 2003 12:14:35 -0000 1.1
--- DodicoLib.java 21 Feb 2003 15:50:15 -0000 1.2
***************
*** 9,15 ****
package org.fudaa.dodico.commun;
! import java.lang.reflect.*;
! import java.util.*;
! import java.io.*;
/**
--- 9,17 ----
package org.fudaa.dodico.commun;
! import java.io.LineNumberReader;
! import java.lang.reflect.Array;
! import java.lang.reflect.Field;
! import java.util.AbstractCollection;
! import java.util.HashMap;
/**
***************
*** 37,41 ****
* @return descriprion
*/
! public static String printObjet(Object _o, boolean _verbose)
{
if(_o == null)
--- 39,43 ----
* @return descriprion
*/
! public static String _printObject(Object _o, boolean _verbose)
{
if(_o == null)
***************
*** 50,57 ****
if(n > 0)
{
! b.append(printObjet(Array.get(_o, 0), _verbose));
for(int j = 1; j < n; j++)
{
! b.append("," + printObjet(Array.get(_o, j), _verbose));
}
}
--- 52,59 ----
if(n > 0)
{
! b.append(_printObject(Array.get(_o, 0), _verbose));
for(int j = 1; j < n; j++)
{
! b.append("," + _printObject(Array.get(_o, j), _verbose));
}
}
***************
*** 91,95 ****
Object o = f.get(_obj);
System.out.print(f.getName());
! System.out.println(" " + printObjet(o, _verbose));
}
catch(Exception e)
--- 93,97 ----
Object o = f.get(_obj);
System.out.print(f.getName());
! System.out.println(" " + _printObject(o, _verbose));
}
catch(Exception e)
***************
*** 100,103 ****
--- 102,110 ----
}
+ public static void printObject(Object _o,boolean _v)
+ {
+ System.out.println(_printObject(_o, _v));
+ }
+
public static void addi18n(AbstractCollection _v,String _s)
{
***************
*** 191,226 ****
return DodicoResource.DODICO.getString(_s);
}
!
!
/**
! * ajoute le n° de ligne et Internationalise <code>_e</code>.
*/
! public static String formateString(String _e, LineNumberReader _l)
! {
! String s;
! if(_l==null) s=geti18n(_e);
! else s=geti18n("ligne")+" "+_l.getLineNumber() + ": " + geti18n(_e);
! return s;
! }
!
! public static String getInfo(String _e, LineNumberReader _l)
! {
! return formateString("Info",null)+": "+formateString(_e,_l);
! }
!
! public static String getError(String _e, LineNumberReader _l)
! {
! return formateString("Erreur",null)+": "+formateString(_e,_l);
! }
!
! public static void addInfo(AbstractCollection _v,String _e, LineNumberReader _l)
! {
! _v.add(getInfo(_e,_l));
! }
!
! public static void addError(AbstractCollection _v,String _e, LineNumberReader _l)
{
! _v.add(getError(_e,_l));
}
--- 198,234 ----
return DodicoResource.DODICO.getString(_s);
}
!
/**
! * Methode permettant de parser les arguments passes a une methode main.
! * Stocke les valeurs pour chaque <code>_ids</code> dans la table de
! * correspondance passee en argument.
! * Les arguments du type -f=monFichier seront ajoutee sous la forme
! * cle=-f et valeur=monFichier.
! * Les arguments de type -l donneront
! * cle=-l et valeur=null.
*/
! public static synchronized HashMap parseArgs(String[] _args)
{
! if(_args==null) return null;
! int l=_args.length;
! HashMap r=new HashMap(l);
! int index;
! String champ;
! for(int i=0;i<l;i++)
! {
! champ=_args[i];
! index=champ.indexOf("=");
! if(index<0)
! {
! r.put(champ, null);
! }
! else
! {
! r.put(champ.substring(0,index),champ.substring(index+1,champ.length()));
! }
! }
! return r;
!
}
Index: ProgressionDodicoAdapter.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/commun/ProgressionDodicoAdapter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ProgressionDodicoAdapter.java 29 Jan 2003 12:14:35 -0000 1.1
--- ProgressionDodicoAdapter.java 21 Feb 2003 15:50:15 -0000 1.2
***************
*** 11,15 ****
import org.fudaa.dodico.corba.calcul.SProgression;
/**
! * une interface pour mettre a jour la progression.
*
* @version $Id$
--- 11,16 ----
import org.fudaa.dodico.corba.calcul.SProgression;
/**
! * une implementation de progessionDodico pour les
! * structures <code>SProgression</code>.
*
* @version $Id$
|
|
From: <de...@us...> - 2003-02-21 15:41:47
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/commun In directory sc8-pr-cvs1:/tmp/cvs-serv8844/dodico/src/org/fudaa/dodico/commun Added Files: DodicoIOAnalyse.java Log Message: Une classe permettant de stocker le deroulement d'un operation ( ecriture ou lecture de fichier par exemple). --- NEW FILE: DodicoIOAnalyse.java --- (This appears to be a binary file; contents omitted.) |
|
From: <de...@us...> - 2003-02-21 15:21:28
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/idl/general In directory sc8-pr-cvs1:/tmp/cvs-serv32490/dodico/idl/general Added Files: utilitaire.idl usine.idl.cpy Log Message: erreurs ... |
|
From: <de...@us...> - 2003-02-21 15:20:28
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/idl/general In directory sc8-pr-cvs1:/tmp/cvs-serv31928/dodico/idl/general Added Files: evenement.idl objet.idl geometrie.idl CosNaming.idl mathematiques.idl simulation.idl collection.idl calcul.idl planification.idl probabilite.idl Log Message: erreurs ... |
|
From: <de...@us...> - 2003-02-21 15:17:45
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/idl/general In directory sc8-pr-cvs1:/tmp/cvs-serv30655/dodico/idl/general Added Files: base.idl Log Message: erreurs ... |
|
From: <de...@us...> - 2003-02-21 15:12:41
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/idl/general
In directory sc8-pr-cvs1:/tmp/cvs-serv28202/dodico/idl/general
Modified Files:
association.idl
Log Message:
essai
Index: association.idl
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/idl/general/association.idl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** association.idl 21 Feb 2003 15:09:08 -0000 1.8
--- association.idl 21 Feb 2003 15:12:32 -0000 1.9
***************
*** 1,50 ****
! /*
! * @file association.idl
! * @creation 1998-03-23
! * @modification $Date$
! * @license GNU General Public License 2
! * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
! * @mail de...@fu...
! */
!
! #ifndef _ASSOCIATION_IDL
! #define _ASSOCIATION_IDL
!
! #include "general/objet.idl"
!
! /**
! * Ce module propose des interfaces pour des associations classiques
! * disponibles notament dans Java comme les Hashtables, ...
! *
! * @version $Revision$ $Date$ by $Author$
! * @author Desnoix Guillaume
! */
! module association
! {
!
! /**
! * Une interface de base pour toutes les associations.
! */
! interface IAssociation : iobjet
! {
! attribute vviobjet paires;
!
! rien vide ();
! booleen contient (in iobjet v);
! iobjet valeur (in iobjet c);
! booleen estVide ();
! viobjet clefs ();
! rien place (in iobjet c, in iobjet v);
! rien enleve (in iobjet c);
! entier taille ();
! viobjet valeurs ();
! };
!
! interface ITableHachage : IAssociation
! {
! };
! };
!
! #endif
!
!
--- 1,50 ----
! /*
! * @file association.idl
! * @creation 1998-03-23
! * @modification $Date$
! * @license GNU General Public License 2
! * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
! * @mail de...@fu...
! */
!
! #ifndef _ASSOCIATION_IDL
! #define _ASSOCIATION_IDL
!
! #include "general/objet.idl"
!
! /**
! * Ce module propose des interfaces pour des associations classiques
! * disponibles notament dans Java comme les Hashtables, ...
! *
! * @version $Id$
! * @author Desnoix Guillaume
! */
! module association
! {
!
! /**
! * Une interface de base pour toutes les associations.
! */
! interface IAssociation : iobjet
! {
! attribute vviobjet paires;
!
! rien vide ();
! booleen contient (in iobjet v);
! iobjet valeur (in iobjet c);
! booleen estVide ();
! viobjet clefs ();
! rien place (in iobjet c, in iobjet v);
! rien enleve (in iobjet c);
! entier taille ();
! viobjet valeurs ();
! };
!
! interface ITableHachage : IAssociation
! {
! };
! };
!
! #endif
!
!
|
|
From: <de...@us...> - 2003-02-21 15:09:13
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/idl/general In directory sc8-pr-cvs1:/tmp/cvs-serv26603a/dodico/idl/general Added Files: association.idl Log Message: Erreurs lors du changement binaire ascii |
|
From: <de...@us...> - 2003-02-21 15:04:59
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/idl/general In directory sc8-pr-cvs1:/tmp/cvs-serv24298/dodico/idl/general Removed Files: association.idl Log Message: Erreurs lors du changement binaire ascii --- association.idl DELETED --- |
|
From: <de...@us...> - 2003-02-21 15:00:37
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/idl/general In directory sc8-pr-cvs1:/tmp/cvs-serv22412/dodico/idl/general Added Files: association.idl Log Message: Erreurs lors du changement binaire ascii |
