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
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/telemac
In directory sc8-pr-cvs1:/tmp/cvs-serv5355/test/telemac
Modified Files:
SerafinArchConvertGUI.java TestCL.java TestCas.java
TestLiquide.java TestSerafin.java TestSerafinArchConvert.java
Log Message:
Creation des dossiers h2d/reflux et h2d/telemac et deplacement des
fichiers concerne.
Gestion des cl et des bords ( a refaire ..)
Amelioration des gestions des versions de fichiers
Index: SerafinArchConvertGUI.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/telemac/SerafinArchConvertGUI.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SerafinArchConvertGUI.java 18 Aug 2003 11:05:20 -0000 1.3
--- SerafinArchConvertGUI.java 22 Aug 2003 15:51:13 -0000 1.4
***************
*** 53,58 ****
* @version $Id$
*/
! public class SerafinArchConvertGUI extends BuPanel implements ActionListener
! {
BuButton btConvert_;
BuLabel lbIn_;
--- 53,57 ----
* @version $Id$
*/
! public class SerafinArchConvertGUI extends BuPanel implements ActionListener {
BuButton btConvert_;
BuLabel lbIn_;
***************
*** 70,91 ****
ProgressionBuAdapter progression_;
! public SerafinArchConvertGUI(JFrame _f)
! {
super();
! f_ = _f;
build();
! defaultHome_ = new File(System.getProperty("user.home"));
! progression_ = new ProgressionBuAdapter();
}
! private final void build()
! {
setLayout(new BuBorderLayout());
setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
! BuPanel bts = new BuPanel();
bts.setLayout(new BuBorderLayout());
! btConvert_ = new BuButton("convertir");
btConvert_.setActionCommand("CONVERT");
btConvert_.addActionListener(this);
--- 69,88 ----
ProgressionBuAdapter progression_;
! public SerafinArchConvertGUI(JFrame _f) {
super();
! f_= _f;
build();
! defaultHome_= new File(System.getProperty("user.home"));
! progression_= new ProgressionBuAdapter();
}
! private final void build() {
setLayout(new BuBorderLayout());
setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
! BuPanel bts= new BuPanel();
bts.setLayout(new BuBorderLayout());
! btConvert_= new BuButton("convertir");
btConvert_.setActionCommand("CONVERT");
btConvert_.addActionListener(this);
***************
*** 93,130 ****
btConvert_.setToolTipText("Convertir");
bts.add(btConvert_, BuBorderLayout.EAST);
! bar_ = new BuTaskView();
bar_.setEmptyText("");
bar_.setVisible(true);
bar_.setBackground(Color.white);
bar_.setOpaque(true);
! BuScrollPane sp = new BuScrollPane(bar_);
sp.setPreferredSize(new Dimension(150, 80));
bts.add(sp, BuBorderLayout.WEST);
! BuPanel center = new BuPanel();
center.setLayout(new BuVerticalLayout(5, true, true));
! BuPanel in = new BuPanel();
in.setLayout(new BuGridLayout(2, 0, 0));
! BuButton chooseIn = new BuButton("...");
chooseIn.setActionCommand("CHOOSE_IN");
chooseIn.addActionListener(this);
in.add(chooseIn);
! lbIn_ = new BuLabel();
//lbIn_.setEditable(false);
lbIn_.setBackground(Color.white);
lbIn_.setAutoscrolls(true);
! BuScrollPane sclIn=new BuScrollPane(lbIn_);
sclIn.setAutoscrolls(true);
! sclIn.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
sclIn.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED);
in.add(sclIn);
in.add(new BuLabel("Format entrée: "));
! lbInFormat_ = new BuLabel("");
in.add(lbInFormat_);
in.add(new BuLabel("Nom : "));
! lbInName_ = new BuTextField(20);
lbInName_.setEditable(false);
lbInName_.setAutoscrolls(true);
! BuScrollPane sc = new BuScrollPane(lbInName_);
sc.setAutoscrolls(true);
in.add(sc);
--- 90,128 ----
btConvert_.setToolTipText("Convertir");
bts.add(btConvert_, BuBorderLayout.EAST);
! bar_= new BuTaskView();
bar_.setEmptyText("");
bar_.setVisible(true);
bar_.setBackground(Color.white);
bar_.setOpaque(true);
! BuScrollPane sp= new BuScrollPane(bar_);
sp.setPreferredSize(new Dimension(150, 80));
bts.add(sp, BuBorderLayout.WEST);
! BuPanel center= new BuPanel();
center.setLayout(new BuVerticalLayout(5, true, true));
! BuPanel in= new BuPanel();
in.setLayout(new BuGridLayout(2, 0, 0));
! BuButton chooseIn= new BuButton("...");
chooseIn.setActionCommand("CHOOSE_IN");
chooseIn.addActionListener(this);
in.add(chooseIn);
! lbIn_= new BuLabel();
//lbIn_.setEditable(false);
lbIn_.setBackground(Color.white);
lbIn_.setAutoscrolls(true);
! BuScrollPane sclIn= new BuScrollPane(lbIn_);
sclIn.setAutoscrolls(true);
! sclIn.setHorizontalScrollBarPolicy(
! JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
sclIn.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED);
in.add(sclIn);
in.add(new BuLabel("Format entrée: "));
! lbInFormat_= new BuLabel("");
in.add(lbInFormat_);
in.add(new BuLabel("Nom : "));
! lbInName_= new BuTextField(20);
lbInName_.setEditable(false);
lbInName_.setAutoscrolls(true);
! BuScrollPane sc= new BuScrollPane(lbInName_);
sc.setAutoscrolls(true);
in.add(sc);
***************
*** 132,144 ****
center.add(in);
! BuPanel out = new BuPanel();
out.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
out.setLayout(new BuGridLayout(2, 5, 5));
! btChooseOut_ = new BuButton("...");
btChooseOut_.setEnabled(false);
btChooseOut_.setActionCommand("CHOOSE_OUT");
btChooseOut_.addActionListener(this);
out.add(btChooseOut_);
! lbOut_ = new BuTextField(10);
lbOut_.setEditable(false);
lbOut_.setBackground(Color.white);
--- 130,142 ----
center.add(in);
! BuPanel out= new BuPanel();
out.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
out.setLayout(new BuGridLayout(2, 5, 5));
! btChooseOut_= new BuButton("...");
btChooseOut_.setEnabled(false);
btChooseOut_.setActionCommand("CHOOSE_OUT");
btChooseOut_.addActionListener(this);
out.add(btChooseOut_);
! lbOut_= new BuTextField(10);
lbOut_.setEditable(false);
lbOut_.setBackground(Color.white);
***************
*** 146,150 ****
out.add(new BuScrollPane(lbOut_));
out.add(new BuLabel("Format sortie: "));
! lbOutFormat_ = new BuLabel("");
out.add(lbOutFormat_);
center.add(out);
--- 144,148 ----
out.add(new BuScrollPane(lbOut_));
out.add(new BuLabel("Format sortie: "));
! lbOutFormat_= new BuLabel("");
out.add(lbOutFormat_);
center.add(out);
***************
*** 153,200 ****
}
! public void actionPerformed(ActionEvent _ae)
! {
! String com = _ae.getActionCommand();
! if ("CHOOSE_IN".equals(com))
! {
! BuFileChooser f = new BuFileChooser();
// f.setFileFilter(new BuFileFilter("*", "Serafin"));
f.setDialogType(BuFileChooser.OPEN_DIALOG);
f.setCurrentDirectory(defaultHome_);
f.setFileSelectionMode(BuFileChooser.FILES_ONLY);
! int i = f.showOpenDialog(this);
! if (i == BuFileChooser.APPROVE_OPTION)
! {
fileIn(f.getSelectedFile());
}
! }
! else if ("CHOOSE_OUT".equals(com))
! {
! BuFileChooser f = new BuFileChooser();
f.setDialogType(BuFileChooser.SAVE_DIALOG);
f.setCurrentDirectory(defaultHome_);
! int i = f.showOpenDialog(this);
! if (i == BuFileChooser.APPROVE_OPTION)
! {
fileOut(f.getSelectedFile());
}
! }
! else if ("CONVERT".equals(com))
! {
System.out.println("convert");
! if (si_ == null)
! {
new BuDialogError(null, null, "Fichier d'entree null").activate();
return;
}
! if (fileOut_ == null)
! {
new BuDialogError(null, null, "Fichier de sortie null").activate();
return;
}
! if (fileOut_.exists())
! {
! BuDialogConfirmation dia =
new BuDialogConfirmation(
null,
--- 151,187 ----
}
! public void actionPerformed(ActionEvent _ae) {
! String com= _ae.getActionCommand();
! if ("CHOOSE_IN".equals(com)) {
! BuFileChooser f= new BuFileChooser();
// f.setFileFilter(new BuFileFilter("*", "Serafin"));
f.setDialogType(BuFileChooser.OPEN_DIALOG);
f.setCurrentDirectory(defaultHome_);
f.setFileSelectionMode(BuFileChooser.FILES_ONLY);
! int i= f.showOpenDialog(this);
! if (i == BuFileChooser.APPROVE_OPTION) {
fileIn(f.getSelectedFile());
}
! } else if ("CHOOSE_OUT".equals(com)) {
! BuFileChooser f= new BuFileChooser();
f.setDialogType(BuFileChooser.SAVE_DIALOG);
f.setCurrentDirectory(defaultHome_);
! int i= f.showOpenDialog(this);
! if (i == BuFileChooser.APPROVE_OPTION) {
fileOut(f.getSelectedFile());
}
! } else if ("CONVERT".equals(com)) {
System.out.println("convert");
! if (si_ == null) {
new BuDialogError(null, null, "Fichier d'entree null").activate();
return;
}
! if (fileOut_ == null) {
new BuDialogError(null, null, "Fichier de sortie null").activate();
return;
}
! if (fileOut_.exists()) {
! BuDialogConfirmation dia=
new BuDialogConfirmation(
null,
***************
*** 203,207 ****
+ fileOut_.getAbsolutePath()
+ " existe. Voulez-vous l'effacer ?");
! int resp = dia.activate();
if (resp != JOptionPane.YES_OPTION)
return;
--- 190,194 ----
+ fileOut_.getAbsolutePath()
+ " existe. Voulez-vous l'effacer ?");
! int resp= dia.activate();
if (resp != JOptionPane.YES_OPTION)
return;
***************
*** 212,256 ****
}
! private void convert()
! {
! final OutputStream out;
! try
! {
! out = new FileOutputStream(fileOut_);
! }
! catch (Exception e)
! {
! new BuDialogError(null, null, "écriture impossible").activate();
! return;
! }
! BuTask t = new BuTask("ecriture")
! {
! public void run()
! {
! try
! {
! SerafinWriter w = new SerafinWriter(SerafinFileFormat.getInstance().getLastVersionImpl());
if (isInSparc_)
w.setMachineID(FortranBinaryInputStream.X86);
else
w.setMachineID(FortranBinaryInputStream.SPARC);
! w.setOut(out);
w.setProgressReceiver(progression_);
! FileOperationSynthese op=new FileOperationSynthese();
! w.write(si_,op);
! DodicoAnalyze a=op.getAnalyze();
! if (a != null)
! {
! new BuDialogMessage(null, null,a.getResume());
}
! }
! catch (Exception e)
! {
new BuDialogError(null, null, e.toString()).show();
! }
! finally
! {
super.run();
}
--- 199,227 ----
}
! private void convert() {
! BuTask t= new BuTask("ecriture") {
! public void run() {
! try {
! SerafinWriter w=
! SerafinFileFormat
! .getInstance()
! .getLastVersionImpl()
! .createSerafinWriter();
if (isInSparc_)
w.setMachineID(FortranBinaryInputStream.X86);
else
w.setMachineID(FortranBinaryInputStream.SPARC);
! w.setFile(fileOut_);
w.setProgressReceiver(progression_);
!
! DodicoAnalyze a= w.write(si_).getAnalyze().toAnalyze();
! if (a != null) {
! new BuDialogMessage(null, null, a.getResume());
}
! } catch (Exception e) {
new BuDialogError(null, null, e.toString()).show();
! } finally {
super.run();
}
***************
*** 270,317 ****
}
! void fileOut(File _fOut)
! {
! fileOut_ = _fOut;
lbOut_.setText(fileOut_.getAbsolutePath());
}
! private void fileIn(File _f)
! {
! final File file = _f;
! lbIn_.setText(file.getAbsolutePath());
! try
! {
! final SerafinReader reader = new SerafinReader(SerafinFileFormat.getInstance().getLastVersionImpl());
! reader.setFile(new FileInputStream(_f));
! reader.setProgressReceiver(progression_);
! final File parent = file.getParentFile();
if (parent != null)
! defaultHome_ = parent;
! BuTask t = new BuTask("lecture")
! {
! public void run()
! {
! try
! {
! si_ = reader.read(new FileOperationSynthese());
! isInSparc_ =
! FortranBinaryInputStream.isSparc(reader.getMachineId());
! if (isInSparc_)
! {
lbInFormat_.setText(FortranBinaryInputStream.SPARC_NAME);
lbOutFormat_.setText(FortranBinaryInputStream.X86_NAME);
! }
! else
! {
lbInFormat_.setText(FortranBinaryInputStream.X86_NAME);
lbOutFormat_.setText(FortranBinaryInputStream.SPARC_NAME);
}
lbInName_.setText(si_.getTitre());
! String dir = parent.getAbsolutePath();
! String fic = file.getName();
! int indexPoint = fic.lastIndexOf('.');
fileOut(
new File(
--- 241,282 ----
}
! void fileOut(File _fOut) {
! fileOut_= _fOut;
lbOut_.setText(fileOut_.getAbsolutePath());
}
! private void fileIn(final File _f) {
! lbIn_.setText(_f.getAbsolutePath());
! try {
! final File parent= _f.getParentFile();
if (parent != null)
! defaultHome_= parent;
! BuTask t= new BuTask("lecture") {
! public void run() {
! try {
! SerafinReader reader=
! new SerafinReader(
! SerafinFileFormat.getInstance().getLastVersionImpl());
! reader.setFile(_f);
! reader.setProgressReceiver(progression_);
! FileOperationSynthese s=reader.read();
! if(s.containsMessages()) s.getAnalyze().toAnalyze().printResume();
!
! si_= (SerafinInterface)s.getSource();
! isInSparc_= FortranBinaryInputStream.isSparc(reader.getMachineId());
! if (isInSparc_) {
lbInFormat_.setText(FortranBinaryInputStream.SPARC_NAME);
lbOutFormat_.setText(FortranBinaryInputStream.X86_NAME);
! } else {
lbInFormat_.setText(FortranBinaryInputStream.X86_NAME);
lbOutFormat_.setText(FortranBinaryInputStream.SPARC_NAME);
}
lbInName_.setText(si_.getTitre());
! String dir= parent.getAbsolutePath();
! String fic= _f.getName();
! int indexPoint= fic.lastIndexOf('.');
fileOut(
new File(
***************
*** 325,331 ****
btChooseOut_.setEnabled(true);
btConvert_.setEnabled(true);
! }
! catch (Exception e)
! {
e.printStackTrace();
new BuDialogError(null, null, e.toString()).activate();
--- 290,294 ----
btChooseOut_.setEnabled(true);
btConvert_.setEnabled(true);
! } catch (Exception e) {
e.printStackTrace();
new BuDialogError(null, null, e.toString()).activate();
***************
*** 337,346 ****
t.setTaskView(bar_);
t.start();
! // f_.pack();
// t.join();
! }
! catch (Exception e)
! {
new BuDialogError(null, null, e.toString()).activate();
}
--- 300,307 ----
t.setTaskView(bar_);
t.start();
! // f_.pack();
// t.join();
! } catch (Exception e) {
new BuDialogError(null, null, e.toString()).activate();
}
***************
*** 348,354 ****
}
! public static void main(String[] args)
! {
! JFrame f = new JFrame(DodicoLib.geti18n("Convertisseur Serafin"));
f.setContentPane(new SerafinArchConvertGUI(f));
f.pack();
--- 309,314 ----
}
! public static void main(String[] args) {
! JFrame f= new JFrame(DodicoLib.geti18n("Convertisseur Serafin"));
f.setContentPane(new SerafinArchConvertGUI(f));
f.pack();
Index: TestCL.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/telemac/TestCL.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** TestCL.java 18 Aug 2003 11:05:20 -0000 1.6
--- TestCL.java 22 Aug 2003 15:51:13 -0000 1.7
***************
*** 11,15 ****
import org.fudaa.dodico.fichiers.FileOperationSynthese;
! import org.fudaa.dodico.h2d.H2dConditionLimiteTelemac;
import org.fudaa.dodico.h2d.type.H2dBordType;
import org.fudaa.dodico.h2d.type.H2dClType;
--- 11,15 ----
import org.fudaa.dodico.fichiers.FileOperationSynthese;
! import org.fudaa.dodico.h2d.telemac.H2dTelemacConditionLimite;
import org.fudaa.dodico.h2d.type.H2dBordType;
import org.fudaa.dodico.h2d.type.H2dClType;
***************
*** 38,42 ****
{
assertNotNull(_inter);
! H2dConditionLimiteTelemac cls = _inter.getLine(0);
assertEquals(cls.getBordType(), H2dBordType.LIQUIDE_ONDE_INCIDENCE);
assertEquals(cls.getHType(), H2dClType.LIBRE);
--- 38,42 ----
{
assertNotNull(_inter);
! H2dTelemacConditionLimite cls = _inter.getLine(0);
assertEquals(cls.getBordType(), H2dBordType.LIQUIDE_ONDE_INCIDENCE);
assertEquals(cls.getHType(), H2dClType.LIBRE);
***************
*** 207,212 ****
TelemacCLInterface inter=getInter(fic_);
File tmpFile=createTempFile();
! FileOperationSynthese syntheseR=TelemacCLFileFormat.getInstance().getLastVersionImpl().write(tmpFile, inter, null);
! assertNull(syntheseR.getAnalyze());
_interfaceTest(getInter(tmpFile));
--- 207,212 ----
TelemacCLInterface inter=getInter(fic_);
File tmpFile=createTempFile();
! FileOperationSynthese syntheseR=TelemacCLFileFormat.getInstance().getLastVersionImpl().writeMaillage(tmpFile, inter, null);
! assertFalse(syntheseR.containsMessages());
_interfaceTest(getInter(tmpFile));
***************
*** 215,221 ****
public TelemacCLInterface getInter(File _f)
{
! FileOperationSynthese syntheseR= new FileOperationSynthese();
! TelemacCLInterface r=TelemacCLFileFormat.getInstance().getLastVersionImpl().read(_f, syntheseR, null);
! assertNull(syntheseR.getAnalyze());
return r;
}
--- 215,221 ----
public TelemacCLInterface getInter(File _f)
{
! FileOperationSynthese syntheseR= TelemacCLFileFormat.getInstance().getLastVersionImpl().read(_f, null);
! TelemacCLInterface r=(TelemacCLInterface)syntheseR.getSource();
! assertFalse(syntheseR.containsMessages());
return r;
}
Index: TestCas.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/telemac/TestCas.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TestCas.java 18 Aug 2003 11:05:20 -0000 1.3
--- TestCas.java 22 Aug 2003 15:51:13 -0000 1.4
***************
*** 64,69 ****
DicoCasInterface inter=getInter(fic_);
File tmpFile=createTempFile();
! FileOperationSynthese syntheseR=Telemac2dFileFormat.getInstance().getLastVersionImpl().writeCas(tmpFile, inter, null);
! assertNull(syntheseR.getAnalyze());
_interfaceTest(getInter(tmpFile));
--- 64,69 ----
DicoCasInterface inter=getInter(fic_);
File tmpFile=createTempFile();
! FileOperationSynthese syntheseR=Telemac2dFileFormat.getInstance().getLastVersionImpl().writeMaillage(tmpFile, inter,null);
! assertFalse(syntheseR.containsMessages());
_interfaceTest(getInter(tmpFile));
***************
*** 72,78 ****
public DicoCasInterface getInter(File _f)
{
! FileOperationSynthese syntheseR= new FileOperationSynthese();
! DicoCasInterface r=Telemac2dFileFormat.getInstance().getLastVersionImpl().readCas(_f, syntheseR, null);
! assertNull(syntheseR.getAnalyze());
return r;
}
--- 72,78 ----
public DicoCasInterface getInter(File _f)
{
! FileOperationSynthese syntheseR= Telemac2dFileFormat.getInstance().getLastVersionImpl().read(_f, null);
! DicoCasInterface r=(DicoCasInterface)syntheseR.getSource();
! assertFalse(syntheseR.containsMessages());
return r;
}
Index: TestLiquide.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/telemac/TestLiquide.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TestLiquide.java 18 Aug 2003 11:05:20 -0000 1.5
--- TestLiquide.java 22 Aug 2003 15:51:13 -0000 1.6
***************
*** 76,81 ****
TelemacLiquideInterface inter=getInter(fic_);
File tmpFile=createTempFile();
! FileOperationSynthese syntheseR=TelemacLiquideFileFormat.getInstance().getLastVersionImpl().write(tmpFile, inter, null);
! assertNull(syntheseR.getAnalyze());
_interfaceTest(getInter(tmpFile));
--- 76,81 ----
TelemacLiquideInterface inter=getInter(fic_);
File tmpFile=createTempFile();
! FileOperationSynthese syntheseR=TelemacLiquideFileFormat.getInstance().getLastVersionImpl().writeMaillage(tmpFile, inter, null);
! assertFalse(syntheseR.containsMessages());
_interfaceTest(getInter(tmpFile));
***************
*** 84,90 ****
public TelemacLiquideInterface getInter(File _f)
{
! FileOperationSynthese syntheseR= new FileOperationSynthese();
! TelemacLiquideInterface r=TelemacLiquideFileFormat.getInstance().getLastVersionImpl().read(_f, syntheseR, null);
! assertNull(syntheseR.getAnalyze());
return r;
}
--- 84,90 ----
public TelemacLiquideInterface getInter(File _f)
{
! FileOperationSynthese syntheseR= TelemacLiquideFileFormat.getInstance().getLastVersionImpl().read(_f, null);
! TelemacLiquideInterface r=(TelemacLiquideInterface)syntheseR.getSource();
! assertFalse(syntheseR.containsMessages());
return r;
}
Index: TestSerafin.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/telemac/TestSerafin.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** TestSerafin.java 18 Aug 2003 11:05:20 -0000 1.10
--- TestSerafin.java 22 Aug 2003 15:51:13 -0000 1.11
***************
*** 19,23 ****
import org.fudaa.dodico.h2d.H2dLib;
import org.fudaa.dodico.h2d.H2dMaillage;
! import org.fudaa.dodico.h2d.H2dMaillageBord;
import org.fudaa.dodico.mnt.MNTSemis;
import org.fudaa.dodico.mnt.MNTZone;
--- 19,24 ----
import org.fudaa.dodico.h2d.H2dLib;
import org.fudaa.dodico.h2d.H2dMaillage;
! import org.fudaa.dodico.h2d.H2dMaillageFrontiere;
! import org.fudaa.dodico.h2d.type.H2dElementType;
import org.fudaa.dodico.mnt.MNTSemis;
import org.fudaa.dodico.mnt.MNTZone;
***************
*** 69,73 ****
assertEquals(maillage.getPtsNb(), 1676);
//NPPEL1
! assertEquals(maillage.getEltType(), H2dElement.T3);
//IKLE1
assertEquals(maillage.getElement(0).getPtIndex()[1], 1545);
--- 70,74 ----
assertEquals(maillage.getPtsNb(), 1676);
//NPPEL1
! assertEquals(maillage.getEltType(), H2dElementType.T3);
//IKLE1
assertEquals(maillage.getElement(0).getPtIndex()[1], 1545);
***************
*** 150,159 ****
SerafinInterface inter= inter_;
File tmpFile= createTempFile();
! SerafinWriter w= SerafinFileFormat.getInstance().getLastVersionImpl().createSerafinWriter();
w.setMachineSPARC();
! FileOperationSynthese syntheseR= FileFormatVersion.initOperation(w, null, tmpFile);
! w.write(inter, syntheseR);
! if (syntheseR.getAnalyze() != null)
! assertFalse(syntheseR.getAnalyze().containsErrors());
_interfaceTest(getInter(tmpFile));
--- 151,163 ----
SerafinInterface inter= inter_;
File tmpFile= createTempFile();
! SerafinWriter w=
! SerafinFileFormat
! .getInstance()
! .getLastVersionImpl()
! .createSerafinWriter();
w.setMachineSPARC();
! w.setFile(tmpFile);
! FileOperationSynthese syntheseR= w.write(inter);
! assertFalse(syntheseR.getAnalyze().containsErrors());
_interfaceTest(getInter(tmpFile));
***************
*** 161,169 ****
public SerafinInterface getInter(File _f) {
! FileOperationSynthese syntheseR= new FileOperationSynthese();
! SerafinInterface r=
! SerafinFileFormat.getInstance().getLastVersionImpl().read(_f, syntheseR, null);
! if (syntheseR.getAnalyze() != null)
! assertFalse(syntheseR.getAnalyze().containsErrors());
return r;
}
--- 165,172 ----
public SerafinInterface getInter(File _f) {
! FileOperationSynthese syntheseR=
! SerafinFileFormat.getInstance().getLastVersionImpl().read(_f, null);
! SerafinInterface r= (SerafinInterface)syntheseR.getSource();
! assertFalse(syntheseR.getAnalyze().containsErrors());
return r;
}
***************
*** 172,176 ****
SerafinInterface inter= inter_;
H2dMaillage.computeBord(inter.getMaillage(), inter.getPtsFrontiere(), null);
! H2dMaillageBord b= inter.getMaillage().getPtsFrontiere();
assertEquals(b.getBordInternNb(), 1);
}
--- 175,179 ----
SerafinInterface inter= inter_;
H2dMaillage.computeBord(inter.getMaillage(), inter.getPtsFrontiere(), null);
! H2dMaillageFrontiere b= inter.getMaillage().getPtsFrontiere();
assertEquals(b.getBordInternNb(), 1);
}
***************
*** 178,182 ****
public void testRechercheFrontiereinterne() {
SerafinInterface inter= inter_;
! inter.getMaillage().computeBordV2(null);
assertTrue(
inter.getMaillage().getPtsFrontiere().isSame(inter.getPtsFrontiere()));
--- 181,185 ----
public void testRechercheFrontiereinterne() {
SerafinInterface inter= inter_;
! inter.getMaillage().computeBord(null);
assertTrue(
inter.getMaillage().getPtsFrontiere().isSame(inter.getPtsFrontiere()));
Index: TestSerafinArchConvert.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/telemac/TestSerafinArchConvert.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TestSerafinArchConvert.java 18 Aug 2003 11:05:20 -0000 1.3
--- TestSerafinArchConvert.java 22 Aug 2003 15:51:13 -0000 1.4
***************
*** 27,34 ****
*/
! public class TestSerafinArchConvert
! {
!
!
/**
--- 27,31 ----
*/
! public class TestSerafinArchConvert {
/**
***************
*** 37,112 ****
* @param args
*/
! public static void main(String[] args)
! {
! SerafinFileFormat.SerafinVersion format=SerafinFileFormat.getInstance().getLastVersionImpl();
! if(args.length<2)
! {
System.out.println("fichier_entree fichier_sortieID format_sortieID");
System.out.println("format_sortieID optionnel");
System.out.println("format_sortieID= \"X86\" ou \"sparc\"");
!
! return ;
}
! try
! {
! File fic = new File(args[0]);
! File ficSortie = new File(args[1]);
! String sortieID=null;
! if(args.length>2) sortieID=args[2];
! else sortieID=System.getProperty("os.arch");
! sortieID=NativeBinaryInputStream.getMachineId(sortieID);
! if(!NativeBinaryInputStream.isMachineKnown(sortieID))
! {
! System.out.println("format de sortieID inconnue");
! System.out.println("format_sortieID= \"X86\" ou \"sparc\"");
! return ;
! }
! if(!fic.exists())
! {
! System.out.println("Le fichier d'entree n'existe pas");
! return ;
! }
! if(ficSortie.exists())
! {
! System.out.println("Le fichier de sortie existe deja");
! return ;
! }
! InputStream in = new FileInputStream(fic);
! SerafinReader t = new SerafinReader(format);
! t.setFile(in);
! System.out.println("les commentaires sur la lecture");
! FileOperationSynthese synthese=new FileOperationSynthese();
! SerafinInterface sinter=t.read(synthese);
! DodicoAnalyze a=synthese.getAnalyze();
! if(a!=null) a.printResume();
! in.close();
! if(t.getMachineId().equals(sortieID))
! {
! System.out.println("les formats d'entree et de sortie sont identiques");
! }
! OutputStream out=new FileOutputStream(ficSortie);
! SerafinWriter w = new SerafinWriter(format);
! w.setOut(out);
! w.setMachineID(sortieID);
! w.write(sinter, synthese);
! System.out.println("");
! DodicoAnalyze analyze=synthese.getAnalyze();
! if(analyze!=null)
! {
! System.out.println("les commentaires sur l'ecriture");
! analyze.printResume();
! }
}
! catch(IOException _e)
! {
! _e.printStackTrace();
}
}
-
-
-
}
-
-
--- 34,87 ----
* @param args
*/
! public static void main(String[] args) {
! SerafinFileFormat.SerafinVersion format=
! SerafinFileFormat.getInstance().getLastVersionImpl();
! if (args.length < 2) {
System.out.println("fichier_entree fichier_sortieID format_sortieID");
System.out.println("format_sortieID optionnel");
System.out.println("format_sortieID= \"X86\" ou \"sparc\"");
!
! return;
}
! File fic= new File(args[0]);
! File ficSortie= new File(args[1]);
! String sortieID= null;
! if (args.length > 2)
! sortieID= args[2];
! else
! sortieID= System.getProperty("os.arch");
! sortieID= NativeBinaryInputStream.getMachineId(sortieID);
! if (!NativeBinaryInputStream.isMachineKnown(sortieID)) {
! System.out.println("format de sortieID inconnue");
! System.out.println("format_sortieID= \"X86\" ou \"sparc\"");
! return;
}
! if (!fic.exists()) {
! System.out.println("Le fichier d'entree n'existe pas");
! return;
}
+ if (ficSortie.exists()) {
+ System.out.println("Le fichier de sortie existe deja");
+ return;
+ }
+ SerafinReader t= new SerafinReader(format);
+ t.setFile(fic);
+ System.out.println("les commentaires sur la lecture");
+ FileOperationSynthese synthese= t.read();
+ SerafinInterface sinter= (SerafinInterface)synthese.getSource();
+ if (synthese.containsMessages())
+ synthese.getAnalyze().toAnalyze().printResume();
+ if (t.getMachineId().equals(sortieID)) {
+ System.out.println("les formats d'entree et de sortie sont identiques");
+ }
+ SerafinWriter w= new SerafinWriter(format);
+ w.setFile(ficSortie);
+ w.setMachineID(sortieID);
+ synthese= w.write(sinter);
+ System.out.println("");
+ if (synthese.containsMessages())
+ synthese.getAnalyze().toAnalyze().printResume();
}
}
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux
In directory sc8-pr-cvs1:/tmp/cvs-serv7810/tr/reflux
Modified Files:
TrRefluxImplHelper.java TrRefluxParametres.java
TrRefluxProjet.java
Added Files:
TrRefluxExport.java TrRefluxFilleVisu.java
Log Message:
tr: ajout de l'export pour le maillage
gestion affichage maillage
commun modif mineure
--- NEW FILE: TrRefluxExport.java ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: TrRefluxFilleVisu.java ---
(This appears to be a binary file; contents omitted.)
Index: TrRefluxImplHelper.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxImplHelper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TrRefluxImplHelper.java 18 Aug 2003 11:54:43 -0000 1.2
--- TrRefluxImplHelper.java 22 Aug 2003 16:02:24 -0000 1.3
***************
*** 11,21 ****
--- 11,25 ----
import java.io.File;
+ import com.memoire.bu.BuMainPanel;
import com.memoire.bu.BuMenuItem;
import com.memoire.bu.BuTaskOperation;
+ import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.commun.DodicoPreferences;
import org.fudaa.dodico.commun.ProgressionBuAdapter;
import org.fudaa.dodico.fichiers.FileFormatSoftware;
import org.fudaa.dodico.reflux.io.INPFileFormat;
+ import org.fudaa.dodico.telemac.io.Telemac2dFileFormat;
+ import org.fudaa.dodico.telemac.io.TelemacDicoFileFormat;
import org.fudaa.fudaa.commun.exec.FudaaExecServerManager;
***************
*** 23,28 ****
import org.fudaa.fudaa.tr.TrImplHelper;
import org.fudaa.fudaa.tr.TrImplementation;
import org.fudaa.fudaa.tr.TrPreferences;
- import org.fudaa.fudaa.tr.TrProjet;
/**
--- 27,32 ----
import org.fudaa.fudaa.tr.TrImplHelper;
import org.fudaa.fudaa.tr.TrImplementation;
+ import org.fudaa.fudaa.tr.TrLib;
import org.fudaa.fudaa.tr.TrPreferences;
/**
***************
*** 30,75 ****
* @version $Id$
*/
! public class TrRefluxImplHelper extends TrImplHelper
! {
! public static FudaaExecServerManager SERVEURS= new FudaaExecServerManager(TrPreferences.TR, DodicoPreferences.buildPrefKey(FileFormatSoftware.REFLUX_IS.name,TrPreferences.KEY_SERVEUR_PREFIXE));
! public TrRefluxImplHelper(TrImplementation _impl)
! {
super(_impl);
}
! public void ouvrir(File _f)
! {
_ouvrir(_f);
}
-
-
! public void ouvrir()
! {
! final File fic = impl_.ouvrirFileChooser(null, "Reflux Fichier inp");
! if (fic != null)
! {
_ouvrir(fic);
}
}
! public BuMenuItem[] getMenuItemsOuvrir()
! {
! BuMenuItem r =
! new BuMenuItem(FudaaResource.FUDAA.getToolIcon("appli/telemac"), "Projet Télémac");
! r.setActionCommand(impl_.PREF_OUVRIR + FileFormatSoftware.TELEMAC_IS.name);
! return new BuMenuItem[]{r};
}
! private void _ouvrir(final File _fic)
! {
! if (_fic != null)
! {
! new BuTaskOperation(impl_, "import fichier cas")
! {
! public void act()
! {
! TrRefluxProjet projet =
TrRefluxProjet.init(
_fic,
--- 34,79 ----
* @version $Id$
*/
! public class TrRefluxImplHelper extends TrImplHelper {
! public static FudaaExecServerManager SERVEURS=
! new FudaaExecServerManager(
! TrPreferences.TR,
! DodicoPreferences.buildPrefKey(
! FileFormatSoftware.REFLUX_IS.name,
! TrPreferences.KEY_SERVEUR_PREFIXE));
! public TrRefluxImplHelper(TrImplementation _impl) {
super(_impl);
}
! public void ouvrir(File _f) {
_ouvrir(_f);
}
! public void ouvrir() {
! final File fic= impl_.ouvrirFileChooser(null, "Reflux Fichier inp");
! if (fic != null) {
_ouvrir(fic);
}
}
! public BuMenuItem[] getMenuItemsOuvrir() {
! BuMenuItem r0=
! new BuMenuItem(
! FudaaResource.FUDAA.getToolIcon("appli/telemac"),
! "Projet Télémac");
! r0.setActionCommand(impl_.PREF_OUVRIR + FileFormatSoftware.TELEMAC_IS.name);
! BuMenuItem r= new BuMenuItem(null, "Projet Dico");
! r.setActionCommand(
! impl_.PREF_OUVRIR + TelemacDicoFileFormat.DICO_PROJET_ID);
! return new BuMenuItem[] { r0, r };
}
! private void _ouvrir(final File _fic) {
! if (_fic != null) {
! new BuTaskOperation(impl_, "import fichier inp") {
! public void act() {
! BuMainPanel mp= getImpl().getMainPanel();
! mp.setMessage(TrLib.geti18n("Ouverture projet"));
! TrRefluxProjet projet=
TrRefluxProjet.init(
_fic,
***************
*** 77,85 ****
new ProgressionBuAdapter(this),
getImpl());
! setProgression(90);
! if (projet != null)
! {
getImpl().addProjet(projet);
}
}
}
--- 81,94 ----
new ProgressionBuAdapter(this),
getImpl());
! mp.setProgression(60);
! this.setName(DodicoLib.EMPTY_STRING);
! this.setProgression(0);
! mp.setMessage(TrLib.geti18n("Affichage ..."));
! if (projet != null) {
getImpl().addProjet(projet);
}
+ mp.setMessage(DodicoLib.EMPTY_STRING);
+ mp.setProgression(0);
+
}
}
***************
*** 91,96 ****
*
*/
! public String getID()
! {
return FileFormatSoftware.REFLUX_IS.name;
}
--- 100,104 ----
*
*/
! public String getSoftwareID() {
return FileFormatSoftware.REFLUX_IS.name;
}
***************
*** 99,104 ****
*
*/
! public FudaaExecServerManager getServersMng()
! {
return SERVEURS;
}
--- 107,111 ----
*
*/
! public FudaaExecServerManager getServersMng() {
return SERVEURS;
}
Index: TrRefluxParametres.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxParametres.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TrRefluxParametres.java 19 Aug 2003 07:48:40 -0000 1.3
--- TrRefluxParametres.java 22 Aug 2003 16:02:24 -0000 1.4
***************
*** 11,14 ****
--- 11,15 ----
import java.io.File;
+ import org.fudaa.dodico.commun.DodicoAnalyze;
import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.commun.ProgressionInterface;
***************
*** 17,24 ****
--- 18,28 ----
import org.fudaa.dodico.h2d.H2dMaillage;
import org.fudaa.dodico.h2d.H2dParametres;
+ import org.fudaa.dodico.h2d.reflux.H2dRefluxParametres;
import org.fudaa.dodico.reflux.io.INPFileFormat;
import org.fudaa.dodico.reflux.io.INPInterface;
import org.fudaa.fudaa.commun.FudaaUI;
+ import org.fudaa.fudaa.tr.TrImplementation;
+ import org.fudaa.fudaa.tr.TrParametres;
/**
***************
*** 26,46 ****
* @version $Id$
*/
! public class TrRefluxParametres implements H2dParametres
! {
File fINP_;
String title_;
! FudaaUI ui_;
! DicoParams dicoParam_;
! H2dMaillage maillage_;
/**
*
*/
! private TrRefluxParametres()
! {
super();
-
}
public final static TrRefluxParametres init(
--- 30,51 ----
* @version $Id$
*/
! public class TrRefluxParametres implements TrParametres {
File fINP_;
String title_;
! TrImplementation ui_;
! H2dRefluxParametres params_;
/**
*
*/
! private TrRefluxParametres() {
super();
}
+
+ public TrImplementation getImpl(){
+ return ui_;
+ }
+
public final static TrRefluxParametres init(
***************
*** 48,88 ****
INPFileFormat.INPVersion _ft,
ProgressionInterface _progress,
! FudaaUI _ui)
! {
! FileOperationSynthese synt=new FileOperationSynthese();
! INPInterface inter=_ft.read(_f, synt, _progress);
! if(_ui!=null) _ui.manageErrorOperation(synt);
! if(inter==null) return null;
! TrRefluxParametres r = new TrRefluxParametres();
! r.ui_ = _ui;
! r.fINP_ = _f;
! String s = _f.getName();
! int i = s.indexOf('.');
if (i > 0)
! s = s.substring(0, i);
! r.title_ = s;
! r.dicoParam_=new DicoParams(inter.getEntiteValue(),_ft);
! H2dMaillage maillage=inter.getMaillage();
! maillage.computeBordV2(_progress);
! r.maillage_=maillage;
!
return r;
}
! public String getTitle()
! {
return title_;
}
! public File getFile()
! {
return fINP_;
}
! public File enregistrerUniqueSousRepertoire(File _f)
! {
! if (!_f.isDirectory())
! {
ui_.error(
"Répertoire",
--- 53,93 ----
INPFileFormat.INPVersion _ft,
ProgressionInterface _progress,
! TrImplementation _ui) {
! FileOperationSynthese synt= _ft.read(_f, _progress);
! INPInterface inter=(INPInterface)synt.getSource();
! if (_ui != null)
! _ui.manageErrorOperationAndIsFatal(synt);
! if (inter == null)
! return null;
! TrRefluxParametres r= new TrRefluxParametres();
! r.ui_= _ui;
! r.fINP_= _f;
! String s= _f.getName();
! int i= s.indexOf('.');
if (i > 0)
! s= s.substring(0, i);
! r.title_= s;
! DodicoAnalyze.Editor analyze=new DodicoAnalyze.Editor();
! analyze.setDesc("Analyze du fichier"+" "+_f.getAbsolutePath());
! r.params_= H2dRefluxParametres.init(inter, _progress, _ft,analyze);
! if(_ui!=null)
! {
! _ui.manageAnalyzeAndIsFatal(analyze.toAnalyze());
!
! }
return r;
}
! public String getTitle() {
return title_;
}
! public File getFile() {
return fINP_;
}
! public File enregistrerUniqueSousRepertoire(File _f) {
! if (!_f.isDirectory()) {
ui_.error(
"Répertoire",
***************
*** 95,107 ****
return null;
}
! File dest =
new File(
_f,
title_ + "." + INPFileFormat.getInstance().getExtensions()[0]);
! int i = 0;
! int max = 20;
! while ((dest.exists()) && (i < max))
! {
! dest =
new File(
_f,
--- 100,111 ----
return null;
}
! File dest=
new File(
_f,
title_ + "." + INPFileFormat.getInstance().getExtensions()[0]);
! int i= 0;
! int max= 20;
! while ((dest.exists()) && (i < max)) {
! dest=
new File(
_f,
***************
*** 112,124 ****
+ INPFileFormat.getInstance().getExtensions()[0]);
}
! if (dest.exists())
! {
ui_.error(
"Impossible de trouver un nom de fichier non existant",
"Effacer des fichier du répertoire " + _f.getAbsolutePath());
return null;
! }
! else
! {
DodicoLib.copyFile(fINP_, dest);
return dest;
--- 116,125 ----
+ INPFileFormat.getInstance().getExtensions()[0]);
}
! if (dest.exists()) {
ui_.error(
"Impossible de trouver un nom de fichier non existant",
"Effacer des fichier du répertoire " + _f.getAbsolutePath());
return null;
! } else {
DodicoLib.copyFile(fINP_, dest);
return dest;
***************
*** 130,136 ****
*
*/
! public DicoParams getDicoParam()
! {
! return dicoParam_;
}
--- 131,136 ----
*
*/
! public DicoParams getDicoParam() {
! return params_.getDicoParams();
}
***************
*** 139,143 ****
*/
public H2dMaillage getMaillage() {
! return maillage_;
}
--- 139,157 ----
*/
public H2dMaillage getMaillage() {
! return params_.getMaillage();
! }
!
! public H2dParametres getParametres() {
! return getRefluxParametres();
! }
!
! public H2dRefluxParametres getRefluxParametres() {
! return params_;
! }
!
! /**
! *
! */
! public void loadGeometrie(ProgressionInterface _interface) {
}
Index: TrRefluxProjet.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxProjet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TrRefluxProjet.java 19 Aug 2003 07:48:40 -0000 1.3
--- TrRefluxProjet.java 22 Aug 2003 16:02:24 -0000 1.4
***************
*** 36,40 ****
TrRefluxParametres params_;
TrRefluxFilleProjet fille_;
! TrImplementation impl_;
FudaaCalculAction calculActions_;
--- 36,40 ----
TrRefluxParametres params_;
TrRefluxFilleProjet fille_;
! TrRefluxFilleVisu visu_;
FudaaCalculAction calculActions_;
***************
*** 42,47 ****
*
*/
! public TrRefluxProjet(TrImplementation _impl, TrRefluxParametres _params) {
! impl_= _impl;
params_= _params;
calculActions_= new FudaaCalculAction(this, true);
--- 42,46 ----
*
*/
! public TrRefluxProjet(TrRefluxParametres _params) {
params_= _params;
calculActions_= new FudaaCalculAction(this, true);
***************
*** 53,65 ****
ProgressionInterface _progress,
TrImplementation _ui) {
- //TODO: gerer si param deja present
TrRefluxParametres params_=
TrRefluxParametres.init(_file, _fileFormat, _progress, _ui);
if (params_ != null)
! return new TrRefluxProjet(_ui, params_);
else
return null;
}
public TrRefluxParametres getRefluxParametres() {
return params_;
--- 52,68 ----
ProgressionInterface _progress,
TrImplementation _ui) {
TrRefluxParametres params_=
TrRefluxParametres.init(_file, _fileFormat, _progress, _ui);
+ _progress.setProgression(100);
if (params_ != null)
! return new TrRefluxProjet(params_);
else
return null;
}
+ public TrImplementation getImpl() {
+ return params_.getImpl();
+ }
+
public TrRefluxParametres getRefluxParametres() {
return params_;
***************
*** 89,114 ****
*
*/
- public TrImplementation getImpl() {
- return impl_;
- }
-
- /**
- *
- */
- public void setImpl(TrImplementation _impl) {}
-
- /**
- *
- */
public void active() {
if (fille_ == null) {
fille_= new TrRefluxFilleProjet(this);
! Dimension dim= impl_.getMainPanel().getDesktop().getSize();
fille_.setSize(
(int) (dim.getWidth() * 0.8),
(int) (dim.getHeight() * 0.8));
! fille_.setLocation(0, 0);
}
! impl_.addInternalFrame(fille_);
}
--- 92,124 ----
*
*/
public void active() {
+ Dimension dim= null;
if (fille_ == null) {
fille_= new TrRefluxFilleProjet(this);
! dim= getImpl().getMainPanel().getDesktop().getSize();
fille_.setSize(
+ (int) (dim.getWidth() * 0.5),
+ (int) (dim.getHeight() * 0.5));
+ fille_.setLocation(0, 0);
+ getImpl().addInternalFrame(fille_);
+ }
+ else
+ {
+ getImpl().activateInternalFrame(fille_);
+ }
+
+ if (visu_ == null) {
+ visu_= new TrRefluxFilleVisu(getImpl(), params_.getRefluxParametres());
+ if (dim == null)
+ dim= getImpl().getMainPanel().getDesktop().getSize();
+ visu_.setSize(
(int) (dim.getWidth() * 0.8),
(int) (dim.getHeight() * 0.8));
! visu_.setLocation(10, 10);
! getImpl().addInternalFrame(visu_);
}
! else
! getImpl().activateInternalFrame(visu_);
!
}
***************
*** 129,133 ****
fille_.dispose();
fille_= null;
! impl_.closeProjet(this);
}
--- 139,143 ----
fille_.dispose();
fille_= null;
! getImpl().closeProjet(this);
}
***************
*** 154,158 ****
}
};
! op.setImpl(impl_);
return op;
}
--- 164,168 ----
}
};
! op.setImpl(getImpl());
return op;
}
***************
*** 176,180 ****
*/
public FudaaUI getUI() {
! return impl_;
}
--- 186,190 ----
*/
public FudaaUI getUI() {
! return getImpl();
}
***************
*** 200,204 ****
*/
public void export(String _actionCommand) {
! new TrExport(params_).export(_actionCommand);
}
--- 210,214 ----
*/
public void export(String _actionCommand) {
! new TrRefluxExport(params_).export(_actionCommand);
}
|
|
From: <de...@us...> - 2003-08-22 20:26:12
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/type
In directory sc8-pr-cvs1:/tmp/cvs-serv5355/h2d/type
Modified Files:
H2dFileFormatType.java
Added Files:
H2dElementType.java
Log Message:
Creation des dossiers h2d/reflux et h2d/telemac et deplacement des
fichiers concerne.
Gestion des cl et des bords ( a refaire ..)
Amelioration des gestions des versions de fichiers
--- NEW FILE: H2dElementType.java ---
(This appears to be a binary file; contents omitted.)
Index: H2dFileFormatType.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/type/H2dFileFormatType.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** H2dFileFormatType.java 18 Aug 2003 11:48:02 -0000 1.1
--- H2dFileFormatType.java 22 Aug 2003 15:51:12 -0000 1.2
***************
*** 47,51 ****
* @param _nom
*/
! public H2dFileFormatType(int _id, String _nom) {
super(_id, _nom);
}
--- 47,51 ----
* @param _nom
*/
! private H2dFileFormatType(int _id, String _nom) {
super(_id, _nom);
}
|
|
From: <de...@us...> - 2003-08-22 20:08:57
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac In directory sc8-pr-cvs1:/tmp/cvs-serv4498/telemac Log Message: Directory /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac added to the repository |
|
From: <de...@us...> - 2003-08-22 19:58:05
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data
In directory sc8-pr-cvs1:/tmp/cvs-serv7810/tr/data
Added Files:
TrCalqueMaillage.java
Removed Files:
TrMaillage.java
Log Message:
tr: ajout de l'export pour le maillage
gestion affichage maillage
commun modif mineure
--- NEW FILE: TrCalqueMaillage.java ---
/*
* @file TrMaillage.java
* @creation 30 juin 2003
* @modification $Date: 2003/08/22 16:02:24 $
* @license GNU General Public License 2
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
* @mail de...@fu...
*/
package org.fudaa.fudaa.tr.data;
import gnu.trove.TIntObjectHashMap;
import org.fudaa.dodico.h2d.H2dElement;
import org.fudaa.dodico.h2d.H2dMaillage;
import org.fudaa.dodico.h2d.H2dPoint;
import org.fudaa.ebli.calque.BCalque;
import org.fudaa.ebli.calque.ZCalqueAffichageDonnees;
import org.fudaa.ebli.calque.ZCalqueLongPolygone;
import org.fudaa.ebli.calque.ZCalquePoint;
import org.fudaa.ebli.calque.ZCalquePolygone;
import org.fudaa.ebli.calque.ZModeleDonnees;
import org.fudaa.ebli.calque.ZModeleLongPolygone;
import org.fudaa.ebli.calque.ZModeleMaillage;
import org.fudaa.ebli.calque.ZModeleMaillageElement;
import org.fudaa.ebli.calque.ZModelePoint;
import org.fudaa.ebli.calque.ZModelePolygone;
import org.fudaa.ebli.commun.EbliListeSelection;
import org.fudaa.ebli.geometrie.GrBoite;
import org.fudaa.ebli.geometrie.GrPoint;
import org.fudaa.ebli.geometrie.GrPolygone;
import org.fudaa.ebli.geometrie.VecteurGrPoint;
import org.fudaa.ebli.trace.PTrait;
/**
* @author deniger
* @version $Id: TrCalqueMaillage.java,v 1.1 2003/08/22 16:02:24 deniger Exp $
*/
public class TrCalqueMaillage extends ZCalqueAffichageDonnees
{
H2dMaillage mail_;
ZCalquePoint cqPt_;
/**
* @param _pts
* @param _elts
*/
public TrCalqueMaillage(H2dMaillage _maill)
{
setName("Maillage");
mail_=_maill;
cqPt_=new ZCalquePoint(new ModelePoint());
cqPt_.setName("Points");
add(cqPt_);
BCalque p=new ZCalquePolygone(new ModelePolygone());
p.setName("polygone");
add(p);
p=new ZCalqueLongPolygone(new ModeleBord());
p.setName("bord");
add(p);
}
/**
*
*/
public GrBoite getDomaine()
{
GrBoite b = new GrBoite();
H2dPoint pt=mail_.getMinPoint();
b.o = new GrPoint(pt.getX(), pt.getY(), pt.getZ());
pt=mail_.getMaxPoint();
b.e = new GrPoint(pt.getX(), pt.getY(), pt.getZ());
return b;
}
public ZModelePoint getModelePoint()
{
return new ModelePoint();
}
public ZModelePolygone getModelePolygone()
{
return new ModelePolygone();
}
public ZModeleLongPolygone getModeleBord()
{
return new ModeleBord();
}
private class ModelePoint implements ZModelePoint
{
/**
*
*/
public boolean point(GrPoint _p, int _i)
{
return TrCalqueMaillage.this.point(_p, _i);
}
/**
*
*/
public GrBoite getDomaine()
{
return TrCalqueMaillage.this.getDomaine();
}
/**
*
*/
public int getNombre()
{
return TrCalqueMaillage.this.mail_.getPtsNb();
}
/**
*
*/
public Object getObject(int _ind)
{
throw new UnsupportedOperationException("methode non implantée");
}
}
protected class ModelePolygone implements ZModelePolygone
{
/**
*
*/
public boolean polygone(GrPolygone _p, int _i)
{
return TrCalqueMaillage.this.polygone(_p, _i);
}
/**
*
*/
public GrBoite getDomaine()
{
return TrCalqueMaillage.this.getDomaine();
}
/**
*
*/
public int getNombre()
{
return TrCalqueMaillage.this.mail_.getEltNb();
}
/**
*
*/
public Object getObject(int _ind)
{
throw new UnsupportedOperationException("methode non implantée");
}
/**
*
*/
public int nbPoints(int i)
{
return TrCalqueMaillage.this.getNbPointsForElt(i);
}
}
public int getNbPointsForElt(int _indexElt)
{
return mail_.getElement(_indexElt).getPtNb();
}
public static void initGrPoint(H2dPoint _pt, GrPoint _ptToinit)
{
_ptToinit.x = _pt.getX();
_ptToinit.y = _pt.getY();
_ptToinit.z = _pt.getZ();
}
public static void initGrPolygone(
H2dMaillage _ma,
H2dElement _pt,
GrPolygone _ptToinit)
{
int n = _pt.getPtNb();
if (_ptToinit.nombre() != n)
{
_ptToinit.sommets.setSize(n);
}
GrPoint grpt;
H2dPoint hpt;
for (int i = 0; i < n; i++)
{
hpt = _ma.getPt(_pt.getPtIndex()[i]);
grpt = _ptToinit.sommets.renvoie(i);
if (grpt != null)
initGrPoint(hpt, grpt);
else
{
grpt = new GrPoint(hpt.getX(), hpt.getY(), hpt.getZ());
_ptToinit.sommets.remplace(grpt, i);
}
}
}
private class ModeleBord implements ZModeleLongPolygone
{
private TIntObjectHashMap indexMinMax_;
public ModeleBord()
{
int n=mail_.getPtsFrontiere().getBordInternNb();
if(n>0)
{
indexMinMax_=new TIntObjectHashMap(n);
for(int i=0;i<n;i++)
{
indexMinMax_.put(i,mail_.getMinMaxPointFrontiere(i));
}
}
}
/**
*
*/
public GrBoite getDomaineForPolygoneIdx(int _idx)
{
if(_idx==0) return TrCalqueMaillage.this.getDomaine();
if(indexMinMax_==null)
{
System.err.println("Prob !!!");
return null;
}
else
{
H2dPoint[] minMax=(H2dPoint[])indexMinMax_.get(_idx-1);
GrBoite r=new GrBoite();
r.o=new GrPoint();
r.e=new GrPoint();
initGrPoint(minMax[0], r.o);
initGrPoint(minMax[1], r.e);
return r;
}
}
/**
*
*/
public int getNbPointForPolygoneIdx(int _idx)
{
return TrCalqueMaillage.this.mail_.getPtsFrontiere().getPtNbForBord(_idx);
}
/**
*
*/
public int getPolygoneNb()
{
return TrCalqueMaillage.this.mail_.getPtsFrontiere().getBordNb();
}
/**
*
*/
public boolean point(GrPoint _p, int _polygoneIdx, int _pointIdx)
{
H2dPoint pt=mail_.getPt(TrCalqueMaillage.this.mail_.getPtsFrontiere().getPtIdxForBord(_polygoneIdx,_pointIdx));
initGrPoint(pt, _p);
return true;
}
/**
*
*/
public GrBoite getDomaine()
{
return TrCalqueMaillage.this.getDomaine();
}
/**
*
*/
public int getNombre()
{
return TrCalqueMaillage.this.mail_.getPtsFrontiere().getBordNb();
}
/**
*
*/
public Object getObject(int _ind)
{
return null;
}
}
/**
*
*/
public boolean point(GrPoint _p, int _i)
{
initGrPoint(mail_.getPt(_i), _p);
return true;
}
/**
*
*/
public boolean polygone(GrPolygone _poly, int _i)
{
initGrPolygone(this.mail_, mail_.getElement(_i), _poly);
return true;
}
/**
*
*/
public ZModeleDonnees modeleDonnees() {
return cqPt_.modeleDonnees();
}
/**
*
*/
public EbliListeSelection selection(
GrPoint _pt,
int _tolerance,
boolean _partiel) {
return cqPt_.selection(_pt, _tolerance, _partiel);
}
/**
*
*/
public EbliListeSelection selection(GrPolygone _poly, boolean _partiel) {
return cqPt_.selection(_poly,_partiel);
}
}
--- TrMaillage.java DELETED ---
|
|
From: <de...@us...> - 2003-08-22 19:08:52
|
Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/impression In directory sc8-pr-cvs1:/tmp/cvs-serv6613/impression Modified Files: EbliDjaFrame.java EbliFilleImprimable.java EbliFillePrevisualisation.java EbliMiseEnPagePanel.java EbliMiseEnPagePreferencesPanel.java EbliPageFormat.java EbliPageableDelegate.java EbliPrinter.java Log Message: Corrections mineures Index: EbliDjaFrame.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/impression/EbliDjaFrame.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** EbliDjaFrame.java 18 Mar 2003 16:19:13 -0000 1.2 --- EbliDjaFrame.java 22 Aug 2003 15:55:31 -0000 1.3 *************** *** 10,22 **** package org.fudaa.ebli.impression; import java.awt.print.PageFormat; import java.awt.print.Printable; - import java.awt.Graphics; - - import com.memoire.bu.BuInformationsSoftware; import com.memoire.bu.BuCommonImplementation; import com.memoire.bu.BuInformationsDocument; ! import com.memoire.dja.DjaFrame; import com.memoire.dja.DjaGrid; --- 10,20 ---- package org.fudaa.ebli.impression; + import java.awt.Graphics; import java.awt.print.PageFormat; import java.awt.print.Printable; import com.memoire.bu.BuCommonImplementation; import com.memoire.bu.BuInformationsDocument; ! import com.memoire.bu.BuInformationsSoftware; import com.memoire.dja.DjaFrame; import com.memoire.dja.DjaGrid; Index: EbliFilleImprimable.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/impression/EbliFilleImprimable.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** EbliFilleImprimable.java 18 Mar 2003 16:19:13 -0000 1.2 --- EbliFilleImprimable.java 22 Aug 2003 15:55:31 -0000 1.3 *************** *** 14,19 **** import com.memoire.bu.BuCommonInterface; - import com.memoire.bu.BuInformationsSoftware; import com.memoire.bu.BuInformationsDocument; import com.memoire.bu.BuInternalFrame; --- 14,19 ---- import com.memoire.bu.BuCommonInterface; import com.memoire.bu.BuInformationsDocument; + import com.memoire.bu.BuInformationsSoftware; import com.memoire.bu.BuInternalFrame; Index: EbliFillePrevisualisation.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/impression/EbliFillePrevisualisation.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** EbliFillePrevisualisation.java 18 Mar 2003 16:19:13 -0000 1.3 --- EbliFillePrevisualisation.java 22 Aug 2003 15:55:31 -0000 1.4 *************** *** 11,73 **** ! import java.io.IOException; ! import java.lang.Math; ! ! import java.awt.Graphics; import java.awt.Component; ! import java.awt.GraphicsEnvironment; ! import java.awt.GraphicsConfiguration; import java.awt.Graphics2D; ! import java.awt.Color; ! import java.awt.FlowLayout; import java.awt.Shape; - import java.awt.Dimension; - - import java.awt.print.PrinterJob; - import java.awt.print.PrinterException; - import java.awt.print.PageFormat; - - import java.awt.event.ActionListener; - import java.awt.event.MouseListener; - import java.awt.event.MouseAdapter; - import java.awt.event.ItemListener; import java.awt.event.ActionEvent; ! import java.awt.event.MouseEvent; import java.awt.event.ItemEvent; ! import java.awt.geom.AffineTransform; import java.awt.geom.Rectangle2D; - import javax.swing.UIManager; - import javax.swing.ListCellRenderer; - import javax.swing.JComponent; import javax.swing.AbstractButton; - import javax.swing.JFrame; - import javax.swing.JList; - import javax.swing.JLabel; - import javax.swing.JScrollPane; import javax.swing.BorderFactory; import javax.swing.DefaultComboBoxModel; import com.memoire.bu.BuButton; import com.memoire.bu.BuComboBox; ! import com.memoire.bu.BuMenuItem; ! import com.memoire.bu.BuToggleButton; ! import com.memoire.bu.BuLabel; import com.memoire.bu.BuIcon; - import com.memoire.bu.BuComboBox; - import com.memoire.bu.BuMenuBar; import com.memoire.bu.BuInternalFrame; import com.memoire.bu.BuPanel; ! import com.memoire.bu.BuBorderLayout; ! import com.memoire.bu.BuGridLayout; ! import com.memoire.bu.BuHorizontalLayout; ! //import com.memoire.bu.BuResource; ! import com.memoire.bu.BuCommonInterface; import org.fudaa.ebli.ressource.EbliResource; - import org.fudaa.ebli.trace.TraceLigne; - import org.fudaa.ebli.ressource.EbliResource; /** --- 11,52 ---- ! import java.awt.Color; import java.awt.Component; ! import java.awt.Dimension; ! import java.awt.Graphics; import java.awt.Graphics2D; ! import java.awt.GraphicsConfiguration; ! import java.awt.GraphicsEnvironment; import java.awt.Shape; import java.awt.event.ActionEvent; ! import java.awt.event.ActionListener; import java.awt.event.ItemEvent; ! import java.awt.event.ItemListener; import java.awt.geom.AffineTransform; import java.awt.geom.Rectangle2D; + import java.awt.print.PageFormat; + import java.awt.print.PrinterException; import javax.swing.AbstractButton; import javax.swing.BorderFactory; import javax.swing.DefaultComboBoxModel; + import javax.swing.JComponent; + import javax.swing.JList; + import javax.swing.JScrollPane; + import javax.swing.ListCellRenderer; + import javax.swing.UIManager; import com.memoire.bu.BuButton; import com.memoire.bu.BuComboBox; ! import com.memoire.bu.BuCommonInterface; ! import com.memoire.bu.BuGridLayout; import com.memoire.bu.BuIcon; import com.memoire.bu.BuInternalFrame; + import com.memoire.bu.BuLabel; import com.memoire.bu.BuPanel; ! import com.memoire.bu.BuToggleButton; import org.fudaa.ebli.ressource.EbliResource; import org.fudaa.ebli.trace.TraceLigne; /** Index: EbliMiseEnPagePanel.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/impression/EbliMiseEnPagePanel.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** EbliMiseEnPagePanel.java 18 Mar 2003 16:19:13 -0000 1.2 --- EbliMiseEnPagePanel.java 22 Aug 2003 15:55:31 -0000 1.3 *************** *** 10,44 **** package org.fudaa.ebli.impression; - import java.awt.GridLayout; import java.awt.Color; ! import java.awt.Font; ! ! import java.awt.print.PageFormat; ! import java.awt.print.PrinterJob; ! ! import java.awt.event.ActionListener; ! import java.awt.event.ItemListener; import java.awt.event.ActionEvent; import java.awt.event.ItemEvent; - import javax.swing.DefaultComboBoxModel; - import javax.swing.JComponent; - import javax.swing.JFrame; import javax.swing.BorderFactory; ! import javax.swing.border.Border; - import javax.swing.border.CompoundBorder; - import javax.swing.border.TitledBorder; - - import java.text.NumberFormat; import com.memoire.bu.BuButton; - import com.memoire.bu.BuComboBox; import com.memoire.bu.BuCheckBox; ! import com.memoire.bu.BuPanel; ! import com.memoire.bu.BuLabel; import com.memoire.bu.BuGridLayout; import com.memoire.bu.BuVerticalLayout; - import com.memoire.bu.BuBorderLayout; import org.fudaa.ebli.ressource.EbliResource; --- 10,35 ---- package org.fudaa.ebli.impression; import java.awt.Color; ! import java.awt.GridLayout; import java.awt.event.ActionEvent; + import java.awt.event.ActionListener; import java.awt.event.ItemEvent; + import java.awt.event.ItemListener; + import java.awt.print.PageFormat; + import java.awt.print.PrinterJob; + import java.text.NumberFormat; import javax.swing.BorderFactory; ! import javax.swing.DefaultComboBoxModel; import javax.swing.border.Border; + import com.memoire.bu.BuBorderLayout; import com.memoire.bu.BuButton; import com.memoire.bu.BuCheckBox; ! import com.memoire.bu.BuComboBox; import com.memoire.bu.BuGridLayout; + import com.memoire.bu.BuLabel; + import com.memoire.bu.BuPanel; import com.memoire.bu.BuVerticalLayout; import org.fudaa.ebli.ressource.EbliResource; Index: EbliMiseEnPagePreferencesPanel.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/impression/EbliMiseEnPagePreferencesPanel.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** EbliMiseEnPagePreferencesPanel.java 18 Mar 2003 16:19:13 -0000 1.2 --- EbliMiseEnPagePreferencesPanel.java 22 Aug 2003 15:55:31 -0000 1.3 *************** *** 10,31 **** package org.fudaa.ebli.impression; - import java.awt.event.ActionEvent; - import java.awt.FlowLayout; - import java.awt.print.PageFormat; import java.awt.print.Paper; - import javax.swing.DefaultComboBoxModel; - import javax.swing.JComponent; - import com.memoire.bu.BuAbstractPreferencesPanel; - import com.memoire.bu.BuInformationsDocument; - import com.memoire.bu.BuInformationsSoftware; - import com.memoire.bu.BuCommonInterface; - import com.memoire.bu.BuButton; - import com.memoire.bu.BuResource; - import com.memoire.bu.BuPanel; - import com.memoire.bu.BuLabel; - import com.memoire.bu.BuGridLayout; import com.memoire.bu.BuBorderLayout; --- 10,17 ---- Index: EbliPageFormat.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/impression/EbliPageFormat.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** EbliPageFormat.java 18 Mar 2003 16:19:12 -0000 1.3 --- EbliPageFormat.java 22 Aug 2003 15:55:31 -0000 1.4 *************** *** 11,29 **** - import java.awt.Font; import java.awt.Color; import java.awt.FontMetrics; - import java.awt.Shape; import java.awt.Graphics; import java.awt.Graphics2D; ! import java.awt.geom.Rectangle2D; - import java.awt.print.PageFormat; import java.awt.print.Paper; import java.awt.print.PrinterJob; - import com.memoire.bu.BuInformationsSoftware; import com.memoire.bu.BuInformationsDocument; import org.fudaa.ebli.ressource.EbliResource; --- 11,27 ---- import java.awt.Color; + import java.awt.Font; import java.awt.FontMetrics; import java.awt.Graphics; import java.awt.Graphics2D; ! import java.awt.Shape; import java.awt.geom.Rectangle2D; import java.awt.print.PageFormat; import java.awt.print.Paper; import java.awt.print.PrinterJob; import com.memoire.bu.BuInformationsDocument; + import com.memoire.bu.BuInformationsSoftware; import org.fudaa.ebli.ressource.EbliResource; Index: EbliPageableDelegate.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/impression/EbliPageableDelegate.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** EbliPageableDelegate.java 18 Mar 2003 16:19:13 -0000 1.2 --- EbliPageableDelegate.java 22 Aug 2003 15:55:31 -0000 1.3 *************** *** 10,24 **** package org.fudaa.ebli.impression; - import java.util.Hashtable; - import java.awt.Graphics; - import java.awt.Graphics2D; - import java.awt.print.PrinterJob; import java.awt.print.PageFormat; - import java.awt.print.Paper; - import java.awt.print.Printable; import java.awt.print.Pageable; ! ! import javax.swing.JComponent; /** --- 10,17 ---- package org.fudaa.ebli.impression; import java.awt.Graphics; import java.awt.print.PageFormat; import java.awt.print.Pageable; ! import java.awt.print.Printable; /** Index: EbliPrinter.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/impression/EbliPrinter.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** EbliPrinter.java 18 Mar 2003 16:19:12 -0000 1.2 --- EbliPrinter.java 22 Aug 2003 15:55:31 -0000 1.3 *************** *** 10,23 **** package org.fudaa.ebli.impression; ! import java.awt.*; ! import java.awt.font.*; ! import java.awt.image.BufferedImage; ! import java.awt.print.*; import java.text.AttributedString; ! import java.util.*; ! import javax.swing.*; ! import java.awt.geom.*; ! import javax.swing.table.*; ! import javax.swing.text.*; --- 10,29 ---- package org.fudaa.ebli.impression; ! import java.awt.Color; ! import java.awt.Component; ! import java.awt.Font; ! import java.awt.Graphics; ! import java.awt.Graphics2D; ! import java.awt.Image; ! import java.awt.Rectangle; ! import java.awt.Shape; ! import java.awt.font.LineBreakMeasurer; ! import java.awt.font.TextAttribute; ! import java.awt.font.TextLayout; ! import java.awt.print.PageFormat; ! import java.awt.print.Printable; import java.text.AttributedString; ! ! import javax.swing.JTable; |
|
From: <de...@us...> - 2003-08-22 18:29:00
|
Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/trace In directory sc8-pr-cvs1:/tmp/cvs-serv6613/trace Modified Files: TraceIsoLignes.java TracePoint.java Log Message: Corrections mineures Index: TraceIsoLignes.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/trace/TraceIsoLignes.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TraceIsoLignes.java 21 Feb 2003 16:54:29 -0000 1.2 --- TraceIsoLignes.java 22 Aug 2003 15:55:31 -0000 1.3 *************** *** 10,15 **** package org.fudaa.ebli.trace; ! import java.awt.*; ! import org.fudaa.ebli.palette.*; /** --- 10,15 ---- package org.fudaa.ebli.trace; ! import java.awt.Graphics; ! import java.awt.Polygon; /** Index: TracePoint.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/trace/TracePoint.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TracePoint.java 21 Feb 2003 16:54:29 -0000 1.2 --- TracePoint.java 22 Aug 2003 15:55:31 -0000 1.3 *************** *** 10,18 **** package org.fudaa.ebli.trace; ! import java.awt.*; ! import java.awt.geom.Line2D; ! import java.awt.geom.Ellipse2D; ! import java.awt.geom.Rectangle2D; ! import javax.swing.*; /** --- 10,19 ---- package org.fudaa.ebli.trace; ! import java.awt.Color; ! import java.awt.Component; ! import java.awt.Graphics; ! import java.awt.Graphics2D; ! ! import javax.swing.Icon; /** |
|
From: <de...@us...> - 2003-08-22 16:22:31
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr In directory sc8-pr-cvs1:/tmp/cvs-serv8993 Added Files: TrThreadListener.java Log Message: Un listener de thread --- NEW FILE: TrThreadListener.java --- (This appears to be a binary file; contents omitted.) |
|
From: <de...@us...> - 2003-08-19 07:49:12
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun In directory sc8-pr-cvs1:/tmp/cvs-serv10343/commun Modified Files: FudaaCommonImplementation.java FudaaDialogNewProject.java Log Message: Gestion de l'export pour le projet tr Index: FudaaCommonImplementation.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/FudaaCommonImplementation.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FudaaCommonImplementation.java 4 Jul 2003 16:05:04 -0000 1.1 --- FudaaCommonImplementation.java 19 Aug 2003 07:48:38 -0000 1.2 *************** *** 37,40 **** --- 37,41 ---- import org.fudaa.dodico.commun.DodicoAnalyze; import org.fudaa.dodico.fichiers.FileOperationSynthese; + import org.fudaa.ebli.impression.EbliFillePrevisualisation; import org.fudaa.ebli.impression.EbliMiseEnPageDialog; Index: FudaaDialogNewProject.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/FudaaDialogNewProject.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** FudaaDialogNewProject.java 4 Jul 2003 15:31:34 -0000 1.4 --- FudaaDialogNewProject.java 19 Aug 2003 07:48:38 -0000 1.5 *************** *** 14,17 **** --- 14,18 ---- import org.fudaa.fudaa.commun.fileChooser.FudaaFileChooser; + import java.awt.*; import java.awt.event.*; |
|
From: <de...@us...> - 2003-08-19 07:49:12
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/exec In directory sc8-pr-cvs1:/tmp/cvs-serv10343/commun/exec Modified Files: FudaaExecPanel.java Log Message: Gestion de l'export pour le projet tr Index: FudaaExecPanel.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/exec/FudaaExecPanel.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FudaaExecPanel.java 4 Jul 2003 15:13:47 -0000 1.1 --- FudaaExecPanel.java 19 Aug 2003 07:48:39 -0000 1.2 *************** *** 31,34 **** --- 31,35 ---- import org.fudaa.dodico.commun.DodicoLib; import org.fudaa.ebli.dialog.EbliSimpleDialogPanel; + import org.fudaa.fudaa.commun.FudaaLib; import org.fudaa.fudaa.commun.FudaaPreferences; |
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/telemac
In directory sc8-pr-cvs1:/tmp/cvs-serv10343/tr/telemac
Modified Files:
TrDicoProjet.java TrTelemacCodePrefDialogPanel.java
TrTelemacImplHelper.java TrTelemacParametres.java
TrTelemacProjet.java
Log Message:
Gestion de l'export pour le projet tr
Index: TrDicoProjet.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/telemac/TrDicoProjet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TrDicoProjet.java 18 Aug 2003 11:54:43 -0000 1.2
--- TrDicoProjet.java 19 Aug 2003 07:48:40 -0000 1.3
***************
*** 77,79 ****
--- 77,84 ----
}
+ /**
+ *
+ */
+ public void export(String _actionCommand) {impl_.error("Non implanté");}
+
}
Index: TrTelemacCodePrefDialogPanel.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacCodePrefDialogPanel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TrTelemacCodePrefDialogPanel.java 4 Jul 2003 15:37:05 -0000 1.1
--- TrTelemacCodePrefDialogPanel.java 19 Aug 2003 07:48:40 -0000 1.2
***************
*** 9,38 ****
package org.fudaa.fudaa.tr.telemac;
- import java.awt.event.FocusEvent;
- import java.awt.event.FocusListener;
- import java.beans.PropertyChangeEvent;
- import java.beans.PropertyChangeListener;
- import java.io.File;
-
- import javax.swing.BorderFactory;
- import javax.swing.JFileChooser;
- import javax.swing.JPanel;
import javax.swing.JTextField;
- import javax.swing.event.CaretEvent;
- import javax.swing.event.CaretListener;
- import com.memoire.bu.BuBorderLayout;
- import com.memoire.bu.BuGridLayout;
- import com.memoire.bu.BuPanel;
-
- import org.fudaa.ebli.dialog.EbliSimpleDialogPanel;
- import org.fudaa.fudaa.commun.FudaaLib;
import org.fudaa.fudaa.commun.exec.FudaaExecManagerPanel;
import org.fudaa.fudaa.commun.exec.FudaaExecServerManager;
import org.fudaa.fudaa.commun.exec.FudaaExecServerManagerPanel;
- import org.fudaa.fudaa.commun.tableau.FudaaCellFileEditor;
- import org.fudaa.fudaa.commun.tableau.FudaaPanelListEditor;
- import org.fudaa.fudaa.commun.tableau.FudaaPanelListEditorModel;
- import org.fudaa.fudaa.tr.TrPreferences;
/**
--- 9,17 ----
Index: TrTelemacImplHelper.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacImplHelper.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TrTelemacImplHelper.java 18 Aug 2003 11:54:43 -0000 1.3
--- TrTelemacImplHelper.java 19 Aug 2003 07:48:40 -0000 1.4
***************
*** 11,19 ****
import java.io.File;
- import javax.swing.ComboBoxModel;
-
- import com.memoire.bu.BuComboBox;
- import com.memoire.bu.BuGridLayout;
- import com.memoire.bu.BuLabel;
import com.memoire.bu.BuMenuItem;
import com.memoire.bu.BuTaskOperation;
--- 11,14 ----
***************
*** 22,27 ****
import org.fudaa.dodico.dico.DicoCasFileFormat;
import org.fudaa.dodico.dico.DicoCasFileFormatVersion;
- import org.fudaa.dodico.dico.DicoLanguage;
- import org.fudaa.dodico.dico.DicoManager;
import org.fudaa.dodico.dico.DicoModelAbstract;
import org.fudaa.dodico.fichiers.FileFormatSoftware;
--- 17,20 ----
***************
*** 29,34 ****
import org.fudaa.dodico.telemac.io.Telemac2dFileFormat;
! import org.fudaa.ebli.dialog.EbliSimpleDialogPanel;
!
import org.fudaa.fudaa.ressource.FudaaResource;
import org.fudaa.fudaa.tr.TrImplHelper;
--- 22,26 ----
import org.fudaa.dodico.telemac.io.Telemac2dFileFormat;
! import org.fudaa.fudaa.dico.FDicoChooserPanel;
import org.fudaa.fudaa.ressource.FudaaResource;
import org.fudaa.fudaa.tr.TrImplHelper;
***************
*** 89,118 ****
public void ouvrirDico()
{
! EbliSimpleDialogPanel s = new EbliSimpleDialogPanel();
! s.setLayout(new BuGridLayout(2, 5, 5, false, false, false, false));
! s.add(new BuLabel("dico :"));
! BuComboBox cb = new BuComboBox();
! ComboBoxModel descModel =
! TelemacDicoManager.getINSTANCE().createDicoDescComboBoxModel();
! cb.setModel(descModel);
! cb.setRenderer(TelemacDicoManager.getINSTANCE().getDicoDescCellRenderer());
! s.add(cb);
! s.add(new BuLabel("Langage :"));
! cb = new BuComboBox();
! DicoLanguage.LanguageComboBoxModel langModel =
! new DicoLanguage.LanguageComboBoxModel();
! cb.setModel(langModel);
! s.add(cb);
! int r = s.afficheModale(impl_.getFrame(), "Choix fichier dico");
! if (EbliSimpleDialogPanel.isOkResponse(r))
{
- final File fic = impl_.ouvrirFileChooser(null, "Fichier cas");
- if (fic != null)
- {
_ouvrir(
! fic,
! (DicoCasFileFormat) descModel.getSelectedItem(),
! langModel.getSelectedLanguage());
! }
}
--- 81,93 ----
public void ouvrirDico()
{
! FDicoChooserPanel s=new FDicoChooserPanel(TelemacDicoManager.getINSTANCE());
! int r = s.afficheModale(impl_.getFrame(), "Choix fichier dico");
! if (s.isOkResponse(r))
{
_ouvrir(
! s.getSelectedFile(),
! s.getFileFormatSelected(),
! s.getVersionSelected(),
! s.getLanguageSelected());
}
***************
*** 123,126 ****
--- 98,102 ----
final File _fic,
final DicoCasFileFormat _ft,
+ final String _v,
final int _language)
{
***************
*** 131,135 ****
public void act()
{
! DicoCasFileFormatVersion version=_ft.getLastVersionImpl(_language);
DicoModelAbstract m =_ft.getLastVersionImpl().getDico();
--- 107,111 ----
public void act()
{
! DicoCasFileFormatVersion version=_ft.getVersionImpl(_v,_language);
DicoModelAbstract m =_ft.getLastVersionImpl().getDico();
Index: TrTelemacParametres.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacParametres.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TrTelemacParametres.java 18 Aug 2003 11:54:43 -0000 1.3
--- TrTelemacParametres.java 19 Aug 2003 07:48:40 -0000 1.4
***************
*** 9,30 ****
package org.fudaa.fudaa.tr.telemac;
- import gnu.trove.TObjectLongHashMap;
-
import java.io.File;
import java.util.Map;
import org.fudaa.dodico.commun.ProgressionInterface;
- import org.fudaa.dodico.dico.DicoCasFileFormat;
import org.fudaa.dodico.dico.DicoCasFileFormatVersion;
import org.fudaa.dodico.dico.DicoCasInterface;
import org.fudaa.dodico.dico.DicoEntiteFile;
import org.fudaa.dodico.fichiers.FileOperationSynthese;
- import org.fudaa.dodico.h2d.H2dLib;
import org.fudaa.dodico.h2d.H2dMaillage;
import org.fudaa.dodico.reflux.io.CorEleBthInterface;
- import org.fudaa.dodico.telemac.io.TelemacLib;
import org.fudaa.dodico.telemac.io.SerafinInterface;
- import org.fudaa.dodico.telemac.io.TelemacCLInterface;
import org.fudaa.dodico.telemac.io.Telemac2dFileFormat;
import org.fudaa.dodico.telemac.io.TelemacLiquideInterface;
--- 9,28 ----
package org.fudaa.fudaa.tr.telemac;
import java.io.File;
import java.util.Map;
import org.fudaa.dodico.commun.ProgressionInterface;
import org.fudaa.dodico.dico.DicoCasFileFormatVersion;
import org.fudaa.dodico.dico.DicoCasInterface;
import org.fudaa.dodico.dico.DicoEntiteFile;
+ import org.fudaa.dodico.dunes.io.DunesInterface;
import org.fudaa.dodico.fichiers.FileOperationSynthese;
import org.fudaa.dodico.h2d.H2dMaillage;
+ import org.fudaa.dodico.h2d.H2dParametres;
import org.fudaa.dodico.reflux.io.CorEleBthInterface;
import org.fudaa.dodico.telemac.io.SerafinInterface;
import org.fudaa.dodico.telemac.io.Telemac2dFileFormat;
+ import org.fudaa.dodico.telemac.io.TelemacCLInterface;
+ import org.fudaa.dodico.telemac.io.TelemacLib;
import org.fudaa.dodico.telemac.io.TelemacLiquideInterface;
***************
*** 37,41 ****
* @version $Id$
*/
! public class TrTelemacParametres extends FDicoParams {
H2dMaillage maillage_;
--- 35,39 ----
* @version $Id$
*/
! public class TrTelemacParametres extends FDicoParams implements H2dParametres{
H2dMaillage maillage_;
***************
*** 73,77 ****
}
-
public CorEleBthInterface createCorEleBthInterface(ProgressionInterface _prog) {
CorEleBthInterface r= null;
--- 71,74 ----
***************
*** 107,111 ****
}
! DicoEntiteFile entFile=dicoParams_.getFileEntite(getTelemacFileFormatVersion().getMaillageEntiteFile());
if (entFile == null) {
ui_.error(
--- 104,110 ----
}
! DicoEntiteFile entFile=
! dicoParams_.getFileEntite(
! getTelemacFileFormatVersion().getMaillageEntiteFile());
if (entFile == null) {
ui_.error(
***************
*** 147,151 ****
public boolean loadConditionsLimite(ProgressionInterface _prg) {
DicoEntiteFile entFile=
! dicoParams_.getFileEntite(getTelemacFileFormatVersion().getCLEntiteFile());
if (entFile == null) {
ui_.error(
--- 146,151 ----
public boolean loadConditionsLimite(ProgressionInterface _prg) {
DicoEntiteFile entFile=
! dicoParams_.getFileEntite(
! getTelemacFileFormatVersion().getCLEntiteFile());
if (entFile == null) {
ui_.error(
***************
*** 182,186 ****
public boolean loadConditionsLimiteLiquide(ProgressionInterface _prg) {
DicoEntiteFile entFile=
! dicoParams_.getFileEntite(getTelemacFileFormatVersion().getCLLiquideEntiteFile());
if (entFile == null) {
ui_.error(
--- 182,187 ----
public boolean loadConditionsLimiteLiquide(ProgressionInterface _prg) {
DicoEntiteFile entFile=
! dicoParams_.getFileEntite(
! getTelemacFileFormatVersion().getCLLiquideEntiteFile());
if (entFile == null) {
ui_.error(
***************
*** 212,272 ****
return getMainFile();
}
! // public TableModel getEntiteTableModel()
! // {
! // return new AbstractTableModel()
! // {
! // public int getRowCount()
! // {
! // return 1;
! // }
! //
! // public int getColumnCount()
! // {
! // return 2;
! // }
! //
! // public Object getValueAt(int _r, int _c)
! // {
! // return null;
! // }
! //
! // };
! //
! // }
!
! // /**
! // *
! // */
! // public void init(
! // File _fichierPrinc,
! // DicoCasFileFormat _ft,
! // Map _initialSetValues,
! // long _timeloaded,
! // boolean _launchEvent)
! // {
! // if(_ft instanceof TelemacCasFileFormat)
! // {
! // init(_fichierPrinc, (TelemacCasFileFormat)_ft, _initialSetValues, _timeloaded, _launchEvent);
! // }
! // else
! //
! // ui_.error("Format telemac 2d uniquement");
! // }
! //
! // public void init(
! // File _fichierPrinc,
! // TelemacCasFileFormat _ft,
! // Map _initialSetValues,
! // long _timeloaded,
! // boolean _launchEvent)
! // {
! // super.init(
! // _fichierPrinc,
! // _ft,
! // _initialSetValues,
! // _timeloaded,
! // _launchEvent);
! // }
}
--- 213,226 ----
return getMainFile();
}
+
+
! /**
! * Renvoie le maillage. Si nul, il est necessaire de charger
! * le maillage avec {@link #loadGeometrie(ProgressionInterface) loadGeometrie}
! */
! public H2dMaillage getMaillage() {
! return maillage_;
! }
}
Index: TrTelemacProjet.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacProjet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TrTelemacProjet.java 18 Aug 2003 11:54:43 -0000 1.3
--- TrTelemacProjet.java 19 Aug 2003 07:48:40 -0000 1.4
***************
*** 12,15 ****
--- 12,16 ----
import org.fudaa.dodico.commun.ProgressionInterface;
+ import org.fudaa.dodico.dunes.io.DunesInterface;
import org.fudaa.dodico.fichiers.FileFormatSoftware;
import org.fudaa.dodico.telemac.io.Telemac2dFileFormat;
***************
*** 18,21 ****
--- 19,23 ----
import org.fudaa.fudaa.dico.FDicoParams;
import org.fudaa.fudaa.dico.FDicoProjetAbstract;
+ import org.fudaa.fudaa.tr.TrExport;
import org.fudaa.fudaa.tr.TrImplementation;
import org.fudaa.fudaa.tr.TrProjet;
***************
*** 70,73 ****
--- 72,80 ----
return params_.getFDicoParams();
}
+
+ /**
+ *
+ */
+ public void export(String _actionCommand) {new TrExport(params_).export(_actionCommand);}
}
|
|
From: <de...@us...> - 2003-08-19 07:48:44
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux
In directory sc8-pr-cvs1:/tmp/cvs-serv10343/tr/reflux
Modified Files:
TrRefluxParametres.java TrRefluxProjet.java
Log Message:
Gestion de l'export pour le projet tr
Index: TrRefluxParametres.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxParametres.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TrRefluxParametres.java 18 Aug 2003 11:54:43 -0000 1.2
--- TrRefluxParametres.java 19 Aug 2003 07:48:40 -0000 1.3
***************
*** 15,18 ****
--- 15,20 ----
import org.fudaa.dodico.dico.DicoParams;
import org.fudaa.dodico.fichiers.FileOperationSynthese;
+ import org.fudaa.dodico.h2d.H2dMaillage;
+ import org.fudaa.dodico.h2d.H2dParametres;
import org.fudaa.dodico.reflux.io.INPFileFormat;
import org.fudaa.dodico.reflux.io.INPInterface;
***************
*** 24,28 ****
* @version $Id$
*/
! public class TrRefluxParametres
{
--- 26,30 ----
* @version $Id$
*/
! public class TrRefluxParametres implements H2dParametres
{
***************
*** 31,42 ****
FudaaUI ui_;
DicoParams dicoParam_;
/**
*
*/
! public TrRefluxParametres(INPInterface _inter,FudaaUI _ui)
{
super();
! ui_ = _ui;
}
--- 33,45 ----
FudaaUI ui_;
DicoParams dicoParam_;
+ H2dMaillage maillage_;
/**
*
*/
! private TrRefluxParametres()
{
super();
!
}
***************
*** 52,56 ****
if(_ui!=null) _ui.manageErrorOperation(synt);
if(inter==null) return null;
! TrRefluxParametres r = new TrRefluxParametres(inter,_ui);
r.fINP_ = _f;
String s = _f.getName();
--- 55,60 ----
if(_ui!=null) _ui.manageErrorOperation(synt);
if(inter==null) return null;
! TrRefluxParametres r = new TrRefluxParametres();
! r.ui_ = _ui;
r.fINP_ = _f;
String s = _f.getName();
***************
*** 59,64 ****
s = s.substring(0, i);
r.title_ = s;
-
r.dicoParam_=new DicoParams(inter.getEntiteValue(),_ft);
return r;
}
--- 63,71 ----
s = s.substring(0, i);
r.title_ = s;
r.dicoParam_=new DicoParams(inter.getEntiteValue(),_ft);
+ H2dMaillage maillage=inter.getMaillage();
+ maillage.computeBordV2(_progress);
+ r.maillage_=maillage;
+
return r;
}
***************
*** 126,129 ****
--- 133,143 ----
{
return dicoParam_;
+ }
+
+ /**
+ *
+ */
+ public H2dMaillage getMaillage() {
+ return maillage_;
}
Index: TrRefluxProjet.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxProjet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TrRefluxProjet.java 18 Aug 2003 11:54:43 -0000 1.2
--- TrRefluxProjet.java 19 Aug 2003 07:48:40 -0000 1.3
***************
*** 17,21 ****
import org.fudaa.dodico.commun.ProgressionInterface;
import org.fudaa.dodico.fichiers.FileFormatSoftware;
- import org.fudaa.dodico.h2d.H2dParametres;
import org.fudaa.dodico.reflux.RefluxExec;
import org.fudaa.dodico.reflux.io.INPFileFormat;
--- 17,20 ----
***************
*** 24,27 ****
--- 23,27 ----
import org.fudaa.fudaa.commun.calcul.FudaaCalculAction;
import org.fudaa.fudaa.commun.calcul.FudaaCalculOp;
+ import org.fudaa.fudaa.tr.TrExport;
import org.fudaa.fudaa.tr.TrImplementation;
import org.fudaa.fudaa.tr.TrProjet;
***************
*** 31,36 ****
* @version $Id$
*/
! public class TrRefluxProjet implements TrProjet
! {
BuInformationsDocument infos_;
--- 31,35 ----
* @version $Id$
*/
! public class TrRefluxProjet implements TrProjet {
BuInformationsDocument infos_;
***************
*** 43,82 ****
*
*/
! public TrRefluxProjet(TrImplementation _impl,TrRefluxParametres _params)
! {
! impl_ = _impl;
! params_=_params;
! calculActions_=new FudaaCalculAction(this,true);
}
!
public static TrRefluxProjet init(
File _file,
INPFileFormat.INPVersion _fileFormat,
! ProgressionInterface _progress,TrImplementation _ui)
! {
//TODO: gerer si param deja present
! TrRefluxParametres params_=TrRefluxParametres.init(_file, _fileFormat, _progress, _ui);
! if(params_!=null) return new TrRefluxProjet(_ui,params_);
! else return null;
}
! public TrRefluxParametres getRefluxParametres()
! {
return params_;
}
!
! public void save()
! {
!
! }
!
/**
*
*/
! public BuInformationsDocument getInformationsDocument()
! {
if (infos_ == null)
! infos_ = new BuInformationsDocument();
return infos_;
}
--- 42,77 ----
*
*/
! public TrRefluxProjet(TrImplementation _impl, TrRefluxParametres _params) {
! impl_= _impl;
! params_= _params;
! calculActions_= new FudaaCalculAction(this, true);
}
!
public static TrRefluxProjet init(
File _file,
INPFileFormat.INPVersion _fileFormat,
! ProgressionInterface _progress,
! TrImplementation _ui) {
//TODO: gerer si param deja present
! TrRefluxParametres params_=
! TrRefluxParametres.init(_file, _fileFormat, _progress, _ui);
! if (params_ != null)
! return new TrRefluxProjet(_ui, params_);
! else
! return null;
}
! public TrRefluxParametres getRefluxParametres() {
return params_;
}
!
! public void save() {}
/**
*
*/
! public BuInformationsDocument getInformationsDocument() {
if (infos_ == null)
! infos_= new BuInformationsDocument();
return infos_;
}
***************
*** 85,103 ****
*
*/
! public H2dParametres getParametres()
! {
! return null;
! }
!
! /**
! *
! */
! public void enregistrerParametres()
! {
! }
!
! public File enregistrerParametresUniqueSousRep(File _d)
! {
return params_.enregistrerUniqueSousRepertoire(_d);
}
--- 80,86 ----
*
*/
! public void enregistrerParametres() {}
! public File enregistrerParametresUniqueSousRep(File _d) {
return params_.enregistrerUniqueSousRepertoire(_d);
}
***************
*** 106,111 ****
*
*/
! public TrImplementation getImpl()
! {
return impl_;
}
--- 89,93 ----
*
*/
! public TrImplementation getImpl() {
return impl_;
}
***************
*** 114,131 ****
*
*/
! public void setImpl(TrImplementation _impl)
! {
!
! }
/**
*
*/
! public void active()
! {
! if (fille_ == null)
! {
! fille_ = new TrRefluxFilleProjet(this);
! Dimension dim = impl_.getMainPanel().getDesktop().getSize();
fille_.setSize(
(int) (dim.getWidth() * 0.8),
--- 96,108 ----
*
*/
! public void setImpl(TrImplementation _impl) {}
/**
*
*/
! public void active() {
! if (fille_ == null) {
! fille_= new TrRefluxFilleProjet(this);
! Dimension dim= impl_.getMainPanel().getDesktop().getSize();
fille_.setSize(
(int) (dim.getWidth() * 0.8),
***************
*** 136,141 ****
}
! public void close()
! {
// if (isModified())
// {
--- 113,117 ----
}
! public void close() {
// if (isModified())
// {
***************
*** 152,156 ****
// }
fille_.dispose();
! fille_ = null;
impl_.closeProjet(this);
}
--- 128,132 ----
// }
fille_.dispose();
! fille_= null;
impl_.closeProjet(this);
}
***************
*** 159,164 ****
*
*/
! public String getTitle()
! {
return params_.getTitle();
}
--- 135,139 ----
*
*/
! public String getTitle() {
return params_.getTitle();
}
***************
*** 167,176 ****
*
*/
! public CalculLauncher actionCalcul()
! {
! FudaaCalculOp op=new FudaaCalculOp(new RefluxExec())
! {
! public File proceedParamFile(ProgressionInterface _inter)
! {
return params_.getFile();
}
--- 142,148 ----
*
*/
! public CalculLauncher actionCalcul() {
! FudaaCalculOp op= new FudaaCalculOp(new RefluxExec()) {
! public File proceedParamFile(ProgressionInterface _inter) {
return params_.getFile();
}
***************
*** 178,183 ****
* @return
*/
! protected String getTaskName()
! {
return "lancement reflux";
}
--- 150,154 ----
* @return
*/
! protected String getTaskName() {
return "lancement reflux";
}
***************
*** 186,206 ****
return op;
}
!
!
/**
*
*/
! public String getID()
! {
return FileFormatSoftware.REFLUX_IS.name;
}
-
-
/**
*
*/
! public File getParamsFile()
! {
return getRefluxParametres().getFile();
}
--- 157,172 ----
return op;
}
!
/**
*
*/
! public String getID() {
return FileFormatSoftware.REFLUX_IS.name;
}
/**
*
*/
! public File getParamsFile() {
return getRefluxParametres().getFile();
}
***************
*** 209,214 ****
*
*/
! public FudaaUI getUI()
! {
return impl_;
}
--- 175,179 ----
*
*/
! public FudaaUI getUI() {
return impl_;
}
***************
*** 217,222 ****
* @return
*/
! public FudaaCalculAction getCalculActions()
! {
return calculActions_;
}
--- 182,186 ----
* @return
*/
! public FudaaCalculAction getCalculActions() {
return calculActions_;
}
***************
*** 225,239 ****
*
*/
! public void saveAs()
! {
!
! }
/**
*
*/
! public void saveCopy()
! {
}
--- 189,204 ----
*
*/
! public void saveAs() {}
/**
*
*/
! public void saveCopy() {}
+ /**
+ *
+ */
+ public void export(String _actionCommand) {
+ new TrExport(params_).export(_actionCommand);
}
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr
In directory sc8-pr-cvs1:/tmp/cvs-serv10343/tr
Modified Files:
TrFileFormatManager.java TrImplHelper.java
TrImplementation.java TrPreferences.java TrProjectManager.java
TrProjet.java
Added Files:
TrExport.java
Log Message:
Gestion de l'export pour le projet tr
--- NEW FILE: TrExport.java ---
(This appears to be a binary file; contents omitted.)
Index: TrFileFormatManager.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/TrFileFormatManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TrFileFormatManager.java 18 Aug 2003 11:54:43 -0000 1.1
--- TrFileFormatManager.java 19 Aug 2003 07:48:40 -0000 1.2
***************
*** 38,42 ****
* @version $Id$
*/
! public class TrFileFormatManager implements ActionListener {
private FileFormat[] formats_;
--- 38,42 ----
* @version $Id$
*/
! public class TrFileFormatManager{
private FileFormat[] formats_;
***************
*** 67,71 ****
}
! public static FileFormat[] getFormatWhithCode(int _type, FileFormat[] _f) {
int n= _f.length;
ArrayList r= new ArrayList(n);
--- 67,75 ----
}
! /**
! * Renvoie les format du tableau dont le type est egal au parametre
! * <code>_type</code>.
! */
! public static FileFormat[] getFormatWhithType(int _type, FileFormat[] _f) {
int n= _f.length;
ArrayList r= new ArrayList(n);
***************
*** 91,96 ****
}
! public FileFormat[] getFormatWithCode(int _type) {
! return getFormatWhithCode(_type, formats_);
}
--- 95,100 ----
}
! public FileFormat[] getFormatWithType(int _type) {
! return getFormatWhithType(_type, formats_);
}
***************
*** 99,112 ****
}
! public void buildExportMenu(BuMenu _m) {
List l= H2dFileFormatType.LIST;
int n= l.size();
! //dans l'ordre des id
for (int i= 0; i < n; i++) {
H2dFileFormatType ft= (H2dFileFormatType)H2dEnumType.getIdInList(l, i);
! FileFormat[] fts= getFormatWithCode(ft.getId());
BuMenu me= new BuMenu(ft.getNom(), ft.getNom());
TreeMap map= new TreeMap();
- //pour trier
for (int j= 0; j < fts.length; j++) {
map.put(fts[j].getName(), fts[j].getID());
--- 103,121 ----
}
! /**
! * Construit le menu export a partir des type de donnees rassemblees
! * dans la classe
! * {@link org.fudaa.dodico.h2d.type.H2dFileFormatType H2dFileFormatType}.
! */
! public void buildExportMenu(BuMenu _m,TrImplementation _impl) {
List l= H2dFileFormatType.LIST;
int n= l.size();
! //on recupere les fileformat dans l'ordre des id
for (int i= 0; i < n; i++) {
H2dFileFormatType ft= (H2dFileFormatType)H2dEnumType.getIdInList(l, i);
! FileFormat[] fts= getFormatWithType(ft.getId());
BuMenu me= new BuMenu(ft.getNom(), ft.getNom());
+ //pour trier ( pas super intelligent ....)
TreeMap map= new TreeMap();
for (int j= 0; j < fts.length; j++) {
map.put(fts[j].getName(), fts[j].getID());
***************
*** 114,118 ****
for (Iterator it= map.keySet().iterator(); it.hasNext();) {
String id= (String)it.next();
! me.addMenuItem(id, "EXPORT"+(String)map.get(id), this);
}
_m.addSubMenu(me, true);
--- 123,127 ----
for (Iterator it= map.keySet().iterator(); it.hasNext();) {
String id= (String)it.next();
! me.addMenuItem(id, TrExport.EXPORT_PREF + (String)map.get(id), _impl);
}
_m.addSubMenu(me, true);
***************
*** 120,130 ****
}
- /**
- *
- */
- public void actionPerformed(ActionEvent e) {
- if (FudaaLib.DEBUG)
- System.out.println("TrFileFormatManager " + e.getActionCommand());
- }
}
--- 129,132 ----
Index: TrImplHelper.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/TrImplHelper.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TrImplHelper.java 18 Aug 2003 11:54:43 -0000 1.3
--- TrImplHelper.java 19 Aug 2003 07:48:40 -0000 1.4
***************
*** 25,43 ****
* @version $Id$
*/
! public abstract class TrImplHelper
! {
protected TrImplementation impl_;
! public TrImplHelper(TrImplementation _impl)
! {
! impl_ = _impl;
impl_.getFrame().setTitle("Superviseur " + getID());
! impl_.getFrame().setIconImage(FudaaResource.FUDAA.getIcon("appli/" + getID()).getImage());
!
}
! public TrImplementation getImpl()
! {
return impl_;
}
--- 25,40 ----
* @version $Id$
*/
! public abstract class TrImplHelper {
protected TrImplementation impl_;
! public TrImplHelper(TrImplementation _impl) {
! impl_= _impl;
impl_.getFrame().setTitle("Superviseur " + getID());
! impl_.getFrame().setIconImage(
! FudaaResource.FUDAA.getIcon("appli/" + getID()).getImage());
}
! public TrImplementation getImpl() {
return impl_;
}
***************
*** 46,93 ****
public abstract void ouvrir(File _f);
! public BuIcon getIcon()
! {
return FudaaResource.FUDAA.getToolIcon("appli/" + getID());
}
public abstract String getID();
!
! public BuMenuItem[] getMenuItemsOuvrir()
! {
return null;
}
! public BuMenuItem[] getMenuItemsProjet()
! {
return null;
}
!
!
! public static TrImplHelper getImplHelper(String _id, TrImplementation _impl)
! {
! if(FudaaLib.DEBUG) System.out.println("Choix impl helper");
! if (_impl.getCurrentImplHelper() != null)
! {
! if (_id.equals(_impl.getCurrentImplHelper().getID()))
! {
! if(FudaaLib.DEBUG) System.out.println("impl courant");
return _impl.getCurrentImplHelper();
}
}
! if (_id.equals(FileFormatSoftware.REFLUX_IS.name))
! {
! if(FudaaLib.DEBUG) System.out.println("impl reflux");
return new TrRefluxImplHelper(_impl);
! }
! else if (_id.equals(FileFormatSoftware.TELEMAC_IS.name))
! {
! if(FudaaLib.DEBUG) System.out.println("impl telemac");
return new TrTelemacImplHelper(_impl);
}
return null;
}
-
-
}
--- 43,75 ----
public abstract void ouvrir(File _f);
! public BuIcon getIcon() {
return FudaaResource.FUDAA.getToolIcon("appli/" + getID());
}
public abstract String getID();
!
! public BuMenuItem[] getMenuItemsOuvrir() {
return null;
}
! public BuMenuItem[] getMenuItemsProjet() {
return null;
}
! public static TrImplHelper getImplHelper(
! String _id,
! TrImplementation _impl) {
! if (_impl.getCurrentImplHelper() != null) {
! if (_id.equals(_impl.getCurrentImplHelper().getID())) {
return _impl.getCurrentImplHelper();
}
}
! if (_id.equals(FileFormatSoftware.REFLUX_IS.name)) {
return new TrRefluxImplHelper(_impl);
! } else if (_id.equals(FileFormatSoftware.TELEMAC_IS.name)) {
return new TrTelemacImplHelper(_impl);
}
return null;
}
}
Index: TrImplementation.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/TrImplementation.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TrImplementation.java 18 Aug 2003 11:54:43 -0000 1.3
--- TrImplementation.java 19 Aug 2003 07:48:40 -0000 1.4
***************
*** 183,186 ****
--- 183,189 ----
} else if ("MODIFIER_CHAINE".equals(action)) {
changeChaineCalcul();
+ } else if (action.startsWith(TrExport.EXPORT_PREF)){
+ projetCourant().export(action);
+
} else {
super.actionPerformed(_evt);
***************
*** 445,457 ****
*/
public void exit() {
- super.exit();
TrPreferences.TR.writeIniFile();
FudaaFavoriteFiles.INSTANCE.saveFavorites();
FudaaPreferences.FUDAA.writeIniFile();
}
private void buildExporterMenu() {
fileFormatMng_.buildExportMenu(
! (BuMenu)getMainMenuBar().getMenu("EXPORTER"));
}
--- 448,460 ----
*/
public void exit() {
TrPreferences.TR.writeIniFile();
FudaaFavoriteFiles.INSTANCE.saveFavorites();
FudaaPreferences.FUDAA.writeIniFile();
+ super.exit();
}
private void buildExporterMenu() {
fileFormatMng_.buildExportMenu(
! (BuMenu)getMainMenuBar().getMenu("EXPORTER"),this);
}
Index: TrPreferences.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/TrPreferences.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TrPreferences.java 18 Aug 2003 11:54:43 -0000 1.3
--- TrPreferences.java 19 Aug 2003 07:48:40 -0000 1.4
***************
*** 30,167 ****
* @author Fred Deniger
*/
! public class TrPreferences extends FudaaPreferences
! {
! public static final String KEY_SERVEUR_PREFIXE = "serveur";
! public static final String KEY_SERVEUR_SHOW_LOG = "serveur.log";
! public static final String KEY_CODE_ID = "tr.code.id";
!
! public final static TrPreferences TR = new TrPreferences();
! protected TrPreferences()
! {
! File f = new File("preferences/tr.base.pref");
! if (f.exists())
! {
! try
! {
! super.defaultValues_.load(new FileInputStream(f));
! }
! catch (FileNotFoundException e)
! {
! e.printStackTrace();
! }
! catch (IOException e)
! {
! e.printStackTrace();
! }
! }
! f = new File("preferences/tr.pref");
! if (f.exists())
! {
! try
! {
super.defaultValues_.load(new FileInputStream(f));
! }
! catch (FileNotFoundException e)
! {
e.printStackTrace();
! }
! catch (IOException e)
! {
e.printStackTrace();
}
}
! if (super.defaultValues_!=null)
! {
! String[] sysPrefixes = new String[] { "linux.", "unix.", "win." };
! String sysPrefixe = null;
! if (FuLib.isLinux())
! {
! sysPrefixe = "linux.";
! }
! else if (FuLib.isUnix())
! {
! sysPrefixe = "unix.";
! }
! else if (FuLib.isWindows())
! {
! sysPrefixe = "win.";
! }
! if (sysPrefixe != null)
! {
! String s, s2, sProp;
! for (Enumeration e = super.defaultValues_.propertyNames();
! e.hasMoreElements();
! )
! {
! s = (String) e.nextElement();
! if (s.startsWith(sysPrefixe))
! {
! s2 = s.substring(sysPrefixe.length());
! sProp = super.defaultValues_.getProperty(s);
! super.defaultValues_.remove(s);
! super.defaultValues_.put(s2, sProp);
! }
! else
! {
! int i = s.indexOf('.');
! if (i > 0)
! {
! s2 = s.substring(0, i + 1);
! if (DodicoLib.findObject(sysPrefixes, s2) >= 0)
! {
! super.defaultValues_.remove(s);
! }
! }
! }
! }
! }
! }
! }
!
!
! public String getCodePrefPrefixeReflux()
! {
! return getCodePrefPrefixe(FileFormatSoftware.REFLUX_IS.name);
! }
!
! public boolean isCodeRefluxDef()
! {
! return FileFormatSoftware.REFLUX_IS.name.equals(getStringProperty(KEY_CODE_ID, null));
! }
!
! public boolean isCodeTelemacDef()
! {
! return FileFormatSoftware.TELEMAC_IS.name.equals(getStringProperty(KEY_CODE_ID, null));
}
! public String getCodePrefPrefixeTelemac()
! {
! return getCodePrefPrefixe(FileFormatSoftware.TELEMAC_IS.name);
! }
! public String getCodePrefPrefixe(String appli)
! {
! return DodicoPreferences.buildPrefKey(
! appli,
! TrPreferences.KEY_SERVEUR_PREFIXE);
! }
! public void applyOn(Object _o)
! {
if (!(_o instanceof TrImplementation))
throw new RuntimeException("" + _o + " is not a TrImplementation.");
}
! public static void main(String[] args)
! {
! TrPreferences pref = new TrPreferences();
! for (Enumeration e = pref.defaultValues_.propertyNames();
e.hasMoreElements();
! )
! {
! String s = (String) e.nextElement();
System.out.println(s + "= " + pref.defaultValues_.getProperty(s));
}
--- 30,133 ----
* @author Fred Deniger
*/
! public class TrPreferences extends FudaaPreferences {
! public static final String KEY_SERVEUR_PREFIXE= "serveur";
! public static final String KEY_SERVEUR_SHOW_LOG= "serveur.log";
! public static final String KEY_CODE_ID= "tr.code.id";
! public final static TrPreferences TR= new TrPreferences();
! protected TrPreferences() {
! // File f= new File("preferences/tr.base.pref");
! // if (f.exists()) {
! // try {
! // super.defaultValues_.load(new FileInputStream(f));
! // } catch (FileNotFoundException e) {
! // e.printStackTrace();
! // } catch (IOException e) {
! // e.printStackTrace();
! // }
! // }
! File f= new File("preferences/tr.pref");
! if (f.exists()) {
! try {
super.defaultValues_.load(new FileInputStream(f));
! } catch (FileNotFoundException e) {
e.printStackTrace();
! } catch (IOException e) {
e.printStackTrace();
}
}
! // String[] sysPrefixes= new String[] { "linux.", "unix.", "win." };
! // String sysPrefixe= null;
! // if (FuLib.isLinux()) {
! // sysPrefixe= "linux.";
! // } else if (FuLib.isUnix()) {
! // sysPrefixe= "unix.";
! // } else if (FuLib.isWindows()) {
! // sysPrefixe= "win.";
! // }
! // if (sysPrefixe != null) {
! // String s, s2, sProp;
! // for (Enumeration e= super.defaultValues_.propertyNames();
! // e.hasMoreElements();
! // ) {
! // s= (String)e.nextElement();
! // if (s.startsWith(sysPrefixe)) {
! // s2= s.substring(sysPrefixe.length());
! // sProp= super.defaultValues_.getProperty(s);
! // super.defaultValues_.remove(s);
! // super.defaultValues_.put(s2, sProp);
! // } else {
! // int i= s.indexOf('.');
! // if (i > 0) {
! // s2= s.substring(0, i + 1);
! // if (DodicoLib.findObject(sysPrefixes, s2) >= 0) {
! // super.defaultValues_.remove(s);
! // }
! // }
! // }
! // }
! // }
}
! // public String getCodePrefPrefixeReflux() {
! // return getCodePrefPrefixe(FileFormatSoftware.REFLUX_IS.name);
! // }
! //
! // public boolean isCodeRefluxDef() {
! // return FileFormatSoftware.REFLUX_IS.name.equals(
! // getStringProperty(KEY_CODE_ID, null));
! // }
! //
! // public boolean isCodeTelemacDef() {
! // return FileFormatSoftware.TELEMAC_IS.name.equals(
! // getStringProperty(KEY_CODE_ID, null));
! // }
! //
! // public String getCodePrefPrefixeTelemac() {
! // return getCodePrefPrefixe(FileFormatSoftware.TELEMAC_IS.name);
! // }
! /**
! * Renvoie l'identifiant pour l'appli <code>appli</code>
! */
! // public String getCodePrefPrefixe(String appli) {
! // return DodicoPreferences.buildPrefKey(
! // appli,
! // TrPreferences.KEY_SERVEUR_PREFIXE);
! // }
! public void applyOn(Object _o) {
if (!(_o instanceof TrImplementation))
throw new RuntimeException("" + _o + " is not a TrImplementation.");
}
! public static void main(String[] args) {
! TrPreferences pref= new TrPreferences();
! for (Enumeration e= pref.defaultValues_.propertyNames();
e.hasMoreElements();
! ) {
! String s= (String)e.nextElement();
System.out.println(s + "= " + pref.defaultValues_.getProperty(s));
}
Index: TrProjectManager.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/TrProjectManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TrProjectManager.java 4 Jul 2003 15:34:57 -0000 1.2
--- TrProjectManager.java 19 Aug 2003 07:48:40 -0000 1.3
***************
*** 9,19 ****
package org.fudaa.fudaa.tr;
- import java.util.ArrayList;
import java.util.HashSet;
- import java.util.Hashtable;
import java.util.Iterator;
import java.util.Set;
-
- import org.fudaa.dodico.h2d.H2dParametres;
/**
--- 9,15 ----
Index: TrProjet.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/TrProjet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TrProjet.java 18 Aug 2003 11:54:43 -0000 1.3
--- TrProjet.java 19 Aug 2003 07:48:40 -0000 1.4
***************
*** 13,18 ****
import com.memoire.bu.BuInformationsDocument;
- import org.fudaa.dodico.h2d.H2dParametres;
- import org.fudaa.dodico.objet.CExec;
import org.fudaa.fudaa.commun.calcul.FudaaCalculAction;
import org.fudaa.fudaa.commun.calcul.FudaaCalculSupportInterface;
--- 13,16 ----
***************
*** 41,44 ****
--- 39,43 ----
public File getParamsFile();
public FudaaCalculAction getCalculActions();
+ public void export(String _actionCommand);
}
|
|
From: <de...@us...> - 2003-08-19 07:48:43
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dico
In directory sc8-pr-cvs1:/tmp/cvs-serv10343/dico
Modified Files:
FDicoProjet.java FDicoProjetAbstract.java
Added Files:
FDicoChooserPanel.java
Log Message:
Gestion de l'export pour le projet tr
--- NEW FILE: FDicoChooserPanel.java ---
(This appears to be a binary file; contents omitted.)
Index: FDicoProjet.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dico/FDicoProjet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FDicoProjet.java 18 Aug 2003 14:12:52 -0000 1.2
--- FDicoProjet.java 19 Aug 2003 07:48:40 -0000 1.3
***************
*** 9,53 ****
package org.fudaa.fudaa.dico;
- import java.awt.Dimension;
- import java.awt.event.ActionEvent;
- import java.awt.event.ActionListener;
import java.io.File;
- import javax.swing.BorderFactory;
- import javax.swing.JButton;
- import javax.swing.JMenuBar;
- import javax.swing.JTable;
-
- import com.memoire.bu.BuBorderLayout;
- import com.memoire.bu.BuButton;
- import com.memoire.bu.BuInformationsDocument;
- import com.memoire.bu.BuInternalFrame;
- import com.memoire.bu.BuMainPanel;
- import com.memoire.bu.BuPanel;
- import com.memoire.bu.BuResource;
- import com.memoire.bu.BuScrollPane;
- import com.memoire.bu.BuTable;
- import com.memoire.bu.BuTaskOperation;
-
- import org.fudaa.dodico.calcul.CalculLauncher;
- import org.fudaa.dodico.commun.DodicoLib;
- import org.fudaa.dodico.commun.ProgressionBuAdapter;
import org.fudaa.dodico.commun.ProgressionInterface;
! import org.fudaa.dodico.dico.*;
! import org.fudaa.dodico.dico.DicoCasFileFormat;
! import org.fudaa.dodico.dico.DicoCasInterface;
! import org.fudaa.dodico.fichiers.FileOperationSynthese;
! import org.fudaa.dodico.h2d.*;
! import org.fudaa.dodico.h2d.H2dParametres;
import org.fudaa.fudaa.commun.FudaaCommonImplementation;
- import org.fudaa.fudaa.commun.FudaaLib;
- import org.fudaa.fudaa.commun.FudaaUI;
- import org.fudaa.fudaa.commun.calcul.FudaaCalculAction;
- import org.fudaa.fudaa.commun.calcul.FudaaCalculSupportInterface;
- import org.fudaa.fudaa.commun.tableau.FudaaCellTextRenderer;
- import org.fudaa.fudaa.ressource.FudaaResource;
- import org.fudaa.fudaa.tr.TrImplementation;
- import org.fudaa.fudaa.tr.TrProjet;
- import org.fudaa.fudaa.tr.telemac.TrTelemacParametres;
/**
--- 9,18 ----
package org.fudaa.fudaa.dico;
import java.io.File;
import org.fudaa.dodico.commun.ProgressionInterface;
! import org.fudaa.dodico.dico.DicoCasFileFormatVersion;
!
import org.fudaa.fudaa.commun.FudaaCommonImplementation;
/**
Index: FDicoProjetAbstract.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dico/FDicoProjetAbstract.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FDicoProjetAbstract.java 18 Aug 2003 11:54:43 -0000 1.2
--- FDicoProjetAbstract.java 19 Aug 2003 07:48:40 -0000 1.3
***************
*** 45,50 ****
*/
public abstract class FDicoProjetAbstract
! implements FDicoProjetInterface, FudaaCalculSupportInterface,ActionListener
! {
protected FudaaCommonImplementation impl_;
protected FudaaCalculAction actions_;
--- 45,49 ----
*/
public abstract class FDicoProjetAbstract
! implements FDicoProjetInterface, FudaaCalculSupportInterface, ActionListener {
protected FudaaCommonImplementation impl_;
protected FudaaCalculAction actions_;
***************
*** 52,108 ****
FDicoFilleProjet entiteFille_;
! public FDicoProjetAbstract(FudaaCommonImplementation _impl)
! {
! this(_impl,true);
}
!
!
! protected FDicoProjetAbstract(FudaaCommonImplementation _impl,boolean _actionStopCalcul)
! {
! impl_=_impl;
! actions_=new FudaaCalculAction(this,_actionStopCalcul);
}
!
! public void setActionStopVisible(boolean b)
! {
! if(b != actions_.isStopCalculVisible())
! {
! actions_=new FudaaCalculAction(this,b);
}
}
-
-
-
/**
*
*/
! public BuInformationsDocument getInformationsDocument()
! {
! if(idoc_==null) idoc_=new BuInformationsDocument();
return idoc_;
}
! public File getParamsFile()
! {
! if(getKeys()==null) return null;
return getKeys().getMainFile();
}
!
! public String getTitle()
! {
! if(getKeys()==null) return DodicoLib.EMPTY_STRING;
return getKeys().getTitle();
}
! public void active()
! {
if (impl_ == null)
return;
! if (entiteFille_ == null)
! {
! entiteFille_ = new FDicoFilleProjet(this);
! Dimension dim = impl_.getMainPanel().getDesktop().getSize();
entiteFille_.setSize(
(int) (dim.getWidth() * 0.8),
--- 51,98 ----
FDicoFilleProjet entiteFille_;
! public FDicoProjetAbstract(FudaaCommonImplementation _impl) {
! this(_impl, true);
}
!
! protected FDicoProjetAbstract(
! FudaaCommonImplementation _impl,
! boolean _actionStopCalcul) {
! impl_= _impl;
! actions_= new FudaaCalculAction(this, _actionStopCalcul);
}
!
! public void setActionStopVisible(boolean b) {
! if (b != actions_.isStopCalculVisible()) {
! actions_= new FudaaCalculAction(this, b);
}
}
/**
*
*/
! public BuInformationsDocument getInformationsDocument() {
! if (idoc_ == null)
! idoc_= new BuInformationsDocument();
return idoc_;
}
! public File getParamsFile() {
! if (getKeys() == null)
! return null;
return getKeys().getMainFile();
}
! public String getTitle() {
! if (getKeys() == null)
! return DodicoLib.EMPTY_STRING;
return getKeys().getTitle();
}
! public void active() {
if (impl_ == null)
return;
! if (entiteFille_ == null) {
! entiteFille_= new FDicoFilleProjet(this);
! Dimension dim= impl_.getMainPanel().getDesktop().getSize();
entiteFille_.setSize(
(int) (dim.getWidth() * 0.8),
***************
*** 111,116 ****
impl_.addInternalFrame(entiteFille_);
}
! JMenuBar menu=entiteFille_.getJMenuBar();
! JButton bt=new BuButton("Comparer");
bt.addActionListener(this);
bt.setIcon(FudaaResource.FUDAA.getIcon("diff_16"));
--- 101,106 ----
impl_.addInternalFrame(entiteFille_);
}
! JMenuBar menu= entiteFille_.getJMenuBar();
! JButton bt= new BuButton("Comparer");
bt.addActionListener(this);
bt.setIcon(FudaaResource.FUDAA.getIcon("diff_16"));
***************
*** 120,134 ****
entiteFille_.setVisible(true);
}
!
! public boolean isValide()
! {
return getKeys().isValide();
}
-
! public void save()
! {
! if (!isValide())
! {
if (!impl_
.confirmation(
--- 110,120 ----
entiteFille_.setVisible(true);
}
!
! public boolean isValide() {
return getKeys().isValide();
}
! public void save() {
! if (!isValide()) {
if (!impl_
.confirmation(
***************
*** 137,144 ****
return;
}
! new BuTaskOperation(impl_, "sauvegarde fichier cas")
! {
! public void act()
! {
getKeys().saveCas(new ProgressionBuAdapter(this));
this.setProgression(100);
--- 123,128 ----
return;
}
! new BuTaskOperation(impl_, "sauvegarde fichier cas") {
! public void act() {
getKeys().saveCas(new ProgressionBuAdapter(this));
this.setProgression(100);
***************
*** 148,164 ****
}
! public void saveAs()
! {
! final File fic =
! impl_.ouvrirFileChooser(
! null,
! "Enregistrement Fichier cas Télémac",
! true);
if (fic == null)
return;
! new BuTaskOperation(impl_, "sauvegarde fichier cas")
! {
! public void act()
! {
getKeys().saveAs(fic, new ProgressionBuAdapter(this));
this.setProgression(100);
--- 132,142 ----
}
! public void saveAs() {
! final File fic=
! impl_.ouvrirFileChooser(null, "Enregistrement Fichier cas", true);
if (fic == null)
return;
! new BuTaskOperation(impl_, "sauvegarde fichier cas") {
! public void act() {
getKeys().saveAs(fic, new ProgressionBuAdapter(this));
this.setProgression(100);
***************
*** 168,178 ****
}
-
-
/**
*
*/
! public FudaaCommonImplementation getImpl()
! {
return impl_;
}
--- 146,153 ----
}
/**
*
*/
! public FudaaCommonImplementation getImpl() {
return impl_;
}
***************
*** 181,201 ****
*
*/
! public void setImpl(FudaaCommonImplementation _implementation)
! {
! impl_ = _implementation;
}
! public boolean isModified()
! {
! if(getKeys()!=null)
! return getKeys().isModified();
return false;
}
-
! public void close()
! {
! if (isModified())
! {
if (FudaaLib
.showConfirmation(
--- 156,171 ----
*
*/
! public void setImpl(FudaaCommonImplementation _implementation) {
! impl_= _implementation;
}
! public boolean isModified() {
! if (getKeys() != null)
! return getKeys().isModified();
return false;
}
! public void close() {
! if (isModified()) {
if (FudaaLib
.showConfirmation(
***************
*** 204,225 ****
"Les données ont été modifiées,\nVoulez-vous sauvegarder les données ?"))
this.save();
! }
! else
! {
System.out.println("données non modifiées");
}
entiteFille_.dispose();
! entiteFille_ = null;
! // impl_.closeProjet(this);
}
-
-
/**
*
*/
! public String getCodeName()
! {
! if(getKeys()==null) return DodicoLib.EMPTY_STRING;
return getKeys().getDico().getCodeName();
}
--- 174,191 ----
"Les données ont été modifiées,\nVoulez-vous sauvegarder les données ?"))
this.save();
! } else {
System.out.println("données non modifiées");
}
entiteFille_.dispose();
! entiteFille_= null;
! // impl_.closeProjet(this);
}
/**
*
*/
! public String getCodeName() {
! if (getKeys() == null)
! return DodicoLib.EMPTY_STRING;
return getKeys().getDico().getCodeName();
}
***************
*** 228,233 ****
* @return
*/
! public FudaaCalculAction getCalculActions()
! {
return actions_;
}
--- 194,198 ----
* @return
*/
! public FudaaCalculAction getCalculActions() {
return actions_;
}
***************
*** 236,242 ****
* @return
*/
! public CalculLauncher actionCalcul()
! {
! FDicoCalculLocal r = new FDicoCalculLocal(this);
r.setImpl(impl_);
return r;
--- 201,206 ----
* @return
*/
! public CalculLauncher actionCalcul() {
! FDicoCalculLocal r= new FDicoCalculLocal(this);
r.setImpl(impl_);
return r;
***************
*** 246,251 ****
*
*/
! public void addParamModelListener(DicoParamsListener _l)
! {
getKeys().getDicoParams().addModelListener(_l);
}
--- 210,214 ----
*
*/
! public void addParamModelListener(DicoParamsListener _l) {
getKeys().getDicoParams().addModelListener(_l);
}
***************
*** 254,309 ****
*
*/
! public void removeParamModelListener(DicoParamsListener _l)
! {
getKeys().removeModelListener(_l);
}
! public FDicoComparator compareWith(File _n, ProgressionInterface _progress)
! {
return getKeys().compareWith(_n, _progress);
}
! public void compareWith()
! {
! final File fic =
! impl_.ouvrirFileChooser(null, "fichier à comparer", false);
if (fic == null)
return;
! new BuTaskOperation(impl_, "Comparaison")
! {
! public void act()
! {
! BuMainPanel mp = impl_ == null ? null : impl_.getMainPanel();
! if (mp != null)
! {
mp.setMessage("Initialisation comparaison");
mp.setProgression(0);
}
! FDicoComparator c = compareWith(fic, new ProgressionBuAdapter(this));
! if(c==null) return;
! if (mp != null)
! {
mp.setMessage("Affichage");
mp.setProgression(80);
}
! BuInternalFrame f=new BuInternalFrame("Comparaison de "+getParamsFile().getName()+" <-> "+
! fic.getName(),true,true,true,true);
! BuPanel pn=new BuPanel();
! pn.setLayout(new BuBorderLayout(5,5));
! pn.setBorder(BorderFactory.createEmptyBorder(5, 5,5,5));
! JTable table=new JTable(c.createTableModel());
c.createRenderer(table);
!
! // table.setDefaultRenderer(String.class, new FudaaCellTextRenderer());
! pn.add(new BuScrollPane(table),BuBorderLayout.CENTER);
f.setContentPane(pn);
impl_.addInternalFrame(f);
f.pack();
f.setVisible(true);
! f.setSize(500,400);
! f.setPreferredSize(new Dimension(500,400));
! if (mp != null)
! {
mp.setMessage("");
mp.setProgression(0);
--- 217,272 ----
*
*/
! public void removeParamModelListener(DicoParamsListener _l) {
getKeys().removeModelListener(_l);
}
! public FDicoComparator compareWith(File _n, ProgressionInterface _progress) {
return getKeys().compareWith(_n, _progress);
}
! public void compareWith() {
! final File fic= impl_.ouvrirFileChooser(null, "fichier à comparer", false);
if (fic == null)
return;
! new BuTaskOperation(impl_, "Comparaison") {
! public void act() {
! BuMainPanel mp= impl_ == null ? null : impl_.getMainPanel();
! if (mp != null) {
mp.setMessage("Initialisation comparaison");
mp.setProgression(0);
}
! FDicoComparator c= compareWith(fic, new ProgressionBuAdapter(this));
! if (c == null)
! return;
! if (mp != null) {
mp.setMessage("Affichage");
mp.setProgression(80);
}
! BuInternalFrame f=
! new BuInternalFrame(
! "Comparaison de "
! + getParamsFile().getName()
! + " <-> "
! + fic.getName(),
! true,
! true,
! true,
! true);
! BuPanel pn= new BuPanel();
! pn.setLayout(new BuBorderLayout(5, 5));
! pn.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
! JTable table= new JTable(c.createTableModel());
c.createRenderer(table);
!
! // table.setDefaultRenderer(String.class, new FudaaCellTextRenderer());
! pn.add(new BuScrollPane(table), BuBorderLayout.CENTER);
f.setContentPane(pn);
impl_.addInternalFrame(f);
f.pack();
f.setVisible(true);
! f.setSize(500, 400);
! f.setPreferredSize(new Dimension(500, 400));
! if (mp != null) {
mp.setMessage("");
mp.setProgression(0);
***************
*** 318,331 ****
*
*/
! public void saveCopy()
! {
! final File fic =
! impl_.ouvrirFileChooser(null, "Enregistrement Copie", true);
if (fic == null)
return;
! new BuTaskOperation(impl_, "sauvegarde copie")
! {
! public void act()
! {
getKeys().saveCopy(fic, new ProgressionBuAdapter(this));
this.setProgression(100);
--- 281,290 ----
*
*/
! public void saveCopy() {
! final File fic= impl_.ouvrirFileChooser(null, "Enregistrement Copie", true);
if (fic == null)
return;
! new BuTaskOperation(impl_, "sauvegarde copie") {
! public void act() {
getKeys().saveCopy(fic, new ProgressionBuAdapter(this));
this.setProgression(100);
***************
*** 339,347 ****
*
*/
! public void actionPerformed(ActionEvent e)
! {
System.out.println(e.getActionCommand());
! if(e.getActionCommand().equals("COMPARER"))
! {
System.out.println("comparaison");
compareWith();
--- 298,304 ----
*
*/
! public void actionPerformed(ActionEvent e) {
System.out.println(e.getActionCommand());
! if (e.getActionCommand().equals("COMPARER")) {
System.out.println("comparaison");
compareWith();
|
|
From: <de...@us...> - 2003-08-19 07:48:43
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido In directory sc8-pr-cvs1:/tmp/cvs-serv10343/lido Modified Files: LidoExport.java LidoImport.java Log Message: Gestion de l'export pour le projet tr Index: LidoExport.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/LidoExport.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** LidoExport.java 4 Jul 2003 15:56:39 -0000 1.5 --- LidoExport.java 19 Aug 2003 07:48:40 -0000 1.6 *************** *** 14,17 **** --- 14,19 ---- import org.fudaa.dodico.corba.lido.*; import org.fudaa.dodico.lido.*; + + import com.memoire.bu.*; import java.io.*; Index: LidoImport.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/LidoImport.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** LidoImport.java 4 Jul 2003 15:56:39 -0000 1.5 --- LidoImport.java 19 Aug 2003 07:48:40 -0000 1.6 *************** *** 12,15 **** --- 12,16 ---- import org.fudaa.dodico.corba.lido.*; import org.fudaa.dodico.lido.*; + import org.fudaa.fudaa.commun.fileChooser.FudaaFileChooser; |
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/tableau In directory sc8-pr-cvs1:/tmp/cvs-serv10343/commun/tableau Modified Files: FudaaCellFileEditor.java FudaaFilleTableau.java FudaaPanelListEditor.java Log Message: Gestion de l'export pour le projet tr Index: FudaaCellFileEditor.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/tableau/FudaaCellFileEditor.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FudaaCellFileEditor.java 4 Jul 2003 15:22:47 -0000 1.1 --- FudaaCellFileEditor.java 19 Aug 2003 07:48:40 -0000 1.2 *************** *** 31,34 **** --- 31,35 ---- import org.fudaa.fudaa.commun.fileChooser.FudaaFileChooser; + /** * @author deniger Index: FudaaFilleTableau.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/tableau/FudaaFilleTableau.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FudaaFilleTableau.java 4 Jul 2003 15:22:47 -0000 1.1 --- FudaaFilleTableau.java 19 Aug 2003 07:48:40 -0000 1.2 *************** *** 10,25 **** package org.fudaa.fudaa.commun.tableau; ! import java.awt.*; ! import java.awt.datatransfer.*; ! import java.awt.event.*; ! import java.awt.print.*; ! import javax.swing.*; ! import javax.swing.border.*; - import com.memoire.bu.*; - import org.fudaa.ebli.impression.EbliPrinter; import org.fudaa.ebli.impression.EbliFilleImprimable; import org.fudaa.fudaa.commun.FudaaLib; - import org.fudaa.fudaa.commun.tableau.FudaaUtilisateurTableauModele; /** * Fenetre fille pour l'affichage d'un tableau. --- 10,36 ---- package org.fudaa.fudaa.commun.tableau; ! import java.awt.Dimension; ! import java.awt.Graphics; ! import java.awt.event.ActionEvent; ! import java.awt.event.ActionListener; ! import java.awt.print.PageFormat; ! ! import javax.swing.JComponent; ! import javax.swing.JOptionPane; ! import javax.swing.JScrollPane; ! ! import com.memoire.bu.BuBorderLayout; ! import com.memoire.bu.BuButton; ! import com.memoire.bu.BuCommonImplementation; ! import com.memoire.bu.BuCutCopyPasteInterface; ! import com.memoire.bu.BuDialogInput; ! import com.memoire.bu.BuInformationsDocument; ! import com.memoire.bu.BuResource; ! import com.memoire.bu.BuTable; import org.fudaa.ebli.impression.EbliFilleImprimable; + import org.fudaa.ebli.impression.EbliPrinter; + import org.fudaa.fudaa.commun.FudaaLib; /** * Fenetre fille pour l'affichage d'un tableau. Index: FudaaPanelListEditor.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/tableau/FudaaPanelListEditor.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FudaaPanelListEditor.java 4 Jul 2003 15:22:47 -0000 1.1 --- FudaaPanelListEditor.java 19 Aug 2003 07:48:40 -0000 1.2 *************** *** 15,19 **** import java.awt.event.MouseEvent; import java.awt.event.MouseListener; - import java.util.Vector; import javax.swing.BorderFactory; --- 15,18 ---- *************** *** 35,39 **** import com.memoire.bu.BuBorderLayout; import com.memoire.bu.BuButton; - import com.memoire.bu.BuButtonLayout; import com.memoire.bu.BuIcon; import com.memoire.bu.BuPanel; --- 34,37 ---- |
|
From: <de...@us...> - 2003-08-19 07:48:43
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/projet In directory sc8-pr-cvs1:/tmp/cvs-serv10343/commun/projet Modified Files: FudaaProjet.java Log Message: Gestion de l'export pour le projet tr Index: FudaaProjet.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/projet/FudaaProjet.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FudaaProjet.java 4 Jul 2003 15:22:47 -0000 1.1 --- FudaaProjet.java 19 Aug 2003 07:48:39 -0000 1.2 *************** *** 19,22 **** --- 19,23 ---- import com.memoire.bu.*; + import org.fudaa.fudaa.commun.FudaaDialogNewProject; import org.fudaa.fudaa.commun.FudaaFiltreFichier; |
|
From: <de...@us...> - 2003-08-19 07:48:42
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/fileChooser
In directory sc8-pr-cvs1:/tmp/cvs-serv10343/commun/fileChooser
Modified Files:
FudaaFavoriteFiles.java FudaaFileChooser.java
Log Message:
Gestion de l'export pour le projet tr
Index: FudaaFavoriteFiles.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/fileChooser/FudaaFavoriteFiles.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FudaaFavoriteFiles.java 4 Jul 2003 15:19:20 -0000 1.1
--- FudaaFavoriteFiles.java 19 Aug 2003 07:48:39 -0000 1.2
***************
*** 9,13 ****
package org.fudaa.fudaa.commun.fileChooser;
- import java.awt.Dimension;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
--- 9,12 ----
***************
*** 21,42 ****
import javax.swing.AbstractListModel;
- import javax.swing.DefaultComboBoxModel;
- import javax.swing.DefaultListModel;
import javax.swing.JComboBox;
import javax.swing.JComponent;
import javax.swing.JFileChooser;
- import javax.swing.JMenu;
import javax.swing.MutableComboBoxModel;
- import javax.swing.tree.DefaultMutableTreeNode;
import com.memoire.bu.BuBorderLayout;
import com.memoire.bu.BuButtonLayout;
- import com.memoire.bu.BuDynamicMenu;
- import com.memoire.bu.BuGridLayout;
- import com.memoire.bu.BuHorizontalLayout;
import com.memoire.bu.BuLabel;
- import com.memoire.bu.BuMenu;
- import com.memoire.bu.BuMenuItem;
import com.memoire.bu.BuPanel;
import com.memoire.bu.BuResource;
import com.memoire.bu.BuToolButton;
--- 20,33 ----
import javax.swing.AbstractListModel;
import javax.swing.JComboBox;
import javax.swing.JComponent;
import javax.swing.JFileChooser;
import javax.swing.MutableComboBoxModel;
import com.memoire.bu.BuBorderLayout;
import com.memoire.bu.BuButtonLayout;
import com.memoire.bu.BuLabel;
import com.memoire.bu.BuPanel;
+ import com.memoire.bu.BuPreferences;
import com.memoire.bu.BuResource;
import com.memoire.bu.BuToolButton;
***************
*** 44,50 ****
import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.commun.DodicoPreferences;
! import org.fudaa.ebli.dialog.EbliSimpleDialog;
import org.fudaa.ebli.dialog.EbliSimpleDialogPanel;
! import org.fudaa.fudaa.commun.FudaaPreferences;
import org.fudaa.fudaa.commun.tableau.FudaaCellTextRenderer;
import org.fudaa.fudaa.commun.tableau.FudaaPanelListEditor;
--- 35,41 ----
import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.commun.DodicoPreferences;
!
import org.fudaa.ebli.dialog.EbliSimpleDialogPanel;
!
import org.fudaa.fudaa.commun.tableau.FudaaCellTextRenderer;
import org.fudaa.fudaa.commun.tableau.FudaaPanelListEditor;
***************
*** 74,78 ****
{
list_ = new ArrayList(20);
! for (Enumeration e = FudaaPreferences.FUDAA.allKeysWithDefaults();
e.hasMoreElements();
)
--- 65,69 ----
{
list_ = new ArrayList(20);
! for (Enumeration e = BuPreferences.BU.keys();
e.hasMoreElements();
)
***************
*** 81,89 ****
if (k.startsWith(PREF_ID))
{
! String val=FudaaPreferences.FUDAA.getStringProperty(k);
File f=new File(val);
if((!f.exists()) || (!f.isDirectory()) )
{
! FudaaPreferences.FUDAA.removeProperty(k);
}
else
--- 72,80 ----
if (k.startsWith(PREF_ID))
{
! String val=BuPreferences.BU.getStringProperty(k);
File f=new File(val);
if((!f.exists()) || (!f.isDirectory()) )
{
! BuPreferences.BU.removeProperty(k);
}
else
***************
*** 285,289 ****
public void saveFavorites()
{
! for (Enumeration e = FudaaPreferences.FUDAA.allKeysWithDefaults();
e.hasMoreElements();
)
--- 276,280 ----
public void saveFavorites()
{
! for (Enumeration e = BuPreferences.BU.keys();
e.hasMoreElements();
)
***************
*** 292,296 ****
if (k.startsWith(PREF_ID))
{
! FudaaPreferences.FUDAA.removeProperty(k);
}
}
--- 283,287 ----
if (k.startsWith(PREF_ID))
{
! BuPreferences.BU.removeProperty(k);
}
}
***************
*** 298,302 ****
for (int i = 0; i < n; i++)
{
! FudaaPreferences.FUDAA.putStringProperty(
DodicoPreferences.buildPrefKey(PREF_ID, DodicoLib.getString(i)),
(String) list_.get(i));
--- 289,293 ----
for (int i = 0; i < n; i++)
{
! BuPreferences.BU.putStringProperty(
DodicoPreferences.buildPrefKey(PREF_ID, DodicoLib.getString(i)),
(String) list_.get(i));
Index: FudaaFileChooser.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/fileChooser/FudaaFileChooser.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FudaaFileChooser.java 4 Jul 2003 15:19:20 -0000 1.1
--- FudaaFileChooser.java 19 Aug 2003 07:48:39 -0000 1.2
***************
*** 10,38 ****
import java.awt.Component;
- import java.awt.Dialog;
import java.awt.Frame;
import java.io.File;
- import java.util.ArrayList;
- import java.util.List;
import javax.swing.BorderFactory;
import javax.swing.JDialog;
- import javax.swing.JFileChooser;
import javax.swing.JFrame;
import javax.swing.SwingUtilities;
- import javax.swing.filechooser.FileSystemView;
import com.memoire.bu.BuBorderLayout;
- import com.memoire.bu.BuCheckBox;
- import com.memoire.bu.BuComboBox;
import com.memoire.bu.BuFileChooser;
- import com.memoire.bu.BuLabel;
import com.memoire.bu.BuPanel;
import com.memoire.fu.FuLib;
- import org.fudaa.ebli.dialog.EbliSimpleDialogPanel;
- import org.fudaa.ebli.dialog.EnhancedDialog;
- import org.fudaa.fudaa.commun.FudaaPreferences;
-
/**
* @author deniger
--- 10,27 ----
import java.awt.Component;
import java.awt.Frame;
import java.io.File;
import javax.swing.BorderFactory;
import javax.swing.JDialog;
import javax.swing.JFrame;
import javax.swing.SwingUtilities;
import com.memoire.bu.BuBorderLayout;
import com.memoire.bu.BuFileChooser;
import com.memoire.bu.BuPanel;
+ import com.memoire.bu.BuPreferences;
import com.memoire.fu.FuLib;
/**
* @author deniger
***************
*** 59,63 ****
response_=BuFileChooser.ERROR_OPTION;
if(_lastDir)
! setCurrentDirectory(new File(FudaaPreferences.FUDAA.getStringProperty(FudaaFavoriteFiles.PREF_LAST,FuLib.getUserHome())));
}
--- 48,52 ----
response_=BuFileChooser.ERROR_OPTION;
if(_lastDir)
! setCurrentDirectory(new File(BuPreferences.BU.getStringProperty(FudaaFavoriteFiles.PREF_LAST,FuLib.getUserHome())));
}
***************
*** 70,78 ****
f.setVisible(true);
int r=tb.showDialog(f);
- if(r==BuFileChooser.APPROVE_OPTION)
- System.out.println("approve");
- else System.out.println("no approve");
FudaaFavoriteFiles.INSTANCE.saveFavorites();
! FudaaPreferences.FUDAA.writeIniFile();
// JFileChooser jfc=new JFileChooser();
// jfc.setFileSelectionMode(FudaaFileChooser.FILES_ONLY);
--- 59,64 ----
f.setVisible(true);
int r=tb.showDialog(f);
FudaaFavoriteFiles.INSTANCE.saveFavorites();
! BuPreferences.BU.writeIniFile();
// JFileChooser jfc=new JFileChooser();
// jfc.setFileSelectionMode(FudaaFileChooser.FILES_ONLY);
***************
*** 170,174 ****
public void approveSelection()
{
! FudaaPreferences.FUDAA.putStringProperty(FudaaFavoriteFiles.PREF_LAST, getCurrentDirectory().getAbsolutePath());
response_=FudaaFileChooser.APPROVE_OPTION;
if(dial_!=null)
--- 156,160 ----
public void approveSelection()
{
! BuPreferences.BU.putStringProperty(FudaaFavoriteFiles.PREF_LAST, getCurrentDirectory().getAbsolutePath());
response_=FudaaFileChooser.APPROVE_OPTION;
if(dial_!=null)
|
|
From: <de...@us...> - 2003-08-19 07:44:25
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/telemac
In directory sc8-pr-cvs1:/tmp/cvs-serv9684/telemac
Modified Files:
TelemacDicoManager.java
Log Message:
Maj des import
Index: TelemacDicoManager.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/telemac/TelemacDicoManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** TelemacDicoManager.java 18 Aug 2003 11:05:20 -0000 1.6
--- TelemacDicoManager.java 19 Aug 2003 07:44:22 -0000 1.7
***************
*** 40,44 ****
map.put(new TelemacDicoFileFormat("tomawac"), new String[] { "v5p3" });
INSTANCE.init(map);
!
}
--- 40,44 ----
map.put(new TelemacDicoFileFormat("tomawac"), new String[] { "v5p3" });
INSTANCE.init(map);
! INSTANCE.load();
}
***************
*** 62,70 ****
public DicoCasFileFormatVersion createVersionImpl(
! DicoCasFileFormat _ft,
String _v,
int _language) {
! if (("telemac2d".equals(_ft.getName()))
! && ("v5p3".equals(_v))
&& (DicoLanguage.getCurrentID() == _language)) {
if (DodicoLib.DEBUG)
--- 62,71 ----
public DicoCasFileFormatVersion createVersionImpl(
! Telemac2dFileFormat _ft,
String _v,
int _language) {
! String name= Telemac2dFileFormat.getInstance().getName();
! String lastVersion= "v5p3";
! if ((lastVersion.equals(_v))
&& (DicoLanguage.getCurrentID() == _language)) {
if (DodicoLib.DEBUG)
***************
*** 72,78 ****
if (telemac2dv5p3_ == null)
telemac2dv5p3_=
! createVersionImpl(getFileFormat("telemac2d"), "v5p3", _language);
return telemac2dv5p3_;
}
return super.createVersionImpl(_ft, _v, _language);
--- 73,92 ----
if (telemac2dv5p3_ == null)
telemac2dv5p3_=
! _ft.createVersion(createDico(name, lastVersion, _language));
! super.createVersionImpl(getFileFormat(name), lastVersion, _language);
return telemac2dv5p3_;
}
+ return _ft.createVersion(createDico(name, _v, _language));
+ }
+
+ public DicoCasFileFormatVersion createVersionImpl(
+ DicoCasFileFormat _ft,
+ String _v,
+ int _language) {
+ if (Telemac2dFileFormat.getInstance().getName().equals(_ft.getName()))
+ return (DicoCasFileFormatVersion)createVersionImpl(
+ (Telemac2dFileFormat)_ft,
+ _v,
+ _language);
return super.createVersionImpl(_ft, _v, _language);
|
|
From: <de...@us...> - 2003-08-19 07:44:25
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/objet
In directory sc8-pr-cvs1:/tmp/cvs-serv9684/objet
Modified Files:
CExec.java
Log Message:
Maj des import
Index: CExec.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/objet/CExec.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CExec.java 4 Jul 2003 13:57:48 -0000 1.4
--- CExec.java 19 Aug 2003 07:44:22 -0000 1.5
***************
*** 30,35 ****
* @author Axel von Arnim
*/
! public class CExec
! {
String[] cmd_;
PrintStream out_, err_;
--- 30,34 ----
* @author Axel von Arnim
*/
! public class CExec {
String[] cmd_;
PrintStream out_, err_;
***************
*** 43,50 ****
* d'erreur.
*/
! public CExec()
! {
! cmd_ = null;
! catchE = true;
}
--- 42,48 ----
* d'erreur.
*/
! public CExec() {
! cmd_= null;
! catchE= true;
}
***************
*** 54,59 ****
* @see java.lang.Runtime#exec(String[])
*/
! public CExec(String[] _cmd)
! {
this();
setCommand(_cmd);
--- 52,56 ----
* @see java.lang.Runtime#exec(String[])
*/
! public CExec(String[] _cmd) {
this();
setCommand(_cmd);
***************
*** 63,70 ****
* Initialisation des commandes.
*/
! public void setCommand(String[] _cmd)
! {
System.out.println(_cmd.length);
! cmd_ = _cmd;
}
--- 60,66 ----
* Initialisation des commandes.
*/
! public void setCommand(String[] _cmd) {
System.out.println(_cmd.length);
! cmd_= _cmd;
}
***************
*** 72,79 ****
* Definition du flux recuperant la sortie standard.
*/
! public void setOutStream(PrintStream _out)
! {
//out.setStream(_out);
! out_ = _out;
}
--- 68,74 ----
* Definition du flux recuperant la sortie standard.
*/
! public void setOutStream(PrintStream _out) {
//out.setStream(_out);
! out_= _out;
}
***************
*** 81,88 ****
* Definition du flux recuperant la sortie d'erreur.
*/
! public void setErrStream(PrintStream _err)
! {
// err.setStream(_err);
! err_ = _err;
}
--- 76,82 ----
* Definition du flux recuperant la sortie d'erreur.
*/
! public void setErrStream(PrintStream _err) {
// err.setStream(_err);
! err_= _err;
}
***************
*** 90,95 ****
* Retourne le processus d'execution.
*/
! public Process getProcess()
! {
return p;
}
--- 84,88 ----
* Retourne le processus d'execution.
*/
! public Process getProcess() {
return p;
}
***************
*** 99,105 ****
* Si elles sont catchees une trace est laissée sur la sortie d'erreur.
*/
! public void setCatchExceptions(boolean _catchE)
! {
! catchE = _catchE;
}
--- 92,97 ----
* Si elles sont catchees une trace est laissée sur la sortie d'erreur.
*/
! public void setCatchExceptions(boolean _catchE) {
! catchE= _catchE;
}
***************
*** 111,163 ****
* eux-meme avant la fin du process.
*/
! private void closeReaderThread(MyReaderThread _th) throws SecurityException
! {
! try
! {
if (_th == null)
return;
if (!_th.isAlive())
return;
//il est encore vivant, on attend
_th.setPriority(Thread.MAX_PRIORITY - 2);
//sous windows, il arrivre que la lecture du flux soit bloquee.
! if (_th.isBlocked())
! {
! if ((DodicoLib.DEBUG) && (err_ != null))
! {
! err_.println(_th.getName() + " " + DodicoLib.geti18n("bloqué "));
! }
!
! }
! else
! {
! //le thread n'est pas termine... bizarre
! if ((DodicoLib.DEBUG) && (err_ != null))
! {
! err_.println(
! "!!" + _th.getName() + " " + DodicoLib.geti18n("non terminé."));
! }
! //on a attendu 2 s, on interrompt le thread
! try
! {
! if (_th != null)
! _th.join(2000);
! }
! catch (InterruptedException _e)
! {
}
}
//on a attendu 50ms, on interrompt le thread
! if (_th.isAlive())
! {
! _th.destroy();
! if ((DodicoLib.DEBUG) && (err_ != null))
! err_.println(
! _th.getName() + " " + DodicoLib.geti18n("interrompu") + " ok");
}
! }
! catch (SecurityException _e)
! {
System.err.println(_e.getMessage());
}
--- 103,137 ----
* eux-meme avant la fin du process.
*/
! private void closeReaderThread(MyReaderThread _th) throws SecurityException {
! try {
if (_th == null)
return;
if (!_th.isAlive())
return;
+ try {
+ _th.join(2000);
+ } catch (InterruptedException _e) {}
+ if (!_th.isAlive())
+ return;
//il est encore vivant, on attend
_th.setPriority(Thread.MAX_PRIORITY - 2);
//sous windows, il arrivre que la lecture du flux soit bloquee.
! if (_th.isBlocked()) {
! if ((DodicoLib.DEBUG) && (err_ != null)) {
! err_.println(_th.getName() + " " + DodicoLib.geti18n("bloqué "));
}
}
+ try {
+ _th.join(1000);
+ } catch (InterruptedException _e) {}
//on a attendu 50ms, on interrompt le thread
! if (_th.isAlive()) {
! _th.finish();
! try {
! _th.join(2000);
! } catch (InterruptedException _e) {}
}
! } catch (SecurityException _e) {
System.err.println(_e.getMessage());
}
***************
*** 169,185 ****
* a la fin du process.
*/
! public void exec()
! {
! if ((cmd_ == null) || (cmd_.length <= 0))
! {
if (err_ != null)
err_.println(DodicoLib.geti18n("Commande nulle"));
return;
}
! BufferedReader psIn = null;
! BufferedReader psErr = null;
! int oldpriority = Thread.currentThread().getPriority();
! try
! {
if (err_ != null)
err_.println(
--- 143,156 ----
* a la fin du process.
*/
! public void exec() {
! if ((cmd_ == null) || (cmd_.length <= 0)) {
if (err_ != null)
err_.println(DodicoLib.geti18n("Commande nulle"));
return;
}
! BufferedReader psIn= null;
! BufferedReader psErr= null;
! int oldpriority= Thread.currentThread().getPriority();
! try {
if (err_ != null)
err_.println(
***************
*** 188,199 ****
if (DodicoLib.DEBUG)
System.out.println("lancement processus");
! p = Runtime.getRuntime().exec(cmd_);
if (listener_ != null)
listener_.setProcess(p);
! psIn = new BufferedReader(new InputStreamReader(p.getInputStream()));
! psErr = new BufferedReader(new InputStreamReader(p.getErrorStream()));
! thErr_ = new MyReaderThread(err_, psErr);
thErr_.setName(DodicoLib.geti18n("Sortie d'erreur"));
! thOut_ = new MyReaderThread(out_, psIn);
thOut_.setName(DodicoLib.geti18n("Sortie standard"));
// try
--- 159,170 ----
if (DodicoLib.DEBUG)
System.out.println("lancement processus");
! p= Runtime.getRuntime().exec(cmd_);
if (listener_ != null)
listener_.setProcess(p);
! psIn= new BufferedReader(new InputStreamReader(p.getInputStream()));
! psErr= new BufferedReader(new InputStreamReader(p.getErrorStream()));
! thErr_= new MyReaderThread(err_, psErr);
thErr_.setName(DodicoLib.geti18n("Sortie d'erreur"));
! thOut_= new MyReaderThread(out_, psIn);
thOut_.setName(DodicoLib.geti18n("Sortie standard"));
// try
***************
*** 206,230 ****
thOut_.start();
thErr_.start();
! boolean interr = true;
! while (interr)
! {
! try
! {
p.waitFor();
! interr = false;
! }
! catch (InterruptedException e)
! {
! interr = true;
}
}
! if (DodicoLib.DEBUG)
! {
System.out.println("fin processus");
}
- closeReaderThread(thErr_);
- System.out.println("fin erreur");
closeReaderThread(thOut_);
! System.out.println("fin std");
if (p.exitValue() != 0)
throw new RuntimeException(cmd_[0] + ": abnormal exit");
--- 177,195 ----
thOut_.start();
thErr_.start();
! boolean interr= true;
! while (interr) {
! try {
p.waitFor();
! interr= false;
! } catch (InterruptedException e) {
! interr= true;
}
}
! if (DodicoLib.DEBUG) {
System.out.println("fin processus");
}
closeReaderThread(thOut_);
! closeReaderThread(thErr_);
!
if (p.exitValue() != 0)
throw new RuntimeException(cmd_[0] + ": abnormal exit");
***************
*** 232,253 ****
err_.println(
"***** " + cmd_[0] + " " + DodicoLib.geti18n("termine") + " *****");
! }
! catch (IOException io)
! {
if (catchE)
System.err.println(io);
else
throw new RuntimeException(io.getMessage());
! }
! catch (RuntimeException r)
! {
if (catchE)
System.err.println(r);
else
throw r;
! }
! finally
! {
! Thread.currentThread().setPriority(oldpriority);
// try
// {
--- 197,212 ----
err_.println(
"***** " + cmd_[0] + " " + DodicoLib.geti18n("termine") + " *****");
! } catch (IOException io) {
if (catchE)
System.err.println(io);
else
throw new RuntimeException(io.getMessage());
! } catch (RuntimeException r) {
if (catchE)
System.err.println(r);
else
throw r;
! } finally {
! Thread.currentThread().setPriority(oldpriority);
// try
// {
***************
*** 288,294 ****
}
! public static void main(String[] args)
! {
! CExec exe =
new CExec(
new String[] {
--- 247,252 ----
}
! public static void main(String[] args) {
! CExec exe=
new CExec(
new String[] {
***************
*** 346,351 ****
* @return
*/
! public CExecListener getListener()
! {
return listener_;
}
--- 304,308 ----
* @return
*/
! public CExecListener getListener() {
return listener_;
}
***************
*** 354,360 ****
* @param _listener
*/
! public void setListener(CExecListener _listener)
! {
! listener_ = _listener;
}
--- 311,316 ----
* @param _listener
*/
! public void setListener(CExecListener _listener) {
! listener_= _listener;
}
***************
*** 367,376 ****
* @see isBlocked();
*/
! class MyReaderThread extends Thread
! {
private PrintStream str_;
private BufferedReader br_;
private boolean blocked_;
! private boolean destroyed_;
/**
--- 323,331 ----
* @see isBlocked();
*/
! class MyReaderThread extends Thread {
private PrintStream str_;
private BufferedReader br_;
private boolean blocked_;
! private boolean finish_;
/**
***************
*** 379,388 ****
* @param _br le buffer lu ( en general un buffer de sortie de process).
*/
! public MyReaderThread(PrintStream _str, BufferedReader _br)
! {
super();
! blocked_ = true;
! str_ = _str;
! br_ = _br;
setPriority(Thread.MAX_PRIORITY - 2);
}
--- 334,342 ----
* @param _br le buffer lu ( en general un buffer de sortie de process).
*/
! public MyReaderThread(PrintStream _str, BufferedReader _br) {
super();
! blocked_= true;
! str_= _str;
! br_= _br;
setPriority(Thread.MAX_PRIORITY - 2);
}
***************
*** 393,398 ****
* il est conseille d'interrompre le thread.
*/
! public boolean isBlocked()
! {
return blocked_;
}
--- 347,351 ----
* il est conseille d'interrompre le thread.
*/
! public boolean isBlocked() {
return blocked_;
}
***************
*** 402,452 ****
* elles sont renvoyees dans le PrintStream.
*/
! public void run()
! {
! int charLu = -1;
! try
! {
! blocked_ = true;
//sous windows le thread de lecture peut bloquer.
//On attend que le buffer puisse etre lu.
! while ((!br_.ready()) && (!destroyed_))
! {
! try
! {
this.sleep(500);
! }
! catch (InterruptedException e)
! {
! }
}
! blocked_ = false;
! if (br_.ready())
! charLu = br_.read();
! else
! charLu = -1;
!
! if (str_ != null)
! {
! while ((charLu != -1) && (!destroyed_))
! {
str_.write(charLu);
! charLu = br_.read();
}
! }
! else
! {
! while ((charLu != -1) && (!destroyed_))
! {
! charLu = br_.read();
}
-
}
! }
! catch (IOException _io)
! {
System.err.println(_io.getMessage());
! }
! finally
! {
str_.flush();
}
--- 355,394 ----
* elles sont renvoyees dans le PrintStream.
*/
! public void run() {
! int charLu= -1;
! try {
! blocked_= true;
//sous windows le thread de lecture peut bloquer.
//On attend que le buffer puisse etre lu.
! while ((!br_.ready()) && (!finish_)) {
! try {
this.sleep(500);
! } catch (InterruptedException e) {}
}
! blocked_= false;
! // if (br_.ready()) {
! // charLu= br_.read();
! // if ((charLu != -1) && (str_ != null)) {
! // str_.write(charLu);
! // } else
! // charLu= -1;
! // }
! if ((finish_) && (!br_.ready())) {
! return;
! }
! charLu= br_.read();
! if (str_ != null) {
! while ((charLu != -1)) {
str_.write(charLu);
! charLu= br_.read();
}
! } else {
! while ((charLu != -1)) {
! charLu= br_.read();
}
}
! } catch (IOException _io) {
System.err.println(_io.getMessage());
! } finally {
str_.flush();
}
***************
*** 457,471 ****
* @see java.lang.Thread#interrupt()
*/
! public void interrupt()
! {
super.interrupt();
}
! /**
! * @see java.lang.Thread#destroy()
! */
! public void destroy()
! {
! destroyed_ = true;
}
--- 399,408 ----
* @see java.lang.Thread#interrupt()
*/
! public void interrupt() {
super.interrupt();
}
! public void finish() {
! finish_= true;
}
|
|
From: <de...@us...> - 2003-08-19 07:44:25
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d
In directory sc8-pr-cvs1:/tmp/cvs-serv9684/h2d
Modified Files:
H2dParametres.java
Log Message:
Maj des import
Index: H2dParametres.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dParametres.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** H2dParametres.java 4 Jul 2003 13:07:25 -0000 1.2
--- H2dParametres.java 19 Aug 2003 07:44:22 -0000 1.3
***************
*** 9,19 ****
package org.fudaa.dodico.h2d;
- import java.util.Comparator;
-
- import com.memoire.bu.BuInformationsDocument;
-
- import org.fudaa.dodico.corba.tr.STrProjetH2d;
- import org.fudaa.dodico.corba.tr.STrProprieteElementaireTransitoire;
- import org.fudaa.dodico.corba.tr.STrProprieteElementaireValeur;
/**
--- 9,12 ----
***************
*** 22,122 ****
* @version $Id$
*/
! public abstract class H2dParametres
{
-
- private STrProjetH2d projet_;
- public static final String CODE_NON_INITIALISE = "INCONNU";
- public static final String CODE_LIBRE = "LIBRE";
- public static final String CODE_PERMANENT = "PERMANENT";
- public static final String CODE_TRANSITOIRE_BEGIN = "TRANS_";
- public static final double NORMALE_NON_INITIALISEE = 400;
-
- //Taille de 16 maxi pour serafin.
- public static String PROPRIETE_VISCOSITE = "VISCOSITE";
- public static String PROPRIETE_RUGOSITE = "RUGOSITE";
- public static String PROPRIETE_ALPHA_LONGUEUR_MELANGE = "LONGUEUR MELANGE";
- public static String PROPRIETE_PERTE_CHARGE = "PERTE CHARGE";
-
-
-
- public H2dParametres()
- {
- }
-
-
- public static boolean isTransitoire(String _code)
- {
- return _code.startsWith(CODE_TRANSITOIRE_BEGIN);
- }
-
-
- // public void setMaillage(SMaillageIndex _index)
- // {
- // if (projet_ == null)
- // projet_ = new STrProjetH2d();
- // projet_.maillage = _index;
- // }
-
- /**
- * Permet de comparer les STrProprieteElementaireValeur a partir de leur
- * index.
- */
- public static Comparator getProprieteElementaireValeurIndexComparator()
- {
- return new proprieteElementaireValeurIndexComparator();
-
- }
! /**
! * Permet de comparer les STrProprieteElementaireTransitoire a partir de leur
! * index.
! */
! public static Comparator getProprieteElementaireTransitoireIndexComparator()
! {
! return new proprieteElementaireTransitoireIndexComparator();
!
! }
!
! static class proprieteElementaireValeurIndexComparator implements Comparator
! {
!
! /**
! * @see java.util.Comparator#compare(Object, Object)
! */
! public int compare(Object o1, Object o2)
! {
! if( (! (o1 instanceof STrProprieteElementaireValeur)) ||
! (! (o2 instanceof STrProprieteElementaireValeur)) )
! {
! throw new IllegalArgumentException("Arguments non valides");
! }
!
! STrProprieteElementaireValeur v1=(STrProprieteElementaireValeur)o1;
! STrProprieteElementaireValeur v2=(STrProprieteElementaireValeur)o2;
! return v1.indexElement-v2.indexElement;
! }
!
! }
!
! static class proprieteElementaireTransitoireIndexComparator implements Comparator
! {
!
! /**
! * @see java.util.Comparator#compare(Object, Object)
! */
! public int compare(Object o1, Object o2)
! {
! if( (! (o1 instanceof STrProprieteElementaireTransitoire)) ||
! (! (o2 instanceof STrProprieteElementaireTransitoire)) )
! {
! throw new IllegalArgumentException("Arguments non valides");
! }
!
! STrProprieteElementaireTransitoire v1=(STrProprieteElementaireTransitoire)o1;
! STrProprieteElementaireTransitoire v2=(STrProprieteElementaireTransitoire)o2;
! return v1.indexElement-v2.indexElement;
! }
- }
}
--- 15,23 ----
* @version $Id$
*/
! public interface H2dParametres
{
! public H2dMaillage getMaillage();
}
|
|
From: <de...@us...> - 2003-08-19 07:44:24
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/fichiers
In directory sc8-pr-cvs1:/tmp/cvs-serv9684/fichiers
Modified Files:
FileFormat.java
Log Message:
Maj des import
Index: FileFormat.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/fichiers/FileFormat.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FileFormat.java 18 Aug 2003 11:05:19 -0000 1.2
--- FileFormat.java 19 Aug 2003 07:44:21 -0000 1.3
***************
*** 10,13 ****
--- 10,14 ----
import java.io.File;
+ import java.util.Comparator;
import com.memoire.bu.BuInformationsSoftware;
***************
*** 39,49 ****
nbFile_= _nbFile;
}
!
! public int getVersionNb(){
return 1;
}
public String[] getVersions() {
! return new String[]{getLastVersion()};
}
--- 40,50 ----
nbFile_= _nbFile;
}
!
! public int getVersionNb() {
return 1;
}
public String[] getVersions() {
! return new String[] { getLastVersion()};
}
***************
*** 124,127 ****
--- 125,147 ----
}
return r;
+ }
+
+ /**
+ * Ce comparateur permet de classer des formats selon leurs nom (ATTENTION 2
+ * formats avec le meme nom seront supposes egaux).
+ */
+ public static class FileFormatNameComparator implements Comparator {
+
+ /**
+ * Compare 2 FileFormat selon le nom (uniquement).
+ */
+ public int compare(Object o1, Object o2) {
+ if (!(o1 instanceof FileFormat))
+ throw new IllegalArgumentException("o1 doit etre de type FileFormat");
+ if (!(o2 instanceof FileFormat))
+ throw new IllegalArgumentException("o2 doit etre de type FileFormat");
+ return ((FileFormat)o1).getName().compareTo(((FileFormat)o2).getName());
+ }
+
}
|
|
From: <de...@us...> - 2003-08-19 07:44:24
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/dico
In directory sc8-pr-cvs1:/tmp/cvs-serv9684/dico
Modified Files:
DicoAnalyzer.java DicoCasFileFormat.java DicoManager.java
Log Message:
Maj des import
Index: DicoAnalyzer.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoAnalyzer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DicoAnalyzer.java 4 Jul 2003 12:08:47 -0000 1.2
--- DicoAnalyzer.java 19 Aug 2003 07:44:21 -0000 1.3
***************
*** 573,576 ****
--- 573,582 ----
}
+ /**
+ * Recupere a partir du nom de fichier dico <code>_s</code> le nom et la version
+ * du code correspondant. Il est suppose que la version est codee sur 4 caractere.
+ * Par exemple pour le fichier Telemac2dv2p5, la methode renvoie
+ * [telemac2d,v5p3] (nom en minuscule et version telle quelle).
+ */
public final static String[] getNameAndVersion(String _s,int _endIndex)
{
***************
*** 580,584 ****
String[] r=new String[2];
r[1]=_s.substring(_endIndex - versionLength, _endIndex - versionLength + 4);
! r[0] = _s.substring(0, _endIndex - versionLength);
return r;
}
--- 586,590 ----
String[] r=new String[2];
r[1]=_s.substring(_endIndex - versionLength, _endIndex - versionLength + 4);
! r[0] = _s.substring(0, _endIndex - versionLength).toLowerCase();
return r;
}
Index: DicoCasFileFormat.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoCasFileFormat.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DicoCasFileFormat.java 18 Aug 2003 11:05:19 -0000 1.2
--- DicoCasFileFormat.java 19 Aug 2003 07:44:21 -0000 1.3
***************
*** 10,13 ****
--- 10,14 ----
import java.io.File;
+ import java.util.Comparator;
import org.fudaa.dodico.commun.ProgressionInterface;
***************
*** 68,70 ****
--- 69,77 ----
}
+ public DicoCasFileFormatVersion getVersionImpl(
+ String _version,
+ int _language) {
+ return getDicoManager().createVersionImpl(this, _version, _language);
+ }
+
}
Index: DicoManager.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DicoManager.java 18 Aug 2003 11:05:19 -0000 1.2
--- DicoManager.java 19 Aug 2003 07:44:21 -0000 1.3
***************
*** 13,20 ****
--- 13,24 ----
import java.io.FileFilter;
import java.util.ArrayList;
+ import java.util.Arrays;
+ import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+ import java.util.Set;
+ import java.util.TreeMap;
import javax.swing.AbstractListModel;
***************
*** 27,30 ****
--- 31,35 ----
import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.commun.DodicoPermanentList;
+ import org.fudaa.dodico.fichiers.FileFormat;
/**
***************
*** 36,40 ****
String packageName_;
Map formatVersions_;
! DodicoPermanentList formats_;
protected DicoManager(String _packageName) {
--- 41,45 ----
String packageName_;
Map formatVersions_;
! public DodicoPermanentList formats_;
protected DicoManager(String _packageName) {
***************
*** 43,136 ****
public void init(Map _init) {
! formatVersions_= new HashMap(_init);
formats_= new DodicoPermanentList(formatVersions_.keySet());
}
- public ComboBoxModel createDicoDescComboBoxModel() {
- return new FormatComboBoxModel();
- }
-
- public class FormatComboBoxModel
- extends AbstractListModel
- implements ComboBoxModel {
-
- Object selected_;
-
- public FormatComboBoxModel() {
- selected_= formats_.get(0);
- }
-
- /**
- *
- */
- public Object getSelectedItem() {
- return selected_;
- }
-
- /**
- *
- */
- public void setSelectedItem(Object anItem) {
- if (((anItem != null)
- && (!anItem.equals(selected_))
- || ((anItem == null) && selected_ != null))) {
- selected_= anItem;
- fireContentsChanged(this, -1, -1);
- }
-
- }
-
- /**
- * Renvoie un objet du type DicoFileFormat
- */
- public Object getElementAt(int arg0) {
- return formats_.get(arg0);
- }
-
- /**
- *
- */
- public int getSize() {
- return formats_.size();
- }
-
- }
-
- private class DicoDescCellRenderer extends DefaultListCellRenderer {
-
- /**
- *
- */
- public Component getListCellRendererComponent(
- JList list,
- Object value,
- int index,
- boolean isSelected,
- boolean cellHasFocus) {
- setComponentOrientation(list.getComponentOrientation());
- if (isSelected) {
- setBackground(list.getSelectionBackground());
- setForeground(list.getSelectionForeground());
- } else {
- setBackground(list.getBackground());
- setForeground(list.getForeground());
- }
- setEnabled(list.isEnabled());
- setFont(list.getFont());
- setBorder(
- (cellHasFocus)
- ? UIManager.getBorder("List.focusCellHighlightBorder")
- : noFocusBorder);
- DicoCasFileFormatVersion d= (DicoCasFileFormatVersion)value;
- setText(d.getFormatName() + " " + d.getVersionName());
- return this;
- }
-
- }
-
- public ListCellRenderer getDicoDescCellRenderer() {
- return new DicoDescCellRenderer();
- }
-
public DicoCasFileFormat getFileFormat(String _nom) {
for (Iterator it= formats_.iterator(); it.hasNext();) {
--- 48,56 ----
public void init(Map _init) {
! formatVersions_= new TreeMap(new FileFormat.FileFormatNameComparator());
! formatVersions_.putAll(_init);
formats_= new DodicoPermanentList(formatVersions_.keySet());
}
public DicoCasFileFormat getFileFormat(String _nom) {
for (Iterator it= formats_.iterator(); it.hasNext();) {
***************
*** 142,146 ****
}
! private DicoModelAbstract createDico(
String _name,
String _version,
--- 62,66 ----
}
! protected DicoModelAbstract createDico(
String _name,
String _version,
***************
*** 216,228 ****
if (format == null) {
formatAjoute= true;
! formatVersions_.put(
! createFormat(formatName),
! DodicoLib.enTableau((List)formatNameList.get(formatName)));
} else {
! formatVersions_.put(
! format,
DodicoLib.mergeAndSort(
getVersions(format),
! ((List)formatNameList.get(formatName))));
}
--- 136,150 ----
if (format == null) {
formatAjoute= true;
! String[] version=
! DodicoLib.enTableau((List)formatNameList.get(formatName));
! Arrays.sort(version);
! formatVersions_.put(createFormat(formatName), version);
} else {
! String[] version=
DodicoLib.mergeAndSort(
getVersions(format),
! ((List)formatNameList.get(formatName)));
! Arrays.sort(version);
! formatVersions_.put(format, version);
}
|
|
From: <de...@us...> - 2003-08-18 14:26:36
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dico
In directory sc8-pr-cvs1:/tmp/cvs-serv469
Modified Files:
FDicoProjet.java
Log Message:
maj
Index: FDicoProjet.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dico/FDicoProjet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FDicoProjet.java 4 Jul 2003 14:44:20 -0000 1.1
--- FDicoProjet.java 18 Aug 2003 14:12:52 -0000 1.2
***************
*** 72,76 ****
public static FDicoProjet init(
File _file,
! DicoCasFileFormat _fileFormat,
ProgressionInterface _progress,FudaaCommonImplementation _ui)
{
--- 72,76 ----
public static FDicoProjet init(
File _file,
! DicoCasFileFormatVersion _fileFormat,
ProgressionInterface _progress,FudaaCommonImplementation _ui)
{
|
|
From: <de...@us...> - 2003-08-18 12:41:17
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/telemac/io
In directory sc8-pr-cvs1:/tmp/cvs-serv17854
Modified Files:
Telemac2dFileFormat.java
Log Message:
maj
Index: Telemac2dFileFormat.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/telemac/io/Telemac2dFileFormat.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Telemac2dFileFormat.java 18 Aug 2003 11:05:20 -0000 1.1
--- Telemac2dFileFormat.java 18 Aug 2003 12:39:33 -0000 1.2
***************
*** 55,58 ****
--- 55,62 ----
}
+
+ public TelemacVersion createVersion(DicoModelAbstract _dico){
+ return new TelemacVersion(_dico);
+ }
public class TelemacVersion extends DicoCasFileFormatVersion {
|
