|
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;
/**
|