Menu
▾
▴
fudaa-cvs-commit — Mailing list for CVS commit messages
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
(89) |
Mar
(219) |
Apr
(82) |
May
(33) |
Jun
(11) |
Jul
(129) |
Aug
(357) |
Sep
(34) |
Oct
(37) |
Nov
(42) |
Dec
(182) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(59) |
Feb
(74) |
Mar
(196) |
Apr
(205) |
May
(109) |
Jun
(268) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <de...@us...> - 2003-12-12 10:58:45
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/undo
In directory sc8-pr-cvs1:/tmp/cvs-serv25602/undo
Modified Files:
FudaaUndoCmdMngListener.java
Log Message:
Deplacement FileChooser
Index: FudaaUndoCmdMngListener.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/undo/FudaaUndoCmdMngListener.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FudaaUndoCmdMngListener.java 25 Nov 2003 10:13:36 -0000 1.2
--- FudaaUndoCmdMngListener.java 12 Dec 2003 10:58:42 -0000 1.3
***************
*** 11,17 ****
--- 11,22 ----
import java.util.Iterator;
import java.util.Set;
+
+ import org.fudaa.ctulu.CtuluLib;
+
import com.memoire.bu.BuCommonImplementation;
+
import org.fudaa.dodico.commun.DodicoCmdMngListener;
import org.fudaa.dodico.commun.DodicoCommandManager;
+
import org.fudaa.fudaa.commun.FudaaLib;
/**
***************
*** 43,54 ****
impl_.setEnabledForAction("DEFAIRE", active_.canUndo());
impl_.setEnabledForAction("REFAIRE", active_.canRedo());
! if (FudaaLib.DEBUG)
! FudaaLib.debug("setActif undoredo Manager");
} else if (!b && (active_ == _m)) {
active_= null;
impl_.setEnabledForAction("DEFAIRE", false);
impl_.setEnabledForAction("REFAIRE", false);
! if (FudaaLib.DEBUG)
! FudaaLib.debug("setUnactif undoredo Manager");
}
}
--- 48,59 ----
impl_.setEnabledForAction("DEFAIRE", active_.canUndo());
impl_.setEnabledForAction("REFAIRE", active_.canRedo());
! if (CtuluLib.DEBUG)
! CtuluLib.debug("setActif undoredo Manager");
} else if (!b && (active_ == _m)) {
active_= null;
impl_.setEnabledForAction("DEFAIRE", false);
impl_.setEnabledForAction("REFAIRE", false);
! if (CtuluLib.DEBUG)
! CtuluLib.debug("setUnactif undoredo Manager");
}
}
***************
*** 65,75 ****
DodicoCommandManager cmd= (DodicoCommandManager)it.next();
if (cmd != active_) {
! if (FudaaLib.DEBUG)
! FudaaLib.debug("clean undoredo Manager");
cmd.clean();
}
}
} else {
! FudaaLib.error("problem with undoredo manager");
}
}
--- 70,80 ----
DodicoCommandManager cmd= (DodicoCommandManager)it.next();
if (cmd != active_) {
! if (CtuluLib.DEBUG)
! CtuluLib.debug("clean undoredo Manager");
cmd.clean();
}
}
} else {
! CtuluLib.error("problem with undoredo manager");
}
}
|
|
From: <de...@us...> - 2003-12-12 10:58:45
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/exec
In directory sc8-pr-cvs1:/tmp/cvs-serv25602/exec
Modified Files:
FudaaEditor.java FudaaEditorPanel.java FudaaExec.java
FudaaExecCellEditor.java FudaaExecCellRenderer.java
FudaaExecComboBoxEditor.java FudaaExecManagerPanel.java
FudaaExecPanel.java FudaaExecServerManagerPanel.java
Log Message:
Deplacement FileChooser
Index: FudaaEditor.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/exec/FudaaEditor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FudaaEditor.java 25 Nov 2003 10:13:33 -0000 1.4
--- FudaaEditor.java 12 Dec 2003 10:58:41 -0000 1.5
***************
*** 11,17 ****
import java.util.ArrayList;
import java.util.Arrays;
- import java.util.Collections;
import java.util.Enumeration;
! import org.fudaa.fudaa.commun.FudaaLib;
import org.fudaa.fudaa.commun.FudaaPreferences;
/**
--- 11,18 ----
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Enumeration;
!
! import org.fudaa.ctulu.CtuluLib;
!
import org.fudaa.fudaa.commun.FudaaPreferences;
/**
***************
*** 88,92 ****
DEFAULT_EDITOR_KEY,
INTERNE_EDITOR_VALUE);
! if (FudaaLib.DEBUG)
System.out.println(
"Editor: definition =" + DEFAULT_EDITOR_KEY + " =" + def);
--- 89,93 ----
DEFAULT_EDITOR_KEY,
INTERNE_EDITOR_VALUE);
! if (CtuluLib.DEBUG)
System.out.println(
"Editor: definition =" + DEFAULT_EDITOR_KEY + " =" + def);
Index: FudaaEditorPanel.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/exec/FudaaEditorPanel.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FudaaEditorPanel.java 25 Nov 2003 10:13:33 -0000 1.3
--- FudaaEditorPanel.java 12 Dec 2003 10:58:41 -0000 1.4
***************
*** 18,24 ****
import com.memoire.bu.BuRadioButton;
import org.fudaa.ebli.dialog.EbliSimpleDialogPanel;
import org.fudaa.fudaa.commun.FudaaPreferences;
import org.fudaa.fudaa.commun.FudaaTee;
- import org.fudaa.fudaa.commun.tableau.FudaaCellTextRenderer;
import org.fudaa.fudaa.ressource.FudaaResource;
/**
--- 18,25 ----
import com.memoire.bu.BuRadioButton;
import org.fudaa.ebli.dialog.EbliSimpleDialogPanel;
+ import org.fudaa.ebli.tableau.EbliCellTextRenderer;
+
import org.fudaa.fudaa.commun.FudaaPreferences;
import org.fudaa.fudaa.commun.FudaaTee;
import org.fudaa.fudaa.ressource.FudaaResource;
/**
***************
*** 42,46 ****
new BuComboBox(FudaaEditor.getInstance().getEditorExternes());
choixExterne_.setEnabled(false);
! choixExterne_.setRenderer(new FudaaCellTextRenderer() {
public void setValue(Object _o) {
if (_o != null)
--- 43,47 ----
new BuComboBox(FudaaEditor.getInstance().getEditorExternes());
choixExterne_.setEnabled(false);
! choixExterne_.setRenderer(new EbliCellTextRenderer() {
public void setValue(Object _o) {
if (_o != null)
Index: FudaaExec.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/exec/FudaaExec.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** FudaaExec.java 25 Nov 2003 10:13:33 -0000 1.5
--- FudaaExec.java 12 Dec 2003 10:58:41 -0000 1.6
***************
*** 10,27 ****
import java.io.IOException;
import java.util.ArrayList;
- import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
import java.util.StringTokenizer;
import javax.swing.Icon;
import com.memoire.bu.BuEmptyIcon;
import com.memoire.bu.BuIcon;
import com.memoire.bu.BuPreferences;
import com.memoire.bu.BuResource;
import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.commun.DodicoPreferences;
import org.fudaa.dodico.objet.CExec;
! import org.fudaa.fudaa.commun.FudaaLib;
! import org.fudaa.fudaa.commun.FudaaPreferences;
import org.fudaa.fudaa.ressource.FudaaResource;
/**
--- 10,30 ----
import java.io.IOException;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.StringTokenizer;
+
import javax.swing.Icon;
+
+ import org.fudaa.ctulu.CtuluLib;
+
import com.memoire.bu.BuEmptyIcon;
import com.memoire.bu.BuIcon;
import com.memoire.bu.BuPreferences;
import com.memoire.bu.BuResource;
+
import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.commun.DodicoPreferences;
import org.fudaa.dodico.objet.CExec;
!
import org.fudaa.fudaa.ressource.FudaaResource;
/**
***************
*** 67,71 ****
}
ArrayList a= new ArrayList(3 + n);
! StringTokenizer st= new StringTokenizer(execCommand_, DodicoLib.ESPACE);
while (st.hasMoreTokens()) {
a.add(st.nextToken());
--- 70,74 ----
}
ArrayList a= new ArrayList(3 + n);
! StringTokenizer st= new StringTokenizer(execCommand_, CtuluLib.ESPACE);
while (st.hasMoreTokens()) {
a.add(st.nextToken());
***************
*** 84,88 ****
if (execCommand_ == null)
System.err.println("Executable null");
! StringTokenizer st= new StringTokenizer(execCommand_, DodicoLib.ESPACE);
while (st.hasMoreTokens()) {
a.add(st.nextToken());
--- 87,91 ----
if (execCommand_ == null)
System.err.println("Executable null");
! StringTokenizer st= new StringTokenizer(execCommand_, CtuluLib.ESPACE);
while (st.hasMoreTokens()) {
a.add(st.nextToken());
***************
*** 136,140 ****
public final void setIconURL(String _iconURL) {
if ((_iconURL == null) || (_iconURL.length() == 0)) {
! iconURL_= DodicoLib.EMPTY_STRING;
icon_= EMPTY_TOOL_ICON;
} else {
--- 139,143 ----
public final void setIconURL(String _iconURL) {
if ((_iconURL == null) || (_iconURL.length() == 0)) {
! iconURL_= CtuluLib.EMPTY_STRING;
icon_= EMPTY_TOOL_ICON;
} else {
Index: FudaaExecCellEditor.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/exec/FudaaExecCellEditor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FudaaExecCellEditor.java 25 Nov 2003 10:13:33 -0000 1.3
--- FudaaExecCellEditor.java 12 Dec 2003 10:58:41 -0000 1.4
***************
*** 10,14 ****
import javax.swing.CellEditor;
import javax.swing.ComboBoxModel;
! import org.fudaa.fudaa.commun.tableau.FudaaCellDialogEditor;
/**
* @author deniger
--- 10,15 ----
import javax.swing.CellEditor;
import javax.swing.ComboBoxModel;
!
! import org.fudaa.ebli.tableau.EbliCellDialogEditor;
/**
* @author deniger
***************
*** 16,20 ****
*/
public class FudaaExecCellEditor
! extends FudaaCellDialogEditor
implements CellEditor {
/**
--- 17,21 ----
*/
public class FudaaExecCellEditor
! extends EbliCellDialogEditor
implements CellEditor {
/**
Index: FudaaExecCellRenderer.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/exec/FudaaExecCellRenderer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FudaaExecCellRenderer.java 25 Nov 2003 10:13:33 -0000 1.3
--- FudaaExecCellRenderer.java 12 Dec 2003 10:58:41 -0000 1.4
***************
*** 8,19 ****
*/
package org.fudaa.fudaa.commun.exec;
! import javax.swing.JComboBox;
! import org.fudaa.dodico.commun.DodicoLib;
! import org.fudaa.fudaa.commun.tableau.FudaaCellTextRenderer;
/**
* @author deniger
* @version $Id$
*/
! public class FudaaExecCellRenderer extends FudaaCellTextRenderer {
public void setValue(Object o) {
FudaaExec e= (FudaaExec)o;
--- 8,19 ----
*/
package org.fudaa.fudaa.commun.exec;
! import org.fudaa.ctulu.CtuluLib;
!
! import org.fudaa.ebli.tableau.EbliCellTextRenderer;
/**
* @author deniger
* @version $Id$
*/
! public class FudaaExecCellRenderer extends EbliCellTextRenderer {
public void setValue(Object o) {
FudaaExec e= (FudaaExec)o;
***************
*** 23,28 ****
setToolTipText(e.getExecCommand());
} else {
! setText(DodicoLib.EMPTY_STRING);
! setToolTipText(DodicoLib.EMPTY_STRING);
setIcon(FudaaExec.EMPTY_TOOL_ICON);
}
--- 23,28 ----
setToolTipText(e.getExecCommand());
} else {
! setText(CtuluLib.EMPTY_STRING);
! setToolTipText(CtuluLib.EMPTY_STRING);
setIcon(FudaaExec.EMPTY_TOOL_ICON);
}
Index: FudaaExecComboBoxEditor.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/exec/FudaaExecComboBoxEditor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FudaaExecComboBoxEditor.java 25 Nov 2003 10:13:33 -0000 1.3
--- FudaaExecComboBoxEditor.java 12 Dec 2003 10:58:41 -0000 1.4
***************
*** 12,15 ****
--- 12,16 ----
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
+
import javax.swing.BorderFactory;
import javax.swing.ComboBoxEditor;
***************
*** 18,27 ****
import javax.swing.border.Border;
import javax.swing.border.EtchedBorder;
! import javax.swing.plaf.basic.BasicComboBoxEditor;
! import javax.swing.plaf.basic.BasicComboBoxRenderer;
! import javax.swing.plaf.basic.BasicLookAndFeel;
! import com.memoire.bu.BuLabel;
! import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.ebli.dialog.EbliSimpleDialogPanel;
import org.fudaa.fudaa.ressource.FudaaResource;
/**
--- 19,27 ----
import javax.swing.border.Border;
import javax.swing.border.EtchedBorder;
!
! import org.fudaa.ctulu.CtuluLib;
!
import org.fudaa.ebli.dialog.EbliSimpleDialogPanel;
+
import org.fudaa.fudaa.ressource.FudaaResource;
/**
***************
*** 63,68 ****
} else {
setIcon(FudaaExec.EMPTY_TOOL_ICON);
! setText(DodicoLib.EMPTY_STRING);
! setToolTipText(DodicoLib.EMPTY_STRING);
}
}
--- 63,68 ----
} else {
setIcon(FudaaExec.EMPTY_TOOL_ICON);
! setText(CtuluLib.EMPTY_STRING);
! setToolTipText(CtuluLib.EMPTY_STRING);
}
}
Index: FudaaExecManagerPanel.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/exec/FudaaExecManagerPanel.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FudaaExecManagerPanel.java 25 Nov 2003 10:13:33 -0000 1.4
--- FudaaExecManagerPanel.java 12 Dec 2003 10:58:41 -0000 1.5
***************
*** 11,17 ****
import com.memoire.bu.BuBorderLayout;
import org.fudaa.ebli.dialog.EbliSimpleDialogPanel;
! import org.fudaa.fudaa.commun.tableau.FudaaCellDialogEditor;
! import org.fudaa.fudaa.commun.tableau.FudaaPanelListEditor;
! import org.fudaa.fudaa.commun.tableau.FudaaPanelListEditorModel;
import org.fudaa.fudaa.ressource.FudaaResource;
/**
--- 11,18 ----
import com.memoire.bu.BuBorderLayout;
import org.fudaa.ebli.dialog.EbliSimpleDialogPanel;
! import org.fudaa.ebli.tableau.EbliCellDialogEditor;
! import org.fudaa.ebli.tableau.EbliPanelListEditor;
! import org.fudaa.ebli.tableau.EbliPanelListEditorModel;
!
import org.fudaa.fudaa.ressource.FudaaResource;
/**
***************
*** 21,32 ****
public class FudaaExecManagerPanel extends EbliSimpleDialogPanel {
FudaaExecManager mng_;
! FudaaPanelListEditorModel model_;
public FudaaExecManagerPanel(FudaaExecManager _mng) {
mng_= _mng;
model_= new ExecModel();
setLayout(new BuBorderLayout());
! FudaaPanelListEditor pn=
! new FudaaPanelListEditor(model_, true, true, false);
! FudaaCellDialogEditor edit= new FudaaExecCellEditor();
edit.setDoubleClick(true);
pn.setValueListCellRenderer(new FudaaExecCellRenderer());
--- 22,33 ----
public class FudaaExecManagerPanel extends EbliSimpleDialogPanel {
FudaaExecManager mng_;
! EbliPanelListEditorModel model_;
public FudaaExecManagerPanel(FudaaExecManager _mng) {
mng_= _mng;
model_= new ExecModel();
setLayout(new BuBorderLayout());
! EbliPanelListEditor pn=
! new EbliPanelListEditor(model_, true, true, false);
! EbliCellDialogEditor edit= new FudaaExecCellEditor();
edit.setDoubleClick(true);
pn.setValueListCellRenderer(new FudaaExecCellRenderer());
***************
*** 34,38 ****
add(pn, BuBorderLayout.CENTER);
}
! private class ExecModel extends FudaaPanelListEditorModel {
public ExecModel() {
super(mng_.execs_, false);
--- 35,39 ----
add(pn, BuBorderLayout.CENTER);
}
! private class ExecModel extends EbliPanelListEditorModel {
public ExecModel() {
super(mng_.execs_, false);
Index: FudaaExecPanel.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/exec/FudaaExecPanel.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** FudaaExecPanel.java 25 Nov 2003 10:13:33 -0000 1.5
--- FudaaExecPanel.java 12 Dec 2003 10:58:41 -0000 1.6
***************
*** 8,35 ****
*/
package org.fudaa.fudaa.commun.exec;
- import java.awt.Color;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.io.File;
! import java.io.IOException;
import javax.swing.Icon;
import javax.swing.JButton;
import javax.swing.JFrame;
import javax.swing.JTextField;
! import com.memoire.bu.BuBorderLayout;
import com.memoire.bu.BuButton;
import com.memoire.bu.BuFileChooser;
import com.memoire.bu.BuGridLayout;
import com.memoire.bu.BuIcon;
- import com.memoire.bu.BuLabel;
- import com.memoire.bu.BuPreferences;
import com.memoire.bu.BuResource;
import com.memoire.fu.FuLib;
! import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.ebli.dialog.EbliSimpleDialogPanel;
! import org.fudaa.fudaa.commun.FudaaBrowserControl;
! import org.fudaa.fudaa.commun.FudaaLib;
! import org.fudaa.fudaa.commun.FudaaPreferences;
! import org.fudaa.fudaa.commun.fileChooser.FudaaFileChooser;
import org.fudaa.fudaa.ressource.FudaaResource;
/**
--- 8,32 ----
*/
package org.fudaa.fudaa.commun.exec;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.io.File;
!
import javax.swing.Icon;
import javax.swing.JButton;
import javax.swing.JFrame;
import javax.swing.JTextField;
!
! import org.fudaa.ctulu.CtuluLib;
!
import com.memoire.bu.BuButton;
import com.memoire.bu.BuFileChooser;
import com.memoire.bu.BuGridLayout;
import com.memoire.bu.BuIcon;
import com.memoire.bu.BuResource;
import com.memoire.fu.FuLib;
!
import org.fudaa.ebli.dialog.EbliSimpleDialogPanel;
! import org.fudaa.ebli.filechooser.EbliFileChooser;
!
import org.fudaa.fudaa.ressource.FudaaResource;
/**
***************
*** 62,74 ****
iconButton_.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent _ae) {
! BuFileChooser bf= new FudaaFileChooser(false);
if ((iconURL_ != null) && (!fudaaExec_.isIconInterne()))
bf.setCurrentDirectory(FuLib.getParentFile(new File(iconURL_)));
else
! bf.setCurrentDirectory(FudaaFileChooser.getLastDir());
bf.setDialogTitle(
(fudaaExec_ != null
? fudaaExec_.getViewedName()
! : DodicoLib.EMPTY_STRING)
+ s
+ BuResource.BU.getString("Icône"));
--- 59,71 ----
iconButton_.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent _ae) {
! BuFileChooser bf= new EbliFileChooser(false);
if ((iconURL_ != null) && (!fudaaExec_.isIconInterne()))
bf.setCurrentDirectory(FuLib.getParentFile(new File(iconURL_)));
else
! bf.setCurrentDirectory(EbliFileChooser.getLastDir());
bf.setDialogTitle(
(fudaaExec_ != null
? fudaaExec_.getViewedName()
! : CtuluLib.EMPTY_STRING)
+ s
+ BuResource.BU.getString("Icône"));
***************
*** 93,100 ****
iconURL_= fudaaExec_.getIconURL();
} else {
! txtName_.setText(DodicoLib.EMPTY_STRING);
! txtCmd_.setText(DodicoLib.EMPTY_STRING);
iconButton_.setIcon(FudaaExec.EMPTY_TOOL_ICON);
! iconURL_= DodicoLib.EMPTY_STRING;
}
}
--- 90,97 ----
iconURL_= fudaaExec_.getIconURL();
} else {
! txtName_.setText(CtuluLib.EMPTY_STRING);
! txtCmd_.setText(CtuluLib.EMPTY_STRING);
iconButton_.setIcon(FudaaExec.EMPTY_TOOL_ICON);
! iconURL_= CtuluLib.EMPTY_STRING;
}
}
Index: FudaaExecServerManagerPanel.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/exec/FudaaExecServerManagerPanel.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FudaaExecServerManagerPanel.java 25 Nov 2003 10:13:33 -0000 1.3
--- FudaaExecServerManagerPanel.java 12 Dec 2003 10:58:41 -0000 1.4
***************
*** 19,23 ****
import com.memoire.bu.BuHorizontalLayout;
import com.memoire.bu.BuPanel;
! import org.fudaa.fudaa.commun.tableau.FudaaPanelListEditorModel;
import org.fudaa.fudaa.ressource.FudaaResource;
/**
--- 19,25 ----
import com.memoire.bu.BuHorizontalLayout;
import com.memoire.bu.BuPanel;
!
! import org.fudaa.ebli.tableau.EbliPanelListEditorModel;
!
import org.fudaa.fudaa.ressource.FudaaResource;
/**
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/tableau In directory sc8-pr-cvs1:/tmp/cvs-serv25602/tableau Removed Files: FudaaCellBooleanEditor.java FudaaCellBooleanRenderer.java FudaaCellDecorator.java FudaaCellDialogEditor.java FudaaCellFileEditor.java FudaaCellRenderer.java FudaaCellRendererRowHeader.java FudaaCellTextRenderer.java FudaaFilleTableau.java FudaaGrapheValeur.java FudaaPanelListEditor.java FudaaPanelListEditorModel.java FudaaUtilisateurEvaluateur.java FudaaUtilisateurTableauModele.java Log Message: Deplacement FileChooser --- FudaaCellBooleanEditor.java DELETED --- --- FudaaCellBooleanRenderer.java DELETED --- --- FudaaCellDecorator.java DELETED --- --- FudaaCellDialogEditor.java DELETED --- --- FudaaCellFileEditor.java DELETED --- --- FudaaCellRenderer.java DELETED --- --- FudaaCellRendererRowHeader.java DELETED --- --- FudaaCellTextRenderer.java DELETED --- --- FudaaFilleTableau.java DELETED --- --- FudaaGrapheValeur.java DELETED --- --- FudaaPanelListEditor.java DELETED --- --- FudaaPanelListEditorModel.java DELETED --- --- FudaaUtilisateurEvaluateur.java DELETED --- --- FudaaUtilisateurTableauModele.java DELETED --- |
|
From: <de...@us...> - 2003-12-12 10:58:45
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/projet In directory sc8-pr-cvs1:/tmp/cvs-serv25602/projet Modified Files: FudaaProjet.java FudaaProjetInformationsFrame.java Log Message: Deplacement FileChooser Index: FudaaProjet.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/projet/FudaaProjet.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** FudaaProjet.java 25 Nov 2003 10:13:35 -0000 1.4 --- FudaaProjet.java 12 Dec 2003 10:58:41 -0000 1.5 *************** *** 8,25 **** */ package org.fudaa.fudaa.commun.projet; ! import java.awt.*; ! import java.awt.event.*; ! import java.io.*; ! import java.util.*; ! import java.util.zip.*; ! import java.lang.reflect.*; ! import javax.swing.*; ! import com.memoire.bu.*; ! import org.fudaa.dodico.commun.DodicoLib; import org.fudaa.fudaa.commun.FudaaDialogNewProject; import org.fudaa.fudaa.commun.FudaaFiltreFichier; - import org.fudaa.fudaa.commun.fileChooser.FudaaFileChooser; import org.fudaa.fudaa.ressource.FudaaResource; - import fr.dyade.koala.xml.koml.*; /** * Projet Fudaa. --- 8,58 ---- */ package org.fudaa.fudaa.commun.projet; ! import java.awt.Frame; ! import java.awt.event.ActionEvent; ! import java.awt.event.ActionListener; ! import java.io.DataInputStream; ! import java.io.DataOutputStream; ! import java.io.EOFException; ! import java.io.File; ! import java.io.FileInputStream; ! import java.io.FileNotFoundException; ! import java.io.FileOutputStream; ! import java.io.IOException; ! import java.io.InvalidClassException; ! import java.io.ObjectInputStream; ! import java.io.ObjectOutputStream; ! import java.lang.reflect.Array; ! import java.lang.reflect.Field; ! import java.lang.reflect.InvocationTargetException; ! import java.lang.reflect.Method; ! import java.util.Enumeration; ! import java.util.Hashtable; ! import java.util.Vector; ! import java.util.zip.GZIPInputStream; ! import java.util.zip.GZIPOutputStream; ! ! import javax.swing.AbstractButton; ! import javax.swing.JMenuItem; ! import javax.swing.JOptionPane; ! ! import org.fudaa.ctulu.CtuluLib; ! ! import com.memoire.bu.BuCommonInterface; ! import com.memoire.bu.BuDialogConfirmation; ! import com.memoire.bu.BuDialogError; ! import com.memoire.bu.BuFileChooser; ! import com.memoire.bu.BuInformationsDocument; ! import com.memoire.bu.BuInformationsSoftware; ! import com.memoire.bu.BuMenu; ! import com.memoire.bu.BuResource; ! ! import fr.dyade.koala.xml.koml.KOMLDeserializer; ! import fr.dyade.koala.xml.koml.KOMLSerializer; ! ! import org.fudaa.ebli.filechooser.EbliFileChooser; ! import org.fudaa.fudaa.commun.FudaaDialogNewProject; import org.fudaa.fudaa.commun.FudaaFiltreFichier; import org.fudaa.fudaa.ressource.FudaaResource; /** * Projet Fudaa. *************** *** 659,663 **** } fichier.writeUTF(FORMAT_VERSION); ! fichier.writeUTF(appliname_ + "Projet" + DodicoLib.LINE_SEP); infos_.write(fichier); fichier.writeInt(params_.size()); --- 692,696 ---- } fichier.writeUTF(FORMAT_VERSION); ! fichier.writeUTF(appliname_ + "Projet" + CtuluLib.LINE_SEP); infos_.write(fichier); fichier.writeInt(params_.size()); *************** *** 884,888 **** } fichier.addObject(FORMAT_VERSION); ! fichier.addObject(appliname_ + "Projet" + DodicoLib.LINE_SEP); fichier.addObject(infos_); fichier.addObject(new Integer(params_.size())); --- 917,921 ---- } fichier.addObject(FORMAT_VERSION); ! fichier.addObject(appliname_ + "Projet" + CtuluLib.LINE_SEP); fichier.addObject(infos_); fichier.addObject(new Integer(params_.size())); *************** *** 894,898 **** System.err.println( FudaaResource.getS("Sérialisation des paramètres") ! + DodicoLib.ESPACE + key); fichier.addObject(key); --- 927,931 ---- System.err.println( FudaaResource.getS("Sérialisation des paramètres") ! + CtuluLib.ESPACE + key); fichier.addObject(key); *************** *** 911,915 **** System.err.println( FudaaResource.getS("Sérialisation des résultats") ! + DodicoLib.ESPACE + key); fichier.addObject(key); --- 944,948 ---- System.err.println( FudaaResource.getS("Sérialisation des résultats") ! + CtuluLib.ESPACE + key); fichier.addObject(key); *************** *** 935,947 **** String s= " : "; return FudaaResource.getS("Le format du fichier est désuet") ! + DodicoLib.LINE_SEP + FudaaResource.getS("Version fichier lu") + s + _readVersion ! + DodicoLib.LINE_SEP + FudaaResource.getS("Version actuelle") + s + FORMAT_VERSION ! + DodicoLib.LINE_SEP + FudaaResource.getS( "Certaines données peuvent etre absentes ou incohérentes"); --- 968,980 ---- String s= " : "; return FudaaResource.getS("Le format du fichier est désuet") ! + CtuluLib.LINE_SEP + FudaaResource.getS("Version fichier lu") + s + _readVersion ! + CtuluLib.LINE_SEP + FudaaResource.getS("Version actuelle") + s + FORMAT_VERSION ! + CtuluLib.LINE_SEP + FudaaResource.getS( "Certaines données peuvent etre absentes ou incohérentes"); *************** *** 952,964 **** "Le fichier est incorrect (numéro de version impossible)") + ":" ! + DodicoLib.LINE_SEP + FudaaResource.getS("Version fichier lu") + s + _readVersion ! + DodicoLib.LINE_SEP + FudaaResource.getS("Version actuelle") + s + FORMAT_VERSION ! + DodicoLib.LINE_SEP + FudaaResource.getS("Contactez le service de maintenance"); } --- 985,997 ---- "Le fichier est incorrect (numéro de version impossible)") + ":" ! + CtuluLib.LINE_SEP + FudaaResource.getS("Version fichier lu") + s + _readVersion ! + CtuluLib.LINE_SEP + FudaaResource.getS("Version actuelle") + s + FORMAT_VERSION ! + CtuluLib.LINE_SEP + FudaaResource.getS("Contactez le service de maintenance"); } *************** *** 1053,1057 **** System.err.println( FudaaResource.getS("Désérialisation des paramètres") ! + DodicoLib.ESPACE + key); params_.put(key, fichier.readObject()); --- 1086,1090 ---- System.err.println( FudaaResource.getS("Désérialisation des paramètres") ! + CtuluLib.ESPACE + key); params_.put(key, fichier.readObject()); *************** *** 1067,1071 **** System.err.println( FudaaResource.getS("Désérialisation des résultats") ! + DodicoLib.ESPACE + key); results_.put(key, fichier.readObject()); --- 1100,1104 ---- System.err.println( FudaaResource.getS("Désérialisation des résultats") ! + CtuluLib.ESPACE + key); results_.put(key, fichier.readObject()); *************** *** 1117,1121 **** System.err.println( FudaaResource.getS("Sérialisation des paramètres") ! + DodicoLib.ESPACE + key); fichier.writeUTF(key); --- 1150,1154 ---- System.err.println( FudaaResource.getS("Sérialisation des paramètres") ! + CtuluLib.ESPACE + key); fichier.writeUTF(key); *************** *** 1134,1138 **** System.err.println( FudaaResource.getS("Sérialisation des résultats") ! + DodicoLib.ESPACE + key); fichier.writeUTF(key); --- 1167,1171 ---- System.err.println( FudaaResource.getS("Sérialisation des résultats") ! + CtuluLib.ESPACE + key); fichier.writeUTF(key); *************** *** 1218,1222 **** System.err.println( FudaaResource.getS("Désérialisation des paramètres") ! + DodicoLib.ESPACE + key); try { --- 1251,1255 ---- System.err.println( FudaaResource.getS("Désérialisation des paramètres") ! + CtuluLib.ESPACE + key); try { *************** *** 1245,1249 **** System.err.println( FudaaResource.getS("Désérialisation des résultats") ! + DodicoLib.ESPACE + key); try { --- 1278,1282 ---- System.err.println( FudaaResource.getS("Désérialisation des résultats") ! + CtuluLib.ESPACE + key); try { *************** *** 1325,1329 **** FudaaResource.getS( "Le fichier :\n{0}\nexiste déjà. Voulez-vous l'écraser?" ! + DodicoLib.LINE_SEP, filtre_.fudify(fichier_))) .activate() --- 1358,1362 ---- FudaaResource.getS( "Le fichier :\n{0}\nexiste déjà. Voulez-vous l'écraser?" ! + CtuluLib.LINE_SEP, filtre_.fudify(fichier_))) .activate() *************** *** 1354,1358 **** if (appli_ instanceof Frame) parent= (Frame)appli_; ! BuFileChooser chooser= new FudaaFileChooser(); chooser.setFileFilter(filtre_); if (dirOpen_ == null) --- 1387,1391 ---- if (appli_ instanceof Frame) parent= (Frame)appli_; ! BuFileChooser chooser= new EbliFileChooser(); chooser.setFileFilter(filtre_); if (dirOpen_ == null) *************** *** 1525,1529 **** System.err.println( FudaaResource.getS("Désérialisation des résultats") ! + DodicoLib.ESPACE + key); results_.put(key, fichier.readObject()); --- 1558,1562 ---- System.err.println( FudaaResource.getS("Désérialisation des résultats") ! + CtuluLib.ESPACE + key); results_.put(key, fichier.readObject()); *************** *** 1552,1556 **** System.err.println( FudaaResource.getS("Désérialisation des paramètres") ! + DodicoLib.ESPACE + key); try { --- 1585,1589 ---- System.err.println( FudaaResource.getS("Désérialisation des paramètres") ! + CtuluLib.ESPACE + key); try { Index: FudaaProjetInformationsFrame.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/projet/FudaaProjetInformationsFrame.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** FudaaProjetInformationsFrame.java 25 Nov 2003 10:13:35 -0000 1.3 --- FudaaProjetInformationsFrame.java 12 Dec 2003 10:58:41 -0000 1.4 *************** *** 8,17 **** */ package org.fudaa.fudaa.commun.projet; ! import java.awt.*; ! import java.awt.event.*; ! import javax.swing.*; ! import javax.swing.border.*; ! import com.memoire.bu.*; ! import org.fudaa.dodico.commun.DodicoLib; import org.fudaa.fudaa.ressource.FudaaResource; /** --- 8,34 ---- */ package org.fudaa.fudaa.commun.projet; ! import java.awt.BorderLayout; ! import java.awt.Container; ! import java.awt.FlowLayout; ! import java.awt.Insets; ! import java.awt.event.ActionEvent; ! import java.awt.event.ActionListener; ! ! import javax.swing.JScrollPane; ! import javax.swing.JTextArea; ! import javax.swing.border.EmptyBorder; ! ! import org.fudaa.ctulu.CtuluLib; ! ! import com.memoire.bu.BuButton; ! import com.memoire.bu.BuCommonImplementation; ! import com.memoire.bu.BuGridLayout; ! import com.memoire.bu.BuInformationsDocument; ! import com.memoire.bu.BuInternalFrame; ! import com.memoire.bu.BuLabel; ! import com.memoire.bu.BuPanel; ! import com.memoire.bu.BuResource; ! import com.memoire.bu.BuTextField; ! import org.fudaa.fudaa.ressource.FudaaResource; /** *************** *** 132,136 **** private void setFields() { FudaaProjetInformations infos= projet_.getInformations(); ! String vide= DodicoLib.EMPTY_STRING; tfTitre_.setText(infos == null ? vide : infos.titre); tfAuteur_.setText(infos == null ? vide : infos.auteur); --- 149,153 ---- private void setFields() { FudaaProjetInformations infos= projet_.getInformations(); ! String vide= CtuluLib.EMPTY_STRING; tfTitre_.setText(infos == null ? vide : infos.titre); tfAuteur_.setText(infos == null ? vide : infos.auteur); *************** *** 146,150 **** private void initialiser() { BuInformationsDocument infos= new BuInformationsDocument(); ! String vide= DodicoLib.EMPTY_STRING; tfAuteur_.setText(infos == null ? vide : infos.author); tfEmail_.setText(infos == null ? vide : infos.contact); --- 163,167 ---- private void initialiser() { BuInformationsDocument infos= new BuInformationsDocument(); ! String vide= CtuluLib.EMPTY_STRING; tfAuteur_.setText(infos == null ? vide : infos.author); tfEmail_.setText(infos == null ? vide : infos.contact); |
|
From: <de...@us...> - 2003-12-12 10:58:45
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun
In directory sc8-pr-cvs1:/tmp/cvs-serv25602
Modified Files:
Fudaa.java FudaaBrowserControl.java
FudaaCommonImplementation.java FudaaDialogNewProject.java
FudaaImplementation.java FudaaLib.java FudaaPopupMessage.java
Log Message:
Deplacement FileChooser
Index: Fudaa.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/Fudaa.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Fudaa.java 25 Nov 2003 10:13:25 -0000 1.7
--- Fudaa.java 12 Dec 2003 10:58:40 -0000 1.8
***************
*** 12,17 ****
--- 12,22 ----
import java.io.PrintStream;
import java.util.Locale;
+
import javax.swing.JFrame;
+
import com.diaam.lgpl.ts.TerminalStandard;
+
+ import org.fudaa.ctulu.CtuluLib;
+
import com.memoire.bu.BuApplication;
import com.memoire.bu.BuDialogError;
***************
*** 19,23 ****
import com.memoire.bu.BuLib;
import com.memoire.bu.BuPreferences;
! import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.fudaa.ressource.FudaaResource;
/**
--- 24,28 ----
import com.memoire.bu.BuLib;
import com.memoire.bu.BuPreferences;
!
import org.fudaa.fudaa.ressource.FudaaResource;
/**
***************
*** 53,57 ****
ts= new TerminalStandard();
ts.activeStandards();
! String ls= DodicoLib.LINE_SEP;
if ("fr".equals(Locale.getDefault().getLanguage())) {
String wlcmsg=
--- 58,62 ----
ts= new TerminalStandard();
ts.activeStandards();
! String ls= CtuluLib.LINE_SEP;
if ("fr".equals(Locale.getDefault().getLanguage())) {
String wlcmsg=
Index: FudaaBrowserControl.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/FudaaBrowserControl.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** FudaaBrowserControl.java 25 Nov 2003 10:13:26 -0000 1.6
--- FudaaBrowserControl.java 12 Dec 2003 10:58:40 -0000 1.7
***************
*** 8,18 ****
*/
package org.fudaa.fudaa.commun;
- import com.memoire.bu.BuBrowserControl;
- import com.memoire.bu.BuPreferences;
- import org.fudaa.dodico.commun.DodicoLib;
- import java.io.IOException;
import java.io.File;
- import java.io.PrintWriter;
import java.io.FileWriter;
/**
* Controle le lancement du browser externe et gere les problemes sous windows.
--- 8,21 ----
*/
package org.fudaa.fudaa.commun;
import java.io.File;
import java.io.FileWriter;
+ import java.io.IOException;
+ import java.io.PrintWriter;
+
+ import org.fudaa.ctulu.CtuluLib;
+
+ import com.memoire.bu.BuBrowserControl;
+
+ import org.fudaa.dodico.commun.DodicoLib;
/**
* Controle le lancement du browser externe et gere les problemes sous windows.
***************
*** 39,43 ****
_url= getTempUrlWin(_url);
if ((_url == null)
! || (_url == DodicoLib.EMPTY_STRING)
|| (_url.length() == 0))
_url= FudaaImplementation.LOCAL_MAN;
--- 42,46 ----
_url= getTempUrlWin(_url);
if ((_url == null)
! || (_url == CtuluLib.EMPTY_STRING)
|| (_url.length() == 0))
_url= FudaaImplementation.LOCAL_MAN;
***************
*** 57,61 ****
protected static String getTempUrlWin(String _urlInit) {
if (_urlInit == null || _urlInit.length() == 0) {
! return DodicoLib.EMPTY_STRING;
}
/* if( (_urlInit.endsWith(".html")) || (_urlInit.endsWith(".htm")) )
--- 60,64 ----
protected static String getTempUrlWin(String _urlInit) {
if (_urlInit == null || _urlInit.length() == 0) {
! return CtuluLib.EMPTY_STRING;
}
/* if( (_urlInit.endsWith(".html")) || (_urlInit.endsWith(".htm")) )
***************
*** 66,71 ****
File shortcut= File.createTempFile("FudaaBrowserTemp", ".html");
shortcut.deleteOnExit();
! if (FudaaLib.DEBUG)
! System.err.println(
"FudaaBrowserControl.getTempUrlWin " + shortcut.getAbsolutePath());
//shortcut.deleteOnExit();
--- 69,74 ----
File shortcut= File.createTempFile("FudaaBrowserTemp", ".html");
shortcut.deleteOnExit();
! if (CtuluLib.DEBUG)
! CtuluLib.debug(
"FudaaBrowserControl.getTempUrlWin " + shortcut.getAbsolutePath());
//shortcut.deleteOnExit();
Index: FudaaCommonImplementation.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/FudaaCommonImplementation.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** FudaaCommonImplementation.java 11 Dec 2003 12:50:53 -0000 1.12
--- FudaaCommonImplementation.java 12 Dec 2003 10:58:40 -0000 1.13
***************
*** 14,19 ****
--- 14,23 ----
import java.net.MalformedURLException;
import java.net.URL;
+
import javax.swing.JInternalFrame;
import javax.swing.JMenu;
+
+ import org.fudaa.ctulu.CtuluLib;
+
import com.memoire.bu.BuBrowserPreferencesPanel;
import com.memoire.bu.BuCommonImplementation;
***************
*** 34,37 ****
--- 38,42 ----
import com.memoire.bu.BuTaskOperation;
import com.memoire.bu.BuUserPreferencesPanel;
+
import org.fudaa.dodico.commun.DodicoAnalyze;
import org.fudaa.dodico.commun.DodicoLib;
***************
*** 39,49 ****
import org.fudaa.dodico.commun.ProgressionInterface;
import org.fudaa.dodico.fichiers.FileOperationSynthese;
import org.fudaa.ebli.impression.EbliFillePrevisualisation;
import org.fudaa.ebli.impression.EbliMiseEnPageDialog;
import org.fudaa.ebli.impression.EbliMiseEnPagePreferencesPanel;
import org.fudaa.ebli.impression.EbliPageable;
import org.fudaa.fudaa.commun.aide.FudaaAidePreferencesPanel;
import org.fudaa.fudaa.commun.aide.FudaaAstuces;
- import org.fudaa.fudaa.commun.fileChooser.FudaaFileChooser;
import org.fudaa.fudaa.commun.undo.FudaaUndoCmdMngListener;
import org.fudaa.fudaa.ressource.FudaaResource;
--- 44,56 ----
import org.fudaa.dodico.commun.ProgressionInterface;
import org.fudaa.dodico.fichiers.FileOperationSynthese;
+
+ import org.fudaa.ebli.filechooser.EbliFileChooser;
import org.fudaa.ebli.impression.EbliFillePrevisualisation;
import org.fudaa.ebli.impression.EbliMiseEnPageDialog;
import org.fudaa.ebli.impression.EbliMiseEnPagePreferencesPanel;
import org.fudaa.ebli.impression.EbliPageable;
+
import org.fudaa.fudaa.commun.aide.FudaaAidePreferencesPanel;
import org.fudaa.fudaa.commun.aide.FudaaAstuces;
import org.fudaa.fudaa.commun.undo.FudaaUndoCmdMngListener;
import org.fudaa.fudaa.ressource.FudaaResource;
***************
*** 94,99 ****
if ((_url.startsWith("file")) && (_url.endsWith("/")))
_url= _url + "index.html";
! if (FudaaLib.DEBUG)
! System.out.println("FudaaCommonImplementation.displayURL " + _url);
if (BuPreferences.BU.getIntegerProperty("browser.type") == 1) {
if (aide_ == null)
--- 101,106 ----
if ((_url.startsWith("file")) && (_url.endsWith("/")))
_url= _url + "index.html";
! if (CtuluLib.DEBUG)
! CtuluLib.debug("FudaaCommonImplementation.displayURL " + _url);
if (BuPreferences.BU.getIntegerProperty("browser.type") == 1) {
if (aide_ == null)
***************
*** 118,124 ****
try {
String url= new URL(_s).toString();
! if (FudaaLib.DEBUG)
! System.err.println(
! getClass().getName() + DodicoLib.ESPACE + "url= " + url);
if (url != null)
displayURL(url);
--- 125,130 ----
try {
String url= new URL(_s).toString();
! if (CtuluLib.DEBUG)
! CtuluLib.debug(getClass().getName() + CtuluLib.ESPACE + "url= " + url);
if (url != null)
displayURL(url);
***************
*** 128,132 ****
FudaaResource.getS("Erreur"),
FudaaResource.getS("Le document est introuvable")
! + DodicoLib.ESPACE
+ _s);
e.printStackTrace();
--- 134,138 ----
FudaaResource.getS("Erreur"),
FudaaResource.getS("Le document est introuvable")
! + CtuluLib.ESPACE
+ _s);
e.printStackTrace();
***************
*** 140,145 ****
try {
String url= _f.toURL().toString();
! if (FudaaLib.DEBUG)
! System.err.println(getClass().getName() + " " + "url= " + url);
if (url != null)
displayURL(url);
--- 146,151 ----
try {
String url= _f.toURL().toString();
! if (CtuluLib.DEBUG)
! CtuluLib.debug(getClass().getName() + " " + "url= " + url);
if (url != null)
displayURL(url);
***************
*** 290,294 ****
FudaaLib.showError(this, _titre, _text);
if (printErr)
! FudaaLib.error(_titre + DodicoLib.ESPACE + _text);
}
/**
--- 296,300 ----
FudaaLib.showError(this, _titre, _text);
if (printErr)
! CtuluLib.error(_titre + CtuluLib.ESPACE + _text);
}
/**
***************
*** 309,313 ****
public boolean manageErrorOperationAndIsFatal(FileOperationSynthese _opResult) {
if (_opResult.getClosingException() != null) {
! FudaaLib.error(
"FATAL :can't close " + _opResult.getAnalyze().getRessource());
}
--- 315,319 ----
public boolean manageErrorOperationAndIsFatal(FileOperationSynthese _opResult) {
if (_opResult.getClosingException() != null) {
! CtuluLib.error(
"FATAL :can't close " + _opResult.getAnalyze().getRessource());
}
***************
*** 361,365 ****
Component _parent,
boolean _saveDialog) {
! BuFileChooser fileChooser= new FudaaFileChooser(true);
fileChooser.setFileHidingEnabled(true);
fileChooser.setMultiSelectionEnabled(false);
--- 367,371 ----
Component _parent,
boolean _saveDialog) {
! BuFileChooser fileChooser= new EbliFileChooser(true);
fileChooser.setFileHidingEnabled(true);
fileChooser.setMultiSelectionEnabled(false);
***************
*** 407,419 ****
return new ProgressionBuAdapter(_bu);
}
!
! public void initTaskView(BuTask _bu){
_bu.setTaskView(getMainPanel().getTaskView());
}
!
! public void clearTaskView(BuTask _bu){
getMainPanel().getTaskView().removeTask(_bu);
}
!
/**
*
--- 413,426 ----
return new ProgressionBuAdapter(_bu);
}
!
! public void initTaskView(BuTask _bu) {
_bu.setTaskView(getMainPanel().getTaskView());
+ getMainPanel().getTaskView().addTask(_bu);
}
!
! public void clearTaskView(BuTask _bu) {
getMainPanel().getTaskView().removeTask(_bu);
}
!
/**
*
***************
*** 423,427 ****
}
public void unsetMainMessage() {
! getMainPanel().setMessage(DodicoLib.EMPTY_STRING);
getMainPanel().setProgression(0);
}
--- 430,434 ----
}
public void unsetMainMessage() {
! getMainPanel().setMessage(CtuluLib.EMPTY_STRING);
getMainPanel().setProgression(0);
}
Index: FudaaDialogNewProject.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/FudaaDialogNewProject.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** FudaaDialogNewProject.java 25 Nov 2003 10:13:27 -0000 1.8
--- FudaaDialogNewProject.java 12 Dec 2003 10:58:40 -0000 1.9
***************
*** 8,21 ****
*/
package org.fudaa.fudaa.commun;
! import com.memoire.bu.*;
! import org.fudaa.dodico.commun.DodicoLib;
! import org.fudaa.fudaa.commun.fileChooser.FudaaFileChooser;
! import org.fudaa.fudaa.ressource.FudaaResource;
! import java.awt.*;
! import java.awt.event.*;
! import java.util.*;
import java.io.File;
! import javax.swing.*;
! import javax.swing.border.*;
/**
* Une boite d'entree de texte.
--- 8,42 ----
*/
package org.fudaa.fudaa.commun;
! import java.awt.Component;
! import java.awt.Container;
! import java.awt.FlowLayout;
! import java.awt.Frame;
! import java.awt.GridLayout;
! import java.awt.Insets;
! import java.awt.event.ActionEvent;
! import java.awt.event.ActionListener;
! import java.awt.event.WindowEvent;
! import java.awt.event.WindowListener;
import java.io.File;
!
! import javax.swing.JButton;
! import javax.swing.JDialog;
! import javax.swing.JLabel;
! import javax.swing.JPanel;
! import javax.swing.JTextField;
! import javax.swing.border.EmptyBorder;
!
! import org.fudaa.ctulu.CtuluLib;
!
! import com.memoire.bu.BuBorderLayout;
! import com.memoire.bu.BuButton;
! import com.memoire.bu.BuFileChooser;
! import com.memoire.bu.BuGridLayout;
! import com.memoire.bu.BuLib;
! import com.memoire.bu.BuResource;
!
! import org.fudaa.ebli.filechooser.EbliFileChooser;
!
! import org.fudaa.fudaa.ressource.FudaaResource;
/**
* Une boite d'entree de texte.
***************
*** 76,80 ****
n++);
panel.add(tf_titre_, n++);
! panel.add(new JLabel(DodicoLib.EMPTY_STRING), n++);
tf_fichier_= new JTextField();
tf_fichier_.setColumns(20);
--- 97,101 ----
n++);
panel.add(tf_titre_, n++);
! panel.add(new JLabel(CtuluLib.EMPTY_STRING), n++);
tf_fichier_= new JTextField();
tf_fichier_.setColumns(20);
***************
*** 186,190 ****
// Methodes privees
private String popFileChooser() {
! BuFileChooser chooser= new FudaaFileChooser(false);
if (filtre_ != null)
chooser.setFileFilter(filtre_);
--- 207,211 ----
// Methodes privees
private String popFileChooser() {
! BuFileChooser chooser= new EbliFileChooser(false);
if (filtre_ != null)
chooser.setFileFilter(filtre_);
Index: FudaaImplementation.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/FudaaImplementation.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** FudaaImplementation.java 25 Nov 2003 10:13:28 -0000 1.9
--- FudaaImplementation.java 12 Dec 2003 10:58:40 -0000 1.10
***************
*** 10,49 ****
import java.awt.Font;
import java.awt.event.ActionEvent;
- import java.awt.print.PrinterJob;
import java.io.ByteArrayOutputStream;
- import java.io.File;
import java.io.PrintStream;
! import java.net.MalformedURLException;
! import java.net.URL;
import javax.swing.JComponent;
import javax.swing.JDialog;
import javax.swing.JFrame;
- import javax.swing.JInternalFrame;
import javax.swing.JOptionPane;
import javax.swing.border.EmptyBorder;
! import com.memoire.bu.BuAbstractPreferencesPanel;
! import com.memoire.bu.BuBrowserPreferencesPanel;
! import com.memoire.bu.BuCommonImplementation;
import com.memoire.bu.BuCommonInterface;
- import com.memoire.bu.BuDesktopPreferencesPanel;
import com.memoire.bu.BuDialog;
import com.memoire.bu.BuDialogError;
- import com.memoire.bu.BuDialogWarning;
- import com.memoire.bu.BuHelpFrame;
import com.memoire.bu.BuInformationsSoftware;
import com.memoire.bu.BuLabelMultiLine;
- import com.memoire.bu.BuLanguagePreferencesPanel;
import com.memoire.bu.BuLib;
- import com.memoire.bu.BuLookPreferencesPanel;
- import com.memoire.bu.BuMainPanel;
import com.memoire.bu.BuMenu;
import com.memoire.bu.BuMenuBar;
- import com.memoire.bu.BuPreferences;
- import com.memoire.bu.BuPreferencesFrame;
import com.memoire.bu.BuResource;
- import com.memoire.bu.BuTaskOperation;
import com.memoire.bu.BuToolBar;
import com.memoire.bu.BuUpdateGUI;
! import com.memoire.bu.BuUserPreferencesPanel;
import org.fudaa.dodico.corba.calcul.ICalcul;
import org.fudaa.dodico.corba.calcul.ICalculHelper;
--- 10,36 ----
import java.awt.Font;
import java.awt.event.ActionEvent;
import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
!
import javax.swing.JComponent;
import javax.swing.JDialog;
import javax.swing.JFrame;
import javax.swing.JOptionPane;
import javax.swing.border.EmptyBorder;
!
! import org.fudaa.ctulu.CtuluLib;
!
import com.memoire.bu.BuCommonInterface;
import com.memoire.bu.BuDialog;
import com.memoire.bu.BuDialogError;
import com.memoire.bu.BuInformationsSoftware;
import com.memoire.bu.BuLabelMultiLine;
import com.memoire.bu.BuLib;
import com.memoire.bu.BuMenu;
import com.memoire.bu.BuMenuBar;
import com.memoire.bu.BuResource;
import com.memoire.bu.BuToolBar;
import com.memoire.bu.BuUpdateGUI;
!
import org.fudaa.dodico.corba.calcul.ICalcul;
import org.fudaa.dodico.corba.calcul.ICalculHelper;
***************
*** 53,63 ****
import org.fudaa.dodico.corba.objet.IPersonne;
import org.fudaa.dodico.corba.objet.ITacheHelper;
! import org.fudaa.dodico.commun.DodicoLib;
! import org.fudaa.ebli.impression.EbliFillePrevisualisation;
! import org.fudaa.ebli.impression.EbliMiseEnPageDialog;
! import org.fudaa.ebli.impression.EbliMiseEnPagePreferencesPanel;
! import org.fudaa.ebli.impression.EbliPageable;
import org.fudaa.fudaa.commun.aide.FudaaAidePreferencesPanel;
- import org.fudaa.fudaa.commun.aide.FudaaAstuces;
import org.fudaa.fudaa.commun.aide.FudaaAstucesDialog;
import org.fudaa.fudaa.commun.dodico.FudaaDodicoSelectionServeur;
--- 40,45 ----
import org.fudaa.dodico.corba.objet.IPersonne;
import org.fudaa.dodico.corba.objet.ITacheHelper;
!
import org.fudaa.fudaa.commun.aide.FudaaAidePreferencesPanel;
import org.fudaa.fudaa.commun.aide.FudaaAstucesDialog;
import org.fudaa.fudaa.commun.dodico.FudaaDodicoSelectionServeur;
***************
*** 175,179 ****
appframe,
is,
! FudaaResource.getS("Connexion") + DodicoLib.ESPACE + Appname,
lb) {
/**
--- 157,161 ----
appframe,
is,
! FudaaResource.getS("Connexion") + CtuluLib.ESPACE + Appname,
lb) {
/**
***************
*** 238,242 ****
*/
public void run() {
! String espAppName= DodicoLib.ESPACE + Appname;
connecter_setMessage(lb, /*dl,*/
FudaaResource.getS("Recherche des serveurs") + espAppName + "...");
--- 220,224 ----
*/
public void run() {
! String espAppName= CtuluLib.ESPACE + Appname;
connecter_setMessage(lb, /*dl,*/
FudaaResource.getS("Recherche des serveurs") + espAppName + "...");
***************
*** 279,283 ****
connecter_setMessage(lb, /* dl,*/
FudaaResource.getS("Connexion établie")
! + DodicoLib.LINE_SEP
+ FudaaResource.getS("Authentification en cours")
+ "...");
--- 261,265 ----
connecter_setMessage(lb, /* dl,*/
FudaaResource.getS("Connexion établie")
! + CtuluLib.LINE_SEP
+ FudaaResource.getS("Authentification en cours")
+ "...");
***************
*** 291,295 ****
}
connecter_setMessage(lb /*, dl*/
! , "Connexion de" + DodicoLib.ESPACE + p.enChaine() + "...");
r.PERSONNE= p;
r.CONNEXION= r.SERVEUR.connexion(p);
--- 273,277 ----
}
connecter_setMessage(lb /*, dl*/
! , "Connexion de" + CtuluLib.ESPACE + p.enChaine() + "...");
r.PERSONNE= p;
r.CONNEXION= r.SERVEUR.connexion(p);
***************
*** 315,326 ****
"Vous n'êtes pas connecté à un serveur {0}",
appname.toUpperCase())
! + DodicoLib.ESPACE
+ FudaaResource.getS(
"Vous ne pourrez pas lancer de calcul ni visualiser de résultat")
+ "."
! + DodicoLib.ESPACE
+ FudaaResource.getS("Détails de l'erreur")
+ ":"
! + DodicoLib.LINE_SEP
+ out.toString())
.activate();
--- 297,308 ----
"Vous n'êtes pas connecté à un serveur {0}",
appname.toUpperCase())
! + CtuluLib.ESPACE
+ FudaaResource.getS(
"Vous ne pourrez pas lancer de calcul ni visualiser de résultat")
+ "."
! + CtuluLib.ESPACE
+ FudaaResource.getS("Détails de l'erreur")
+ ":"
! + CtuluLib.LINE_SEP
+ out.toString())
.activate();
***************
*** 343,354 ****
"Vous n'êtes pas connecté à un serveur {0}",
appname.toUpperCase())
! + DodicoLib.ESPACE
+ FudaaResource.getS(
"Vous ne pourrez pas lancer de calcul ni visualiser de résultat")
+ "."
! + DodicoLib.ESPACE
+ FudaaResource.getS("Détails de l'erreur")
+ ":"
! + DodicoLib.LINE_SEP
+ out.toString())
.activate();
--- 325,336 ----
"Vous n'êtes pas connecté à un serveur {0}",
appname.toUpperCase())
! + CtuluLib.ESPACE
+ FudaaResource.getS(
"Vous ne pourrez pas lancer de calcul ni visualiser de résultat")
+ "."
! + CtuluLib.ESPACE
+ FudaaResource.getS("Détails de l'erreur")
+ ":"
! + CtuluLib.LINE_SEP
+ out.toString())
.activate();
***************
*** 361,365 ****
IConnexion[] cs= r.SERVEUR.connexions();
String s= ": ";
! String deb= DodicoLib.LINE_SEP + DodicoLib.ESPACE + DodicoLib.ESPACE;
connecter_setMessage(lb, /*dl,*/
FudaaResource.getS("Détails de la connexion")
--- 343,347 ----
IConnexion[] cs= r.SERVEUR.connexions();
String s= ": ";
! String deb= CtuluLib.LINE_SEP + CtuluLib.ESPACE + CtuluLib.ESPACE;
connecter_setMessage(lb, /*dl,*/
FudaaResource.getS("Détails de la connexion")
***************
*** 377,381 ****
+ s
+ cs.length
! + DodicoLib.LINE_SEP);
dl.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
r.printInfo();
--- 359,363 ----
+ s
+ cs.length
! + CtuluLib.LINE_SEP);
dl.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
r.printInfo();
Index: FudaaLib.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/FudaaLib.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** FudaaLib.java 25 Nov 2003 10:13:28 -0000 1.13
--- FudaaLib.java 12 Dec 2003 10:58:40 -0000 1.14
***************
*** 8,38 ****
*/
package org.fudaa.fudaa.commun;
- import java.awt.Color;
- import java.awt.Font;
import java.io.File;
- import java.io.IOException;
import java.util.Vector;
import javax.swing.JOptionPane;
! import javax.swing.border.EmptyBorder;
! import com.memoire.bu.BuBorderLayout;
import com.memoire.bu.BuCommonInterface;
- import com.memoire.bu.BuDialogChoice;
import com.memoire.bu.BuDialogConfirmation;
import com.memoire.bu.BuDialogError;
import com.memoire.bu.BuDialogMessage;
- import com.memoire.bu.BuDialogMulti;
import com.memoire.bu.BuDialogWarning;
import com.memoire.bu.BuIcon;
! import com.memoire.bu.BuInformationsSoftware;
! import com.memoire.bu.BuLabelMultiLine;
! import com.memoire.bu.BuLib;
! import com.memoire.bu.BuPanel;
! import com.memoire.bu.BuPicture;
! import com.memoire.bu.BuVerticalLayout;
! import com.memoire.fu.FuLib;
! import org.fudaa.dodico.commun.DodicoLib;
! import org.fudaa.dodico.objet.CExec;
import org.fudaa.fudaa.ressource.FudaaResource;
- import org.fudaa.fudaa.tr.reflux.TrRefluxBoundaryMiddleLayer;
/**
* Une classe d'utilitaires inclassables.
--- 8,26 ----
*/
package org.fudaa.fudaa.commun;
import java.io.File;
import java.util.Vector;
+
import javax.swing.JOptionPane;
!
! import org.fudaa.ctulu.CtuluLib;
!
import com.memoire.bu.BuCommonInterface;
import com.memoire.bu.BuDialogConfirmation;
import com.memoire.bu.BuDialogError;
import com.memoire.bu.BuDialogMessage;
import com.memoire.bu.BuDialogWarning;
import com.memoire.bu.BuIcon;
!
import org.fudaa.fudaa.ressource.FudaaResource;
/**
* Une classe d'utilitaires inclassables.
***************
*** 42,55 ****
*/
public class FudaaLib {
- public final static boolean DEBUG= "TRUE".equals(System.getProperty("DEBUG"));
public final static boolean INFO=
! DEBUG || "TRUE".equals(System.getProperty("INFO"));
private FudaaLib() {}
- public static void debug(String _s) {
- System.out.println("DEBUG: " + _s);
- }
- public static void error(String _s) {
- System.out.println("ERROR: " + _s);
- }
public static void info(String _s) {
System.out.println("--> " + _s);
--- 30,36 ----
*/
public class FudaaLib {
public final static boolean INFO=
! CtuluLib.DEBUG || "TRUE".equals(System.getProperty("INFO"));
private FudaaLib() {}
public static void info(String _s) {
System.out.println("--> " + _s);
***************
*** 71,75 ****
*/
public static File getAbsolutePathnameTo(File _main, File _file) {
! return DodicoLib.getAbsolutePath(_main, _file.getPath());
// File file;
// // Le fichier donné n'est pas relatif
--- 52,56 ----
*/
public static File getAbsolutePathnameTo(File _main, File _file) {
! return CtuluLib.getAbsolutePath(_main, _file.getPath());
// File file;
// // Le fichier donné n'est pas relatif
***************
*** 256,308 ****
mes.activate();
}
! /**
! * Perment de déterminer le chemin relatif de _destFile par rapport a _baseDir. L'entier
! * _nbParentTest permet de limiter les recherches : maximum _nbParentTest repertoire parent teste
! * ( soit maximum _nbParentTest fois "../").
! */
! public static String getRelativeFile(
! File _destFile,
! File _baseDir,
! int _nbParentTest) {
! if (_destFile == null)
! return null;
! else if (_destFile.getParentFile().equals(_baseDir))
! return _destFile.getName();
! else if ((_baseDir == null) || (_destFile.getParentFile() == null))
! return _destFile.getAbsolutePath();
! String sFile= _destFile.getAbsolutePath();
! String parentPath= _baseDir.getAbsolutePath();
! if (sFile.startsWith(parentPath)) {
! String r= sFile.substring(parentPath.length());
! if (r.startsWith(File.separator))
! return r.substring(1);
! else
! return r;
! }
! File parent= _baseDir.getParentFile();
! if (parent != null) {
! int nb= 1;
! if (_nbParentTest < 0)
! _nbParentTest= Integer.MAX_VALUE;
! while ((nb <= _nbParentTest) && (parent != null)) {
! parentPath= parent.getAbsolutePath();
! if (sFile.startsWith(parentPath)) {
! StringBuffer r= new StringBuffer();
! String append= ".." + File.separator;
! for (int i= nb; i > 0; i--) {
! r.append(append);
! }
! append= sFile.substring(parentPath.length());
! if (append.startsWith(File.separator))
! append= append.substring(1);
! r.append(append);
! return r.toString();
! }
! nb++;
! parent= parent.getParentFile();
! }
! }
! return _destFile.getAbsolutePath();
! }
public static void main(String[] args) {
System.out.println(
--- 237,241 ----
mes.activate();
}
!
public static void main(String[] args) {
System.out.println(
Index: FudaaPopupMessage.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/FudaaPopupMessage.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** FudaaPopupMessage.java 25 Nov 2003 10:13:28 -0000 1.6
--- FudaaPopupMessage.java 12 Dec 2003 10:58:40 -0000 1.7
***************
*** 16,24 ****
import java.awt.Insets;
import java.awt.Point;
! import java.awt.font.FontRenderContext;
! import java.awt.font.LineMetrics;
! import java.awt.geom.Rectangle2D;
import javax.swing.JComponent;
! import org.fudaa.dodico.commun.DodicoLib;
/**
* Une fenetre pop-up pour des messages.
--- 16,23 ----
import java.awt.Insets;
import java.awt.Point;
!
import javax.swing.JComponent;
!
! import org.fudaa.ctulu.CtuluLib;
/**
* Une fenetre pop-up pour des messages.
***************
*** 106,110 ****
public String getText() {
if (text_ == null)
! return DodicoLib.EMPTY_STRING;
return text_;
}
--- 105,109 ----
public String getText() {
if (text_ == null)
! return CtuluLib.EMPTY_STRING;
return text_;
}
***************
*** 120,124 ****
int w= 0;
int h= 0;
! while (!tt.equals(DodicoLib.EMPTY_STRING)) {
int i= tt.indexOf("\n");
String s;
--- 119,123 ----
int w= 0;
int h= 0;
! while (!tt.equals(CtuluLib.EMPTY_STRING)) {
int i= tt.indexOf("\n");
String s;
***************
*** 128,132 ****
} else {
s= tt;
! tt= DodicoLib.EMPTY_STRING;
}
//fm=ft.getLineMetrics(s, context);
--- 127,131 ----
} else {
s= tt;
! tt= CtuluLib.EMPTY_STRING;
}
//fm=ft.getLineMetrics(s, context);
|
|
From: <de...@us...> - 2003-12-12 10:58:45
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/dodico
In directory sc8-pr-cvs1:/tmp/cvs-serv25602/dodico
Modified Files:
FudaaInfoConnexion.java
Log Message:
Deplacement FileChooser
Index: FudaaInfoConnexion.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/dodico/FudaaInfoConnexion.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FudaaInfoConnexion.java 25 Nov 2003 10:13:33 -0000 1.4
--- FudaaInfoConnexion.java 12 Dec 2003 10:58:41 -0000 1.5
***************
*** 8,16 ****
*/
package org.fudaa.fudaa.commun.dodico;
! import org.fudaa.dodico.corba.objet.*;
! import org.fudaa.dodico.corba.calcul.*;
! import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.fudaa.ressource.FudaaResource;
- import javax.swing.event.*;
/**
* Cette classe stocke les informations du serveur utilise. Les donnees sont
--- 8,24 ----
*/
package org.fudaa.fudaa.commun.dodico;
! import javax.swing.event.ChangeEvent;
! import javax.swing.event.ChangeListener;
!
! import org.fudaa.ctulu.CtuluLib;
!
! import org.fudaa.dodico.corba.calcul.ICalculHelper;
! import org.fudaa.dodico.corba.calcul.IParametres;
! import org.fudaa.dodico.corba.calcul.IResultats;
! import org.fudaa.dodico.corba.objet.IConnexion;
! import org.fudaa.dodico.corba.objet.IPersonne;
! import org.fudaa.dodico.corba.objet.ITache;
!
import org.fudaa.fudaa.ressource.FudaaResource;
/**
* Cette classe stocke les informations du serveur utilise. Les donnees sont
***************
*** 37,41 ****
public void printInfo() {
try {
! String s= DodicoLib.ESPACE + DodicoLib.ESPACE;
String egal= " = ";
System.err.println(FudaaResource.getS("Informations sur la connexion"));
--- 45,49 ----
public void printInfo() {
try {
! String s= CtuluLib.ESPACE + CtuluLib.ESPACE;
String egal= " = ";
System.err.println(FudaaResource.getS("Informations sur la connexion"));
|
|
From: <de...@us...> - 2003-12-12 10:58:44
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/fileChooser In directory sc8-pr-cvs1:/tmp/cvs-serv25602/fileChooser Removed Files: FudaaFavoriteFiles.java FudaaFileChooser.java Log Message: Deplacement FileChooser --- FudaaFavoriteFiles.java DELETED --- --- FudaaFileChooser.java DELETED --- |
|
From: <de...@us...> - 2003-12-12 10:58:44
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/calcul
In directory sc8-pr-cvs1:/tmp/cvs-serv25602/calcul
Modified Files:
FudaaCalculOp.java
Log Message:
Deplacement FileChooser
Index: FudaaCalculOp.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/calcul/FudaaCalculOp.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** FudaaCalculOp.java 11 Dec 2003 12:50:53 -0000 1.6
--- FudaaCalculOp.java 12 Dec 2003 10:58:41 -0000 1.7
***************
*** 13,21 ****
import java.util.TimerTask;
import com.memoire.bu.BuTaskOperation;
import org.fudaa.dodico.calcul.CalculExec;
import org.fudaa.dodico.calcul.CalculLauncherAbstract;
- import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.commun.ProgressionInterface;
import org.fudaa.dodico.objet.CExecListener;
--- 13,22 ----
import java.util.TimerTask;
+ import org.fudaa.ctulu.CtuluLib;
+
import com.memoire.bu.BuTaskOperation;
import org.fudaa.dodico.calcul.CalculExec;
import org.fudaa.dodico.calcul.CalculLauncherAbstract;
import org.fudaa.dodico.commun.ProgressionInterface;
import org.fudaa.dodico.objet.CExecListener;
***************
*** 63,67 ****
}
protected void initEtat() {
! setEtat(DodicoLib.EMPTY_STRING, 0);
}
protected void _calcul(ProgressionInterface _progress) {
--- 64,68 ----
}
protected void initEtat() {
! setEtat(CtuluLib.EMPTY_STRING, 0);
}
protected void _calcul(ProgressionInterface _progress) {
***************
*** 79,87 ****
exe_.setUI(impl_);
exe_.setProgression(_progress);
! exe_.launch(f, this);
actionToDoJustAfterLaunching();
setEtat(
FudaaResource.getS("Le calcul est terminé:")
! + DodicoLib.LINE_SEP
+ f.getAbsolutePath(),
100);
--- 80,88 ----
exe_.setUI(impl_);
exe_.setProgression(_progress);
! exe_.launch(f, this);
actionToDoJustAfterLaunching();
setEtat(
FudaaResource.getS("Le calcul est terminé:")
! + CtuluLib.LINE_SEP
+ f.getAbsolutePath(),
100);
|
|
From: <de...@us...> - 2003-12-12 10:58:44
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/aide In directory sc8-pr-cvs1:/tmp/cvs-serv25602/aide Modified Files: FudaaAstuces.java Log Message: Deplacement FileChooser Index: FudaaAstuces.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/aide/FudaaAstuces.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** FudaaAstuces.java 25 Nov 2003 10:13:28 -0000 1.4 --- FudaaAstuces.java 12 Dec 2003 10:58:41 -0000 1.5 *************** *** 8,16 **** */ package org.fudaa.fudaa.commun.aide; import com.memoire.bu.BuPreferences; ! import org.fudaa.dodico.commun.DodicoLib; import org.fudaa.fudaa.commun.FudaaPreferences; import org.fudaa.fudaa.ressource.FudaaResource; - import java.io.*; /** * Classe de gestion des astuces --- 8,21 ---- */ package org.fudaa.fudaa.commun.aide; + import java.io.BufferedInputStream; + import java.io.InputStreamReader; + import java.io.LineNumberReader; + + import org.fudaa.ctulu.CtuluLib; + import com.memoire.bu.BuPreferences; ! import org.fudaa.fudaa.commun.FudaaPreferences; import org.fudaa.fudaa.ressource.FudaaResource; /** * Classe de gestion des astuces *************** *** 63,67 **** public String getAstuceRecursif(int i) { if ((i < 1) || (i > getNombreLigneTotal())) { ! return DodicoLib.LINE_SEP + FudaaResource.getS("Pas d'astuces trouvées"); } int nombreInf= 0; --- 68,72 ---- public String getAstuceRecursif(int i) { if ((i < 1) || (i > getNombreLigneTotal())) { ! return CtuluLib.LINE_SEP + FudaaResource.getS("Pas d'astuces trouvées"); } int nombreInf= 0; *************** *** 76,80 **** } } ! return DodicoLib.LINE_SEP + FudaaResource.getS("Pas d'astuces trouvées"); } /** --- 81,85 ---- } } ! return CtuluLib.LINE_SEP + FudaaResource.getS("Pas d'astuces trouvées"); } /** *************** *** 136,141 **** */ protected String lecture(int i) { ! String retour= ! DodicoLib.LINE_SEP + FudaaResource.getS("Astuce non trouvée"); int nombreLigneLu= 0; try { --- 141,145 ---- */ protected String lecture(int i) { ! String retour= CtuluLib.LINE_SEP + FudaaResource.getS("Astuce non trouvée"); int nombreLigneLu= 0; try { |
Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/tableau In directory sc8-pr-cvs1:/tmp/cvs-serv25251/tableau Removed Files: FudaaCellBooleanEditor.java FudaaCellBooleanRenderer.java FudaaCellDecorator.java FudaaCellDialogEditor.java FudaaCellFileEditor.java FudaaCellRenderer.java FudaaCellRendererRowHeader.java FudaaCellTextRenderer.java FudaaPanelListEditor.java FudaaPanelListEditorModel.java Log Message: suppression Fudaa* --- FudaaCellBooleanEditor.java DELETED --- --- FudaaCellBooleanRenderer.java DELETED --- --- FudaaCellDecorator.java DELETED --- --- FudaaCellDialogEditor.java DELETED --- --- FudaaCellFileEditor.java DELETED --- --- FudaaCellRenderer.java DELETED --- --- FudaaCellRendererRowHeader.java DELETED --- --- FudaaCellTextRenderer.java DELETED --- --- FudaaPanelListEditor.java DELETED --- --- FudaaPanelListEditorModel.java DELETED --- |
|
From: <de...@us...> - 2003-12-12 10:52:31
|
Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/filechooser
In directory sc8-pr-cvs1:/tmp/cvs-serv24894/filechooser
Modified Files:
EbliFavoriteFiles.java
Log Message:
renommage Fudaa* en Ebli*
Index: EbliFavoriteFiles.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/filechooser/EbliFavoriteFiles.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** EbliFavoriteFiles.java 12 Dec 2003 10:32:09 -0000 1.1
--- EbliFavoriteFiles.java 12 Dec 2003 10:52:25 -0000 1.2
***************
*** 34,40 ****
import org.fudaa.ebli.dialog.EbliSimpleDialogPanel;
import org.fudaa.ebli.ressource.EbliResource;
! import org.fudaa.ebli.tableau.FudaaCellTextRenderer;
! import org.fudaa.ebli.tableau.FudaaPanelListEditor;
! import org.fudaa.ebli.tableau.FudaaPanelListEditorModel;
/**
* @author deniger
--- 34,40 ----
import org.fudaa.ebli.dialog.EbliSimpleDialogPanel;
import org.fudaa.ebli.ressource.EbliResource;
! import org.fudaa.ebli.tableau.EbliCellTextRenderer;
! import org.fudaa.ebli.tableau.EbliPanelListEditor;
! import org.fudaa.ebli.tableau.EbliPanelListEditorModel;
/**
* @author deniger
***************
*** 143,147 ****
final FavoriteModel model= new FavoriteModel();
final JComboBox j= new JComboBox(model);
! FudaaCellTextRenderer cellRenderer= new FudaaCellTextRenderer() {
protected void setValue(Object value) {
String s= (String)value;
--- 143,147 ----
final FavoriteModel model= new FavoriteModel();
final JComboBox j= new JComboBox(model);
! EbliCellTextRenderer cellRenderer= new EbliCellTextRenderer() {
protected void setValue(Object value) {
String s= (String)value;
***************
*** 179,188 ****
bt.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent _ae) {
! FudaaPanelListEditorModel listmodel=
! new FudaaPanelListEditorModel(list_, false);
! FudaaPanelListEditor editor=
! new FudaaPanelListEditor(listmodel, false, true, false) {
public void initCellRendererEditor() {
! FudaaCellTextRenderer txt= new FudaaCellTextRenderer();
txt.setIcon(BuResource.BU.getToolIcon("ouvrir"));
table_.getColumnModel().getColumn(0).setCellRenderer(txt);
--- 179,188 ----
bt.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent _ae) {
! EbliPanelListEditorModel listmodel=
! new EbliPanelListEditorModel(list_, false);
! EbliPanelListEditor editor=
! new EbliPanelListEditor(listmodel, false, true, false) {
public void initCellRendererEditor() {
! EbliCellTextRenderer txt= new EbliCellTextRenderer();
txt.setIcon(BuResource.BU.getToolIcon("ouvrir"));
table_.getColumnModel().getColumn(0).setCellRenderer(txt);
|
|
From: <de...@us...> - 2003-12-12 10:52:31
|
Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/ressource In directory sc8-pr-cvs1:/tmp/cvs-serv24894/ressource Modified Files: ebli_en.fr_txt Log Message: renommage Fudaa* en Ebli* Index: ebli_en.fr_txt =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/ressource/ebli_en.fr_txt,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ebli_en.fr_txt 12 Dec 2003 10:32:09 -0000 1.6 --- ebli_en.fr_txt 12 Dec 2003 10:52:25 -0000 1.7 *************** *** 104,106 **** Supprimer les éléments sélectionnés=Delete selected items Modifier=Modify ! Modifier l'élément sélectionner=Modify the selected item \ No newline at end of file --- 104,110 ---- Supprimer les éléments sélectionnés=Delete selected items Modifier=Modify ! Modifier l'élément sélectionner=Modify the selected item ! Enlever une formule=Add a formula ! Ajouter une formuleRemove a formula ! Tableau=Table ! Formule=Formula \ No newline at end of file |
|
From: <de...@us...> - 2003-12-12 10:32:13
|
Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/graphe
In directory sc8-pr-cvs1:/tmp/cvs-serv21927/graphe
Modified Files:
Axe.java BGraphe.java Contrainte.java CourbeAbstract.java
CourbeDefault.java Graphe.java GrapheComponent.java
Repartition.java
Added Files:
CourbeDataModel.java CourbeModelAbstract.java
CourbeModelDefault.java
Removed Files:
CourbeModel.java
Log Message:
Deplacement du package tableau et filechooser
--- NEW FILE: CourbeDataModel.java ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: CourbeModelAbstract.java ---
/*
* @file Courbe.java
* @creation 1999-07-29
* @modification $Date: 2003/12/12 10:32:09 $
* @license GNU General Public License 2
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
* @mail de...@fu...
*/
package org.fudaa.ebli.graphe;
import java.awt.*;
import java.util.Vector;
/**
* Courbe
*
* @version $Revision: 1.1 $ $Date: 2003/12/12 10:32:09 $ by $Author: deniger $
* @author Guillaume Desnoix
* @see Graphe
*/
public abstract class CourbeModelAbstract extends CourbeAbstract {
/**
*
*/
public void dessine(
Graphics2D g,
int x,
int y,
int w,
int h,
Axe ax,
Axe ay,
boolean b) {
if (!visible)
return;
int nb= getNbPoint();
if (nb == 0)
return;
int xp= 0;
int yp= 0;
int xmin= x;
int xmax= x + w;
int ymin= y;
int ymax= y + h;
double xCoef= ((double)w) / ((double) (ax.maximum - ax.minimum));
double yCoef= -((double)h) / ((double) (ay.maximum - ay.minimum));
double yBase=(double)y+h;
double xBase=(double)x;
Color old= g.getColor();
if (marqueurs) {
g.setColor(getAspectTexte());
for (int i= nb - 1; i >= 0; i--) {
xp= (int) (xBase + xCoef * (double)(getX(i) - ax.minimum));
yp= (int) (yBase+ yCoef * (double)(getY(i) - ay.minimum));
if ((xp >= xmin) && (xp <= xmax) && (yp >= ymin) && (yp <= ymax)) {
System.out.println("dessine "+xp+" , "+yp);
g.drawRect(xp - 1, yp - 1, 2, 2);
}
}
}
int x0= (int) (xBase + xCoef * (double)(getX(nb - 1) - ax.minimum));
int y0= (int) (yBase + yCoef * (double)(getY(nb - 1) - ay.minimum));
boolean x0InClip=
(x0 >= xmin) && (x0 <= xmax) && (y0 >= ymin) && (y0 <= ymax);
boolean xpInClip= false;
g.setColor(getAspectContour());
for (int i= nb - 2; i >= 0; i--) {
xp= (int) (xBase + xCoef * (double)(getX(i) - ax.minimum));
yp= (int) (yBase + yCoef * (double)(getY(i) - ay.minimum));
xpInClip= (xp >= xmin) && (xp <= xmax) && (yp >= ymin) && (yp <= ymax);
if (x0InClip || xpInClip) {
g.drawLine(x0, y0, xp, yp);
}
x0InClip= xpInClip;
x0= xp;
y0= yp;
}
g.setColor(old);
}
public abstract int getNbPoint();
public abstract double getX(int _idx);
public abstract double getY(int _idx);
}
--- NEW FILE: CourbeModelDefault.java ---
(This appears to be a binary file; contents omitted.)
Index: Axe.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/graphe/Axe.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Axe.java 11 Dec 2003 12:41:52 -0000 1.6
--- Axe.java 12 Dec 2003 10:32:09 -0000 1.7
***************
*** 19,23 ****
* @see Graphe
*/
! public class Axe{
public static boolean DEBUG= BGraphe.DEBUG;
public String titre;
--- 19,23 ----
* @see Graphe
*/
! public class Axe {
public static boolean DEBUG= BGraphe.DEBUG;
public String titre;
***************
*** 89,93 ****
return r;
}
! void dessine(Graphics2D g, int x, int y, int w, int h) {
if (!visible)
return;
--- 89,93 ----
return r;
}
! public void dessine(Graphics2D g, int x, int y, int w, int h) {
if (!visible)
return;
***************
*** 122,133 ****
Math.min(255, gc + incr),
Math.min(255, bc + incr));
! if (graduations || grille)
for (double s= minimum; s <= maximum; s += pas) {
g.setColor(lightfg);
// HACK: NumberFormat (jdk1.1)
! java.text.NumberFormat nf=
! java.text.NumberFormat.getInstance(java.util.Locale.US);
! nf.setMaximumFractionDigits(2);
! nf.setGroupingUsed(false);
if (vertical) {
int ye=
--- 122,135 ----
Math.min(255, gc + incr),
Math.min(255, bc + incr));
!
! if (graduations || grille) {
! java.text.NumberFormat nf=
! java.text.NumberFormat.getInstance(java.util.Locale.US);
! nf.setMaximumFractionDigits(2);
! nf.setGroupingUsed(false);
for (double s= minimum; s <= maximum; s += pas) {
g.setColor(lightfg);
// HACK: NumberFormat (jdk1.1)
!
if (vertical) {
int ye=
***************
*** 155,158 ****
--- 157,161 ----
}
}
+ }
t= titre;
if (!unite.equals(""))
***************
*** 184,186 ****
--- 187,203 ----
}
}
+ /**
+ *
+ */
+ public String getTitre() {
+ return titre;
+ }
+
+ /**
+ *
+ */
+ public boolean isVisible() {
+ return visible;
+ }
+
}
Index: BGraphe.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/graphe/BGraphe.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** BGraphe.java 25 Nov 2003 10:06:43 -0000 1.6
--- BGraphe.java 12 Dec 2003 10:32:09 -0000 1.7
***************
*** 14,17 ****
--- 14,18 ----
import java.awt.Graphics2D;
import java.awt.Image;
+ import java.awt.Insets;
import java.awt.PrintJob;
import java.awt.Rectangle;
***************
*** 579,582 ****
--- 580,584 ----
System.err.println("BGraphe : FULL");
}
+ Insets insets=getInsets();
graphe.dessine(cg, 0, 0, size.width, size.height, 0, this);
if (cg != g) {
***************
*** 588,592 ****
+ cache_.getHeight(this));
}
! g.drawImage(cache_, 0, 0, this);
}
} else {
--- 590,594 ----
+ cache_.getHeight(this));
}
! g.drawImage(cache_, 0,0, this);
}
} else {
***************
*** 594,598 ****
System.err.println("BGraphe : CACH");
}
! g.drawImage(cache_, 0, 0, this);
}
}
--- 596,600 ----
System.err.println("BGraphe : CACH");
}
! g.drawImage(cache_, 0,0, this);
}
}
Index: Contrainte.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/graphe/Contrainte.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Contrainte.java 25 Nov 2003 10:06:43 -0000 1.4
--- Contrainte.java 12 Dec 2003 10:32:09 -0000 1.5
***************
*** 16,20 ****
* @see Graphe
*/
! public class Contrainte {
public String titre;
public boolean visible;
--- 16,20 ----
* @see Graphe
*/
! public class Contrainte implements GrapheComponent{
public String titre;
public boolean visible;
***************
*** 68,72 ****
return r;
}
! void dessine(Graphics g, int x, int y, int w, int h, Axe ax, Axe ay) {
if (!visible)
return;
--- 68,72 ----
return r;
}
! public void dessine(Graphics2D g, int x, int y, int w, int h, Axe ax, Axe ay,boolean _b) {
if (!visible)
return;
***************
*** 137,139 ****
--- 137,194 ----
}
}
+
+ public final boolean isCourbe(){
+ return false;
+ }
+
+
+ /**
+ *
+ */
+ public String getTitre() {
+ return titre;
+ }
+
+ /**
+ *
+ */
+ public boolean isVisible() {
+ return visible;
+ }
+
+ /**
+ *
+ */
+ public int getAxeId() {
+ return axe;
+ }
+
+ /**
+ *
+ */
+ public Color getAspectContour() {
+ return Color.white;
+ }
+
+ /**
+ *
+ */
+ public Color getAspectSurface() {
+ return Color.white;
+ }
+
+ /**
+ *
+ */
+ public Color getAspectTexte() {
+ return couleur;
+ }
+
+ /**
+ *
+ */
+ public final boolean isLegendAvailable() {
+ return false;
+ }
+
}
Index: CourbeAbstract.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/graphe/CourbeAbstract.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CourbeAbstract.java 11 Dec 2003 12:41:52 -0000 1.1
--- CourbeAbstract.java 12 Dec 2003 10:32:09 -0000 1.2
***************
*** 43,47 ****
*
*/
! public int getAxeIdx() {
return axe;
}
--- 43,47 ----
*
*/
! public int getAxeId() {
return axe;
}
***************
*** 80,83 ****
--- 80,90 ----
public boolean isVisible() {
return visible;
+ }
+
+ /**
+ *
+ */
+ public final boolean isLegendAvailable() {
+ return true;
}
Index: CourbeDefault.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/graphe/CourbeDefault.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CourbeDefault.java 11 Dec 2003 12:41:52 -0000 1.1
--- CourbeDefault.java 12 Dec 2003 10:32:09 -0000 1.2
***************
*** 162,166 ****
Axe ax,
Axe ay,
! boolean b) {
if (!visible)
return;
--- 162,166 ----
Axe ax,
Axe ay,
! boolean _couleurAspect) {
if (!visible)
return;
***************
*** 172,179 ****
trieX();
type= "enveloppex";
! dessine(g, x, y, w, h, ax, ay, b);
trieY();
type= "enveloppey";
! dessine(g, x, y, w, h, ax, ay, b);
return;
}
--- 172,179 ----
trieX();
type= "enveloppex";
! dessine(g, x, y, w, h, ax, ay, _couleurAspect);
trieY();
type= "enveloppey";
! dessine(g, x, y, w, h, ax, ay, _couleurAspect);
return;
}
***************
*** 193,197 ****
- (int) ((double)h * ((o1.v - ay.minimum) / (ay.maximum - ay.minimum)));
Polygon polygon= new Polygon();
! g.setColor(b ? aspect.contour : Color.gray);
if (trace.equals("lineaire")) {
for (int i= 0; i < valeurs.size(); i++) {
--- 193,197 ----
- (int) ((double)h * ((o1.v - ay.minimum) / (ay.maximum - ay.minimum)));
Polygon polygon= new Polygon();
! g.setColor(_couleurAspect ? aspect.contour : Color.gray);
if (trace.equals("lineaire")) {
for (int i= 0; i < valeurs.size(); i++) {
***************
*** 207,221 ****
* ((o.v - ay.minimum) / (ay.maximum - ay.minimum)));
if (type.equals("nuage")) {
! g.setColor(b ? aspect.contour : Color.gray);
g.drawLine(xe, ye, xe, ye);
} else if (type.equals("enveloppex")) {
int xg[]= { x0, xe, x1 };
int yg[]= { y0, ye, y1 };
! g.setColor(b ? aspect.surface : Color.lightGray);
g.fillPolygon(xg, yg, 3);
} else if (type.equals("enveloppey")) {
int xg[]= { x0, xe, x1 };
int yg[]= { y0, ye, y1 };
! g.setColor(b ? aspect.surface : Color.lightGray);
g.fillPolygon(xg, yg, 3);
} else if (type.equals("histogramme")) {
--- 207,221 ----
* ((o.v - ay.minimum) / (ay.maximum - ay.minimum)));
if (type.equals("nuage")) {
! g.setColor(_couleurAspect ? aspect.contour : Color.gray);
g.drawLine(xe, ye, xe, ye);
} else if (type.equals("enveloppex")) {
int xg[]= { x0, xe, x1 };
int yg[]= { y0, ye, y1 };
! g.setColor(_couleurAspect ? aspect.surface : Color.lightGray);
g.fillPolygon(xg, yg, 3);
} else if (type.equals("enveloppey")) {
int xg[]= { x0, xe, x1 };
int yg[]= { y0, ye, y1 };
! g.setColor(_couleurAspect ? aspect.surface : Color.lightGray);
g.fillPolygon(xg, yg, 3);
} else if (type.equals("histogramme")) {
***************
*** 227,233 ****
(int) ((double)w
* ((aspect.largeur - ax.minimum) / (ax.maximum - ax.minimum)));
! g.setColor(b ? aspect.surface : Color.lightGray);
g.fillRect(xe - l / 2, ye, l, y + h - ye - 1);
! g.setColor(b ? aspect.contour : Color.gray);
g.drawLine(xe - l / 2, y + h - 1, xe - l / 2, ye);
g.drawLine(xe - l / 2, ye, xe + l / 2, ye);
--- 227,233 ----
(int) ((double)w
* ((aspect.largeur - ax.minimum) / (ax.maximum - ax.minimum)));
! g.setColor(_couleurAspect ? aspect.surface : Color.lightGray);
g.fillRect(xe - l / 2, ye, l, y + h - ye - 1);
! g.setColor(_couleurAspect ? aspect.contour : Color.gray);
g.drawLine(xe - l / 2, y + h - 1, xe - l / 2, ye);
g.drawLine(xe - l / 2, ye, xe + l / 2, ye);
***************
*** 244,252 ****
- (int) ((double)h
* ((o.vsup - ay.minimum) / (ay.maximum - ay.minimum)));
! g.setColor(b ? aspect.surface : Color.lightGray);
g.drawLine(xe, yeinf, xe, yesup);
g.drawLine(xe - 2, yeinf, xe + 2, yeinf);
g.drawLine(xe - 2, yesup, xe + 2, yesup);
! g.setColor(b ? aspect.contour : Color.gray);
g.drawLine(xe - 2, ye, xe + 2, ye);
} else if (type.equals("polygone")) {
--- 244,252 ----
- (int) ((double)h
* ((o.vsup - ay.minimum) / (ay.maximum - ay.minimum)));
! g.setColor(_couleurAspect ? aspect.surface : Color.lightGray);
g.drawLine(xe, yeinf, xe, yesup);
g.drawLine(xe - 2, yeinf, xe + 2, yeinf);
g.drawLine(xe - 2, yesup, xe + 2, yesup);
! g.setColor(_couleurAspect ? aspect.contour : Color.gray);
g.drawLine(xe - 2, ye, xe + 2, ye);
} else if (type.equals("polygone")) {
***************
*** 256,262 ****
int xg[]= { xp, xe, xe, xp };
int yg[]= { yp, ye, y + h - 1, y + h - 1 };
! g.setColor(b ? aspect.surface : Color.lightGray);
g.fillPolygon(xg, yg, 4);
! g.setColor(b ? aspect.contour : Color.gray);
}
g.drawLine(xp, yp, xe, ye);
--- 256,262 ----
int xg[]= { xp, xe, xe, xp };
int yg[]= { yp, ye, y + h - 1, y + h - 1 };
! g.setColor(_couleurAspect ? aspect.surface : Color.lightGray);
g.fillPolygon(xg, yg, 4);
! g.setColor(_couleurAspect ? aspect.contour : Color.gray);
}
g.drawLine(xp, yp, xe, ye);
***************
*** 266,272 ****
}
if (type.equals("polygone")) {
! g.setColor(b ? aspect.surface : Color.lightGray);
g.fillPolygon(polygon);
! g.setColor(b ? aspect.contour : Color.gray);
g.drawPolygon(polygon);
}
--- 266,272 ----
}
if (type.equals("polygone")) {
! g.setColor(_couleurAspect ? aspect.surface : Color.lightGray);
g.fillPolygon(polygon);
! g.setColor(_couleurAspect ? aspect.contour : Color.gray);
g.drawPolygon(polygon);
}
Index: Graphe.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/graphe/Graphe.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Graphe.java 11 Dec 2003 12:41:52 -0000 1.7
--- Graphe.java 12 Dec 2003 10:32:09 -0000 1.8
***************
*** 9,15 ****
package org.fudaa.ebli.graphe;
import java.applet.Applet;
! import java.awt.*;
! import java.awt.image.*;
import java.util.Vector;
/**
* Graphe
--- 9,24 ----
package org.fudaa.ebli.graphe;
import java.applet.Applet;
! import java.awt.Color;
! import java.awt.Font;
! import java.awt.FontMetrics;
! import java.awt.Graphics;
! import java.awt.Graphics2D;
! import java.awt.Image;
! import java.awt.Rectangle;
! import java.awt.Shape;
! import java.awt.image.ImageObserver;
import java.util.Vector;
+
+ import org.fudaa.ctulu.CtuluLib;
/**
* Graphe
***************
*** 20,24 ****
*/
public class Graphe {
! public String titre;
public String soustitre;
public boolean legende;
--- 29,33 ----
*/
public class Graphe {
! public String titre;
public String soustitre;
public boolean legende;
***************
*** 27,32 ****
public Marges marges;
private Vector elements;
! private Vector axes;
public Image fond;
public boolean copyright;
public boolean visible;
--- 36,45 ----
public Marges marges;
private Vector elements;
! private Vector axesVertical;
public Image fond;
+ private Axe ax;
+ private Font ftLegend;
+ private Font ftTitre;
+ private Font ftSousTitre;
public boolean copyright;
public boolean visible;
***************
*** 38,45 ****
vitesse= 1000;
marges= new Marges();
! elements= new Vector(0, 1);
fond= null;
copyright= true;
visible= true;
}
public static Graphe parse(Lecteur lin, Applet applet) {
--- 51,72 ----
vitesse= 1000;
marges= new Marges();
! elements= new Vector(10);
! axesVertical= new Vector(3);
! ax= new Axe();
fond= null;
copyright= true;
visible= true;
+ ftTitre=new Font("SansSerif", Font.BOLD, 14);
+ ftSousTitre=new Font("SansSerif", Font.PLAIN, 12);
+ ftLegend=new Font("SansSerif", Font.ITALIC, 10);
+ }
+
+ public Axe getHorizontalAxe(){
+ return ax;
+ }
+
+ public Axe getFirstVerticalAxe(){
+ if(axesVertical.size()>0) return (Axe)axesVertical.get(0);
+ else return null;
}
public static Graphe parse(Lecteur lin, Applet applet) {
***************
*** 69,73 ****
r.marges= Marges.parse(lin);
else if (t.equals("axe"))
! r.elements.addElement(Axe.parse(lin));
else if (t.equals("courbe"))
r.elements.addElement(CourbeDefault.parse(lin));
--- 96,100 ----
r.marges= Marges.parse(lin);
else if (t.equals("axe"))
! r.ajoute(Axe.parse(lin));
else if (t.equals("courbe"))
r.elements.addElement(CourbeDefault.parse(lin));
***************
*** 96,131 ****
h.titre= "X";
h.maximum= c.getMaxX();
! r.elements.addElement(v);
! r.elements.addElement(h);
r.elements.addElement(c);
return r;
}
!
! private final void addGrapheComponent(GrapheComponent _c){
! elements.add(_c);
}
!
public void ajoute(Axe a) {
! axes.add(a);
}
!
public void ajoute(Object el) {
! if (!((el instanceof Axe)
! || (el instanceof CourbeAbstract)
! || (el instanceof Repartition)
! || (el instanceof Contrainte))) {
! System.err.println(
! "Erreur: élément " + el.getClass().getName() + " inconnu");
! return;
}
! if (!elements.contains(el))
! elements.addElement(el);
}
public void enleve(Object el) {
! if (elements.contains(el))
! elements.removeElement(el);
}
public Object[] getElementsParType(Class c) {
Vector cs= new Vector();
for (int i= 0; i < elements.size(); i++)
if (elements.get(i).getClass() == c)
--- 123,178 ----
h.titre= "X";
h.maximum= c.getMaxX();
! r.axesVertical.addElement(v);
! r.axesVertical.addElement(h);
r.elements.addElement(c);
return r;
}
!
! public final void ajouteComponent(GrapheComponent _c) {
! if (!elements.contains(_c))
! elements.add(_c);
}
!
public void ajoute(Axe a) {
! if (a == null)
! return;
! if (a.vertical) {
! if (!axesVertical.contains(a))
! axesVertical.add(a);
! } else
! ax= a;
}
!
! public void ajoute(CourbeAbstract _c) {
! ajouteComponent(_c);
! }
!
! public void ajoute(Repartition _c) {
! ajouteComponent(_c);
! }
!
! public void ajoute(Contrainte _c) {
! ajouteComponent(_c);
! }
!
public void ajoute(Object el) {
! if (el instanceof Axe) {
! ajoute((Axe)el);
! } else if (el instanceof GrapheComponent) {
! ajouteComponent((GrapheComponent)el);
! } else {
! CtuluLib.error("élément " + el.getClass().getName() + " inconnu");
}
!
}
public void enleve(Object el) {
! elements.removeElement(el);
! axesVertical.remove(el);
}
public Object[] getElementsParType(Class c) {
Vector cs= new Vector();
+ if (c.equals(Axe.class)) {
+ return axesVertical.toArray();
+ }
for (int i= 0; i < elements.size(); i++)
if (elements.get(i).getClass() == c)
***************
*** 152,156 ****
Font f;
FontMetrics fm;
! f= new Font("SansSerif", Font.BOLD, 14);
g2d.setFont(f);
g2d.setColor(Color.black);
--- 199,203 ----
Font f;
FontMetrics fm;
! f= ftTitre;
g2d.setFont(f);
g2d.setColor(Color.black);
***************
*** 160,164 ****
x + (w - fm.stringWidth(titre)) / 2,
y + (marges.haut + f.getSize()) / 2);
! f= new Font("SansSerif", Font.PLAIN, 12);
g2d.setFont(f);
g2d.setColor(Color.black);
--- 207,211 ----
x + (w - fm.stringWidth(titre)) / 2,
y + (marges.haut + f.getSize()) / 2);
! f= ftSousTitre;
g2d.setFont(f);
g2d.setColor(Color.black);
***************
*** 168,171 ****
--- 215,219 ----
x + (w - fm.stringWidth(soustitre)) / 2,
y + marges.haut - 2);
+ int legendeYShift=y;
if (copyright) {
g2d.setColor(Color.orange);
***************
*** 174,188 ****
String t= "Ebli Graphique 1D - CETMEF 1997/2002";
fm= g2d.getFontMetrics();
! g2d.drawString(t, x + w - 2 - fm.stringWidth(t), y + f.getSize());
}
g2d.setColor(Color.black);
f= new Font("SansSerif", Font.PLAIN, 10);
g2d.setFont(f);
- Axe ax= new Axe();
- Vector ay= new Vector();
int nc= 0;
if (animation) {
! for (int i= 0; i < elements.size(); i++)
! if (elements.elementAt(i) instanceof CourbeAbstract)
nc++;
if (nc > 0)
--- 222,236 ----
String t= "Ebli Graphique 1D - CETMEF 1997/2002";
fm= g2d.getFontMetrics();
! g2d.drawString(t, x + w - 2 - fm.stringWidth(t), y + f.getSize()+5);
! legendeYShift=y + f.getSize()+5;
}
g2d.setColor(Color.black);
f= new Font("SansSerif", Font.PLAIN, 10);
g2d.setFont(f);
int nc= 0;
+ int nbElement= elements.size();
if (animation) {
! for (int i= 0; i < nbElement; i++)
! if (((GrapheComponent)elements.elementAt(i)).isCourbe())
nc++;
if (nc > 0)
***************
*** 190,340 ****
nc= 0;
}
for (int i= 0; i < elements.size(); i++) {
! Object o= elements.elementAt(i);
! if (o instanceof Axe) {
! Axe a= (Axe)o;
! if (a.vertical) {
! int n= ay.size();
! ay.add(a);
! a.dessine(
! g2d,
! x + marges.gauche - n * a.ecart,
! y + marges.haut,
! w - marges.gauche + n * a.ecart - marges.droite,
! h - marges.haut - marges.bas);
! } else {
! ax= a;
! a.dessine(
! g2d,
! x + marges.gauche,
! y + h - marges.bas,
! w - marges.gauche - marges.droite,
! h - marges.haut - marges.bas);
! }
! } else if (o instanceof CourbeAbstract) {
! CourbeAbstract c= (CourbeAbstract)o;
! Axe aay= null;
! if (ay.isEmpty())
! aay= new Axe();
! else
! aay= (Axe)ay.get(c.getAxeIdx());
if ((!animation) || (nr == nc)) {
! Shape old_clip= g2d.getClip();
! g2d.clip(
! new Rectangle(
! x + marges.gauche,
! y + marges.haut,
! w - marges.gauche - marges.droite,
! h - marges.haut - marges.bas));
! c.dessine(
! g2d,
! x + marges.gauche,
! y + marges.haut,
! w - marges.gauche - marges.droite,
! h - marges.haut - marges.bas,
! ax,
! aay,
! true);
! g2d.setClip(old_clip);
}
nc++;
! } else if (o instanceof Contrainte) {
! Contrainte c= (Contrainte)o;
! Axe aay= null;
! if (ay.isEmpty()) {
! aay= new Axe();
! } else {
! aay= (Axe)ay.get(c.axe);
! }
! c.dessine(
! g2d,
! x + marges.gauche,
! y + marges.haut,
! w - marges.gauche - marges.droite,
! h - marges.haut - marges.bas,
! ax,
! aay);
! } else if (o instanceof Repartition) {
! Repartition r= (Repartition)o;
! r.dessine(
! g2d,
! x + marges.gauche,
! y + marges.haut,
! w - marges.gauche - marges.droite,
! h - marges.haut - marges.bas,
! true);
! } else
! System.err.println("Erreur: " + o + " n'est pas dessine");
}
! if (legende) {
! f= new Font("SansSerif", Font.ITALIC, 10);
g2d.setFont(f);
! int yl= y + marges.haut;
! nc= 0;
! for (int i= 0; i < elements.size(); i++) {
! Object o= elements.elementAt(i);
! if (o instanceof CourbeAbstract) {
! CourbeAbstract c= (CourbeAbstract)o;
! if (((!animation) || (nr == nc))
! && !"".equals(c.getTitre())
! && c.isVisible()) {
! g2d.setColor(c.getAspectSurface());
! g2d.fillRect(x + w - marges.droite, yl + 5, 12, 4);
! g2d.setColor(c.getAspectContour());
! g2d.drawLine(
! x + w - marges.droite,
! yl + 5,
! x + w - marges.droite + 11,
! yl + 5);
! // 8
! // HACK de AvA: on double le trait pour mieux en voir la couleur
! g2d.drawLine(
! x + w - marges.droite,
! yl + 5 + 1,
! x + w - marges.droite + 11,
! yl + 5 + 1);
! // 8
! g2d.setColor(c.getAspectTexte());
! g2d.drawString(c.getTitre(), x + w - marges.droite + 15, yl + 8);
! yl += 12;
! }
! nc++;
! } else if (o instanceof Repartition) {
! Repartition c= (Repartition)o;
! for (int j= 0; j < c.valeurs.size(); j++) {
! Valeur v= (Valeur)c.valeurs.elementAt(j);
! if (((!animation) || (nr == nc)) && c.visible) {
! if (v.aspect.surface != null) {
! g2d.setColor(v.aspect.surface);
! g2d.fillRect(x + w - marges.droite, yl + 5, 12, 4);
! } else {
! g2d.setColor(v.aspect.contour);
! g2d.drawLine(
! x + w - marges.droite,
! yl + 5,
! x + w - marges.droite + 11,
! yl + 5);
! // 8
! // HACK de AvA: on double le trait pour mieux en voir la couleur
! g2d.drawLine(
! x + w - marges.droite,
! yl + 5 + 1,
! x + w - marges.droite + 11,
! yl + 5 + 1);
! // 8
! }
! g2d.setColor(v.aspect.texte);
! g2d.drawString(
! v.s + " " + v.titre,
! x + w - marges.droite + 15,
! yl + 8);
! yl += 12;
! }
! nc++;
! }
}
}
}
}
}
--- 238,374 ----
nc= 0;
}
+ int nbAxe= axesVertical.size();
+ int hMarge= h - marges.haut - marges.bas;
+ int wMarge= w - marges.gauche - marges.droite;
+ int xMarge= x + marges.gauche;
+ int yMarge= y + marges.haut;
+ for (int i= 0; i < nbAxe; i++) {
+ Axe a= (Axe)axesVertical.get(i);
+ a.dessine(
+ g2d,
+ xMarge - i * a.ecart,
+ yMarge,
+ wMarge + i * a.ecart,
+ hMarge);
+ }
+ //dessine axe horizontal
+ ax.dessine(g2d, xMarge, yMarge + hMarge, wMarge, hMarge);
+ Axe aayDefault= null;
+ Shape old_clip= g2d.getClip();
+ g2d.clip(new Rectangle(xMarge, yMarge, wMarge, hMarge));
for (int i= 0; i < elements.size(); i++) {
! GrapheComponent o= (GrapheComponent)elements.elementAt(i);
! int axe= o.getAxeId();
! Axe aay= null;
! if (axe >= 0) {
! if (axe >= axesVertical.size()) {
! if (aayDefault == null)
! aayDefault= new Axe();
! aay= aayDefault;
! } else
! aay= (Axe)axesVertical.get(axe);
! }
!
! if (o.isCourbe()) {
if ((!animation) || (nr == nc)) {
! o.dessine(g2d, xMarge, yMarge, wMarge, hMarge, ax, aay, true);
}
nc++;
!
! } else {
! o.dessine(g2d, xMarge, yMarge, wMarge, hMarge, ax, aay, true);
! }
}
! g2d.setClip(old_clip);
! if (legende && !animation) {
! f= ftLegend;
g2d.setFont(f);
! //on dessine a partir de 15 du haut.
! int maxWidthForLegend= 0;
! int temp;
! fm= g2d.getFontMetrics();
! for (int i= nbElement - 1; i >= 0; i--) {
! GrapheComponent c= (GrapheComponent)elements.get(i);
! if (c.isLegendAvailable() && c.isVisible()) {
! temp= fm.stringWidth(c.getTitre());
! if (temp > maxWidthForLegend)
! maxWidthForLegend= temp;
}
}
+ if (maxWidthForLegend == 0) {
+ return;
+ }
+ int wRect= 12;
+ int hRect= 4;
+ int wTrait= 11;
+ int hTrait= hRect / 2;
+ int xLeft= x + w - 15 - maxWidthForLegend - (marges.droite/2) - wRect;
+ int xTitre= xLeft + wRect + 15;
+ int hLine= fm.getHeight();
+ //Au cas ou la hauteur de ligne soit inferieur a la hauteur du carre.
+ if (hLine < (hRect + 2))
+ hLine= hRect + 2;
+ int yl= legendeYShift + 10 + hLine;
+ Color old= g2d.getColor();
+ for (int i= 0; i < nbElement; i++) {
+ GrapheComponent c= (GrapheComponent)elements.get(i);
+ if (c.isLegendAvailable()
+ && c.isVisible()
+ && (c.getTitre() != null)
+ && (c.getTitre().length() > 0)) {
+ g2d.setColor(c.getAspectSurface());
+ g2d.fillRect(xLeft, yl - hRect, wRect, hRect);
+ g2d.setColor(c.getAspectContour());
+ g2d.fillRect(xLeft, yl - ((hRect-hTrait)/ 2)-hTrait, wTrait, hTrait);
+ g2d.drawString(c.getTitre(), xTitre, yl);
+
+ }
+ yl += hLine;
+ }
+ g2d.setColor(old);
}
}
+ /**
+ *
+ */
+ public Font getFtLegend() {
+ return ftLegend;
+ }
+
+ /**
+ *
+ */
+ public Font getFtSousTitre() {
+ return ftSousTitre;
+ }
+
+ /**
+ *
+ */
+ public Font getFtTitre() {
+ return ftTitre;
+ }
+
+ /**
+ *
+ */
+ public void setFtLegend(Font _font) {
+ ftLegend= _font;
+ }
+
+ /**
+ *
+ */
+ public void setFtSousTitre(Font _font) {
+ ftSousTitre= _font;
+ }
+
+ /**
+ *
+ */
+ public void setFtTitre(Font _font) {
+ ftTitre= _font;
+ }
+
}
Index: GrapheComponent.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/graphe/GrapheComponent.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GrapheComponent.java 11 Dec 2003 12:41:52 -0000 1.1
--- GrapheComponent.java 12 Dec 2003 10:32:09 -0000 1.2
***************
*** 30,33 ****
--- 30,40 ----
public String getTitre();
public boolean isVisible();
+ public boolean isCourbe();
+ /**
+ * Renvoie l'index de l'axe requis.
+ * @return -1 si pas d'axe necessaire
+ */
+ public int getAxeId();
+ public boolean isLegendAvailable();
public Color getAspectSurface();
public Color getAspectContour();
Index: Repartition.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/graphe/Repartition.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Repartition.java 25 Nov 2003 10:06:43 -0000 1.4
--- Repartition.java 12 Dec 2003 10:32:09 -0000 1.5
***************
*** 17,21 ****
* @see Graphe
*/
! public class Repartition {
public String titre;
public String type;
--- 17,21 ----
* @see Graphe
*/
! public class Repartition implements GrapheComponent{
public String titre;
public String type;
***************
*** 64,68 ****
return r;
}
! void dessine(Graphics g, int x, int y, int w, int h, boolean b) {
if (!visible)
return;
--- 64,70 ----
return r;
}
! public void dessine(Graphics2D g, int x, int y, int w, int h,Axe ax,
! Axe ay,
! boolean b) {
if (!visible)
return;
***************
*** 112,114 ****
--- 114,169 ----
}
}
+ /**
+ *
+ */
+ public Color getAspectContour() {
+ return aspect.contour;
+ }
+
+ /**
+ *
+ */
+ public Color getAspectSurface() {
+ return aspect.surface;
+ }
+
+ /**
+ *
+ */
+ public Color getAspectTexte() {
+ return aspect.texte;
+ }
+
+ /**
+ *
+ */
+ public String getTitre() {
+ return titre;
+ }
+
+ /**
+ *
+ */
+ public boolean isVisible() {
+ return visible;
+ }
+
+ public final boolean isCourbe(){
+ return false;
+ }
+
+ /**
+ *
+ */
+ public int getAxeId() {
+ return -1;
+ }
+
+ /**
+ *
+ */
+ public final boolean isLegendAvailable() {
+ return true;
+ }
+
}
--- CourbeModel.java DELETED ---
|
|
From: <de...@us...> - 2003-12-12 10:32:12
|
Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/test
In directory sc8-pr-cvs1:/tmp/cvs-serv21927/test
Modified Files:
TestGraphe.java essai.gdf
Log Message:
Deplacement du package tableau et filechooser
Index: TestGraphe.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/test/TestGraphe.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TestGraphe.java 25 Nov 2003 10:06:47 -0000 1.5
--- TestGraphe.java 12 Dec 2003 10:32:09 -0000 1.6
***************
*** 83,87 ****
}
public void paint(Graphics g) {
! g.drawImage(tampon, 0, 0, this);
}
public void update(Graphics g) {
--- 83,88 ----
}
public void paint(Graphics g) {
! Insets insets=getInsets();
! g.drawImage(tampon, insets.left, insets.top, this);
}
public void update(Graphics g) {
Index: essai.gdf
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/test/essai.gdf,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** essai.gdf 11 Dec 2003 12:41:52 -0000 1.1
--- essai.gdf 12 Dec 2003 10:32:09 -0000 1.2
***************
*** 1,11 ****
graphe
{
legende oui
marges
{
droite 50
! gauche 1
! haut 1
! bas 1
}
courbe
--- 1,30 ----
graphe
{
+ titre essai
legende oui
+ axe
+ {
+ orientation vertical
+ minimum 0
+ maximum 60
+ graduations oui
+ pas 10
+ titre Y
+ }
+ axe
+ {
+ minimum 0
+ maximum 60
+ graduations oui
+ pas 10
+ titre X
+ }
+
marges
{
droite 50
! gauche 50
! haut 50
! bas 50
}
courbe
|
|
From: <de...@us...> - 2003-12-12 10:32:12
|
Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/filechooser
In directory sc8-pr-cvs1:/tmp/cvs-serv21927/filechooser
Added Files:
EbliFavoriteFiles.java EbliFileChooser.java
Log Message:
Deplacement du package tableau et filechooser
--- NEW FILE: EbliFavoriteFiles.java ---
/*
* @file FudaaFavoriteFiles.java
* @creation 23 juin 2003
* @modification $Date: 2003/12/12 10:32:09 $
* @license GNU General Public License 2
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
* @mail de...@fu...
*/
package org.fudaa.ebli.filechooser;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.io.File;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Enumeration;
import java.util.List;
import javax.swing.AbstractListModel;
import javax.swing.JComboBox;
import javax.swing.JComponent;
import javax.swing.JFileChooser;
import javax.swing.JLabel;
import javax.swing.MutableComboBoxModel;
import com.memoire.bu.BuBorderLayout;
import com.memoire.bu.BuButtonLayout;
import com.memoire.bu.BuPanel;
import com.memoire.bu.BuPreferences;
import com.memoire.bu.BuResource;
import com.memoire.bu.BuToolButton;
import org.fudaa.ebli.dialog.EbliSimpleDialogPanel;
import org.fudaa.ebli.ressource.EbliResource;
import org.fudaa.ebli.tableau.FudaaCellTextRenderer;
import org.fudaa.ebli.tableau.FudaaPanelListEditor;
import org.fudaa.ebli.tableau.FudaaPanelListEditorModel;
/**
* @author deniger
* @version $Id: EbliFavoriteFiles.java,v 1.1 2003/12/12 10:32:09 deniger Exp $
*/
public class EbliFavoriteFiles {
public static final String PREF_ID= "filechooser.favorite";
public static final String PREF_LAST= "filechooser.last.dir";
public static final EbliFavoriteFiles INSTANCE= new EbliFavoriteFiles();
List list_;
/**
*
*/
private EbliFavoriteFiles() {
loadFavorites();
}
private void loadFavorites() {
list_= new ArrayList(20);
for (Enumeration e= BuPreferences.BU.keys(); e.hasMoreElements();) {
String k= (String)e.nextElement();
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 {
list_.add(val);
}
}
}
Collections.sort(list_);
}
private class FavoriteModel
extends AbstractListModel
implements MutableComboBoxModel {
Object selected_;
/**
*
*/
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);
}
}
public boolean contains(Object o) {
return list_.contains(o);
}
public void addElement(Object obj) {
if (obj instanceof String) {
list_.add(obj);
Collections.sort(list_);
fireContentsChanged(this, 0, list_.size());
}
}
/**
* Adds an item at a specific index
*/
public void insertElementAt(Object obj, int index) {
addElement(obj);
}
/**
* Removes an item at a specific index
*/
public void removeElementAt(int _i) {
if (_i >= 0) {
list_.remove(_i);
fireIntervalRemoved(this, _i, _i);
}
}
protected void update() {
if (list_.contains(getSelectedItem())) {
setSelectedItem(null);
}
fireContentsChanged(this, 0, list_.size());
}
/**
*
*/
public Object getElementAt(int arg0) {
return list_.get(arg0);
}
/**
*
*/
public int getSize() {
return list_.size();
}
/**
*
*/
public void removeElement(Object obj) {
removeElementAt(list_.indexOf(obj));
}
}
public JComponent createComponent(final JFileChooser _f) {
BuPanel pn= new BuPanel();
pn.setLayout(new BuBorderLayout(2, 2));
JLabel lb= new JLabel(EbliResource.getS("Favoris") + ":");
pn.add(lb, BuBorderLayout.WEST);
final FavoriteModel model= new FavoriteModel();
final JComboBox j= new JComboBox(model);
FudaaCellTextRenderer cellRenderer= new FudaaCellTextRenderer() {
protected void setValue(Object value) {
String s= (String)value;
setToolTipText(s);
setText(s);
}
};
cellRenderer.setIcon(BuResource.BU.getToolIcon("ouvrir"));
j.setRenderer(cellRenderer);
j.addItemListener(new ItemListener() {
public void itemStateChanged(ItemEvent e) {
if (e.getStateChange() == ItemEvent.SELECTED) {
if (model.getSelectedItem() != null) {
_f.setCurrentDirectory(new File((String)model.getSelectedItem()));
}
}
}
});
pn.add(j, BuBorderLayout.CENTER);
BuToolButton bt= new BuToolButton(BuResource.BU.loadMenuCommandIcon("oui"));
bt.setToolTipText(
EbliResource.getS("Ajouter le répertoire courant aux favoris"));
bt.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent _ae) {
String s= _f.getCurrentDirectory().getAbsolutePath();
if (!list_.contains(s)) {
model.addElement(s);
}
}
});
BuPanel pnBt= new BuPanel();
pnBt.setLayout(new BuButtonLayout(1, BuButtonLayout.CENTER));
pnBt.add(bt);
bt= new BuToolButton(BuResource.BU.loadMenuCommandIcon("editer"));
bt.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent _ae) {
FudaaPanelListEditorModel listmodel=
new FudaaPanelListEditorModel(list_, false);
FudaaPanelListEditor editor=
new FudaaPanelListEditor(listmodel, false, true, false) {
public void initCellRendererEditor() {
FudaaCellTextRenderer txt= new FudaaCellTextRenderer();
txt.setIcon(BuResource.BU.getToolIcon("ouvrir"));
table_.getColumnModel().getColumn(0).setCellRenderer(txt);
}
};
EbliSimpleDialogPanel pn= new EbliSimpleDialogPanel();
pn.setLayout(new BuBorderLayout());
pn.add(editor, BuBorderLayout.CENTER);
if (EbliSimpleDialogPanel
.isOkResponse(
pn.afficheModale(j, EbliResource.getS("Edition des favoris")))) {
list_= listmodel.getValuesInList();
model.update();
}
}
});
bt.setToolTipText(EbliResource.getS("Editer les favoris"));
pnBt.add(bt);
pn.add(pnBt, BuBorderLayout.EAST);
return pn;
}
/**
* Enregistre les preferences dans FudaaPreferences mais n'ecrit pas le fichier de pref.
*/
public void saveFavorites() {
for (Enumeration e= BuPreferences.BU.keys(); e.hasMoreElements();) {
String k= (String)e.nextElement();
if (k.startsWith(PREF_ID)) {
BuPreferences.BU.removeProperty(k);
}
}
int n= list_.size();
for (int i= 0; i < n; i++) {
String fin= Integer.toString(i);
StringBuffer b= new StringBuffer(PREF_ID.length() + fin.length() + 2);
b.append(PREF_ID).append('.').append(fin);
BuPreferences.BU.putStringProperty(b.toString(), (String)list_.get(i));
}
}
}
--- NEW FILE: EbliFileChooser.java ---
/*
* @file TestBrowser.java
* @creation 23 juin 2003
* @modification $Date: 2003/12/12 10:32:09 $
* @license GNU General Public License 2
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
* @mail de...@fu...
*/
package org.fudaa.ebli.filechooser;
import java.awt.Component;
import java.awt.ComponentOrientation;
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.BuLabel;
import com.memoire.bu.BuPanel;
import com.memoire.bu.BuPreferences;
import com.memoire.bu.BuVerticalLayout;
import com.memoire.fu.FuLib;
/**
* @author deniger
* @version $Id: EbliFileChooser.java,v 1.1 2003/12/12 10:32:09 deniger Exp $
*/
public class EbliFileChooser extends BuFileChooser {
int response_;
JDialog dial_;
public EbliFileChooser() {
this(true);
}
/**
* Si _lastDir, le fileChooser est ouvert dans le dernier repertoire ouvert.
*/
public EbliFileChooser(boolean _lastDir) {
super();
response_= BuFileChooser.ERROR_OPTION;
if (_lastDir)
setCurrentDirectory(getLastDir());
}
public static File getLastDir() {
return new File(
BuPreferences.BU.getStringProperty(
EbliFavoriteFiles.PREF_LAST,
FuLib.getUserHome()));
}
public static void main(String[] args) {
JFrame f= new JFrame();
EbliFileChooser tb= new EbliFileChooser();
tb.setFileSelectionMode(EbliFileChooser.FILES_ONLY);
f.setVisible(true);
int r= tb.showDialog(f);
EbliFavoriteFiles.INSTANCE.saveFavorites();
BuPreferences.BU.writeIniFile();
// JFileChooser jfc=new JFileChooser();
// jfc.setFileSelectionMode(FudaaFileChooser.FILES_ONLY);
// jfc.showOpenDialog(f);
}
/**
*
*/
public int showDialog(Frame parent) {
dial_= new JDialog(parent);
init(dial_);
rescanCurrentDirectory();
dial_.setLocationRelativeTo(parent);
dial_.show();
return response_;
}
private void init(JDialog _dial) {
BuPanel pn= new BuPanel();
pn.setLayout(new BuBorderLayout());
pn.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
pn.add(this, BuBorderLayout.CENTER);
pn.add(
EbliFavoriteFiles.INSTANCE.createComponent(this),
BuBorderLayout.NORTH);
_dial.setContentPane(pn);
String title= getDialogTitle();
_dial.setModal(true);
_dial.setTitle(title);
_dial.pack();
}
/**
*
*/
public int showOpenDialog(Frame parent) {
setDialogType(BuFileChooser.OPEN_DIALOG);
return showDialog(parent);
}
/**
*
*/
public int showSaveDialog(Frame parent) {
setDialogType(BuFileChooser.SAVE_DIALOG);
return showDialog(parent);
}
/**
*
*/
public int showDialog(Component parent, String approveButtonText) {
Frame frame=
parent instanceof Frame
? (Frame)parent
: (Frame)SwingUtilities.getAncestorOfClass(Frame.class, parent);
return showDialog(frame);
}
/**
*
*/
public int showOpenDialog(Component parent) {
Frame frame=
parent instanceof Frame
? (Frame)parent
: (Frame)SwingUtilities.getAncestorOfClass(Frame.class, parent);
return showOpenDialog(frame);
}
/**
*
*/
public int showSaveDialog(Component parent) {
Frame frame=
parent instanceof Frame
? (Frame)parent
: (Frame)SwingUtilities.getAncestorOfClass(Frame.class, parent);
return showSaveDialog(frame);
}
/**
*
*/
public void approveSelection() {
BuPreferences.BU.putStringProperty(
EbliFavoriteFiles.PREF_LAST,
getCurrentDirectory().getAbsolutePath());
response_= EbliFileChooser.APPROVE_OPTION;
if (dial_ != null) {
dial_.dispose();
dial_= null;
}
}
/**
*
*/
public void cancelSelection() {
response_= EbliFileChooser.CANCEL_OPTION;
if (dial_ != null) {
dial_.dispose();
dial_= null;
}
}
}
|
|
From: <de...@us...> - 2003-12-12 10:32:12
|
Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/ressource In directory sc8-pr-cvs1:/tmp/cvs-serv21927/ressource Modified Files: ebli_en.fr_txt Added Files: curves.xcf curves_16.gif curves_24.gif Log Message: Deplacement du package tableau et filechooser --- NEW FILE: curves.xcf --- (This appears to be a binary file; contents omitted.) --- NEW FILE: curves_16.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: curves_24.gif --- (This appears to be a binary file; contents omitted.) Index: ebli_en.fr_txt =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/ressource/ebli_en.fr_txt,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ebli_en.fr_txt 11 Dec 2003 12:41:52 -0000 1.5 --- ebli_en.fr_txt 12 Dec 2003 10:32:09 -0000 1.6 *************** *** 95,97 **** Gras=Bold Italique=Italic ! Gras Italique=Bold Italic \ No newline at end of file --- 95,106 ---- Gras=Bold Italique=Italic ! Gras Italique=Bold Italic ! Favoris=Favorites ! Ajouter le répertoire courant aux favoris=Add curent folder to favorites ! Edition des favoris=Favorites edition ! Editer les favoris=Edit favorites ! Ajouter un nouvel élément=Add an new item ! Insérer un nouveau élément=Insert a new item ! Supprimer les éléments sélectionnés=Delete selected items ! Modifier=Modify ! Modifier l'élément sélectionner=Modify the selected item \ No newline at end of file |
|
From: <de...@us...> - 2003-12-12 10:32:12
|
Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/dialog
In directory sc8-pr-cvs1:/tmp/cvs-serv21927/dialog
Modified Files:
EbliSimpleDialogPanel.java
Log Message:
Deplacement du package tableau et filechooser
Index: EbliSimpleDialogPanel.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/dialog/EbliSimpleDialogPanel.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** EbliSimpleDialogPanel.java 11 Dec 2003 12:41:52 -0000 1.10
--- EbliSimpleDialogPanel.java 12 Dec 2003 10:32:08 -0000 1.11
***************
*** 35,38 ****
--- 35,40 ----
import javax.swing.border.EmptyBorder;
+ import org.fudaa.ctulu.CtuluLib;
+
import com.memoire.bu.BuBorderLayout;
import com.memoire.bu.BuButton;
***************
*** 54,58 ****
import com.memoire.fu.FuLib;
- import org.fudaa.ebli.commun.EbliLib;
import org.fudaa.ebli.ressource.EbliResource;
/**
--- 56,59 ----
***************
*** 182,187 ****
private void createDialog() {
if (dialog_ != null) {
! if (EbliLib.DEBUG)
! System.err.println(
getClass().getName() + " Cet element est deja visualise");
dialog_.dispose();
--- 183,188 ----
private void createDialog() {
if (dialog_ != null) {
! if (CtuluLib.DEBUG)
! CtuluLib.debug(
getClass().getName() + " Cet element est deja visualise");
dialog_.dispose();
***************
*** 192,197 ****
private void createDialog(Frame _parent) {
if (dialog_ != null) {
! if (EbliLib.DEBUG)
! System.err.println(
getClass().getName() + " Cet element est deja visualise");
}
--- 193,198 ----
private void createDialog(Frame _parent) {
if (dialog_ != null) {
! if (CtuluLib.DEBUG)
! CtuluLib.debug(
getClass().getName() + " Cet element est deja visualise");
}
***************
*** 200,205 ****
private void createDialog(Dialog _parent) {
if (dialog_ != null) {
! if (EbliLib.DEBUG)
! System.err.println(
getClass().getName() + " Cet element est deja visualise");
//dialog_.dispose();
--- 201,206 ----
private void createDialog(Dialog _parent) {
if (dialog_ != null) {
! if (CtuluLib.DEBUG)
! CtuluLib.debug(
getClass().getName() + " Cet element est deja visualise");
//dialog_.dispose();
|
Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque
In directory sc8-pr-cvs1:/tmp/cvs-serv21927/calque
Modified Files:
BCalqueCarte.java BCalqueMaillage.java BVueCalque.java
ZCalqueRepereInteraction.java ZEbliFilleCalques.java
Log Message:
Deplacement du package tableau et filechooser
Index: BCalqueCarte.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalqueCarte.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** BCalqueCarte.java 25 Nov 2003 10:06:36 -0000 1.4
--- BCalqueCarte.java 12 Dec 2003 10:32:07 -0000 1.5
***************
*** 12,27 ****
//import org.fudaa.dodico.corba.mesure.*;
//import org.fudaa.dodico.corba.representation.*;
! import org.fudaa.ebli.commun.EbliLib;
! import org.fudaa.ebli.geometrie.*;
! import org.fudaa.ebli.palette.*;
! import org.fudaa.ebli.repere.*;
! import org.fudaa.ebli.trace.*;
! import javax.swing.*;
! import javax.swing.event.*;
! import java.awt.*;
! import java.awt.image.*;
! import java.awt.geom.*;
! import java.util.*;
! import java.text.*;
/**
* Un calque d'affichage de cartes.
--- 12,41 ----
//import org.fudaa.dodico.corba.mesure.*;
//import org.fudaa.dodico.corba.representation.*;
! import java.awt.Color;
! import java.awt.Component;
! import java.awt.Dimension;
! import java.awt.FontMetrics;
! import java.awt.Graphics;
! import java.awt.Polygon;
! import java.awt.PrintGraphics;
! import java.awt.Rectangle;
! import java.awt.geom.Rectangle2D;
! import java.text.NumberFormat;
! import java.util.Locale;
!
! import javax.swing.JComponent;
!
! import org.fudaa.ctulu.CtuluLib;
!
! import org.fudaa.ebli.geometrie.GrBoite;
! import org.fudaa.ebli.geometrie.GrMaillage;
! import org.fudaa.ebli.geometrie.GrMorphisme;
! import org.fudaa.ebli.geometrie.VecteurGrContour;
! import org.fudaa.ebli.palette.BPaletteCouleur;
! import org.fudaa.ebli.palette.BPaletteCouleurSimple;
! import org.fudaa.ebli.trace.BParametresGouraud;
! import org.fudaa.ebli.trace.Gouraud;
! import org.fudaa.ebli.trace.TraceIsoLignes;
! import org.fudaa.ebli.trace.TraceIsoSurfaces;
/**
* Un calque d'affichage de cartes.
***************
*** 261,269 ****
Gouraud grd= null;
if (_g instanceof PrintGraphics) {
! if (EbliLib.DEBUG)
System.err.println("Gouraud imprimante");
grd= new Gouraud(_g, 2, 2);
} else {
! if (EbliLib.DEBUG)
System.err.println("Gouraud écran");
grd=
--- 275,283 ----
Gouraud grd= null;
if (_g instanceof PrintGraphics) {
! if (CtuluLib.DEBUG)
System.err.println("Gouraud imprimante");
grd= new Gouraud(_g, 2, 2);
} else {
! if (CtuluLib.DEBUG)
System.err.println("Gouraud écran");
grd=
Index: BCalqueMaillage.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalqueMaillage.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** BCalqueMaillage.java 25 Nov 2003 10:06:37 -0000 1.4
--- BCalqueMaillage.java 12 Dec 2003 10:32:08 -0000 1.5
***************
*** 8,21 ****
*/
package org.fudaa.ebli.calque;
! import java.awt.*;
! import java.awt.image.*;
! import java.util.*;
! import javax.swing.*;
! import javax.swing.event.*;
! import org.fudaa.ebli.commun.EbliLib;
! import org.fudaa.ebli.geometrie.*;
! import org.fudaa.ebli.palette.*;
! import org.fudaa.ebli.repere.*;
! import org.fudaa.ebli.trace.*;
/**
* Un calque d'affichage de cartes.
--- 8,28 ----
*/
package org.fudaa.ebli.calque;
! import java.awt.Color;
! import java.awt.Component;
! import java.awt.Graphics;
! import java.awt.Polygon;
! import java.awt.PrintGraphics;
! import java.awt.Rectangle;
!
! import org.fudaa.ctulu.CtuluLib;
!
! import org.fudaa.ebli.geometrie.GrBoite;
! import org.fudaa.ebli.geometrie.GrMaillage;
! import org.fudaa.ebli.geometrie.GrMorphisme;
! import org.fudaa.ebli.palette.BPaletteCouleur;
! import org.fudaa.ebli.palette.BPaletteCouleurSimple;
! import org.fudaa.ebli.trace.Gouraud;
! import org.fudaa.ebli.trace.TraceIsoLignes;
! import org.fudaa.ebli.trace.TraceIsoSurfaces;
/**
* Un calque d'affichage de cartes.
***************
*** 117,121 ****
vmax_= v;
}
! if (EbliLib.DEBUG)
System.err.println(
getClass().getName() + " " + "setValeurs DV=" + vmin_ + " " + vmax_);
--- 124,128 ----
vmax_= v;
}
! if (CtuluLib.DEBUG)
System.err.println(
getClass().getName() + " " + "setValeurs DV=" + vmin_ + " " + vmax_);
Index: BVueCalque.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BVueCalque.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** BVueCalque.java 25 Nov 2003 10:06:37 -0000 1.5
--- BVueCalque.java 12 Dec 2003 10:32:08 -0000 1.6
***************
*** 21,24 ****
--- 21,27 ----
import java.awt.event.MouseMotionListener;
import java.awt.print.PrinterGraphics;
+
+ import org.fudaa.ctulu.CtuluLib;
+
import org.fudaa.ebli.commun.EbliLib;
import org.fudaa.ebli.geometrie.GrBoite;
***************
*** 354,358 ****
_g.setClip(0, 0, size.width, size.height);
if (_g instanceof PrintGraphics || _g instanceof PrinterGraphics) {
! if (EbliLib.DEBUG)
System.err.println("_g is a PrintGraphics/PrinterGraphics");
BCalque[] c= getCalque().getTousCalques();
--- 357,361 ----
_g.setClip(0, 0, size.width, size.height);
if (_g instanceof PrintGraphics || _g instanceof PrinterGraphics) {
! if (CtuluLib.DEBUG)
System.err.println("_g is a PrintGraphics/PrinterGraphics");
BCalque[] c= getCalque().getTousCalques();
Index: ZCalqueRepereInteraction.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueRepereInteraction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ZCalqueRepereInteraction.java 24 Nov 2003 11:21:27 -0000 1.2
--- ZCalqueRepereInteraction.java 12 Dec 2003 10:32:08 -0000 1.3
***************
*** 170,175 ****
private void setZoomMoins(boolean _b) {
if (_b != zoomMoins_) {
- if (EbliLib.DEBUG)
- System.out.println("setZoom " + _b);
zoomMoins_= _b;
firePropertyChange("state", null, null);
--- 170,173 ----
Index: ZEbliFilleCalques.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZEbliFilleCalques.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** ZEbliFilleCalques.java 11 Dec 2003 12:41:51 -0000 1.18
--- ZEbliFilleCalques.java 12 Dec 2003 10:32:08 -0000 1.19
***************
*** 19,23 ****
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
- import java.awt.event.KeyEvent;
import java.awt.print.PageFormat;
import java.awt.print.Printable;
--- 19,22 ----
***************
*** 27,31 ****
import java.util.ArrayList;
import java.util.Arrays;
! import javax.swing.AbstractButton;
import javax.swing.Action;
import javax.swing.ActionMap;
--- 26,30 ----
import java.util.ArrayList;
import java.util.Arrays;
!
import javax.swing.Action;
import javax.swing.ActionMap;
***************
*** 50,53 ****
--- 49,55 ----
import javax.swing.table.TableModel;
import javax.swing.tree.TreeSelectionModel;
+
+ import org.fudaa.ctulu.CtuluLib;
+
import com.memoire.bu.BuBorderLayout;
import com.memoire.bu.BuCheckBox;
***************
*** 63,66 ****
--- 65,69 ----
import com.memoire.bu.BuSeparator;
import com.memoire.bu.BuTable;
+
import org.fudaa.ebli.calque.action.EbliActionInterface;
import org.fudaa.ebli.calque.action.EbliChangeStateAction;
***************
*** 68,72 ****
import org.fudaa.ebli.calque.action.EbliPaletteAction;
import org.fudaa.ebli.calque.action.EbliSimpleAction;
- import org.fudaa.ebli.commun.EbliLib;
import org.fudaa.ebli.commun.EbliPreferences;
import org.fudaa.ebli.dialog.EbliSimpleDialogPanel;
--- 71,74 ----
***************
*** 74,78 ****
import org.fudaa.ebli.impression.EbliFilleImprimable;
import org.fudaa.ebli.impression.EbliPrinter;
- import org.fudaa.ebli.palette.BSelecteurReduitFonte;
import org.fudaa.ebli.palette.BSelecteurReduitFonteNewVersion;
import org.fudaa.ebli.palette.BSelecteurReduitPaletteCouleur;
--- 76,79 ----
***************
*** 665,669 ****
vc_.setDefaultCursor();
} else {
! EbliLib.error(getClass().getName() + " unknown layer " + _b);
}
}
--- 666,670 ----
vc_.setDefaultCursor();
} else {
! CtuluLib.error(getClass().getName() + " unknown layer " + _b);
}
}
***************
*** 693,697 ****
}
protected void showViewPreferences() {
! if (EbliLib.DEBUG)
System.out.println("ViewPreferences ok");
if (specificToolsPrefView_ == null) {
--- 694,698 ----
}
protected void showViewPreferences() {
! if (CtuluLib.DEBUG)
System.out.println("ViewPreferences ok");
if (specificToolsPrefView_ == null) {
|
|
From: <de...@us...> - 2003-12-12 10:32:12
|
Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/controle
In directory sc8-pr-cvs1:/tmp/cvs-serv21927/controle
Modified Files:
EbliButtonGroup.java
Log Message:
Deplacement du package tableau et filechooser
Index: EbliButtonGroup.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/controle/EbliButtonGroup.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** EbliButtonGroup.java 25 Nov 2003 10:06:40 -0000 1.5
--- EbliButtonGroup.java 12 Dec 2003 10:32:08 -0000 1.6
***************
*** 9,14 ****
--- 9,18 ----
package org.fudaa.ebli.controle;
import javax.swing.AbstractButton;
+
+ import org.fudaa.ctulu.CtuluLib;
+
import com.memoire.bu.BuDesktop;
import com.memoire.bu.BuPopupButton;
+
import org.fudaa.ebli.commun.EbliLib;
import org.fudaa.ebli.ressource.EbliResource;
***************
*** 106,110 ****
if (_b == null)
return null;
! int index= EbliLib.getIndex(_b, buttons_);
if (index < 0) {
buttons_= addButton(_b, buttons_);
--- 110,114 ----
if (_b == null)
return null;
! int index= CtuluLib.getIndex(_b, buttons_);
if (index < 0) {
buttons_= addButton(_b, buttons_);
***************
*** 151,155 ****
: null);
}
! int index= EbliLib.getIndex(_b, _array);
if (index < 0) {
int n= _array.length;
--- 155,159 ----
: null);
}
! int index= CtuluLib.getIndex(_b, _array);
if (index < 0) {
int n= _array.length;
|
|
From: <de...@us...> - 2003-12-12 10:32:12
|
Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/commun
In directory sc8-pr-cvs1:/tmp/cvs-serv21927/commun
Modified Files:
EbliLib.java
Log Message:
Deplacement du package tableau et filechooser
Index: EbliLib.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/commun/EbliLib.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** EbliLib.java 11 Dec 2003 12:41:52 -0000 1.7
--- EbliLib.java 12 Dec 2003 10:32:08 -0000 1.8
***************
*** 18,47 ****
*/
public class EbliLib {
! public final static boolean DEBUG= "TRUE".equals(System.getProperty("DEBUG"));
! public static void debug(String _s) {
! System.out.println("DEBUG: " + _s);
! }
! public static void error(String _s) {
! System.out.println("ERROR: " + _s);
! }
! /**
! * Cherche l'index de la chaine <code>_string</code>
! * dans le tableau <code>_stringArray</code>. Renvoie <code>-1</code> si
! * l'un des deux parametres est nuls.
! * @return index si l'action du composant est trouvee dans le tableau, -1 sinon
! */
! public static int getIndex(Object _obj, Object[] _objArray) {
! if ((_obj == null) || (_objArray == null)) {
! return -1;
! }
! int n= _objArray.length - 1;
! Object com;
! for (int i= n; i >= 0; i--) {
! com= _objArray[i];
! if (_obj.equals(com))
! return i;
! }
! return -1;
! }
/**
* Return -1 if no contiguous selection
--- 18,23 ----
*/
public class EbliLib {
!
!
/**
* Return -1 if no contiguous selection
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/dico
In directory sc8-pr-cvs1:/tmp/cvs-serv21488/dico
Modified Files:
DicoAnalyzer.java DicoCasFileFormatVersionAbstract.java
DicoCasWriter.java DicoDataType.java DicoDataTypeGenerate.java
DicoEntite.java DicoEntiteGenerate.java DicoFactory.java
DicoGenerator.java DicoModelAbstract.java DicoParams.java
Log Message:
Maj general (CtuluLib)
Index: DicoAnalyzer.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoAnalyzer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** DicoAnalyzer.java 25 Nov 2003 10:11:26 -0000 1.6
--- DicoAnalyzer.java 12 Dec 2003 10:30:53 -0000 1.7
***************
*** 21,24 ****
--- 21,27 ----
import java.util.Set;
import java.util.StringTokenizer;
+
+ import org.fudaa.ctulu.CtuluLib;
+
import org.fudaa.dodico.commun.DodicoAnalyze;
import org.fudaa.dodico.commun.DodicoLib;
***************
*** 266,270 ****
analyze_.addInfo(
DicoResource.getS("Erreur avec la valeur par défaut")
! + DodicoLib.ESPACE
+ b.toString(),
_indexEntite);
--- 269,273 ----
analyze_.addInfo(
DicoResource.getS("Erreur avec la valeur par défaut")
! + CtuluLib.ESPACE
+ b.toString(),
_indexEntite);
***************
*** 272,279 ****
r[i]= DicoEntite.Vecteur.getStringValuesArray(rTemp, _sep);
if (r[i] == null) {
! r[i]= DodicoLib.EMPTY_STRING;
analyze_.addInfo(
DicoResource.getS("Erreur avec la valeur par défaut")
! + DodicoLib.ESPACE
+ b.toString(),
_indexEntite);
--- 275,282 ----
r[i]= DicoEntite.Vecteur.getStringValuesArray(rTemp, _sep);
if (r[i] == null) {
! r[i]= CtuluLib.EMPTY_STRING;
analyze_.addInfo(
DicoResource.getS("Erreur avec la valeur par défaut")
! + CtuluLib.ESPACE
+ b.toString(),
_indexEntite);
***************
*** 540,544 ****
analyze_.addInfo(
DicoResource.getS("INDEX mis à 0 pour")
! + DodicoLib.ESPACE
+ entite.getNoms()[0],
ligne);
--- 543,547 ----
analyze_.addInfo(
DicoResource.getS("INDEX mis à 0 pour")
! + CtuluLib.ESPACE
+ entite.getNoms()[0],
ligne);
***************
*** 551,555 ****
analyze_.addInfo(
DicoResource.getS("NIVEAU mis à 0 pour")
! + DodicoLib.ESPACE
+ entite.getNoms()[0],
ligne);
--- 554,558 ----
analyze_.addInfo(
DicoResource.getS("NIVEAU mis à 0 pour")
! + CtuluLib.ESPACE
+ entite.getNoms()[0],
ligne);
***************
*** 706,710 ****
+ ": "
+ dicoFile_.getAbsolutePath());
! if (DodicoLib.DEBUG)
e.printStackTrace();
} catch (IOException e1) {
--- 709,713 ----
+ ": "
+ dicoFile_.getAbsolutePath());
! if (CtuluLib.DEBUG)
e.printStackTrace();
} catch (IOException e1) {
Index: DicoCasFileFormatVersionAbstract.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoCasFileFormatVersionAbstract.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DicoCasFileFormatVersionAbstract.java 25 Nov 2003 10:11:27 -0000 1.3
--- DicoCasFileFormatVersionAbstract.java 12 Dec 2003 10:30:53 -0000 1.4
***************
*** 11,15 ****
import java.util.Iterator;
import java.util.Set;
! import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.fichiers.FileFormatVersion;
/**
--- 11,17 ----
import java.util.Iterator;
import java.util.Set;
!
! import org.fudaa.ctulu.CtuluLib;
!
import org.fudaa.dodico.fichiers.FileFormatVersion;
/**
***************
*** 31,35 ****
}
public String toString() {
! return dico_.getCodeName() + DodicoLib.ESPACE + dico_.getVersion();
}
public abstract DicoEntite getFichierPrincipalEntite();
--- 33,37 ----
}
public String toString() {
! return dico_.getCodeName() + CtuluLib.ESPACE + dico_.getVersion();
}
public abstract DicoEntite getFichierPrincipalEntite();
Index: DicoCasWriter.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoCasWriter.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** DicoCasWriter.java 25 Nov 2003 10:11:27 -0000 1.6
--- DicoCasWriter.java 12 Dec 2003 10:30:53 -0000 1.7
***************
*** 13,16 ****
--- 13,19 ----
import java.util.Set;
import java.util.StringTokenizer;
+
+ import org.fudaa.ctulu.CtuluLib;
+
import com.memoire.fu.FuLib;
import org.fudaa.dodico.commun.DodicoAnalyze;
***************
*** 186,190 ****
*/
private String formatToMaxChar(String _init) {
! return formatToMaxChar(_init, DodicoLib.EMPTY_STRING);
}
/**
--- 189,193 ----
*/
private String formatToMaxChar(String _init) {
! return formatToMaxChar(_init, CtuluLib.EMPTY_STRING);
}
/**
Index: DicoDataType.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoDataType.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** DicoDataType.java 25 Nov 2003 10:11:27 -0000 1.8
--- DicoDataType.java 12 Dec 2003 10:30:53 -0000 1.9
***************
*** 10,14 ****
--- 10,18 ----
import java.util.Collection;
import java.util.Iterator;
+
import javax.swing.MutableComboBoxModel;
+
+ import org.fudaa.ctulu.CtuluLib;
+
import org.fudaa.dodico.commun.DodicoLib;
/**
***************
*** 136,140 ****
return super.getDefaultValue();
else
! return DodicoLib.EMPTY_STRING;
}
public String getControleDescription() {
--- 140,144 ----
return super.getDefaultValue();
else
! return CtuluLib.EMPTY_STRING;
}
public String getControleDescription() {
***************
*** 284,288 ****
return super.getDefaultValue();
else
! return DodicoLib.ZERO;
}
public boolean isFonctionTrue(DicoComportValues _fct, String _v) {
--- 288,292 ----
return super.getDefaultValue();
else
! return CtuluLib.ZERO;
}
public boolean isFonctionTrue(DicoComportValues _fct, String _v) {
***************
*** 342,351 ****
return DicoResource.getS(
"La valeur doit être supérieure à {0}",
! DodicoLib.getString(min_));
else if ((t < min_) || (t > max_))
return DicoResource.getS(
"La valeur doit appartenir à l'intervalle [ {0},{1}]",
! DodicoLib.getString(min_),
! DodicoLib.getString(max_));
}
return null;
--- 346,355 ----
return DicoResource.getS(
"La valeur doit être supérieure à {0}",
! CtuluLib.getString(min_));
else if ((t < min_) || (t > max_))
return DicoResource.getS(
"La valeur doit appartenir à l'intervalle [ {0},{1}]",
! CtuluLib.getString(min_),
! CtuluLib.getString(max_));
}
return null;
***************
*** 356,365 ****
return DicoResource.getS(
"Valeur supérieure à {0}",
! DodicoLib.getString(min_));
else
return DicoResource.getS(
"Valeur comprise dans l'intervalle [{0},{1}]",
! DodicoLib.getString(min_),
! DodicoLib.getString(max_));
}
return null;
--- 360,369 ----
return DicoResource.getS(
"Valeur supérieure à {0}",
! CtuluLib.getString(min_));
else
return DicoResource.getS(
"Valeur comprise dans l'intervalle [{0},{1}]",
! CtuluLib.getString(min_),
! CtuluLib.getString(max_));
}
return null;
***************
*** 434,438 ****
return super.getDefaultValue();
else
! return DodicoLib.ZERO;
}
public void accept(DicoComponentVisitor _m) {
--- 438,442 ----
return super.getDefaultValue();
else
! return CtuluLib.ZERO;
}
public void accept(DicoComponentVisitor _m) {
***************
*** 447,451 ****
double t= 0D;
String data= _data;
! if (DodicoLib.DEBUG)
if (data.indexOf('d') > 0) {
data= _data.replace('d', 'E');
--- 451,455 ----
double t= 0D;
String data= _data;
! if (CtuluLib.DEBUG)
if (data.indexOf('d') > 0) {
data= _data.replace('d', 'E');
Index: DicoDataTypeGenerate.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoDataTypeGenerate.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DicoDataTypeGenerate.java 25 Nov 2003 10:11:28 -0000 1.5
--- DicoDataTypeGenerate.java 12 Dec 2003 10:30:53 -0000 1.6
***************
*** 9,13 ****
package org.fudaa.dodico.dico;
import java.io.IOException;
! import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.commun.DodicoResource;
import org.fudaa.dodico.dico.DicoGenerator.DicoWriter;
--- 9,15 ----
package org.fudaa.dodico.dico;
import java.io.IOException;
!
! import org.fudaa.ctulu.CtuluLib;
!
import org.fudaa.dodico.commun.DodicoResource;
import org.fudaa.dodico.dico.DicoGenerator.DicoWriter;
***************
*** 94,98 ****
if (!type.isValide(choiceKeys_[j]))
return choiceKeys_[i]
! + DodicoLib.ESPACE
+ DodicoResource.getS("non valide");
}
--- 96,100 ----
if (!type.isValide(choiceKeys_[j]))
return choiceKeys_[i]
! + CtuluLib.ESPACE
+ DodicoResource.getS("non valide");
}
***************
*** 105,109 ****
if (!type.isValide(choiceValues_[i][j])) {
return choiceValues_[i][j]
! + DodicoLib.ESPACE
+ DodicoResource.getS("non valide");
}
--- 107,111 ----
if (!type.isValide(choiceValues_[i][j])) {
return choiceValues_[i][j]
! + CtuluLib.ESPACE
+ DodicoResource.getS("non valide");
}
Index: DicoEntite.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoEntite.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** DicoEntite.java 11 Dec 2003 12:41:26 -0000 1.10
--- DicoEntite.java 12 Dec 2003 10:30:53 -0000 1.11
***************
*** 15,20 ****
import java.util.Set;
import java.util.StringTokenizer;
import com.memoire.fu.FuLib;
! import org.fudaa.dodico.commun.DodicoDoubleDoubleSortedList;
import org.fudaa.dodico.commun.DodicoLib;
/**
--- 15,23 ----
import java.util.Set;
import java.util.StringTokenizer;
+
+ import org.fudaa.ctulu.CtuluLib;
+
import com.memoire.fu.FuLib;
!
import org.fudaa.dodico.commun.DodicoLib;
/**
***************
*** 36,41 ****
protected DicoDataType type_;
private String nom_;
! private String aide_= DodicoLib.EMPTY_STRING;
! private String defautValue_= DodicoLib.EMPTY_STRING;
private int index_;
private int niveau_;
--- 39,44 ----
protected DicoDataType type_;
private String nom_;
! private String aide_= CtuluLib.EMPTY_STRING;
! private String defautValue_= CtuluLib.EMPTY_STRING;
private int index_;
private int niveau_;
***************
*** 66,70 ****
if ((n >= 0) && (n < NIVEAU.length))
return NIVEAU[n];
! return DodicoLib.getString(niveau_);
};
/**
--- 69,73 ----
if ((n >= 0) && (n < NIVEAU.length))
return NIVEAU[n];
! return CtuluLib.getString(niveau_);
};
/**
***************
*** 300,305 ****
s= _type.getInvalideMessage((String)_l.get(i));
if (s != null) {
! sb.append(DodicoLib.LINE_SEP);
! sb.append("Value " + (String)_l.get(i)).append(DodicoLib.ESPACE);
sb.append(s);
}
--- 303,308 ----
s= _type.getInvalideMessage((String)_l.get(i));
if (s != null) {
! sb.append(CtuluLib.LINE_SEP);
! sb.append("Value " + (String)_l.get(i)).append(CtuluLib.ESPACE);
sb.append(s);
}
***************
*** 488,497 ****
if ((s == null) && (nbElem >= 0)) {
if (_l.size() > nbElem) {
! if(nbElem==0)
! return DicoResource.getS(
! "Ce mot-clé est inutile");
return DicoResource.getS(
"Le nombre d'éléments doit être inférieur à {0}",
! DodicoLib.getString(nbElem));
}
}
--- 491,499 ----
if ((s == null) && (nbElem >= 0)) {
if (_l.size() > nbElem) {
! if (nbElem == 0)
! return DicoResource.getS("Ce mot-clé est inutile");
return DicoResource.getS(
"Le nombre d'éléments doit être inférieur à {0}",
! CtuluLib.getString(nbElem));
}
}
Index: DicoEntiteGenerate.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoEntiteGenerate.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DicoEntiteGenerate.java 25 Nov 2003 10:11:28 -0000 1.5
--- DicoEntiteGenerate.java 12 Dec 2003 10:30:53 -0000 1.6
***************
*** 13,16 ****
--- 13,19 ----
import java.util.Iterator;
import java.util.List;
+
+ import org.fudaa.ctulu.CtuluLib;
+
import org.fudaa.dodico.commun.DodicoAnalyze;
import org.fudaa.dodico.commun.DodicoLib;
***************
*** 71,75 ****
_analyze.addError(
noms_[0]
! + DodicoLib.ESPACE
+ DicoResource.getS("fonction de comportement non supportée"));
}
--- 74,78 ----
_analyze.addError(
noms_[0]
! + CtuluLib.ESPACE
+ DicoResource.getS("fonction de comportement non supportée"));
}
Index: DicoFactory.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoFactory.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DicoFactory.java 25 Nov 2003 10:11:29 -0000 1.4
--- DicoFactory.java 12 Dec 2003 10:30:53 -0000 1.5
***************
*** 10,13 ****
--- 10,16 ----
import java.io.File;
import java.util.HashMap;
+
+ import org.fudaa.ctulu.CtuluLib;
+
import org.fudaa.dodico.commun.DodicoAnalyze;
import org.fudaa.dodico.commun.DodicoLib;
***************
*** 33,37 ****
}
public void printAnalyze(DodicoAnalyze[] _an) {
! String pref= DodicoLib.ESPACE + DodicoLib.ESPACE;
if (_an[0] != null) {
System.out.println(DodicoResource.getS("Analyse"));
--- 36,40 ----
}
public void printAnalyze(DodicoAnalyze[] _an) {
! String pref= CtuluLib.ESPACE + CtuluLib.ESPACE;
if (_an[0] != null) {
System.out.println(DodicoResource.getS("Analyse"));
Index: DicoGenerator.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoGenerator.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** DicoGenerator.java 25 Nov 2003 10:11:29 -0000 1.6
--- DicoGenerator.java 12 Dec 2003 10:30:53 -0000 1.7
***************
*** 23,26 ****
--- 23,29 ----
import java.util.Map;
import java.util.StringTokenizer;
+
+ import org.fudaa.ctulu.CtuluLib;
+
import org.fudaa.dodico.commun.DodicoAnalyze;
import org.fudaa.dodico.commun.DodicoLib;
***************
*** 64,68 ****
packageName_= _destPackage;
//className_ = _destClass;
! lineSep_= DodicoLib.LINE_SEP;
}
private void _getBooleenEntites() throws IOException {
--- 67,71 ----
packageName_= _destPackage;
//className_ = _destClass;
! lineSep_= CtuluLib.LINE_SEP;
}
private void _getBooleenEntites() throws IOException {
***************
*** 567,571 ****
private Writer out_;
private String tab_;
! private String lineSeparator_= DodicoLib.LINE_SEP;
private String fin_= ";";
DicoWriter(Writer _out, String _tab, String _lineSep) {
--- 570,574 ----
private Writer out_;
private String tab_;
! private String lineSeparator_= CtuluLib.LINE_SEP;
private String fin_= ";";
DicoWriter(Writer _out, String _tab, String _lineSep) {
Index: DicoModelAbstract.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoModelAbstract.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** DicoModelAbstract.java 25 Nov 2003 10:11:29 -0000 1.8
--- DicoModelAbstract.java 12 Dec 2003 10:30:53 -0000 1.9
***************
*** 11,19 ****
import java.util.HashMap;
import java.util.HashSet;
- import java.util.Hashtable;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
! import org.fudaa.dodico.commun.DodicoLib;
/**
* Une classe abstraite pour toutes les classes generees pour les fichiers dico.
--- 11,19 ----
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
!
! import org.fudaa.ctulu.CtuluLib;
/**
* Une classe abstraite pour toutes les classes generees pour les fichiers dico.
***************
*** 164,170 ****
public String toString() {
return getCodeName()
! + DodicoLib.ESPACE
+ getVersion()
! + DodicoLib.ESPACE
+ DicoLanguage.getLocalID(languageIndex_);
}
--- 164,170 ----
public String toString() {
return getCodeName()
! + CtuluLib.ESPACE
+ getVersion()
! + CtuluLib.ESPACE
+ DicoLanguage.getLocalID(languageIndex_);
}
Index: DicoParams.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoParams.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** DicoParams.java 11 Dec 2003 12:41:26 -0000 1.12
--- DicoParams.java 12 Dec 2003 10:30:53 -0000 1.13
***************
*** 11,16 ****
import java.util.ArrayList;
import java.util.Arrays;
- import java.util.Collections;
- import java.util.Enumeration;
import java.util.HashMap;
import java.util.HashSet;
--- 11,14 ----
***************
*** 20,26 ****
import java.util.Map;
import java.util.Set;
import org.fudaa.dodico.commun.DodicoCommand;
import org.fudaa.dodico.commun.DodicoCommandComposite;
- import org.fudaa.dodico.commun.DodicoLib;
/**
* Cette classe permet de gerer les parametres d'un fichier cas: mot-cles
--- 18,26 ----
import java.util.Map;
import java.util.Set;
+
+ import org.fudaa.ctulu.CtuluLib;
+
import org.fudaa.dodico.commun.DodicoCommand;
import org.fudaa.dodico.commun.DodicoCommandComposite;
/**
* Cette classe permet de gerer les parametres d'un fichier cas: mot-cles
***************
*** 484,488 ****
final boolean _setValue(DicoEntite _ent, String _value) {
if (_value == null)
! _value= DodicoLib.EMPTY_STRING;
//L'entite fait deja partie des modifiees
if (entitesValues_.containsKey(_ent)) {
--- 484,488 ----
final boolean _setValue(DicoEntite _ent, String _value) {
if (_value == null)
! _value= CtuluLib.EMPTY_STRING;
//L'entite fait deja partie des modifiees
if (entitesValues_.containsKey(_ent)) {
|
|
From: <de...@us...> - 2003-12-12 10:31:26
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/dunes/io
In directory sc8-pr-cvs1:/tmp/cvs-serv21488/dunes/io
Modified Files:
DunesReader.java
Log Message:
Maj general (CtuluLib)
Index: DunesReader.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/dunes/io/DunesReader.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** DunesReader.java 11 Dec 2003 12:41:27 -0000 1.11
--- DunesReader.java 12 Dec 2003 10:30:53 -0000 1.12
***************
*** 10,21 ****
import java.io.EOFException;
import java.io.IOException;
import org.fudaa.dodico.commun.DodicoAnalyze;
- import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.fichiers.FileFormat;
import org.fudaa.dodico.fichiers.FileFormatVersion;
import org.fudaa.dodico.fichiers.FileOpReadCharSimpleAbstract;
import org.fudaa.dodico.h2d.H2dElement;
- import org.fudaa.dodico.h2d.H2dLib;
import org.fudaa.dodico.h2d.H2dGrid;
import org.fudaa.dodico.h2d.H2dPoint;
import org.fudaa.dodico.h2d.H2dResource;
--- 10,23 ----
import java.io.EOFException;
import java.io.IOException;
+
+ import org.fudaa.ctulu.CtuluLib;
+
import org.fudaa.dodico.commun.DodicoAnalyze;
import org.fudaa.dodico.fichiers.FileFormat;
import org.fudaa.dodico.fichiers.FileFormatVersion;
import org.fudaa.dodico.fichiers.FileOpReadCharSimpleAbstract;
import org.fudaa.dodico.h2d.H2dElement;
import org.fudaa.dodico.h2d.H2dGrid;
+ import org.fudaa.dodico.h2d.H2dLib;
import org.fudaa.dodico.h2d.H2dPoint;
import org.fudaa.dodico.h2d.H2dResource;
***************
*** 101,105 ****
H2dResource.getS(
"La définition du noeud {0} n'est pas valide",
! DodicoLib.getString(i + 1)),
in_);
return null;
--- 103,107 ----
H2dResource.getS(
"La définition du noeud {0} n'est pas valide",
! CtuluLib.getString(i + 1)),
in_);
return null;
***************
*** 188,192 ****
H2dResource.getS(
"Le nombre de points est négatif ou nul pour l'élément d'indice {0}",
! DodicoLib.getString(i + 1)),
in_);
return null;
--- 190,194 ----
H2dResource.getS(
"Le nombre de points est négatif ou nul pour l'élément d'indice {0}",
! CtuluLib.getString(i + 1)),
in_);
return null;
***************
*** 234,239 ****
in_);
} catch (EOFException e) {
! if (DodicoLib.DEBUG)
! DodicoLib.debug("Dunes Read end");
} catch (NumberFormatException fe) {
DodicoAnalyze.manageException(fe, analyze_, in_);
--- 236,241 ----
in_);
} catch (EOFException e) {
! if (CtuluLib.DEBUG)
! CtuluLib.debug("Dunes Read end");
} catch (NumberFormatException fe) {
DodicoAnalyze.manageException(fe, analyze_, in_);
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/commun
In directory sc8-pr-cvs1:/tmp/cvs-serv21488/commun
Modified Files:
DodicoAnalyze.java DodicoDoubleDoubleSortedList.java
DodicoLib.java DodicoUIDefault.java
Log Message:
Maj general (CtuluLib)
Index: DodicoAnalyze.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/commun/DodicoAnalyze.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** DodicoAnalyze.java 25 Nov 2003 10:11:25 -0000 1.9
--- DodicoAnalyze.java 12 Dec 2003 10:30:52 -0000 1.10
***************
*** 13,16 ****
--- 13,19 ----
import java.util.ArrayList;
import java.util.Collection;
+
+ import org.fudaa.ctulu.CtuluLib;
+
import org.fudaa.dodico.fortran.FortranReader;
/**
***************
*** 57,61 ****
public static String getResume(DodicoAnalyze[] _analyzes) {
if (_analyzes == null)
! return DodicoLib.EMPTY_STRING;
int n= _analyzes.length;
StringBuffer b= new StringBuffer();
--- 60,64 ----
public static String getResume(DodicoAnalyze[] _analyzes) {
if (_analyzes == null)
! return CtuluLib.EMPTY_STRING;
int n= _analyzes.length;
StringBuffer b= new StringBuffer();
***************
*** 65,70 ****
if (an != null) {
if (i != 0)
! b.append(DodicoLib.SEP_LINE);
! b.append(an.getDesc()).append(DodicoLib.SEP_LINE);
b.append(an.getResume());
}
--- 68,73 ----
if (an != null) {
if (i != 0)
! b.append(CtuluLib.SEP_LINE);
! b.append(an.getDesc()).append(CtuluLib.SEP_LINE);
b.append(an.getResume());
}
***************
*** 76,80 ****
}
public String getResume() {
! return getResume(DodicoLib.EMPTY_STRING);
}
/**
--- 79,83 ----
}
public String getResume() {
! return getResume(CtuluLib.EMPTY_STRING);
}
/**
***************
*** 82,116 ****
*/
public String getResume(String _prefix) {
! String prefix= _prefix == null ? DodicoLib.EMPTY_STRING : _prefix;
StringBuffer s=
new StringBuffer(
prefix
! + (desc_ == null ? DodicoLib.EMPTY_STRING : desc_)
! + DodicoLib.LINE_SEP);
! prefix += DodicoLib.ESPACE + DodicoLib.ESPACE;
if (ressource_ != null)
s.append(
prefix
+ DodicoResource.getS("Ressource")
! + DodicoLib.ESPACE
+ ressource_
! + DodicoLib.LINE_SEP);
if (fatalError_ != null) {
s.append(
! DodicoLib.LINE_SEP + prefix + DodicoResource.getS("Erreur fatale"));
if (fatalError_.getOffset() >= 0)
! s.append(DodicoLib.LINE_SEP + prefix + fatalError_.toString());
else
! s.append(DodicoLib.LINE_SEP + prefix + fatalError_.getMessage());
}
! s.append(DodicoLib.LINE_SEP);
boolean b= getResume(s, DodicoResource.getS("Erreurs"), errors_, prefix);
if (b)
! s.append(DodicoLib.LINE_SEP);
b= getResume(s, DodicoResource.getS("Avertissements"), warns_, prefix);
if (b)
! s.append(DodicoLib.LINE_SEP);
getResume(s, DodicoResource.getS("Informations"), infos_, prefix);
! s.append(DodicoLib.LINE_SEP);
return s.toString();
}
--- 85,119 ----
*/
public String getResume(String _prefix) {
! String prefix= _prefix == null ? CtuluLib.EMPTY_STRING : _prefix;
StringBuffer s=
new StringBuffer(
prefix
! + (desc_ == null ? CtuluLib.EMPTY_STRING : desc_)
! + CtuluLib.LINE_SEP);
! prefix += CtuluLib.ESPACE + CtuluLib.ESPACE;
if (ressource_ != null)
s.append(
prefix
+ DodicoResource.getS("Ressource")
! + CtuluLib.ESPACE
+ ressource_
! + CtuluLib.LINE_SEP);
if (fatalError_ != null) {
s.append(
! CtuluLib.LINE_SEP + prefix + DodicoResource.getS("Erreur fatale"));
if (fatalError_.getOffset() >= 0)
! s.append(CtuluLib.LINE_SEP + prefix + fatalError_.toString());
else
! s.append(CtuluLib.LINE_SEP + prefix + fatalError_.getMessage());
}
! s.append(CtuluLib.LINE_SEP);
boolean b= getResume(s, DodicoResource.getS("Erreurs"), errors_, prefix);
if (b)
! s.append(CtuluLib.LINE_SEP);
b= getResume(s, DodicoResource.getS("Avertissements"), warns_, prefix);
if (b)
! s.append(CtuluLib.LINE_SEP);
getResume(s, DodicoResource.getS("Informations"), infos_, prefix);
! s.append(CtuluLib.LINE_SEP);
return s.toString();
}
***************
*** 156,160 ****
_analyze.addError(DodicoResource.getS("Fichier non trouvé"));
_analyze.addInfo(_e.getMessage());
! if (DodicoLib.DEBUG)
_e.printStackTrace();
}
--- 159,163 ----
_analyze.addError(DodicoResource.getS("Fichier non trouvé"));
_analyze.addInfo(_e.getMessage());
! if (CtuluLib.DEBUG)
_e.printStackTrace();
}
***************
*** 164,168 ****
_analyze.addFatalError(DodicoResource.getS("Erreur d'entrée/sortie"));
_analyze.addInfo(_e.getMessage());
! if (DodicoLib.DEBUG)
_e.printStackTrace();
}
--- 167,171 ----
_analyze.addFatalError(DodicoResource.getS("Erreur d'entrée/sortie"));
_analyze.addInfo(_e.getMessage());
! if (CtuluLib.DEBUG)
_e.printStackTrace();
}
***************
*** 175,179 ****
_l);
_analyze.addInfo(_e.getMessage());
! if (DodicoLib.DEBUG)
_e.printStackTrace();
}
--- 178,182 ----
_l);
_analyze.addInfo(_e.getMessage());
! if (CtuluLib.DEBUG)
_e.printStackTrace();
}
***************
*** 184,188 ****
DodicoResource.getS("Erreur interne: argument non valide"));
_analyze.addInfo(_e.getMessage());
! if (DodicoLib.DEBUG)
_e.printStackTrace();
}
--- 187,191 ----
DodicoResource.getS("Erreur interne: argument non valide"));
_analyze.addInfo(_e.getMessage());
! if (CtuluLib.DEBUG)
_e.printStackTrace();
}
***************
*** 192,196 ****
_analyze.addFatalError(DodicoResource.getS("Erreur à l'exécution"));
_analyze.addInfo(_e.getMessage());
! if (DodicoLib.DEBUG)
_e.printStackTrace();
}
--- 195,199 ----
_analyze.addFatalError(DodicoResource.getS("Erreur à l'exécution"));
_analyze.addInfo(_e.getMessage());
! if (CtuluLib.DEBUG)
_e.printStackTrace();
}
***************
*** 216,220 ****
_bufferStockage.append(_prefix);
_bufferStockage.append(_titre);
! String lineSep= DodicoLib.LINE_SEP;
Field element;
int nb= _ls.length;
--- 219,223 ----
_bufferStockage.append(_prefix);
_bufferStockage.append(_titre);
! String lineSep= CtuluLib.LINE_SEP;
Field element;
int nb= _ls.length;
***************
*** 225,232 ****
int t= element.getOffset();
_bufferStockage.append(
! DodicoLib.ESPACE
+ DodicoResource.getS("Ligne")
! + DodicoLib.ESPACE
! + (t > 0 ? Integer.toString(t) : DodicoLib.EMPTY_STRING)
+ ": "
+ element.getMessage());
--- 228,235 ----
int t= element.getOffset();
_bufferStockage.append(
! CtuluLib.ESPACE
+ DodicoResource.getS("Ligne")
! + CtuluLib.ESPACE
! + (t > 0 ? Integer.toString(t) : CtuluLib.EMPTY_STRING)
+ ": "
+ element.getMessage());
***************
*** 511,515 ****
public String toString() {
return DodicoResource.getS("Ligne")
! + DodicoLib.ESPACE
+ offset_
+ " :"
--- 514,518 ----
public String toString() {
return DodicoResource.getS("Ligne")
! + CtuluLib.ESPACE
+ offset_
+ " :"
Index: DodicoDoubleDoubleSortedList.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/commun/DodicoDoubleDoubleSortedList.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DodicoDoubleDoubleSortedList.java 11 Dec 2003 12:41:26 -0000 1.5
--- DodicoDoubleDoubleSortedList.java 12 Dec 2003 10:30:52 -0000 1.6
***************
*** 9,13 ****
package org.fudaa.dodico.commun;
import gnu.trove.TDoubleArrayList;
! import gnu.trove.TDoubleDoubleHashMap;
/**
* @author deniger
--- 9,14 ----
package org.fudaa.dodico.commun;
import gnu.trove.TDoubleArrayList;
!
! import org.fudaa.ctulu.CtuluLib;
/**
* @author deniger
***************
*** 21,31 ****
val_= new TDoubleArrayList();
}
!
public DodicoDoubleDoubleSortedList(DodicoDoubleDoubleSortedList _l) {
! t_= new TDoubleArrayList(_l.t_.toNativeArray());
! val_= new TDoubleArrayList(_l.val_.toNativeArray());
! }
!
!
public boolean containsKey(double _key) {
return indexOfKey(_key) >= 0;
--- 22,31 ----
val_= new TDoubleArrayList();
}
!
public DodicoDoubleDoubleSortedList(DodicoDoubleDoubleSortedList _l) {
! t_= new TDoubleArrayList(_l.t_.toNativeArray());
! val_= new TDoubleArrayList(_l.val_.toNativeArray());
! }
!
public boolean containsKey(double _key) {
return indexOfKey(_key) >= 0;
***************
*** 35,38 ****
--- 35,76 ----
val_.ensureCapacity(_c);
}
+
+ public double getMinX() {
+ return (t_.size() == 0) ? 0 : t_.getQuick(0);
+ }
+
+ public double getMaxX() {
+ int n= t_.size() - 1;
+ return n < 0 ? 0 : t_.getQuick(n);
+ }
+
+ public double getMinY() {
+ int n= t_.size() - 1;
+ if (n < 0)
+ return 0;
+ double r= val_.getQuick(n);
+ double temp;
+ for (int i= n - 1; i >= 0; i--) {
+ temp= val_.getQuick(i);
+ if (temp < r)
+ r= temp;
+ }
+ return r;
+ }
+
+ public double getMaxY() {
+ int n= t_.size() - 1;
+ if (n < 0)
+ return 0;
+ double r= val_.getQuick(n);
+ double temp;
+ for (int i= n - 1; i >= 0; i--) {
+ temp= val_.getQuick(i);
+ if (temp > r)
+ r= temp;
+ }
+ return r;
+ }
+
/**
*
***************
*** 66,70 ****
}
public String toString() {
! return t_.toString() + DodicoLib.LINE_SEP + val_.toString();
}
public void removeKey(double _key) {
--- 104,108 ----
}
public String toString() {
! return t_.toString() + CtuluLib.LINE_SEP + val_.toString();
}
public void removeKey(double _key) {
Index: DodicoLib.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/commun/DodicoLib.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** DodicoLib.java 11 Dec 2003 12:41:26 -0000 1.19
--- DodicoLib.java 12 Dec 2003 10:30:52 -0000 1.20
***************
*** 39,42 ****
--- 39,45 ----
import java.util.Locale;
import java.util.StringTokenizer;
+
+ import org.fudaa.ctulu.CtuluLib;
+
import com.memoire.fu.FuLib;
/**
***************
*** 47,76 ****
*/
public class DodicoLib {
- public final static boolean DEBUG= "TRUE".equals(System.getProperty("DEBUG"));
- public final static String[] EMPTY_STRING_ARRAY= new String[0];
- public final static String EMPTY_STRING= "";
- public final static String ZERO= "0";
- public final static String UN= "1";
- public final static String DEUX= "2";
- public final static String TROIS= "3";
- public final static String QUATRE= "4";
- public final static String CINQ= "5";
- public final static String SIX= "6";
- public final static String SEPT= "7";
- public final static String HUIT= "8";
- public final static String NEUF= "9";
- public final static String DIX= "10";
- public final static String SEP_LINE= "\n";
- public final static String ESPACE= " ";
private DodicoLib() {}
! /** */
! public final static String LINE_SEP= System.getProperty("line.separator");
! public static void debug(String _s) {
! System.out.println("DEBUG: " + _s);
! }
!
! public static void error(String _s) {
! System.out.println("ERROR: " + _s);
! }
public final static Object[] sort(Object[] _o) {
Arrays.sort(_o);
--- 50,55 ----
*/
public class DodicoLib {
private DodicoLib() {}
!
public final static Object[] sort(Object[] _o) {
Arrays.sort(_o);
***************
*** 142,176 ****
}
}
! public static String getString(int _i) {
! if (_i < 11) {
! switch (_i) {
! case 0 :
! return ZERO;
! case 1 :
! return UN;
! case 2 :
! return DEUX;
! case 3 :
! return TROIS;
! case 4 :
! return QUATRE;
! case 5 :
! return CINQ;
! case 6 :
! return SIX;
! case 7 :
! return SEPT;
! case 8 :
! return HUIT;
! case 9 :
! return NEUF;
! case 10 :
! return DIX;
! default :
! return _i + "";
! }
! } else
! return _i + "";
! }
public static void printObject(Object _o, boolean _v) {
System.out.println(_printObject(_o, _v));
--- 121,125 ----
}
}
!
public static void printObject(Object _o, boolean _v) {
System.out.println(_printObject(_o, _v));
***************
*** 181,185 ****
public static void addi18n(StringBuffer _v, String _s) {
_v.append(DodicoResource.getS(_s));
! _v.append(LINE_SEP);
}
public static void printStringArray(String[] _s) {
--- 130,134 ----
public static void addi18n(StringBuffer _v, String _s) {
_v.append(DodicoResource.getS(_s));
! _v.append(CtuluLib.LINE_SEP);
}
public static void printStringArray(String[] _s) {
***************
*** 398,449 ****
return enTableau(l);
}
! /**
! * Renvoie le chemin canonique du fichier _f. Si une exception est levee
! * renvoie le chemin absolu.
! * @return une valeur non nulle
! * @see java.io.File#getCanonicalFile();
! * @see java.io.File#getAbsoluteFile();
! */
! public static String getCanonicalPath(File _f) {
! String path= null;
! try {
! path= _f.getCanonicalPath();
! } catch (IOException e) {
! e.printStackTrace();
! path= _f.getAbsolutePath();
! }
! return path;
! }
! public static File getConanicalPathFile(File _f) {
! File path= null;
! try {
! path= _f.getCanonicalFile();
! } catch (IOException e) {
! e.printStackTrace();
! path= _f.getAbsoluteFile();
! }
! return path;
! }
! public static File getAbsolutePath(String _baseDir, String _path) {
! File f= new File(_path);
! if (f.isAbsolute())
! return f;
! else
! return new File(_baseDir, _path);
! }
! /**
! * if _path is absolute return new File(_path) else return
! * new File(_baseDir,_path)
! * @return null if one arg is null.
! */
! public static File getAbsolutePath(File _baseDir, String _path) {
! if ((_path == null) || (_baseDir == null))
! return null;
! File f= new File(_path);
! if (f.isAbsolute())
! return f;
! else
! return getConanicalPathFile(new File(_baseDir, _path));
! }
public static TObjectDoubleHashMap copy(TObjectDoubleHashMap _m){
--- 347,351 ----
return enTableau(l);
}
!
public static TObjectDoubleHashMap copy(TObjectDoubleHashMap _m){
Index: DodicoUIDefault.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/commun/DodicoUIDefault.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DodicoUIDefault.java 25 Nov 2003 10:11:25 -0000 1.3
--- DodicoUIDefault.java 12 Dec 2003 10:30:52 -0000 1.4
***************
*** 8,11 ****
--- 8,14 ----
*/
package org.fudaa.dodico.commun;
+
+ import org.fudaa.ctulu.CtuluLib;
+
/**
* @author fred deniger
***************
*** 34,38 ****
*/
public void error(String _msg) {
! error(DodicoLib.EMPTY_STRING, _msg);
}
/**
--- 37,41 ----
*/
public void error(String _msg) {
! error(CtuluLib.EMPTY_STRING, _msg);
}
/**
***************
*** 40,44 ****
*/
public void message(String _msg) {
! message(DodicoLib.EMPTY_STRING, _msg);
}
}
--- 43,47 ----
*/
public void message(String _msg) {
! message(CtuluLib.EMPTY_STRING, _msg);
}
}
|
|
From: <de...@us...> - 2003-12-12 10:31:25
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/calcul
In directory sc8-pr-cvs1:/tmp/cvs-serv21488/calcul
Modified Files:
CalculExec.java
Log Message:
Maj general (CtuluLib)
Index: CalculExec.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/calcul/CalculExec.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CalculExec.java 11 Dec 2003 12:41:26 -0000 1.4
--- CalculExec.java 12 Dec 2003 10:30:52 -0000 1.5
***************
*** 10,16 ****
import java.io.File;
import java.io.PrintStream;
! import java.util.ArrayList;
! import java.util.List;
import com.memoire.fu.FuLib;
import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.commun.DodicoPreferences;
--- 10,18 ----
import java.io.File;
import java.io.PrintStream;
!
! import org.fudaa.ctulu.CtuluLib;
!
import com.memoire.fu.FuLib;
+
import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.commun.DodicoPreferences;
***************
*** 94,103 ****
s.append(_cmd);
for (int i= 1; i < n; i++) {
! s.append(DodicoLib.ESPACE).append(_cmd);
}
String cmd=
DodicoPreferences.DODICO.getStringProperty("cexec.term.launch", null);
if (cmd != null) {
! String[] init= DodicoLib.parseString(cmd, DodicoLib.ESPACE);
int nInit= init.length;
String[] r= new String[nInit + 1];
--- 96,105 ----
s.append(_cmd);
for (int i= 1; i < n; i++) {
! s.append(CtuluLib.ESPACE).append(_cmd);
}
String cmd=
DodicoPreferences.DODICO.getStringProperty("cexec.term.launch", null);
if (cmd != null) {
! String[] init= DodicoLib.parseString(cmd, CtuluLib.ESPACE);
int nInit= init.length;
String[] r= new String[nInit + 1];
|
|
From: <de...@us...> - 2003-12-12 10:30:59
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/telemac/io
In directory sc8-pr-cvs1:/tmp/cvs-serv21488/telemac/io
Modified Files:
SerafinReader.java SinusxConvert.java SinusxReader.java
SinusxWriter.java TelemacCLReader.java TelemacCLWriter.java
TelemacDicoFileFormatVersion.java TelemacLiquideReader.java
TelemacLiquideWriter.java
Log Message:
Maj general (CtuluLib)
Index: SerafinReader.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/telemac/io/SerafinReader.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** SerafinReader.java 25 Nov 2003 10:11:58 -0000 1.13
--- SerafinReader.java 12 Dec 2003 10:30:55 -0000 1.14
***************
*** 16,22 ****
import java.util.ArrayList;
import java.util.Calendar;
import com.memoire.fu.FuVectordouble;
import org.fudaa.dodico.commun.DodicoAnalyze;
- import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.fichiers.FileFormat;
import org.fudaa.dodico.fichiers.FileFormatVersion;
--- 16,25 ----
import java.util.ArrayList;
import java.util.Calendar;
+
+ import org.fudaa.ctulu.CtuluLib;
+
import com.memoire.fu.FuVectordouble;
+
import org.fudaa.dodico.commun.DodicoAnalyze;
import org.fudaa.dodico.fichiers.FileFormat;
import org.fudaa.dodico.fichiers.FileFormatVersion;
***************
*** 68,72 ****
in= new FileInputStream(_f);
} catch (FileNotFoundException _e) {
! if (DodicoLib.DEBUG)
_e.printStackTrace();
// analyze_.addFatalError(DodicoLib.geti18n("Fichier non trouvé"));
--- 71,75 ----
in= new FileInputStream(_f);
} catch (FileNotFoundException _e) {
! if (CtuluLib.DEBUG)
_e.printStackTrace();
// analyze_.addFatalError(DodicoLib.geti18n("Fichier non trouvé"));
***************
*** 364,369 ****
H2dResource.getS(
"Nb pas de temps mal estimé (estimé {0}, lu {1})",
! DodicoLib.getString(nbPasTempsEstime),
! DodicoLib.getString(inter_.getNbPasDeTemps())));
}
inter_.setMaillage(new H2dGrid(points, elements));
--- 367,372 ----
H2dResource.getS(
"Nb pas de temps mal estimé (estimé {0}, lu {1})",
! CtuluLib.getString(nbPasTempsEstime),
! CtuluLib.getString(inter_.getNbPasDeTemps())));
}
inter_.setMaillage(new H2dGrid(points, elements));
Index: SinusxConvert.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/telemac/io/SinusxConvert.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SinusxConvert.java 25 Nov 2003 10:11:58 -0000 1.3
--- SinusxConvert.java 12 Dec 2003 10:30:55 -0000 1.4
***************
*** 9,22 ****
package org.fudaa.dodico.telemac.io;
import java.io.File;
- import java.io.FileOutputStream;
import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
- import java.io.OutputStream;
import java.io.PrintWriter;
import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.commun.ProgressionBuAdapter;
import org.fudaa.dodico.mnt.MNTZone;
- import com.memoire.bu.BuTask;
/**
* @version $Id$
--- 9,24 ----
package org.fudaa.dodico.telemac.io;
import java.io.File;
import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
import java.io.PrintWriter;
+
+ import org.fudaa.ctulu.CtuluLib;
+
+ import com.memoire.bu.BuTask;
+
import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.commun.ProgressionBuAdapter;
import org.fudaa.dodico.mnt.MNTZone;
/**
* @version $Id$
***************
*** 47,51 ****
return;
}
! String linesep= DodicoLib.LINE_SEP;
if (args.length > 2) {
String sortieID= args[2];
--- 49,53 ----
return;
}
! String linesep= CtuluLib.LINE_SEP;
if (args.length > 2) {
String sortieID= args[2];
Index: SinusxReader.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/telemac/io/SinusxReader.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SinusxReader.java 25 Nov 2003 10:11:58 -0000 1.4
--- SinusxReader.java 12 Dec 2003 10:30:55 -0000 1.5
***************
*** 12,17 ****
import java.io.Reader;
import java.util.ArrayList;
import org.fudaa.dodico.commun.DodicoLib;
- import org.fudaa.dodico.commun.DodicoResource;
import org.fudaa.dodico.commun.ProgressionInterface;
import org.fudaa.dodico.fortran.FortranReader;
--- 12,19 ----
import java.io.Reader;
import java.util.ArrayList;
+
+ import org.fudaa.ctulu.CtuluLib;
+
import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.commun.ProgressionInterface;
import org.fudaa.dodico.fortran.FortranReader;
***************
*** 269,273 ****
throw _err;
} catch (EOFException _err) {
! if (DodicoLib.DEBUG)
System.out.println("Lecture terminée");
}
--- 271,275 ----
throw _err;
} catch (EOFException _err) {
! if (CtuluLib.DEBUG)
System.out.println("Lecture terminée");
}
Index: SinusxWriter.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/telemac/io/SinusxWriter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SinusxWriter.java 25 Nov 2003 10:11:58 -0000 1.3
--- SinusxWriter.java 12 Dec 2003 10:30:55 -0000 1.4
***************
*** 15,19 ****
import java.util.Calendar;
import java.util.Locale;
! import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.commun.ProgressionInterface;
import org.fudaa.dodico.h2d.H2dResource;
--- 15,21 ----
import java.util.Calendar;
import java.util.Locale;
!
! import org.fudaa.ctulu.CtuluLib;
!
import org.fudaa.dodico.commun.ProgressionInterface;
import org.fudaa.dodico.h2d.H2dResource;
***************
*** 50,54 ****
*/
public SinusxWriter(Writer _out, MNTZone[] _zones) {
! this(_out, _zones, null, DodicoLib.LINE_SEP);
}
/**
--- 52,56 ----
*/
public SinusxWriter(Writer _out, MNTZone[] _zones) {
! this(_out, _zones, null, CtuluLib.LINE_SEP);
}
/**
Index: TelemacCLReader.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/telemac/io/TelemacCLReader.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** TelemacCLReader.java 11 Dec 2003 12:41:28 -0000 1.15
--- TelemacCLReader.java 12 Dec 2003 10:30:55 -0000 1.16
***************
*** 11,16 ****
import java.io.IOException;
import java.util.ArrayList;
import org.fudaa.dodico.commun.DodicoAnalyze;
- import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.fichiers.FileFormat;
import org.fudaa.dodico.fichiers.FileFormatVersion;
--- 11,18 ----
import java.io.IOException;
import java.util.ArrayList;
+
+ import org.fudaa.ctulu.CtuluLib;
+
import org.fudaa.dodico.commun.DodicoAnalyze;
import org.fudaa.dodico.fichiers.FileFormat;
import org.fudaa.dodico.fichiers.FileFormatVersion;
***************
*** 20,27 ****
import org.fudaa.dodico.h2d.telemac.H2dTelemacCLElementSource;
import org.fudaa.dodico.h2d.telemac.H2dTelemacCLSourceInterface;
- import org.fudaa.dodico.h2d.telemac.H2dTelemacBoundaryCondition;
- import org.fudaa.dodico.h2d.telemac.H2dTelemacBoundaryConditionMutable;
- import org.fudaa.dodico.h2d.type.H2dBoundaryType;
import org.fudaa.dodico.h2d.type.H2dBcType;
/**
*
--- 22,27 ----
import org.fudaa.dodico.h2d.telemac.H2dTelemacCLElementSource;
import org.fudaa.dodico.h2d.telemac.H2dTelemacCLSourceInterface;
import org.fudaa.dodico.h2d.type.H2dBcType;
+ import org.fudaa.dodico.h2d.type.H2dBoundaryType;
/**
*
***************
*** 128,133 ****
H2dResource.getS(
"L'index lu est invalide ( lu: {0} attendu: {1})",
! DodicoLib.getString(cl.k_),
! DodicoLib.getString(index)),
in_);
return null;
--- 128,133 ----
H2dResource.getS(
"L'index lu est invalide ( lu: {0} attendu: {1})",
! CtuluLib.getString(cl.k_),
! CtuluLib.getString(index)),
in_);
return null;
***************
*** 152,157 ****
}
} catch (EOFException _oef) {
! if (DodicoLib.DEBUG)
! DodicoLib.debug("Telemac boundary file read end");
} catch (NumberFormatException _ex) {
DodicoAnalyze.manageException(_ex, analyze_, in_);
--- 152,157 ----
}
} catch (EOFException _oef) {
! if (CtuluLib.DEBUG)
! CtuluLib.debug("Telemac boundary file read end");
} catch (NumberFormatException _ex) {
DodicoAnalyze.manageException(_ex, analyze_, in_);
***************
*** 246,250 ****
H2dResource.getS("Le code concernant le traceur est incorrect")
+ "."
! + DodicoLib.ESPACE
+ H2dResource.getS("Code lu")
+ ": "
--- 246,250 ----
H2dResource.getS("Le code concernant le traceur est incorrect")
+ "."
! + CtuluLib.ESPACE
+ H2dResource.getS("Code lu")
+ ": "
***************
*** 261,265 ****
H2dResource.getS("Le code concernant l'onde incidence est incorrect")
+ "."
! + DodicoLib.ESPACE
+ H2dResource.getS("Code accepté")
+ "1 1 1",
--- 261,265 ----
H2dResource.getS("Le code concernant l'onde incidence est incorrect")
+ "."
! + CtuluLib.ESPACE
+ H2dResource.getS("Code accepté")
+ "1 1 1",
***************
*** 284,288 ****
H2dResource.getS("Le code concernant la hauteur est incorrect")
+ "."
! + DodicoLib.ESPACE
+ H2dResource.getS("Codes acceptés")
+ ": "
--- 284,288 ----
H2dResource.getS("Le code concernant la hauteur est incorrect")
+ "."
! + CtuluLib.ESPACE
+ H2dResource.getS("Codes acceptés")
+ ": "
***************
*** 356,360 ****
H2dResource.getS("Le code concernant la vitesse u est incorrect")
+ "."
! + DodicoLib.ESPACE
+ H2dResource.getS("Codes autorisés")
+ ": "
--- 356,360 ----
H2dResource.getS("Le code concernant la vitesse u est incorrect")
+ "."
! + CtuluLib.ESPACE
+ H2dResource.getS("Codes autorisés")
+ ": "
***************
*** 389,393 ****
H2dResource.getS("Le code concernant la vitesse v est incorrect")
+ "."
! + DodicoLib.ESPACE
+ H2dResource.getS("Codes autorisés")
+ ": "
--- 389,393 ----
H2dResource.getS("Le code concernant la vitesse v est incorrect")
+ "."
! + CtuluLib.ESPACE
+ H2dResource.getS("Codes autorisés")
+ ": "
Index: TelemacCLWriter.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/telemac/io/TelemacCLWriter.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** TelemacCLWriter.java 25 Nov 2003 10:11:58 -0000 1.12
--- TelemacCLWriter.java 12 Dec 2003 10:30:55 -0000 1.13
***************
*** 9,12 ****
--- 9,15 ----
package org.fudaa.dodico.telemac.io;
import java.io.IOException;
+
+ import org.fudaa.ctulu.CtuluLib;
+
import org.fudaa.dodico.commun.DodicoAnalyze;
import org.fudaa.dodico.commun.DodicoLib;
***************
*** 19,25 ****
import org.fudaa.dodico.h2d.telemac.H2dTelemacCLElementSource;
import org.fudaa.dodico.h2d.telemac.H2dTelemacCLSourceInterface;
- import org.fudaa.dodico.h2d.telemac.H2dTelemacBoundaryCondition;
- import org.fudaa.dodico.h2d.type.H2dBoundaryType;
import org.fudaa.dodico.h2d.type.H2dBcType;
/**
*
--- 22,27 ----
import org.fudaa.dodico.h2d.telemac.H2dTelemacCLElementSource;
import org.fudaa.dodico.h2d.telemac.H2dTelemacCLSourceInterface;
import org.fudaa.dodico.h2d.type.H2dBcType;
+ import org.fudaa.dodico.h2d.type.H2dBoundaryType;
/**
*
***************
*** 118,123 ****
H2dResource.getS(
"L'index lu est invalide ( lu: {0} attendu: {1})",
! DodicoLib.getString(i + 1),
! DodicoLib.getString(line.k_ + 1)),
i);
return;
--- 120,125 ----
H2dResource.getS(
"L'index lu est invalide ( lu: {0} attendu: {1})",
! CtuluLib.getString(i + 1),
! CtuluLib.getString(line.k_ + 1)),
i);
return;
***************
*** 228,232 ****
_r.addWarning(
H2dResource.getS("Le code concernant le traceur est incorrect")
! + DodicoLib.ESPACE
+ _source.tracerType_,
_indexFrontiere);
--- 230,234 ----
_r.addWarning(
H2dResource.getS("Le code concernant le traceur est incorrect")
! + CtuluLib.ESPACE
+ _source.tracerType_,
_indexFrontiere);
Index: TelemacDicoFileFormatVersion.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/telemac/io/TelemacDicoFileFormatVersion.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** TelemacDicoFileFormatVersion.java 11 Dec 2003 12:41:29 -0000 1.7
--- TelemacDicoFileFormatVersion.java 12 Dec 2003 10:30:55 -0000 1.8
***************
*** 9,13 ****
package org.fudaa.dodico.telemac.io;
import java.util.Set;
! import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.dico.DicoCasFileFormat;
import org.fudaa.dodico.dico.DicoEntite;
--- 9,15 ----
package org.fudaa.dodico.telemac.io;
import java.util.Set;
!
! import org.fudaa.ctulu.CtuluLib;
!
import org.fudaa.dodico.dico.DicoCasFileFormat;
import org.fudaa.dodico.dico.DicoEntite;
***************
*** 19,23 ****
import org.fudaa.dodico.h2d.type.H2dFileFormatType;
import org.fudaa.dodico.telemac.TelemacDicoManager;
- import sun.security.action.GetBooleanAction;
/**
* @author deniger
--- 21,24 ----
***************
*** 178,182 ****
*/
public boolean isFlowrateComputeFromVelocities(String _v) {
! return DodicoLib.DEUX.equals(_v);
}
/**
--- 179,183 ----
*/
public boolean isFlowrateComputeFromVelocities(String _v) {
! return CtuluLib.DEUX.equals(_v);
}
/**
***************
*** 184,188 ****
*/
public boolean isFlowrateComputeFromElevation(String _v) {
! return DodicoLib.QUATRE.equals(_v);
}
/**
--- 185,189 ----
*/
public boolean isFlowrateComputeFromElevation(String _v) {
! return CtuluLib.QUATRE.equals(_v);
}
/**
***************
*** 190,194 ****
*/
public boolean isFlowrateComputeFromVelocityU(String _v) {
! return DodicoLib.TROIS.equals(_v);
}
}
--- 191,195 ----
*/
public boolean isFlowrateComputeFromVelocityU(String _v) {
! return CtuluLib.TROIS.equals(_v);
}
}
Index: TelemacLiquideReader.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/telemac/io/TelemacLiquideReader.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** TelemacLiquideReader.java 11 Dec 2003 12:41:29 -0000 1.10
--- TelemacLiquideReader.java 12 Dec 2003 10:30:55 -0000 1.11
***************
*** 10,13 ****
--- 10,16 ----
import java.io.EOFException;
import java.io.IOException;
+
+ import org.fudaa.ctulu.CtuluLib;
+
import org.fudaa.dodico.commun.DodicoAnalyze;
import org.fudaa.dodico.commun.DodicoLib;
***************
*** 140,145 ****
}
} catch (EOFException _e) {
! if (DodicoLib.DEBUG)
! DodicoLib.debug("end of file for telemac liquid file");
} catch (NumberFormatException _e) {
DodicoAnalyze.manageException(_e, analyze_);
--- 143,148 ----
}
} catch (EOFException _e) {
! if (CtuluLib.DEBUG)
! CtuluLib.debug("end of file for telemac liquid file");
} catch (NumberFormatException _e) {
DodicoAnalyze.manageException(_e, analyze_);
Index: TelemacLiquideWriter.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/telemac/io/TelemacLiquideWriter.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** TelemacLiquideWriter.java 11 Dec 2003 12:41:29 -0000 1.8
--- TelemacLiquideWriter.java 12 Dec 2003 10:30:55 -0000 1.9
***************
*** 11,17 ****
import java.text.DateFormat;
import java.util.Calendar;
import org.fudaa.dodico.commun.DodicoAnalyze;
- import org.fudaa.dodico.commun.DodicoLib;
- import org.fudaa.dodico.commun.DodicoResource;
import org.fudaa.dodico.fichiers.FileFormat;
import org.fudaa.dodico.fichiers.FileFormatVersion;
--- 11,18 ----
import java.text.DateFormat;
import java.util.Calendar;
+
+ import org.fudaa.ctulu.CtuluLib;
+
import org.fudaa.dodico.commun.DodicoAnalyze;
import org.fudaa.dodico.fichiers.FileFormat;
import org.fudaa.dodico.fichiers.FileFormatVersion;
***************
*** 82,86 ****
+ " "
+ H2dResource.getS("Généré le")
! + DodicoLib.ESPACE
+ DateFormat.getDateInstance().format(Calendar.getInstance().getTime())
+ lineSep_);
--- 83,87 ----
+ " "
+ H2dResource.getS("Généré le")
! + CtuluLib.ESPACE
+ DateFormat.getDateInstance().format(Calendar.getInstance().getTime())
+ lineSep_);
***************
*** 89,93 ****
b.append(version_.getTempsVariable());
for (int i= 0; i < nbEvol; i++) {
! b.append(DodicoLib.ESPACE).append(evols[i].getTelemacEnteteId());
}
writeln(b);
--- 90,94 ----
b.append(version_.getTempsVariable());
for (int i= 0; i < nbEvol; i++) {
! b.append(CtuluLib.ESPACE).append(evols[i].getTelemacEnteteId());
}
writeln(b);
***************
*** 95,99 ****
b.append("s");
for (int i= 0; i < nbEvol; i++) {
! b.append(DodicoLib.ESPACE + evols[i].getUnite());
}
writeln(b);
--- 96,100 ----
b.append("s");
for (int i= 0; i < nbEvol; i++) {
! b.append(CtuluLib.ESPACE + evols[i].getUnite());
}
writeln(b);
***************
*** 103,107 ****
b.append(ev0.getQuickPasDeTemps(i));
for (int j= 0; j < nbEvol; j++) {
! b.append(DodicoLib.ESPACE + evols[j].getQuickValue(i));
}
writeln(b);
--- 104,108 ----
b.append(ev0.getQuickPasDeTemps(i));
for (int j= 0; j < nbEvol; j++) {
! b.append(CtuluLib.ESPACE + evols[j].getQuickValue(i));
}
writeln(b);
|
