[Fudaa-cvs-commit] fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico FDicoParams.java,1.3,1.4 FDicoEntiteTableModel.java,1.1,1.2 FDicoEntiteFileTableModelInterface.java,1.2,1.3 FDicoFilleProjet.java,1.3,1.4 FDicoEntitePanel.java,1.3,1.4 FDicoProjet.java,1.3,1.4 FDicoTableEditorChooser.java,1.3,1.4 FDicoProjectPanel.java,1.3,1.4

[Frederic D. <de...@us...>]

Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23809/src/org/fudaa/fudaa/fdico

Modified Files:
	FDicoParams.java FDicoEntiteTableModel.java 
	FDicoEntiteFileTableModelInterface.java FDicoFilleProjet.java 
	FDicoEntitePanel.java FDicoProjet.java 
	FDicoTableEditorChooser.java FDicoProjectPanel.java 
Log Message:


Index: FDicoTableEditorChooser.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoTableEditorChooser.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FDicoTableEditorChooser.java	5 May 2004 12:42:38 -0000	1.3
--- FDicoTableEditorChooser.java	1 Jun 2004 11:27:44 -0000	1.4
***************
*** 343,347 ****
          _actChoiceEditor(_data);
        } else {
!         BuTextField txt= new BuTextField();
          txt.setCharValidator(null);
          editor_= new DicoDefaultEditor(txt);
--- 343,347 ----
          _actChoiceEditor(_data);
        } else {
!         BuTextField txt= new BuTextField(10);
          txt.setCharValidator(null);
          editor_= new DicoDefaultEditor(txt);
***************
*** 352,356 ****
          _actChoiceEditor(_data);
        } else {
!         BuTextField txt= new BuTextField();
          txt.setCharValidator(BuCharValidator.INTEGER);
          editor_= new DicoDefaultEditor(txt);
--- 352,356 ----
          _actChoiceEditor(_data);
        } else {
!         BuTextField txt= new BuTextField(10);
          txt.setCharValidator(BuCharValidator.INTEGER);
          editor_= new DicoDefaultEditor(txt);
***************
*** 363,367 ****
      }
      public void visitReel(DicoDataType.Reel _data) {
!       BuTextField txt= new BuTextField();
        txt.setCharValidator(DICO_DOUBLE_CHAR_VALIDATOR);
        editor_= new DicoDefaultEditor(txt);
--- 363,367 ----
      }
      public void visitReel(DicoDataType.Reel _data) {
!       BuTextField txt= new BuTextField(10);
        txt.setCharValidator(DICO_DOUBLE_CHAR_VALIDATOR);
        editor_= new DicoDefaultEditor(txt);

Index: FDicoEntiteTableModel.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoEntiteTableModel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FDicoEntiteTableModel.java	12 Feb 2004 16:15:19 -0000	1.1
--- FDicoEntiteTableModel.java	1 Jun 2004 11:27:44 -0000	1.2
***************
*** 96,100 ****
      }
      if (cmdMng_ == null)
!       projet_.getDicoParams().removeValues(_ents, _max);
      else {
        cmdMng_.addCmd(
--- 96,100 ----
      }
      if (cmdMng_ == null)
!       projet_.getDicoParams().removeValuesAndGenerateCommand(_ents, _max);
      else {
        cmdMng_.addCmd(
***************
*** 180,184 ****
     */
    public boolean isCellEditable(int rowIndex, int columnIndex) {
!     return FDicoTableColumnIdentifier.getIdentifer(columnIndex).isEditable(
        rowIndex,
        this);
--- 180,184 ----
     */
    public boolean isCellEditable(int rowIndex, int columnIndex) {
!     return (getEntite(rowIndex).isModifiable()) && FDicoTableColumnIdentifier.getIdentifer(columnIndex).isEditable(
        rowIndex,
        this);
***************
*** 199,203 ****
      }
      if (cmdMng_ == null)
!       projet_.getDicoParams().setValue(e, (String)_aValue);
      else {
        cmdMng_.addCmd(
--- 199,203 ----
      }
      if (cmdMng_ == null)
!       projet_.getDicoParams().setValueAndGenerateCommand(e, (String)_aValue);
      else {
        cmdMng_.addCmd(

Index: FDicoEntitePanel.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoEntitePanel.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FDicoEntitePanel.java	5 May 2004 12:42:38 -0000	1.3
--- FDicoEntitePanel.java	1 Jun 2004 11:27:44 -0000	1.4
***************
*** 1,3 ****
! /*
   *  @file         TrDicoEntitePanel.java
   *  @creation     13 mai 2003
--- 1,3 ----
! /**
   *  @file         TrDicoEntitePanel.java
   *  @creation     13 mai 2003
***************
*** 670,675 ****
        table_.scrollRectToVisible(table_.getCellRect(lead, 0, true));
        ent = tableModel_.getEntite(lead);
!       actionDefaultSelected_.setEnabled(true);
!       actionEditerSelected_.setEnabled(true);
      } else {
        actionDefaultSelected_.setEnabled(false);
--- 670,675 ----
        table_.scrollRectToVisible(table_.getCellRect(lead, 0, true));
        ent = tableModel_.getEntite(lead);
!       actionDefaultSelected_.setEnabled(!ent.isRequired());
!       actionEditerSelected_.setEnabled(ent.isModifiable());
      } else {
        actionDefaultSelected_.setEnabled(false);

Index: FDicoProjet.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoProjet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FDicoProjet.java	31 Mar 2004 08:17:48 -0000	1.3
--- FDicoProjet.java	1 Jun 2004 11:27:44 -0000	1.4
***************
*** 204,208 ****
     * @return le panneau projet
     */
!   protected FDicoFilleProjet getProjetFille(){
      return entiteFille_;
    }
--- 204,208 ----
     * @return le panneau projet
     */
!   public FDicoFilleProjet getProjetFille(){
      return entiteFille_;
    }

Index: FDicoEntiteFileTableModelInterface.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoEntiteFileTableModelInterface.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FDicoEntiteFileTableModelInterface.java	5 May 2004 12:42:38 -0000	1.2
--- FDicoEntiteFileTableModelInterface.java	1 Jun 2004 11:27:44 -0000	1.3
***************
*** 20,23 ****
--- 20,24 ----
    public void setCmdMng(DodicoCommandManager _manager);
    public int indexOf(DicoEntite e);
+   public void editer(int i);
    public DicoEntite getEntite(int row);
    public void remove(int[] _row);

Index: FDicoFilleProjet.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoFilleProjet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FDicoFilleProjet.java	31 Mar 2004 08:17:48 -0000	1.3
--- FDicoFilleProjet.java	1 Jun 2004 11:27:44 -0000	1.4
***************
*** 61,66 ****
      null, 
      projPane, 
!     FDicoResource.getS("Les fichiers du projet"), 
!     projPane.getCmdMng());
      DodicoCommandManager cmd = new DodicoCommandManager();
      pnEnt_ = new FDicoEntitePanel(new FDicoEntiteTableModel(_proj, cmd), _leftUp);
--- 61,65 ----
      null, 
      projPane, 
!     FDicoResource.getS("Les fichiers du projet"));
      DodicoCommandManager cmd = new DodicoCommandManager();
      pnEnt_ = new FDicoEntitePanel(new FDicoEntiteTableModel(_proj, cmd), _leftUp);
***************
*** 69,74 ****
      null, 
      pnEnt_, 
!     FDicoResource.getS("Mot-clés"), 
!     cmd);
      projet_ = _proj;
    }
--- 68,72 ----
      null, 
      pnEnt_, 
!     FDicoResource.getS("Mot-clés"));
      projet_ = _proj;
    }

Index: FDicoProjectPanel.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoProjectPanel.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FDicoProjectPanel.java	5 May 2004 12:42:38 -0000	1.3
--- FDicoProjectPanel.java	1 Jun 2004 11:27:44 -0000	1.4
***************
*** 31,34 ****
--- 31,35 ----
  import javax.swing.JTextField;
  import javax.swing.KeyStroke;
+ import javax.swing.ListSelectionModel;
  import javax.swing.event.ListSelectionEvent;
  import javax.swing.event.ListSelectionListener;
***************
*** 89,92 ****
--- 90,94 ----
      proj.getDicoParams().addModelListener(this);
      table_= new BuTable(model_);
+     table_.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
      table_.addMouseListener(this);
      table_.getSelectionModel().addListSelectionListener(this);
***************
*** 229,234 ****
  //      }
      } else if ("EDITER".equals(_evt.getActionCommand())) {
!       int r= table_.getSelectedRow();
!       ((FDicoParams.EntiteFileTableModel)table_.getModel()).editer(r);
      }
    }
--- 231,235 ----
  //      }
      } else if ("EDITER".equals(_evt.getActionCommand())) {
!       model_.editer(table_.getSelectedRow());
      }
    }
***************
*** 441,447 ****
     */
    public void valueChanged(ListSelectionEvent e) {
!     boolean b=!table_.getSelectionModel().isSelectionEmpty();
!     actionDefaultSelected_.setEnabled(b);
!     actionEditerSelected_.setEnabled(b);
    
    }
--- 442,456 ----
     */
    public void valueChanged(ListSelectionEvent e) {
!     boolean isKeywordSelected=!table_.getSelectionModel().isSelectionEmpty();
!     if(!isKeywordSelected){
!     actionDefaultSelected_.setEnabled(false);
!     actionEditerSelected_.setEnabled(false);
!     }
!     else{
! 
!       DicoEntite kw=model_.getEntite(table_.getSelectedRow());
!       actionDefaultSelected_.setEnabled(!kw.isRequired());
!       actionEditerSelected_.setEnabled(kw.isModifiable());
!     }
    
    }

Index: FDicoParams.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoParams.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FDicoParams.java	5 May 2004 12:42:38 -0000	1.3
--- FDicoParams.java	1 Jun 2004 11:27:44 -0000	1.4
***************
*** 1,11 ****
  /*
!  *  @file         TrDicoEntiteValuesDefault.java
!  *  @creation     19 mai 2003
!  *  @modification $Date$
!  *  @license      GNU General Public License 2
!  *  @copyright    (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
!  *  @mail         de...@fu...
   */
  package org.fudaa.fudaa.fdico;
  import java.io.File;
[...1510 lines suppressed...]
    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);
    }
! 
! }
\ No newline at end of file