[Fudaa-cvs-commit] fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico FDicoCalculLocal.java,1.3,1.4 fdico_en.fr_txt,1.2,1.3 FDicoProjetInterface.java,1.2,1.3 FDicoEntitePanel.java,1.4,1.5 FDicoProjectPanel.java,1.4,1.5 FDicoProjet.java,1.4,1.5

[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-serv6565/src/org/fudaa/fudaa/fdico

Modified Files:
	FDicoCalculLocal.java fdico_en.fr_txt 
	FDicoProjetInterface.java FDicoEntitePanel.java 
	FDicoProjectPanel.java FDicoProjet.java 
Log Message:


Index: FDicoEntitePanel.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoEntitePanel.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FDicoEntitePanel.java	1 Jun 2004 11:27:44 -0000	1.4
--- FDicoEntitePanel.java	11 Jun 2004 16:39:45 -0000	1.5
***************
*** 106,109 ****
--- 106,113 ----
    }
  
+   /**
+    * @author Fred Deniger
+    * @version $Id$
+    */
    private class DecoratorCellRenderer implements EbliCellDecorator {
  
***************
*** 114,118 ****
  
      /**
!      *       *
       */
      public void decore(
--- 118,122 ----
  
      /**
!      * @see org.fudaa.ebli.tableau.EbliCellDecorator#decore(javax.swing.JComponent, javax.swing.JTable, java.lang.Object, int, int)
       */
      public void decore(
***************
*** 165,174 ****
  
      /**
!      *       *
       */
      public void decore(JComponent c, JList table, Object value, int index) {}
  
      /**
!      *       *
       */
      public void decore(
--- 169,178 ----
  
      /**
!      * @see org.fudaa.ebli.tableau.EbliCellDecorator#decore(javax.swing.JComponent, javax.swing.JList, java.lang.Object, int)
       */
      public void decore(JComponent c, JList table, Object value, int index) {}
  
      /**
!      * @see org.fudaa.ebli.tableau.EbliCellDecorator#decore(javax.swing.JComponent, javax.swing.JTable, java.lang.Object, int, int)
       */
      public void decore(
***************
*** 203,208 ****
      JLabel     txtError_;
  
!     PanelInfo() {
!       init();
      }
  
--- 207,212 ----
      JLabel     txtError_;
  
!     PanelInfo(boolean _comment) {
!       init(_comment);
      }
  
***************
*** 223,231 ****
        txtType_.setText(CtuluLib.EMPTY_STRING);
        txtError_.setText(CtuluLib.EMPTY_STRING);
!       txtComment_.setText(CtuluLib.EMPTY_STRING);
        clearComportButton();
      }
  
!     private void init() {
        BuPanel main = new BuPanel();
        main.setLayout(new BuBorderLayout(3, 3));
--- 227,235 ----
        txtType_.setText(CtuluLib.EMPTY_STRING);
        txtError_.setText(CtuluLib.EMPTY_STRING);
!       if(txtComment_!=null) txtComment_.setText(CtuluLib.EMPTY_STRING);
        clearComportButton();
      }
  
!     private void init(boolean _comment) {
        BuPanel main = new BuPanel();
        main.setLayout(new BuBorderLayout(3, 3));
***************
*** 289,292 ****
--- 293,297 ----
        main.add(js, BuBorderLayout.SOUTH);
        addTab(FDicoResource.getS("Infos"), main);
+       if(!_comment) return;
        txtComment_ = new BuTextArea();
        txtComment_.setLineWrap(true);
***************
*** 319,324 ****
--- 324,331 ----
        }
        txtError_.setText(tableModel_.getInvalideMessage(lastEntiteSelected_));
+       if(txtComment_!=null){
        txtComment_.setText(params.getComment(lastEntiteSelected_));
        txtComment_.setEditable(params.isValueSetFor(lastEntiteSelected_));
+       }
        if (params.isEntiteWithComportBehavior(lastEntiteSelected_)) {
          DicoEntite[] entsHideTie = 
***************
*** 408,414 ****
       */
      public void saveCurrentComment() {
!       if (lastEntiteSelected_ != null) {
!         //DEBUG to remove
!         System.out.println("save comment");
          tableModel_.setCommentaire(lastEntiteSelected_, txtComment_.getText());
        }
--- 415,419 ----
       */
      public void saveCurrentComment() {
!       if((txtComment_!=null) &&  (lastEntiteSelected_ != null)) {
          tableModel_.setCommentaire(lastEntiteSelected_, txtComment_.getText());
        }
***************
*** 432,436 ****
     */
    public FDicoEntitePanel(FDicoEntiteTableModel _model) {
!     this(_model, null);
    }
  
--- 437,451 ----
     */
    public FDicoEntitePanel(FDicoEntiteTableModel _model) {
!     this(_model, null,true);
!   }
!   /**
!    * @param _model le model pour les mot-cles
!    */
!   public FDicoEntitePanel(FDicoEntiteTableModel _model,boolean _comment) {
!     this(_model, null,_comment);
!   }
!   
!   public FDicoEntitePanel(FDicoEntiteTableModel _model, Component _leftUp) {
!     this(_model, _leftUp,false);
    }
  
***************
*** 439,443 ****
     * @param _leftUp un composant qui sera ajoute en haut a gauche (si non null)
     */
!   public FDicoEntitePanel(FDicoEntiteTableModel _model, Component _leftUp) {
      tableModel_ = _model;
      TableCellRenderer valueRenderer = 
--- 454,458 ----
     * @param _leftUp un composant qui sera ajoute en haut a gauche (si non null)
     */
!   public FDicoEntitePanel(FDicoEntiteTableModel _model, Component _leftUp,boolean _comment) {
      tableModel_ = _model;
      TableCellRenderer valueRenderer = 
***************
*** 580,584 ****
      setLeftComponent(left);
      setOneTouchExpandable(true);
!     pnInfos_ = new PanelInfo();
      pnInfos_.refresh();
      //pnTable_.add(pnInfos_, BuBorderLayout.SOUTH);
--- 595,599 ----
      setLeftComponent(left);
      setOneTouchExpandable(true);
!     pnInfos_ = new PanelInfo(_comment);
      pnInfos_.refresh();
      //pnTable_.add(pnInfos_, BuBorderLayout.SOUTH);
***************
*** 688,692 ****
    public void setTxtAreaHelpVisible(boolean _b) {
      if (_b && (pnInfos_ == null)) {
!       pnInfos_ = new PanelInfo();
        pnInfos_.refresh();
        pnTable_.add(pnInfos_, BuBorderLayout.SOUTH);
--- 703,707 ----
    public void setTxtAreaHelpVisible(boolean _b) {
      if (_b && (pnInfos_ == null)) {
!       pnInfos_ = new PanelInfo(true);
        pnInfos_.refresh();
        pnTable_.add(pnInfos_, BuBorderLayout.SOUTH);

Index: FDicoProjet.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoProjet.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FDicoProjet.java	1 Jun 2004 11:27:44 -0000	1.4
--- FDicoProjet.java	11 Jun 2004 16:39:45 -0000	1.5
***************
*** 48,51 ****
--- 48,54 ----
  public class FDicoProjet
    implements FDicoProjetInterface, FudaaCalculSupportInterface {
+   public String getCodeExecPath() {
+     return getCodeName();
+   }
    protected FudaaCalculAction actions_;
    private EbliSimpleAction actionDiff_;

Index: FDicoCalculLocal.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoCalculLocal.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FDicoCalculLocal.java	5 May 2004 12:42:38 -0000	1.3
--- FDicoCalculLocal.java	11 Jun 2004 16:39:45 -0000	1.4
***************
*** 1,4 ****
! /*
!  *  @file         TrDicoOpCalculLocal.java
   *  @creation     13 juin 2003
   *  @modification $Date$
--- 1,3 ----
! /**
   *  @creation     13 juin 2003
   *  @modification $Date$
***************
*** 29,33 ****
    FDicoProjetInterface projet_;
    public FDicoCalculLocal(FDicoProjetInterface _projet) {
!     super(new DicoExec(_projet.getCodeName()));
      projet_= _projet;
    }
--- 28,32 ----
    FDicoProjetInterface projet_;
    public FDicoCalculLocal(FDicoProjetInterface _projet) {
!     super(new DicoExec(_projet.getCodeExecPath()));
      projet_= _projet;
    }

Index: FDicoProjetInterface.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoProjetInterface.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FDicoProjetInterface.java	5 May 2004 12:42:38 -0000	1.2
--- FDicoProjetInterface.java	11 Jun 2004 16:39:45 -0000	1.3
***************
*** 1,4 ****
! /*
!  *  @file         TrDicoProjetInterface.java
   *  @creation     10 juin 2003
   *  @modification $Date$
--- 1,3 ----
! /**
   *  @creation     10 juin 2003
   *  @modification $Date$
***************
*** 24,27 ****
--- 23,27 ----
    public File getDirBase();
    public String getCodeName();
+   public String getCodeExecPath();
    //public FudaaCalculAction getCalculActions();
    //  public FDicoEntiteFileTableModelInterface createEntiteFileTableModel();

Index: FDicoProjectPanel.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoProjectPanel.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FDicoProjectPanel.java	1 Jun 2004 11:27:44 -0000	1.4
--- FDicoProjectPanel.java	11 Jun 2004 16:39:45 -0000	1.5
***************
*** 50,53 ****
--- 50,54 ----
  import com.memoire.bu.BuTextField;
  import com.memoire.bu.BuVerticalLayout;
+ import com.memoire.fu.FuLib;
  
  import org.fudaa.ctulu.CtuluLib;
***************
*** 122,126 ****
      pn.add(new BuLabel(FDicoResource.getS("Fichier principal:")));
      lbFile_= new BuLabel();
!     lbFile_.setText(proj.getFDicoParams().getMainFile().getAbsolutePath());
      pn.add(lbFile_);
      pn.add(new BuLabel(FDicoResource.getS("Type projet:")));
--- 123,129 ----
      pn.add(new BuLabel(FDicoResource.getS("Fichier principal:")));
      lbFile_= new BuLabel();
!     String s=proj.getFDicoParams().getMainFile().getAbsolutePath();
!     lbFile_.setText(FuLib.reducedPath(s));
!     lbFile_.setToolTipText(s);
      pn.add(lbFile_);
      pn.add(new BuLabel(FDicoResource.getS("Type projet:")));
***************
*** 431,439 ****
    }
    /**
!    *
     */
    public void dicoParamsProjectModifyStateChanged(DicoParams _cas) {
      fileEditor.setBaseDir(proj_.getDirBase());
!     lbFile_.setText(proj_.getFDicoParams().getMainFile().getAbsolutePath());
      updateSaveState();
    }
--- 434,445 ----
    }
    /**
!    * maj du nom du fichier et de l'etat de sauvegarde.
!    * @see org.fudaa.dodico.dico.DicoParamsListener#dicoParamsProjectModifyStateChanged(org.fudaa.dodico.dico.DicoParams)
     */
    public void dicoParamsProjectModifyStateChanged(DicoParams _cas) {
      fileEditor.setBaseDir(proj_.getDirBase());
!     String s=proj_.getFDicoParams().getMainFile().getAbsolutePath();
!     lbFile_.setText(FuLib.reducedPath(s));
!     lbFile_.setToolTipText(s);
      updateSaveState();
    }

Index: fdico_en.fr_txt
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/fdico_en.fr_txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** fdico_en.fr_txt	12 Mar 2004 10:17:03 -0000	1.2
--- fdico_en.fr_txt	11 Jun 2004 16:39:45 -0000	1.3
***************
*** 16,20 ****
--- 16,22 ----
  Mot-clés erronés=erroneous keywords
  Mot-clés modifiés=Modified keywords
+ Mot-clé modifié=Modified keyword
  Mot-clés non modifiés=Not modified keywords
+ Mot-clé non modifié=Not modified keyword
  n'est pas accessible en écriture=is not in writable mode
  n'est pas un répertoire=is not a folder
***************
*** 32,34 ****
  Initialiser le filtre=Initialyze filter
  Le nom du fichier ne doit pas comporter d'espace=The filename must not contain spaces
! Créer les fichiers de log=Create log files
\ No newline at end of file
--- 34,37 ----
  Initialiser le filtre=Initialyze filter
  Le nom du fichier ne doit pas comporter d'espace=The filename must not contain spaces
! Créer les fichiers de log=Create log files
! Mot-clés\: options=Keywords\: options
\ No newline at end of file