[Fudaa-svn-commit] SF.net SVN: fudaa:[4229] branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src /org/fudaa/ebli/calque

[<emm...@us...>]

Revision: 4229
          http://fudaa.svn.sourceforge.net/fudaa/?rev=4229&view=rev
Author:   emmanuel_martin
Date:     2008-11-20 13:31:40 +0000 (Thu, 20 Nov 2008)

Log Message:
-----------
modification du comportement de la boite de distance et correction de bug a propos des listeners de la tableau de visibilit?\195?\169.

Modified Paths:
--------------
    branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/SceneShowDistanceAction.java
    branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/BPaletteDistance.java
    branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/BPaletteEditVisibility.java

Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/SceneShowDistanceAction.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/SceneShowDistanceAction.java	2008-11-20 13:21:24 UTC (rev 4228)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/SceneShowDistanceAction.java	2008-11-20 13:31:40 UTC (rev 4229)
@@ -27,7 +27,7 @@
  * points.
  * 
  * @author Emmanuel MARTIN
- * @version $Id:$
+ * @version $Id$
  */
 public class SceneShowDistanceAction extends EbliActionPaletteSpecAbstract implements PropertyChangeListener {
 
@@ -75,8 +75,10 @@
     // Cas un autre calque que celui du zoom, du deplacement de vue et d'edition
     // est d\xE9gel\xE9 donc on ferme le pannel d'edition si il \xE9tait ouvert.
     if (_evt.getSource()!=calqueZoom_&&_evt.getSource()!=calqueDeplacementVue_&&_evt.getSource()!=calqueDistance_
-        &&!((Boolean)_evt.getNewValue()).booleanValue()) {
+        &&!((Boolean)_evt.getNewValue()).booleanValue()&&isSelected()) {
       calqueDistance_.cancelEdition();
+      setSelected(false);
+      super.changeAction();
     }
   }
 

Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/BPaletteDistance.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/BPaletteDistance.java	2008-11-20 13:21:24 UTC (rev 4228)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/BPaletteDistance.java	2008-11-20 13:31:40 UTC (rev 4229)
@@ -30,7 +30,7 @@
 /**
  * Palette affichant les informations de distances.
  * @author Emmanuel MARTIN
- * @version $Id:$
+ * @version $Id$
  */
 public class BPaletteDistance extends BuPanel implements ActionListener, BPalettePanelInterface, PropertyChangeListener {
 
@@ -41,7 +41,7 @@
   /** Le calque qui contient les informations de distance. */
   protected ZCalqueDistanceInteraction calqueDistance_;
   /** Le bouton 'continuer'. */
-  protected BuButton btContinuer_=new BuButton(EbliLib.getS("Continuer"));
+  protected BuButton btContinuer_=new BuButton(EbliLib.getS("Reprise"));
   protected EbliFormatterInterface formatter_;
   private ZEbliCalquesPanel calquesPanel_;
   

Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/BPaletteEditVisibility.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/BPaletteEditVisibility.java	2008-11-20 13:21:24 UTC (rev 4228)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/BPaletteEditVisibility.java	2008-11-20 13:31:40 UTC (rev 4229)
@@ -1,6 +1,6 @@
 /*
  * @creation     23 oct. 2008
- * @modification $Date:$
+ * @modification $Date$
  * @license      GNU General Public License 2
  * @copyright    (c)1998-2008 CETMEF 2 bd Gambetta F-60231 Compiegne
  * @mail         fud...@li...
@@ -215,9 +215,11 @@
       boolean selected=table_.getSelectionModel().isSelectedIndex(rowIndex);
       if(columnIndex==0){
         rows_[rowIndex][columnIndex]=value;
+        listenSelection=false;
         fireTableDataChanged();
         if(selected)
           table_.getSelectionModel().addSelectionInterval(rowIndex, rowIndex);
+        listenSelection=true;
       }
       else if(columnIndex==1){
         if (rows_[rowIndex][columnIndex]!=value) {
@@ -232,9 +234,11 @@
             for (int i=rowIndex+1; i<rows_.length; i++)
               newRows[i-1]=rows_[i];
             rows_=newRows;
+            listenSelection=false;
             fireTableDataChanged();
             if (selected)
               table_.getSelectionModel().addSelectionInterval(rowIndex, rowIndex);
+            listenSelection=true;
           }
         }
       }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.