Menu
▾
▴
[Fudaa-cvs-commit] fudaa_devel/fudaa/src/org/fudaa/fudaa/dico FDicoCalculLocal.java,1.6,1.7 FDicoEntiteFileTableModelInterface.java,1.2,1.3 FDicoEntitePanel.java,1.8,1.9 FDicoEntiteTableModel.java,1.6,1.7 FDicoFilleProjet.java,1.10,1.11 FDicoFiltreChooserName.java,1.3,1.4 FDicoFiltreController.java,1.7,1.8 FDicoMultiEntiteViewer.java,1.5,1.6 FDicoParams.java,1.13,1.14 FDicoProjectPanel.java,1.8,1.9 FDicoProjet.java,1.8,1.9 FDicoProjetInterface.java,1.8,1.9
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dico
In directory sc8-pr-cvs1:/tmp/cvs-serv25368/dico
Modified Files:
FDicoCalculLocal.java FDicoEntiteFileTableModelInterface.java
FDicoEntitePanel.java FDicoEntiteTableModel.java
FDicoFilleProjet.java FDicoFiltreChooserName.java
FDicoFiltreController.java FDicoMultiEntiteViewer.java
FDicoParams.java FDicoProjectPanel.java FDicoProjet.java
FDicoProjetInterface.java
Log Message:
Modification du prepro tr.
Ajout tail follow
Modifation ebli/graphe/courbe
Index: FDicoCalculLocal.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dico/FDicoCalculLocal.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** FDicoCalculLocal.java 25 Nov 2003 10:13:39 -0000 1.6
--- FDicoCalculLocal.java 11 Dec 2003 12:50:54 -0000 1.7
***************
*** 9,15 ****
--- 9,26 ----
package org.fudaa.fudaa.dico;
import java.io.File;
+
+ import javax.swing.JCheckBox;
+
+ import com.memoire.bu.BuBorderLayout;
+ import com.memoire.bu.BuCheckBox;
+ import com.memoire.bu.BuGridLayout;
+
+ import org.fudaa.dodico.calcul.CalculExec;
import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.commun.ProgressionInterface;
import org.fudaa.dodico.dico.DicoExec;
+
+ import org.fudaa.ebli.dialog.EbliSimpleDialogPanel;
+
import org.fudaa.fudaa.commun.calcul.FudaaCalculOp;
/**
***************
*** 23,26 ****
--- 34,45 ----
projet_= _projet;
}
+
+ public void execute() {
+ CalculPanel p=new CalculPanel();
+ if(EbliSimpleDialogPanel.isOkResponse(p.afficheModale(projet_.getImpl().getFrame(), projet_.getCodeName()))){
+ getDicoExec().setLog(p.isLog());
+ super.execute();
+ }
+ }
/**
*
***************
*** 38,41 ****
--- 57,86 ----
+ DodicoLib.ESPACE
+ projet_.getCodeName();
+ }
+
+ protected DicoExec getDicoExec(){
+ return (DicoExec)exe_;
+ }
+
+ private class CalculPanel extends EbliSimpleDialogPanel{
+ JCheckBox cbLog_;
+ CalculPanel(){
+ addEmptyBorder(10);
+ setLayout(new BuGridLayout(2,10,10));
+ addStringText(getDicoExec().getExecName()).setEnabled(false);
+ addStringText(projet_.getParamsFile().getAbsolutePath()).setEnabled(false);
+ addLabel(DodicoLib.EMPTY_STRING);
+ cbLog_=new BuCheckBox(FDicoResource.getS("Créer les fichiers de log"));
+ cbLog_.setSelected(FDicoPreferences.FD.getBooleanProperty("calcul.log", true));
+ add(cbLog_);
+ }
+
+ public boolean isLog(){
+ return cbLog_.isSelected();
+ }
+
+ public void apply(){
+ FDicoPreferences.FD.putBooleanProperty("calcul.log", cbLog_.isSelected());
+ }
}
}
Index: FDicoEntiteFileTableModelInterface.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dico/FDicoEntiteFileTableModelInterface.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FDicoEntiteFileTableModelInterface.java 25 Nov 2003 10:13:40 -0000 1.2
--- FDicoEntiteFileTableModelInterface.java 11 Dec 2003 12:50:54 -0000 1.3
***************
*** 21,23 ****
--- 21,24 ----
public int indexOf(DicoEntite e);
public DicoEntite getEntite(int row);
+ public void remove(int[] _row);
}
Index: FDicoEntitePanel.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dico/FDicoEntitePanel.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** FDicoEntitePanel.java 25 Nov 2003 10:13:40 -0000 1.8
--- FDicoEntitePanel.java 11 Dec 2003 12:50:54 -0000 1.9
***************
*** 31,34 ****
--- 31,35 ----
import javax.swing.JScrollPane;
import javax.swing.JTable;
+ import javax.swing.JTextField;
import javax.swing.KeyStroke;
import javax.swing.ListSelectionModel;
***************
*** 330,334 ****
refresh();
}
! public void dicoParamsStateEntiteUpdated(
DicoParams _cas,
DicoEntite _ent) {
--- 331,335 ----
refresh();
}
! public void dicoParamsValidStateEntiteUpdated(
DicoParams _cas,
DicoEntite _ent) {
***************
*** 358,361 ****
--- 359,363 ----
JTable table_;
FDicoEntiteTableModel tableModel_;
+ FDicoFiltreChooserName findFiltre_;
// public FDicoEntitePanel(FDicoEntiteTableModel _model) {
// this(_model,null);
***************
*** 456,460 ****
table_.getTableHeader().addMouseListener(l);
FDicoFiltreController filtre= new FDicoFiltreController();
! filtre.add(new FDicoFiltreChooserName());
filtre.add(new FDicoFiltreChooserModified(_model.getParams()));
filtre.add(new FDIcoFiltreChooserMode());
--- 458,463 ----
table_.getTableHeader().addMouseListener(l);
FDicoFiltreController filtre= new FDicoFiltreController();
! findFiltre_= new FDicoFiltreChooserName();
! filtre.add(findFiltre_);
filtre.add(new FDicoFiltreChooserModified(_model.getParams()));
filtre.add(new FDIcoFiltreChooserMode());
***************
*** 623,626 ****
--- 626,652 ----
menu.add(mEnr);
menu.show(_c, _x, _y);
+ }
+ JTextField txtFind_;
+ public void activeFind() {
+ if (txtFind_ == null) {
+ JComponent leftCp= getLeftComponent();
+ int n= leftCp.getComponentCount();
+ for (int i= 0; i < n; i++) {
+ if ("pnFind".equals(leftCp.getComponent(i).getName())) {
+ JPanel pn= (JPanel)leftCp.getComponent(i);
+ n= pn.getComponentCount();
+ for (int j= 0; j < n; j++) {
+ if ("txtFind".equals(pn.getComponent(j).getName())) {
+ txtFind_= (JTextField)pn.getComponent(j);
+ break;
+ }
+ }
+ break;
+ }
+ }
+ }
+ if (txtFind_ != null) {
+ txtFind_.requestFocus();
+ }
}
/**
Index: FDicoEntiteTableModel.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dico/FDicoEntiteTableModel.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** FDicoEntiteTableModel.java 25 Nov 2003 10:13:40 -0000 1.6
--- FDicoEntiteTableModel.java 11 Dec 2003 12:50:54 -0000 1.7
***************
*** 83,86 ****
--- 83,88 ----
projet_.getDicoParams().removeValues(_ents, _max);
else {
+ //DEBUG TO REMOVE
+ System.out.println("yes");
cmdMng_.addCmd(
projet_.getDicoParams().removeValuesAndGenerateCommand(_ents, _max));
***************
*** 296,300 ****
}
}
! public void dicoParamsStateEntiteUpdated(DicoParams _cas, DicoEntite _ent) {
if (projet_.getDicoParams() == projet_) {
int index= entitesViewed_.indexOf(_ent);
--- 298,302 ----
}
}
! public void dicoParamsValidStateEntiteUpdated(DicoParams _cas, DicoEntite _ent) {
if (projet_.getDicoParams() == projet_) {
int index= entitesViewed_.indexOf(_ent);
Index: FDicoFilleProjet.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dico/FDicoFilleProjet.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** FDicoFilleProjet.java 25 Nov 2003 10:13:40 -0000 1.10
--- FDicoFilleProjet.java 11 Dec 2003 12:50:54 -0000 1.11
***************
*** 17,20 ****
--- 17,21 ----
import com.memoire.bu.BuInternalFrame;
import com.memoire.bu.BuResource;
+ import com.memoire.bu.BuSelectFindReplaceInterface;
import com.memoire.bu.BuTabbedPane;
import com.memoire.bu.BuUndoRedoInterface;
***************
*** 29,37 ****
* @version $Id$
*/
! public class FDicoFilleProjet extends FudaaUndoPaneFille {
protected JComponent[] specificTools_;
private FDicoProjet projet_;
BuCommonImplementation impl_;
- FudaaUndoCmdMngListener listener_;
public FDicoFilleProjet(FDicoProjet _proj, FudaaCommonImplementation _impl) {
super(_proj.getTitle(), true, true, true, true, _impl.getUndoCmdListener());
--- 30,40 ----
* @version $Id$
*/
! public class FDicoFilleProjet
! extends FudaaUndoPaneFille
! implements BuSelectFindReplaceInterface {
protected JComponent[] specificTools_;
private FDicoProjet projet_;
+ private FDicoEntitePanel pnEnt_;
BuCommonImplementation impl_;
public FDicoFilleProjet(FDicoProjet _proj, FudaaCommonImplementation _impl) {
super(_proj.getTitle(), true, true, true, true, _impl.getUndoCmdListener());
***************
*** 42,56 ****
null,
projPane,
! FDicoResource.getS("Les fichiers du projet"));
! if (listener_ != null)
! listener_.add(projPane.getCmdMng());
DodicoCommandManager cmd= new DodicoCommandManager();
! if (listener_ != null)
! listener_.add(cmd);
super.addTab(
FDicoResource.getS("Mot-clés"),
null,
! new FDicoEntitePanel(new FDicoEntiteTableModel(_proj, cmd)),
! FDicoResource.getS("Mot-clés"));
projet_= _proj;
}
--- 45,58 ----
null,
projPane,
! FDicoResource.getS("Les fichiers du projet"),
! projPane.getCmdMng());
DodicoCommandManager cmd= new DodicoCommandManager();
! pnEnt_= new FDicoEntitePanel(new FDicoEntiteTableModel(_proj, cmd));
super.addTab(
FDicoResource.getS("Mot-clés"),
null,
! pnEnt_,
! FDicoResource.getS("Mot-clés"),
! cmd);
projet_= _proj;
}
***************
*** 111,113 ****
--- 113,148 ----
}
}
+ /**
+ *
+ */
+ public void find() {
+ if (getSelectedComponent() == pnEnt_) {
+ pnEnt_.activeFind();
+ }
+ }
+ /**
+ *
+ */
+ public void replace() {}
+ /**
+ *
+ */
+ public void select() {}
+ /**
+ *
+ */
+ public void setSelected(boolean b) throws PropertyVetoException {
+ super.setSelected(b);
+ if(impl_!=null)
+ impl_.setEnabledForAction("RECHERCHER",b && (pnEnt_!=null) && (getSelectedComponent() == pnEnt_));
+ }
+ /**
+ *
+ */
+ public void stateChanged(ChangeEvent e) {
+ super.stateChanged(e);
+ if(impl_!=null)
+ impl_.setEnabledForAction("RECHERCHER", (pnEnt_!=null) && (getSelectedComponent() == pnEnt_));
+ }
+
}
Index: FDicoFiltreChooserName.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dico/FDicoFiltreChooserName.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FDicoFiltreChooserName.java 25 Nov 2003 10:13:40 -0000 1.3
--- FDicoFiltreChooserName.java 11 Dec 2003 12:50:54 -0000 1.4
***************
*** 83,86 ****
--- 83,89 ----
public JPanel buildPanel(Font _f, ListCellRenderer _r) {
BuPanel r= new BuPanel();
+ //this name is important. It is used to search the text field "txtFind" : for the
+ //"find" action
+ r.setName("pnFind");
r.setLayout(new BuGridLayout(2));
r.setBorder(
***************
*** 96,99 ****
--- 99,103 ----
});
final FiltreTextField t= new FiltreTextField();
+ t.setName("txtFind");
if (filtre_ != null)
t.setText(filtre_);
Index: FDicoFiltreController.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dico/FDicoFiltreController.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** FDicoFiltreController.java 25 Nov 2003 10:13:40 -0000 1.7
--- FDicoFiltreController.java 11 Dec 2003 12:50:54 -0000 1.8
***************
*** 64,67 ****
--- 64,68 ----
listener_= _l;
}
+
public void add(FDicoFiltreChooserAbstract _f) {
synchronized (filtreChoosers_) {
***************
*** 92,95 ****
--- 93,98 ----
}
}
+
+
public JPanel buildPanel() {
JPanel r= new BuPanel();
Index: FDicoMultiEntiteViewer.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dico/FDicoMultiEntiteViewer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** FDicoMultiEntiteViewer.java 25 Nov 2003 10:13:40 -0000 1.5
--- FDicoMultiEntiteViewer.java 11 Dec 2003 12:50:54 -0000 1.6
***************
*** 100,103 ****
--- 100,105 ----
}
public void setVecteurEntite(DicoEntite.Vecteur _v) {
+ if(_v.getNbElemFixed()>=0) setEntite(_v,_v.getNbElemFixed());
+ else
setEntite(_v, -1);
}
Index: FDicoParams.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dico/FDicoParams.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** FDicoParams.java 25 Nov 2003 10:13:40 -0000 1.13
--- FDicoParams.java 11 Dec 2003 12:50:54 -0000 1.14
***************
*** 54,57 ****
--- 54,58 ----
protected DicoParams dicoParams_;
protected FudaaUI ui_;
+ private boolean isValide_;
//private List newEntiteFileToSave_;
/**
***************
*** 64,71 ****
--- 65,80 ----
fileLastModified_= _file.lastModified();
ui_= _ui;
+ manageName();
}
public final DicoParams getDicoParams() {
return dicoParams_;
}
+ private final void manageName() {
+ if (casFileName_.indexOf(' ') >= 0) {
+ ui_.message("Le nom du fichier ne doit pas comporter d'espace");
+ isValide_= false;
+ } else
+ isValide_= true;
+ }
/**
* Use this method to add a new entiteFile that will be save.
***************
*** 105,109 ****
File _f,
ProgressionInterface _interface) {
! System.err.println(
"had to save " + _entFile.getNom() + " in " + _f.getAbsolutePath());
return false;
--- 114,118 ----
File _f,
ProgressionInterface _interface) {
! FudaaLib.error(
"had to save " + _entFile.getNom() + " in " + _f.getAbsolutePath());
return false;
***************
*** 285,289 ****
}
}
! public void dicoParamsStateEntiteUpdated(
DicoParams _cas,
DicoEntite _ent) {
--- 294,298 ----
}
}
! public void dicoParamsValidStateEntiteUpdated(
DicoParams _cas,
DicoEntite _ent) {
***************
*** 309,315 ****
entites_.remove(_ent);
fireTableDataChanged();
- System.out.println("taille ent remove " + entites_.size());
}
- System.out.println("taille ent " + entites_.size());
}
/**
--- 318,322 ----
***************
*** 358,361 ****
--- 365,380 ----
*/
public void dicoParamsProjectModifyStateChanged(DicoParams _cas) {}
+ /**
+ *
+ */
+ public void remove(int[] _row) {
+ if ((_row != null) && (_row.length > 0)) {
+ DicoEntite[] es= new DicoEntite[_row.length];
+ for (int i= _row.length - 1; i >= 0; i--) {
+ es[i]= getEntite(_row[i]);
+ }
+ cmdMng_.addCmd(dicoParams_.removeValuesAndGenerateCommand(es));
+ }
+ }
}
/**
***************
*** 417,421 ****
|| ((f.lastModified()
!= state.getFileLastTimeModifiedWhenLoad()))) {
! dicoParams_.setModified(ent, true);
if (f.exists()) {
if (FudaaLib.DEBUG)
--- 436,440 ----
|| ((f.lastModified()
!= state.getFileLastTimeModifiedWhenLoad()))) {
! dicoParams_.setLoadedModified(ent, true);
if (f.exists()) {
if (FudaaLib.DEBUG)
***************
*** 480,484 ****
}
}
! private Map computeNewEntiteFileToSave(DicoEntite[] _ent) {
if (_ent == null)
return null;
--- 499,503 ----
}
}
! private final Map computeNewEntiteFileToSave(DicoEntite[] _ent) {
if (_ent == null)
return null;
***************
*** 513,516 ****
--- 532,536 ----
dirBase_= _n.getParentFile();
casFileName_= _n.getName();
+ manageName();
fileLastModified_= _n.lastModified();
dicoParams_.clearModified();
***************
*** 556,560 ****
return saveDicoEntiteFileAction(_ent, _destFile, _progress);
} else {
! if (_initFile.exists()) {
if (FudaaLib.DEBUG)
FudaaLib.debug(
--- 576,580 ----
return saveDicoEntiteFileAction(_ent, _destFile, _progress);
} else {
! if ((_initFile != null) && _initFile.exists()) {
if (FudaaLib.DEBUG)
FudaaLib.debug(
***************
*** 565,572 ****
return DodicoLib.copyFile(_initFile, _destFile);
} else {
! System.out.println(
_ent.getNom()
+ " file "
! + _initFile.getAbsolutePath()
+ " unknown source");
return saveDicoEntiteFileAction(_ent, _destFile, _progress);
--- 585,592 ----
return DodicoLib.copyFile(_initFile, _destFile);
} else {
! FudaaLib.error(
_ent.getNom()
+ " file "
! + (_initFile == null ? "?" : _initFile.getAbsolutePath())
+ " unknown source");
return saveDicoEntiteFileAction(_ent, _destFile, _progress);
***************
*** 610,614 ****
}
Iterator fileIt= dicoParams_.getDicoEntiteFileEnum();
! for (int i= n; i > 0; i--) {
entFile[i]= (DicoEntite)fileIt.next();
initFile[i]=
--- 630,634 ----
}
Iterator fileIt= dicoParams_.getDicoEntiteFileEnum();
! for (int i= n - 1; i >= 0; i--) {
entFile[i]= (DicoEntite)fileIt.next();
initFile[i]=
***************
*** 697,701 ****
}
}
! } //new File save and update this dico if needed.
if (newFile != null) {
n= newFile.length;
--- 717,722 ----
}
}
! }
! //new File save and update this dico if needed.
if (newFile != null) {
n= newFile.length;
***************
*** 705,713 ****
if (_saveIn) {
dicoParams_.setValue(
! entFile[i],
! (String)modifiedEntite.get(entFile[i]));
if ((dicoParams_.isLoaded(newEntite[i])) && (er)) {
dicoParams_.setLoaded(newEntite[i], newFile[i], false);
}
}
}
--- 726,735 ----
if (_saveIn) {
dicoParams_.setValue(
! newEntite[i],
! (String)modifiedEntite.get(newEntite[i]));
if ((dicoParams_.isLoaded(newEntite[i])) && (er)) {
dicoParams_.setLoaded(newEntite[i], newFile[i], false);
}
+ dicoParams_.clearModified();
}
}
***************
*** 718,733 ****
}
} /**
! *
! */
public String getCasFileName() {
return casFileName_;
} /**
! *
! */
public long getCasFileTimeLoaded() {
return fileLastModified_;
} /**
! *
! */
public File getDirBase() {
return dirBase_;
--- 740,755 ----
}
} /**
! *
! */
public String getCasFileName() {
return casFileName_;
} /**
! *
! */
public long getCasFileTimeLoaded() {
return fileLastModified_;
} /**
! *
! */
public File getDirBase() {
return dirBase_;
***************
*** 736,768 ****
return dicoParams_.getDicoFileFormatVersion();
} /**
! *
! */
public FudaaUI getUI() {
return ui_;
} /**
! *
! */ /**
! *
! */
public String canUpdate(DicoEntite _ent) {
return dicoParams_.canUpdate(_ent);
} /**
! *
! */
public boolean contains(DicoEntite _ent) {
return dicoParams_.contains(_ent);
} /**
! *
! */
public Set getAllEntiteWithValuesSet() {
return dicoParams_.getAllEntiteWithValuesSet();
} /**
! *
! */
public DicoModelAbstract getDico() {
return dicoParams_.getDico();
} /**
! *
! */
public DicoCasInterface getDicoCasInterface() {
return dicoParams_.getDicoCasInterface();
--- 758,790 ----
return dicoParams_.getDicoFileFormatVersion();
} /**
! *
! */
public FudaaUI getUI() {
return ui_;
} /**
! *
! */ /**
! *
! */
public String canUpdate(DicoEntite _ent) {
return dicoParams_.canUpdate(_ent);
} /**
! *
! */
public boolean contains(DicoEntite _ent) {
return dicoParams_.contains(_ent);
} /**
! *
! */
public Set getAllEntiteWithValuesSet() {
return dicoParams_.getAllEntiteWithValuesSet();
} /**
! *
! */
public DicoModelAbstract getDico() {
return dicoParams_.getDico();
} /**
! *
! */
public DicoCasInterface getDicoCasInterface() {
return dicoParams_.getDicoCasInterface();
***************
*** 771,836 ****
return dicoParams_.getEntiteFileNb();
} /**
! *
! */
public Map getEntiteValues() {
return dicoParams_.getEntiteValues();
} /**
! *
! */
public void getEntiteValues(Map _m) {
dicoParams_.getEntiteValues(_m);
} /**
! *
! */
public String getTitle() {
return dicoParams_.getTitle();
} /**
! *
! */
public String getValue(DicoEntite _e) {
return dicoParams_.getValue(_e);
} /**
! *
! */
public int getValuesSize() {
return dicoParams_.getValuesSize();
} /**
! *
! */
public boolean isValide() {
! return dicoParams_.isValide();
} /**
! *
! */
public boolean isValueSetFor(DicoEntite _ent) {
return dicoParams_.isValueSetFor(_ent);
} /**
! *
! */
public boolean isValueValideFor(DicoEntite _ent) {
return dicoParams_.isValueValideFor(_ent);
} /**
! *
! */
public void removeModelListener(DicoParamsListener _l) {
dicoParams_.removeModelListener(_l);
} /**
! *
! */
public void removeValue(DicoEntite _ent) {
dicoParams_.removeValue(_ent);
} /**
! *
! */
public void removeValues(DicoEntite[] _ent) {
dicoParams_.removeValues(_ent);
} /**
! *
! */
public void removeValues(DicoEntite[] _ent, int _max) {
dicoParams_.removeValues(_ent, _max);
} /**
! *
! */
public void setValue(DicoEntite _ent, String _value) {
dicoParams_.setValue(_ent, _value);
--- 793,858 ----
return dicoParams_.getEntiteFileNb();
} /**
! *
! */
public Map getEntiteValues() {
return dicoParams_.getEntiteValues();
} /**
! *
! */
public void getEntiteValues(Map _m) {
dicoParams_.getEntiteValues(_m);
} /**
! *
! */
public String getTitle() {
return dicoParams_.getTitle();
} /**
! *
! */
public String getValue(DicoEntite _e) {
return dicoParams_.getValue(_e);
} /**
! *
! */
public int getValuesSize() {
return dicoParams_.getValuesSize();
} /**
! *
! */
public boolean isValide() {
! return isValide_ && dicoParams_.isValide();
} /**
! *
! */
public boolean isValueSetFor(DicoEntite _ent) {
return dicoParams_.isValueSetFor(_ent);
} /**
! *
! */
public boolean isValueValideFor(DicoEntite _ent) {
return dicoParams_.isValueValideFor(_ent);
} /**
! *
! */
public void removeModelListener(DicoParamsListener _l) {
dicoParams_.removeModelListener(_l);
} /**
! *
! */
public void removeValue(DicoEntite _ent) {
dicoParams_.removeValue(_ent);
} /**
! *
! */
public void removeValues(DicoEntite[] _ent) {
dicoParams_.removeValues(_ent);
} /**
! *
! */
public void removeValues(DicoEntite[] _ent, int _max) {
dicoParams_.removeValues(_ent, _max);
} /**
! *
! */
public void setValue(DicoEntite _ent, String _value) {
dicoParams_.setValue(_ent, _value);
Index: FDicoProjectPanel.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dico/FDicoProjectPanel.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** FDicoProjectPanel.java 25 Nov 2003 10:13:41 -0000 1.8
--- FDicoProjectPanel.java 11 Dec 2003 12:50:54 -0000 1.9
***************
*** 15,22 ****
--- 15,28 ----
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+ import java.awt.event.KeyEvent;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.text.DateFormat;
import java.util.Date;
+
+ import javax.swing.AbstractAction;
+ import javax.swing.Action;
+ import javax.swing.BorderFactory;
+ import javax.swing.InputMap;
import javax.swing.JComponent;
import javax.swing.JFileChooser;
***************
*** 24,34 ****
import javax.swing.JTable;
import javax.swing.JTextField;
import javax.swing.table.DefaultTableCellRenderer;
import javax.swing.table.TableColumn;
import javax.swing.table.TableColumnModel;
import com.memoire.bu.BuBorderLayout;
import com.memoire.bu.BuGridLayout;
import com.memoire.bu.BuLabel;
- import com.memoire.bu.BuLib;
import com.memoire.bu.BuMenuItem;
import com.memoire.bu.BuPanel;
--- 30,45 ----
import javax.swing.JTable;
import javax.swing.JTextField;
+ import javax.swing.KeyStroke;
+ import javax.swing.event.ListSelectionEvent;
+ import javax.swing.event.ListSelectionListener;
import javax.swing.table.DefaultTableCellRenderer;
import javax.swing.table.TableColumn;
import javax.swing.table.TableColumnModel;
+
import com.memoire.bu.BuBorderLayout;
+ import com.memoire.bu.BuButton;
import com.memoire.bu.BuGridLayout;
+ import com.memoire.bu.BuHorizontalLayout;
import com.memoire.bu.BuLabel;
import com.memoire.bu.BuMenuItem;
import com.memoire.bu.BuPanel;
***************
*** 38,41 ****
--- 49,54 ----
import com.memoire.bu.BuTable;
import com.memoire.bu.BuTextField;
+ import com.memoire.bu.BuVerticalLayout;
+
import org.fudaa.dodico.commun.DodicoCommandManager;
import org.fudaa.dodico.commun.DodicoLib;
***************
*** 43,48 ****
import org.fudaa.dodico.dico.DicoParams;
import org.fudaa.dodico.dico.DicoParamsListener;
import org.fudaa.ebli.dialog.EbliSimpleDialogPanel;
! import org.fudaa.fudaa.commun.undo.*;
import org.fudaa.fudaa.ressource.FudaaResource;
/**
--- 56,63 ----
import org.fudaa.dodico.dico.DicoParams;
import org.fudaa.dodico.dico.DicoParamsListener;
+
import org.fudaa.ebli.dialog.EbliSimpleDialogPanel;
!
! import org.fudaa.fudaa.commun.undo.FudaaUndoCmdMngContainer;
import org.fudaa.fudaa.ressource.FudaaResource;
/**
***************
*** 52,56 ****
public class FDicoProjectPanel
extends BuPanel
! implements ActionListener, MouseListener, DicoParamsListener, FudaaUndoCmdMngContainer {
BuTable table_;
FDicoEntiteFileTableModelInterface model_;
--- 67,71 ----
public class FDicoProjectPanel
extends BuPanel
! implements ActionListener, MouseListener, DicoParamsListener, FudaaUndoCmdMngContainer,ListSelectionListener {
BuTable table_;
FDicoEntiteFileTableModelInterface model_;
***************
*** 64,67 ****
--- 79,84 ----
JLabel lbModifie_;
JLabel lbDate_;
+ Action actionDefaultSelected_;
+ Action actionEditerSelected_;
/**
*
***************
*** 77,81 ****
--- 94,100 ----
table_= new BuTable(model_);
table_.addMouseListener(this);
+ table_.getSelectionModel().addListSelectionListener(this);
setLayout(new BuBorderLayout(5, 5));
+ setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
add(new BuScrollPane(table_), BuBorderLayout.CENTER);
TableColumnModel columnModel= table_.getColumnModel();
***************
*** 122,125 ****
--- 141,169 ----
updateErreur();
updateSaveState();
+ buildAction();
+ BuPanel p= new BuPanel();
+ p.setLayout(new BuVerticalLayout(5,false,false));
+ BuButton bt= new BuButton();
+ bt.setAction(actionEditerSelected_);
+ bt.setText(DodicoLib.EMPTY_STRING);
+ p.add(bt);
+ bt= new BuButton();
+ bt.setAction(actionDefaultSelected_);
+ bt.setText(DodicoLib.EMPTY_STRING);
+ p.add(bt);
+ add(p,BuBorderLayout.EAST);
+ InputMap thisMap=
+ getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
+ thisMap.put(
+ KeyStroke.getKeyStroke(KeyEvent.VK_D, KeyEvent.CTRL_MASK),
+ "INITIALISER");
+ getActionMap().put("INITIALISER", actionDefaultSelected_);
+ thisMap.put(
+ KeyStroke.getKeyStroke(KeyEvent.VK_E, KeyEvent.CTRL_MASK),
+ "EDITER");
+ thisMap.put(
+ KeyStroke.getKeyStroke(KeyEvent.VK_SPACE, KeyEvent.KEY_TYPED),
+ "EDITER");
+ getActionMap().put("EDITER", actionEditerSelected_);
}
private void updateErreur() {
***************
*** 145,148 ****
--- 189,221 ----
new Date(proj_.getFDicoParams().fileLastModified_)));
}
+ private void buildAction() {
+ actionDefaultSelected_=
+ new AbstractAction(
+ FudaaResource.getS("Initialiser"),
+ BuResource.BU.getIcon("annuler")) {
+ public void actionPerformed(ActionEvent _ae) {
+ model_.remove(table_.getSelectedRows());
+ }
+ };
+ actionEditerSelected_=
+ new AbstractAction(
+ BuResource.BU.getString("Editer"),
+ BuResource.BU.getIcon("editer")) {
+ public void actionPerformed(ActionEvent _ae) {
+ int i= table_.getSelectedRow();
+ if (i >= 0)
+ table_.editCellAt(i, 2);
+ fileEditor.doClick();
+ }
+ };
+ actionDefaultSelected_.setEnabled(false);
+ actionDefaultSelected_.putValue(
+ Action.SHORT_DESCRIPTION,
+ FDicoResource.getS("Initialiser les mot-clés sélectionnés"));
+ actionEditerSelected_.setEnabled(false);
+ actionEditerSelected_.putValue(
+ Action.SHORT_DESCRIPTION,
+ BuResource.BU.getString("Editer"));
+ }
public void actionPerformed(ActionEvent _evt) {
if (_evt.getSource() == txtName_) {
***************
*** 372,376 ****
*
*/
! public void dicoParamsStateEntiteUpdated(DicoParams _cas, DicoEntite _ent) {
updateErreur();
}
--- 445,449 ----
*
*/
! public void dicoParamsValidStateEntiteUpdated(DicoParams _cas, DicoEntite _ent) {
updateErreur();
}
***************
*** 383,385 ****
--- 456,468 ----
updateSaveState();
}
+ /**
+ *
+ */
+ public void valueChanged(ListSelectionEvent e) {
+ boolean b=!table_.getSelectionModel().isSelectionEmpty();
+ actionDefaultSelected_.setEnabled(b);
+ actionEditerSelected_.setEnabled(b);
+
+ }
+
}
Index: FDicoProjet.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dico/FDicoProjet.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** FDicoProjet.java 25 Nov 2003 10:13:41 -0000 1.8
--- FDicoProjet.java 11 Dec 2003 12:50:54 -0000 1.9
***************
*** 66,69 ****
--- 66,70 ----
actions_.setEnableCalcul(isValide());
}
+
/**
*
***************
*** 186,194 ****
}
public void close() {
! entiteFille_.setVisible(false);
getImpl().removeInternalFrame(entiteFille_);
entiteFille_.dispose();
entiteFille_= null;
! // getImpl().closeProjet(this);
}
/**
--- 187,196 ----
}
public void close() {
! if(entiteFille_!=null) {
! entiteFille_.setVisible(false);
getImpl().removeInternalFrame(entiteFille_);
entiteFille_.dispose();
entiteFille_= null;
! }
}
/**
Index: FDicoProjetInterface.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dico/FDicoProjetInterface.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** FDicoProjetInterface.java 25 Nov 2003 10:13:41 -0000 1.8
--- FDicoProjetInterface.java 11 Dec 2003 12:50:54 -0000 1.9
***************
*** 8,11 ****
--- 8,12 ----
*/
package org.fudaa.fudaa.dico;
+ import java.awt.Frame;
import java.io.File;
import org.fudaa.dodico.commun.ProgressionInterface;
***************
*** 22,25 ****
--- 23,27 ----
public String getTitle();
public DicoParams getDicoParams();
+ public FudaaCommonImplementation getImpl();
public File getParamsFile();
public File getDirBase();
|
