Menu
▾
▴
[Fudaa-cvs-commit] fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico FDicoMultiEntiteViewer.java,1.1,1.2 FDicoParams.java,1.1,1.2 FDicoComparator.java,1.1,1.2 FDicoFilleProjet.java,1.2,1.3 FDicoEntitePanel.java,1.1,1.2 FDIcoFiltreChooserMode.java,1.1,1.2 FDicoProjectPanel.java,1.1,1.2 FDicoChooserPanel.java,1.3,1.4 FDicoProjet.java,1.2,1.3 FDicoNewProjectPanel.java,1.1,1.2 FDicoTableEditorChooser.java,1.1,1.2
|
From: Frederic D. <de...@us...> - 2004-03-31 08:30:08
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10634/src/org/fudaa/fudaa/fdico Modified Files: FDicoMultiEntiteViewer.java FDicoParams.java FDicoComparator.java FDicoFilleProjet.java FDicoEntitePanel.java FDIcoFiltreChooserMode.java FDicoProjectPanel.java FDicoChooserPanel.java FDicoProjet.java FDicoNewProjectPanel.java FDicoTableEditorChooser.java Log Message: Maj post Index: FDicoNewProjectPanel.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoNewProjectPanel.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FDicoNewProjectPanel.java 12 Feb 2004 16:15:20 -0000 1.1 --- FDicoNewProjectPanel.java 31 Mar 2004 08:17:49 -0000 1.2 *************** *** 19,24 **** import org.fudaa.dodico.dico.DicoManager; - - import org.fudaa.ebli.dialog.EbliSimpleDialogPanel; /** * @author deniger --- 19,22 ---- *************** *** 26,48 **** */ public class FDicoNewProjectPanel ! extends EbliSimpleDialogPanel implements CaretListener { BuLabelMultiLine lbWarn; - FDicoChooserPanel chooserPn; /** * */ public FDicoNewProjectPanel(DicoManager _m) { ! setLayout(new BuBorderLayout(10, 5)); ! addEmptyBorder(5); ! chooserPn= new FDicoChooserPanel(_m); ! add(chooserPn, BuBorderLayout.CENTER); ! chooserPn.fic_.addCaretListener(this); ! } ! public FDicoChooserPanel getChooserPanel() { ! return chooserPn; } public File getFile() { ! return chooserPn.getSelectedFile(); } private void noWarn() { --- 24,40 ---- */ public class FDicoNewProjectPanel ! extends FDicoChooserPanel implements CaretListener { BuLabelMultiLine lbWarn; /** * */ public FDicoNewProjectPanel(DicoManager _m) { ! super(_m); ! fic_.addCaretListener(this); } + public File getFile() { ! return getSelectedFile(); } private void noWarn() { *************** *** 50,53 **** --- 42,47 ---- lbWarn.setVisible(false); } + + private void warn(String s) { if (lbWarn == null) { *************** *** 66,70 **** */ public void caretUpdate(CaretEvent e) { ! String s= chooserPn.fic_.getText(); if (s != null) { File f= new File(s); --- 60,64 ---- */ public void caretUpdate(CaretEvent e) { ! String s= fic_.getText(); if (s != null) { File f= new File(s); *************** *** 78,80 **** --- 72,82 ---- noWarn(); } + /** + * @see java.lang.Object#finalize() + */ + protected void finalize() throws Throwable { + super.finalize(); + if(fic_!=null) fic_.removeCaretListener(this); + } + } Index: FDicoEntitePanel.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoEntitePanel.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FDicoEntitePanel.java 12 Feb 2004 16:15:19 -0000 1.1 --- FDicoEntitePanel.java 31 Mar 2004 08:17:48 -0000 1.2 *************** *** 8,11 **** --- 8,12 ---- */ package org.fudaa.fudaa.fdico; + import java.awt.Color; import java.awt.Component; *************** *** 18,22 **** import java.awt.event.MouseListener; import java.util.Iterator; [...1287 lines suppressed...] ! CtuluLib.debug("entite panel unactive"); if (table_.getCellEditor() != null) { table_.getCellEditor().stopCellEditing(); ! if (pnInfos_ != null) ! pnInfos_.saveCurrentComment(); } ! int i = colModel_.getColumnIndex(FDicoTableColumnIdentifier.COLUMN_NOM); table_.setColumnSelectionInterval(i, i); } } + + /** + * @see org.fudaa.fudaa.commun.undo.FudaaUndoCmdMngContainer#clearCmd(org.fudaa.dodico.commun.DodicoCommandManager) + */ + public void clearCmd(DodicoCommandManager _source) { + if (tableModel_.getCmdMng() != _source) + tableModel_.getCmdMng().clean(); + } } \ No newline at end of file Index: FDicoComparator.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoComparator.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FDicoComparator.java 12 Feb 2004 16:15:19 -0000 1.1 --- FDicoComparator.java 31 Mar 2004 08:17:48 -0000 1.2 *************** *** 8,11 **** --- 8,12 ---- */ package org.fudaa.fudaa.fdico; + import java.util.ArrayList; import java.util.Arrays; *************** *** 22,35 **** import javax.swing.table.TableModel; - import org.fudaa.ctulu.CtuluLib; - import com.memoire.bu.BuIcon; import com.memoire.bu.BuResource; ! import org.fudaa.dodico.commun.DodicoLib; import org.fudaa.dodico.commun.ProgressionInterface; ! import org.fudaa.dodico.dico.DicoCasInterface; import org.fudaa.dodico.dico.DicoEntite; - import org.fudaa.ebli.tableau.EbliCellTextRenderer; /** --- 23,33 ---- import javax.swing.table.TableModel; import com.memoire.bu.BuIcon; import com.memoire.bu.BuResource; ! import org.fudaa.ctulu.CtuluLib; import org.fudaa.dodico.commun.ProgressionInterface; ! import org.fudaa.dodico.commun.ProgressionUpdater; import org.fudaa.dodico.dico.DicoEntite; import org.fudaa.ebli.tableau.EbliCellTextRenderer; /** *************** *** 38,173 **** */ public class FDicoComparator { ! Map entiteBase_; ! String titleBase_; ! Map entiteCompare_; ! String titleCompare_; ! ComparaisonField[] compFields_; ProgressionInterface progression_; ! BuIcon ajout_= BuResource.BU.getIcon("oui_16"); ! BuIcon supp_= BuResource.BU.getIcon("non_16"); ! BuIcon mod_= BuResource.BU.getIcon("editer_16"); public FDicoComparator( ! Map _base, ! String _titleBase, ! Map _compare, ! String _titleCompare) { ! entiteBase_= _base; ! entiteCompare_= _compare; ! titleBase_= _titleBase; ! titleCompare_= _titleCompare; compare(); } public void setProgressionInterface(ProgressionInterface _prog) { ! progression_= _prog; } private void compare() { ! ArrayList compTemp= new ArrayList(entiteBase_.size()); ! List compareValues= new ArrayList(entiteCompare_.keySet()); DicoEntite ent; String value; String valueCompare; ! int index= 0; ! int pourc= 0; ! boolean afficheAvance= (progression_ == null ? false : true); ! if (afficheAvance) ! progression_.setProgression(pourc); ! int nb= (int) (entiteBase_.size() * 1.5); ! int step= DodicoLib.getStep(nb); ! int pourcStep= (int) (50 / step); ! int pas= (int) (nb / step); ! int pMax= pas; ! for (Iterator it= entiteBase_.keySet().iterator(); it.hasNext();) { index++; ! ent= (DicoEntite)it.next(); ! value= (String)entiteBase_.get(ent); if (entiteCompare_.containsKey(ent)) { compareValues.remove(ent); ! valueCompare= (String)entiteCompare_.get(ent); if (!valueCompare.equals(value)) { ! ComparaisonField c= new ComparaisonField(); ! c.ent_= ent; ! c.valueBase_= value; ! c.valueCompare_= valueCompare; ! c.state_= ComparaisonField.CHANGE; compTemp.add(c); } } else { ! ComparaisonField c= new ComparaisonField(); ! c.ent_= ent; ! c.valueBase_= value; ! c.valueCompare_= null; ! c.state_= ComparaisonField.ADD; compTemp.add(c); } ! if (afficheAvance) { ! if (index > pMax) { ! pourc += pourcStep; ! progression_.setProgression(pourc); ! pMax += pas; ! } ! } } ! for (Iterator it= compareValues.iterator(); it.hasNext();) { ! ent= (DicoEntite)it.next(); ! ComparaisonField c= new ComparaisonField(); ! c.ent_= ent; ! c.valueBase_= null; ! c.valueCompare_= (String)entiteCompare_.get(ent); ! c.state_= ComparaisonField.REMOVE; compTemp.add(c); } ! compFields_= new ComparaisonField[compTemp.size()]; compTemp.toArray(compFields_); Arrays.sort(compFields_, new ComparaisonFieldComparator()); ! if (afficheAvance) ! progression_.setProgression(100); } public class ComparaisonFieldComparator implements Comparator { /** ! * ! */ public int compare(Object o1, Object o2) { ! return compare((ComparaisonField)o1, (ComparaisonField)o2); } public int compare(ComparaisonField _f1, ComparaisonField _f2) { return _f1.getEntite().compareTo(_f2.getEntite()); } } public TableModel createTableModel() { return new ComparaisonTableModel(); } public void createRenderer(JTable _t) { ! TableColumnModel colModel= _t.getColumnModel(); ! EbliCellTextRenderer textRender= new EbliCellTextRenderer(); ! EbliCellTextRenderer iconRender= new EbliCellTextRenderer() { public void setValue(Object o) { ! setIcon((Icon)o); } }; ! TableColumn col= colModel.getColumn(0); col.setCellRenderer(iconRender); ! int n= colModel.getColumnCount() - 1; ! for (int i= n; i >= 1; i--) { colModel.getColumn(i).setCellRenderer(textRender); } } private class ComparaisonTableModel extends AbstractTableModel { /** ! * ! */ public int getColumnCount() { return 4; } /** ! * */ public int getRowCount() { return compFields_.length; } /** ! * */ public Object getValueAt(int _row, int _col) { ! ComparaisonField f= compFields_[_row]; if (_col == 0) return f.getStateIcon(); --- 36,204 ---- */ public class FDicoComparator { ! ! Map entiteBase_; ! String titleBase_; ! Map entiteCompare_; ! String titleCompare_; ! ComparaisonField[] compFields_; ProgressionInterface progression_; ! BuIcon ajout_ = BuResource.BU.getIcon("oui_16"); ! BuIcon supp_ = BuResource.BU.getIcon("non_16"); ! BuIcon mod_ = BuResource.BU.getIcon("editer_16"); ! ! /** ! * @param _base les mots-clés de base a comparer ! * @param _titleBase le titre pour les mot-clés de base ! * @param _compare les mot-clés de dest a comparer ! * @param _titleCompare le titre des mot-clés de dest ! */ public FDicoComparator( ! Map _base, ! String _titleBase, ! Map _compare, ! String _titleCompare) { ! entiteBase_ = _base; ! entiteCompare_ = _compare; ! titleBase_ = _titleBase; ! titleCompare_ = _titleCompare; compare(); } + public void setProgressionInterface(ProgressionInterface _prog) { ! progression_ = _prog; } + private void compare() { ! ArrayList compTemp = new ArrayList(entiteBase_.size()); ! List compareValues = new ArrayList(entiteCompare_.keySet()); DicoEntite ent; String value; String valueCompare; ! int index = 0; ! int pourc = 0; ! boolean afficheAvance = (progression_ == null ? false : true); ! if (afficheAvance) ! progression_.setProgression(pourc); ! int nb = (int) (entiteBase_.size() * 1.5); ! ProgressionUpdater up = new ProgressionUpdater(progression_); ! up.setValue(2, nb, 0, 50); ! up.majProgessionStateOnly(); ! for (Iterator it = entiteBase_.keySet().iterator(); it.hasNext();) { index++; ! ent = (DicoEntite) it.next(); ! value = (String) entiteBase_.get(ent); if (entiteCompare_.containsKey(ent)) { compareValues.remove(ent); ! valueCompare = (String) entiteCompare_.get(ent); if (!valueCompare.equals(value)) { ! ComparaisonField c = new ComparaisonField(); ! c.ent_ = ent; ! c.valueBase_ = value; ! c.valueCompare_ = valueCompare; ! c.state_ = ComparaisonField.CHANGE; compTemp.add(c); } } else { ! ComparaisonField c = new ComparaisonField(); ! c.ent_ = ent; ! c.valueBase_ = value; ! c.valueCompare_ = null; ! c.state_ = ComparaisonField.ADD; compTemp.add(c); } ! up.majAvancement(); } ! for (Iterator it = compareValues.iterator(); it.hasNext();) { ! ent = (DicoEntite) it.next(); ! ComparaisonField c = new ComparaisonField(); ! c.ent_ = ent; ! c.valueBase_ = null; ! c.valueCompare_ = (String) entiteCompare_.get(ent); ! c.state_ = ComparaisonField.REMOVE; compTemp.add(c); } ! compFields_ = new ComparaisonField[compTemp.size()]; compTemp.toArray(compFields_); Arrays.sort(compFields_, new ComparaisonFieldComparator()); ! if (afficheAvance) ! progression_.setProgression(100); } + + /** + * Un comparateur pour les noms de mots-clés + * @author Fred Deniger + * @version $Id$ + */ public class ComparaisonFieldComparator implements Comparator { + + /** ! * Compare les "ComparaisonField" ! * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object) ! */ public int compare(Object o1, Object o2) { ! return compare((ComparaisonField) o1, (ComparaisonField) o2); } + + /** + * @param _f1 le premier field a comparer + * @param _f2 le deuxieme + * @return le resultat qui va bien + */ public int compare(ComparaisonField _f1, ComparaisonField _f2) { return _f1.getEntite().compareTo(_f2.getEntite()); } } + + /** + * @return un modele pour les JTable + */ public TableModel createTableModel() { return new ComparaisonTableModel(); } + + /** + * Cree des renderer pour le modele JTable de cette classe + * @param _t la table de dest + */ public void createRenderer(JTable _t) { ! TableColumnModel colModel = _t.getColumnModel(); ! EbliCellTextRenderer textRender = new EbliCellTextRenderer(); ! EbliCellTextRenderer iconRender = new EbliCellTextRenderer() { ! public void setValue(Object o) { ! setIcon((Icon) o); } }; ! TableColumn col = colModel.getColumn(0); col.setCellRenderer(iconRender); ! int n = colModel.getColumnCount() - 1; ! for (int i = n; i >= 1; i--) { colModel.getColumn(i).setCellRenderer(textRender); } } + private class ComparaisonTableModel extends AbstractTableModel { + /** ! * @see javax.swing.table.TableModel#getColumnCount() ! */ public int getColumnCount() { return 4; } + /** ! * @see javax.swing.table.TableModel#getRowCount() */ public int getRowCount() { return compFields_.length; } + + /** ! * @see javax.swing.table.TableModel#getValueAt(int, int) */ public Object getValueAt(int _row, int _col) { ! ComparaisonField f = compFields_[_row]; if (_col == 0) return f.getStateIcon(); *************** *** 176,185 **** else if (_col == 2) return f.valueBase_; ! else if (_col == 3) ! return f.valueCompare_; return null; } /** ! * */ public String getColumnName(int _col) { --- 207,218 ---- else if (_col == 2) return f.valueBase_; ! else if (_col == 3) ! return f.valueCompare_; return null; } + + /** ! * @see javax.swing.table.TableModel#getColumnName(int) */ public String getColumnName(int _col) { *************** *** 190,206 **** else if (_col == 2) return titleBase_; ! else if (_col == 3) ! return titleCompare_; return CtuluLib.EMPTY_STRING; } } private class ComparaisonField { ! private final static int ADD= 0; ! private final static int REMOVE= 1; ! private final static int CHANGE= 2; ! DicoEntite ent_; ! String valueBase_; ! String valueCompare_; ! int state_; public String getState() { if (state_ == ADD) --- 223,245 ---- else if (_col == 2) return titleBase_; ! else if (_col == 3) ! return titleCompare_; return CtuluLib.EMPTY_STRING; } } + private class ComparaisonField { ! ! private final static int ADD = 0; ! private final static int REMOVE = 1; ! private final static int CHANGE = 2; ! DicoEntite ent_; ! String valueBase_; ! String valueCompare_; ! int state_; ! ! /** ! * @return l'etat du champ ! */ public String getState() { if (state_ == ADD) *************** *** 208,218 **** else if (state_ == REMOVE) return FDicoResource.getS("Supprimé"); ! else if (state_ == CHANGE) ! return FDicoResource.getS("Modifié"); return CtuluLib.EMPTY_STRING; } public DicoEntite getEntite() { return ent_; } public BuIcon getStateIcon() { if (state_ == ADD) --- 247,265 ---- else if (state_ == REMOVE) return FDicoResource.getS("Supprimé"); ! else if (state_ == CHANGE) ! return FDicoResource.getS("Modifié"); return CtuluLib.EMPTY_STRING; } + + /** + * @return l'entite du comparateur + */ public DicoEntite getEntite() { return ent_; } + + /** + * @return l'icone associe + */ public BuIcon getStateIcon() { if (state_ == ADD) *************** *** 220,225 **** else if (state_ == REMOVE) return FDicoComparator.this.supp_; ! else if (state_ == CHANGE) ! return FDicoComparator.this.mod_; return null; } --- 267,272 ---- else if (state_ == REMOVE) return FDicoComparator.this.supp_; ! else if (state_ == CHANGE) ! return FDicoComparator.this.mod_; return null; } Index: FDIcoFiltreChooserMode.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDIcoFiltreChooserMode.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FDIcoFiltreChooserMode.java 12 Feb 2004 16:15:19 -0000 1.1 --- FDIcoFiltreChooserMode.java 31 Mar 2004 08:17:48 -0000 1.2 *************** *** 9,21 **** package org.fudaa.fudaa.fdico; import javax.swing.JMenuItem; ! import org.fudaa.dodico.commun.DodicoLib; import org.fudaa.dodico.dico.DicoEntite; import org.fudaa.fudaa.ressource.FudaaResource; public final class FDIcoFiltreChooserMode extends FDicoFiltreChooserSimple { public FDIcoFiltreChooserMode() { ! super(DodicoLib.copy(DicoEntite.NIVEAU)); } /** ! * */ public String getName() { --- 9,30 ---- package org.fudaa.fudaa.fdico; import javax.swing.JMenuItem; ! ! import org.fudaa.ctulu.CtuluLib; import org.fudaa.dodico.dico.DicoEntite; import org.fudaa.fudaa.ressource.FudaaResource; + /** + * @author Fred Deniger + * @version $Id$ + */ public final class FDIcoFiltreChooserMode extends FDicoFiltreChooserSimple { + /** + * Filtre selon le mode des mot-clés + */ public FDIcoFiltreChooserMode() { ! super(CtuluLib.copy(DicoEntite.NIVEAU)); } + /** ! * @see org.fudaa.fudaa.fdico.FDicoFiltreChooserAbstract#getName() */ public String getName() { *************** *** 23,27 **** } /** ! * */ public boolean accept(DicoEntite _ent) { --- 32,36 ---- } /** ! * @see org.fudaa.fudaa.fdico.FDicoFiltre#accept(org.fudaa.dodico.dico.DicoEntite) */ public boolean accept(DicoEntite _ent) { *************** *** 33,38 **** return true; } /** ! * */ public JMenuItem[] getActionFor(DicoEntite _ent) { --- 42,48 ---- return true; } + /** ! * @see org.fudaa.fudaa.fdico.FDicoFiltreChooserAbstract#getActionFor(org.fudaa.dodico.dico.DicoEntite) */ public JMenuItem[] getActionFor(DicoEntite _ent) { Index: FDicoParams.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoParams.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FDicoParams.java 12 Feb 2004 16:15:20 -0000 1.1 --- FDicoParams.java 31 Mar 2004 08:17:48 -0000 1.2 *************** *** 18,25 **** import javax.swing.table.AbstractTableModel; ! import org.fudaa.ctulu.CtuluLib; ! import com.memoire.bu.BuResource; import org.fudaa.dodico.commun.DodicoCommandManager; import org.fudaa.dodico.commun.DodicoLib; --- 18,25 ---- import javax.swing.table.AbstractTableModel; ! import com.memoire.bu.BuInformationsDocument; import com.memoire.bu.BuResource; + import org.fudaa.ctulu.CtuluLib; import org.fudaa.dodico.commun.DodicoCommandManager; import org.fudaa.dodico.commun.DodicoLib; *************** *** 38,42 **** import org.fudaa.dodico.dico.DicoParamsListener; import org.fudaa.dodico.fichiers.FileOperationSynthese; - import org.fudaa.fudaa.commun.FudaaLib; import org.fudaa.fudaa.commun.FudaaUI; --- 38,41 ---- *************** *** 57,60 **** --- 56,60 ---- protected FudaaUI ui_; private boolean isValide_; + BuInformationsDocument idoc_; //private List newEntiteFileToSave_; /** *************** *** 69,72 **** --- 69,82 ---- manageName(); } + + /** + * @return les informations sur le document + */ + public BuInformationsDocument getInformationsDocument() { + if (idoc_ == null) + idoc_= new BuInformationsDocument(); + return idoc_; + } + public final DicoParams getDicoParams() { return dicoParams_; Index: FDicoChooserPanel.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoChooserPanel.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** FDicoChooserPanel.java 12 Mar 2004 10:17:04 -0000 1.3 --- FDicoChooserPanel.java 31 Mar 2004 08:17:48 -0000 1.4 *************** *** 18,30 **** import javax.swing.DefaultComboBoxModel; import javax.swing.DefaultListCellRenderer; ! import javax.swing.JFileChooser; import javax.swing.JList; import javax.swing.JTextField; import javax.swing.ListCellRenderer; - import javax.swing.ListModel; import javax.swing.UIManager; ! import org.fudaa.ctulu.CtuluLib; ! import com.memoire.bu.BuComboBox; import com.memoire.bu.BuGridLayout; --- 18,29 ---- import javax.swing.DefaultComboBoxModel; import javax.swing.DefaultListCellRenderer; ! import javax.swing.JComboBox; ! import javax.swing.JLabel; import javax.swing.JList; import javax.swing.JTextField; import javax.swing.ListCellRenderer; import javax.swing.UIManager; ! import com.memoire.bu.BuAbstractCellRenderer; import com.memoire.bu.BuComboBox; import com.memoire.bu.BuGridLayout; *************** *** 32,41 **** import com.memoire.bu.BuResource; import org.fudaa.dodico.dico.DicoCasFileFormat; import org.fudaa.dodico.dico.DicoLanguage; import org.fudaa.dodico.dico.DicoManager; - import org.fudaa.ebli.dialog.EbliSimpleDialogPanel; - import org.fudaa.ebli.filechooser.EbliFileChooser; /** * @author deniger --- 31,39 ---- import com.memoire.bu.BuResource; + import org.fudaa.ctulu.CtuluLib; import org.fudaa.dodico.dico.DicoCasFileFormat; import org.fudaa.dodico.dico.DicoLanguage; import org.fudaa.dodico.dico.DicoManager; import org.fudaa.ebli.dialog.EbliSimpleDialogPanel; /** * @author deniger *************** *** 49,53 **** DefaultComboBoxModel versionChooser_; DicoLanguage.LanguageComboBoxModel langChooser_; ! JTextField fic_; /** * @param _m les dico a prendre en compte --- 47,51 ---- DefaultComboBoxModel versionChooser_; DicoLanguage.LanguageComboBoxModel langChooser_; ! protected JTextField fic_; /** * @param _m les dico a prendre en compte *************** *** 73,76 **** --- 71,78 ---- fic_.setText(_f); } + /** + * @param _m + * @param _fileChooser + */ public FDicoChooserPanel(DicoManager _m, boolean _fileChooser) { dicoMng_= _m; *************** *** 81,86 **** fic_= addLabelFileChooserPanel(BuResource.BU.getString("Fichier") + s); } ! add(new BuLabel(FDicoResource.getS("Dictionnaire") + s)); ! BuComboBox cb= new BuComboBox(); dicoChooser_= new FormatComboBoxModel(dicoMng_.formats_); cb.setModel(dicoChooser_); --- 83,88 ---- fic_= addLabelFileChooserPanel(BuResource.BU.getString("Fichier") + s); } ! add(new JLabel(FDicoResource.getS("Dictionnaire") + s)); ! JComboBox cb= new JComboBox(); dicoChooser_= new FormatComboBoxModel(dicoMng_.formats_); cb.setModel(dicoChooser_); *************** *** 90,110 **** DicoCasFileFormat f= (DicoCasFileFormat)dicoMng_.formats_.get(0); dicoChooser_.setSelectedItem(f); ! add(new BuLabel(BuResource.BU.getString("Version") + s)); cb= new BuComboBox(); versionChooser_= new DefaultComboBoxModel(dicoMng_.getVersions(f)); cb.setModel(versionChooser_); add(cb); add(new BuLabel(BuResource.BU.getString("Langage") + s)); ! cb= new BuComboBox(); langChooser_= new DicoLanguage.LanguageComboBoxModel(); cb.setModel(langChooser_); add(cb); } public DicoCasFileFormat getFileFormatSelected() { return (DicoCasFileFormat)dicoChooser_.getSelectedItem(); } public String getVersionSelected() { return (String)versionChooser_.getSelectedItem(); } public int getLanguageSelected() { return langChooser_.getSelectedLanguage(); --- 92,122 ---- DicoCasFileFormat f= (DicoCasFileFormat)dicoMng_.formats_.get(0); dicoChooser_.setSelectedItem(f); ! add(new JLabel(BuResource.BU.getString("Version") + s)); cb= new BuComboBox(); + // cb.setRenderer(new DefaultListCellRenderer()); versionChooser_= new DefaultComboBoxModel(dicoMng_.getVersions(f)); cb.setModel(versionChooser_); add(cb); add(new BuLabel(BuResource.BU.getString("Langage") + s)); ! cb= new JComboBox(); langChooser_= new DicoLanguage.LanguageComboBoxModel(); cb.setModel(langChooser_); add(cb); } + /** + * @return le format selectionne + */ public DicoCasFileFormat getFileFormatSelected() { return (DicoCasFileFormat)dicoChooser_.getSelectedItem(); } + /** + * @return la version selectionnee + */ public String getVersionSelected() { return (String)versionChooser_.getSelectedItem(); } + /** + * @return le langage + */ public int getLanguageSelected() { return langChooser_.getSelectedLanguage(); *************** *** 210,218 **** } } ! /** ! * ! */ ! public JFileChooser createFileChooser() { ! return new EbliFileChooser(); ! } } --- 222,225 ---- } } ! } Index: FDicoTableEditorChooser.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoTableEditorChooser.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FDicoTableEditorChooser.java 12 Feb 2004 16:15:20 -0000 1.1 --- FDicoTableEditorChooser.java 31 Mar 2004 08:17:49 -0000 1.2 *************** *** 31,34 **** --- 31,35 ---- import org.fudaa.dodico.dico.DicoDataType; import org.fudaa.dodico.dico.DicoEntite; + import org.fudaa.ebli.dialog.EbliSimpleDialog; import org.fudaa.ebli.dialog.EbliSimpleDialogPanel; import org.fudaa.ebli.tableau.EbliCellBooleanEditor; *************** *** 106,110 **** if (multiEditor_ == null) { dialog_= new FDicoMultiEntiteViewer(); ! multiEditor_= new MultiDialogEditor(dialog_, null); } dialog_.setVecteurEntite(_ent); --- 107,116 ---- if (multiEditor_ == null) { dialog_= new FDicoMultiEntiteViewer(); ! EbliSimpleDialog s=new EbliSimpleDialog(dialog_); ! s.setTitle(_ent.getNom()); ! multiEditor_= new MultiDialogEditor(s, null); ! } ! else{ ! multiEditor_.getDialog().setTitle(_ent.getNom()); } dialog_.setVecteurEntite(_ent); *************** *** 114,120 **** if (multiEditor_ == null) { dialog_= new FDicoMultiEntiteViewer(); ! multiEditor_= new MultiDialogEditor(dialog_, null); } dialog_.setVecteurEntite(_ent); editor_= multiEditor_; } --- 120,132 ---- if (multiEditor_ == null) { dialog_= new FDicoMultiEntiteViewer(); ! EbliSimpleDialog s=new EbliSimpleDialog(dialog_); ! s.setTitle(_ent.getNom()); ! multiEditor_= new MultiDialogEditor(s, null); ! } ! else{ ! multiEditor_.getDialog().setTitle(_ent.getNom()); } dialog_.setVecteurEntite(_ent); + editor_= multiEditor_; } *************** *** 145,149 **** implements FDicoEditorInterface { public MultiDialogEditor( ! EbliSimpleDialogPanel _dialog, EbliCellDecorator _deco) { super(_dialog, _deco); --- 157,161 ---- implements FDicoEditorInterface { public MultiDialogEditor( ! EbliSimpleDialog _dialog, EbliCellDecorator _deco) { super(_dialog, _deco); *************** *** 363,372 **** FDicoMultiEntiteViewer dialog= new FDicoMultiEntiteViewer(); dialog.setVecteurEntite(_ent); ! editor_= new MultiDialogEditor(dialog, null); } public void visitVecteur(DicoEntite.Vecteur _ent) { FDicoMultiEntiteViewer dialog= new FDicoMultiEntiteViewer(); dialog.setVecteurEntite(_ent); ! editor_= new MultiDialogEditor(dialog, null); } } --- 375,388 ---- FDicoMultiEntiteViewer dialog= new FDicoMultiEntiteViewer(); dialog.setVecteurEntite(_ent); ! EbliSimpleDialog s=new EbliSimpleDialog(dialog); ! s.setTitle(_ent.getNom()); ! editor_= new MultiDialogEditor(s, null); } public void visitVecteur(DicoEntite.Vecteur _ent) { FDicoMultiEntiteViewer dialog= new FDicoMultiEntiteViewer(); dialog.setVecteurEntite(_ent); ! EbliSimpleDialog s=new EbliSimpleDialog(dialog); ! s.setTitle(_ent.getNom()); ! editor_= new MultiDialogEditor(s, null); } } Index: FDicoMultiEntiteViewer.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoMultiEntiteViewer.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FDicoMultiEntiteViewer.java 12 Feb 2004 16:15:20 -0000 1.1 --- FDicoMultiEntiteViewer.java 31 Mar 2004 08:17:48 -0000 1.2 *************** *** 115,119 **** private void setEntite(DicoEntite.Vecteur _v, int _taille) { entite_= _v; - setTitle(entite_.getNom()); table_.setValueListCellRenderer( FDicoTableRendererChooser.createCellRenderer( --- 115,118 ---- Index: FDicoProjet.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoProjet.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FDicoProjet.java 12 Mar 2004 10:17:04 -0000 1.2 --- FDicoProjet.java 31 Mar 2004 08:17:48 -0000 1.3 *************** *** 50,54 **** protected FudaaCalculAction actions_; private EbliSimpleAction actionDiff_; ! BuInformationsDocument idoc_; protected FDicoFilleProjet entiteFille_; FudaaCommonImplementation impl_; --- 50,54 ---- protected FudaaCalculAction actions_; private EbliSimpleAction actionDiff_; ! protected FDicoFilleProjet entiteFille_; FudaaCommonImplementation impl_; *************** *** 137,148 **** } } ! /** ! * @return les informations sur le document ! */ ! public BuInformationsDocument getInformationsDocument() { ! if (idoc_ == null) ! idoc_= new BuInformationsDocument(); ! return idoc_; ! } /** * @see org.fudaa.fudaa.fdico.FDicoProjetInterface#getParamsFile() --- 137,141 ---- } } ! /** * @see org.fudaa.fudaa.fdico.FDicoProjetInterface#getParamsFile() *************** *** 429,446 **** return r; } /** ! * */ public DicoParams getDicoParams() { return params_.getDicoParams(); } public FDicoParams getFDicoParams() { return params_; } /** ! * */ public File getDirBase() { return params_.getDirBase(); } } --- 422,451 ---- return r; } + /** ! * @see org.fudaa.fudaa.fdico.FDicoProjetInterface#getDicoParams() */ public DicoParams getDicoParams() { return params_.getDicoParams(); } + /** + * @return les parametres dico issus de fudaa + */ public FDicoParams getFDicoParams() { return params_; } + /** ! * @see org.fudaa.fudaa.fdico.FDicoProjetInterface#getDirBase() */ public File getDirBase() { return params_.getDirBase(); } + + /** + * @return les informations sur le document + */ + public BuInformationsDocument getInformationsDocument() { + return params_.getInformationsDocument(); + } } Index: FDicoFilleProjet.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoFilleProjet.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FDicoFilleProjet.java 12 Mar 2004 10:17:04 -0000 1.2 --- FDicoFilleProjet.java 31 Mar 2004 08:17:48 -0000 1.3 *************** *** 54,58 **** */ public FDicoFilleProjet(FDicoProjet _proj, FudaaCommonImplementation _impl, Component _leftUp) { ! super(_proj.getTitle(), true, true, true, true, _impl.getUndoCmdListener()); impl_ = _impl; FDicoProjectPanel projPane = new FDicoProjectPanel(_proj); --- 54,58 ---- */ public FDicoFilleProjet(FDicoProjet _proj, FudaaCommonImplementation _impl, Component _leftUp) { ! super(_proj.getTitle(), true, true, true, true,_impl.getUndoCmdListener()); impl_ = _impl; FDicoProjectPanel projPane = new FDicoProjectPanel(_proj); Index: FDicoProjectPanel.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoProjectPanel.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FDicoProjectPanel.java 12 Feb 2004 16:15:20 -0000 1.1 --- FDicoProjectPanel.java 31 Mar 2004 08:17:48 -0000 1.2 *************** *** 451,453 **** --- 451,460 ---- } + /** + * @see org.fudaa.fudaa.commun.undo.FudaaUndoCmdMngContainer#clearCmd(org.fudaa.dodico.commun.DodicoCommandManager) + */ + public void clearCmd(DodicoCommandManager _source) { + if(cmdMng!=_source) cmdMng.clean(); + } + } |
