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

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

Revision: 4211
          http://fudaa.svn.sourceforge.net/fudaa/?rev=4211&view=rev
Author:   emmanuel_martin
Date:     2008-11-12 15:06:29 +0000 (Wed, 12 Nov 2008)

Log Message:
-----------
bugfix #58

Modified Paths:
--------------
    branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/CalqueGISEditionAction.java

Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/CalqueGISEditionAction.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/CalqueGISEditionAction.java	2008-11-12 13:36:43 UTC (rev 4210)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/CalqueGISEditionAction.java	2008-11-12 15:06:29 UTC (rev 4211)
@@ -89,15 +89,22 @@
    */
   protected void setTarget(final Object _o) {
     final Object newTarget=(_o instanceof ZCalqueEditable)?_o:null;
+    /*
+     * On n'utilise pas 'isTargetValid' dans cette m\xE9thode car elle est, entre
+     * autre, appell\xE9e quand la s\xE9lection dans l'arbre est modifi\xE9e; or dans
+     * ce cas 'CalqueGISEditionAction' est pr\xE9venu avant 'ZScene' de cette
+     * modification. Donc l'utilisation de 'isTargetValid' est incoh\xE9rente.
+     */
+    boolean valide=scene_!=null && (!scene_.isRestrictedToCalqueActif() || newTarget!=null);
     if (target_ != newTarget) {
       target_ = newTarget;
       if (isSelected()) {
         setPaletteTarget(target_ == null ? null : editor_);
       } else {
-        setEnabled(isTargetValid(null));
+        setEnabled(valide);
       }
     }
-    setDisableWhenHide_ = !isTargetValid(null);
+    setDisableWhenHide_ = !valide;
     if (editor_ != null) {
       editor_.setActivated(newTarget, (BPaletteEdition) palette_);
     }


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