[Fudaa-svn-commit] SF.net SVN: fudaa:[4256] branches/FudaaModeleur_TC1Bis/fudaa_devel

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

Revision: 4256
          http://fudaa.svn.sourceforge.net/fudaa/?rev=4256&view=rev
Author:   emmanuel_martin
Date:     2008-12-01 14:49:27 +0000 (Mon, 01 Dec 2008)

Log Message:
-----------
Tache #108 : "Palette de visibilit?\195?\169 visible: Ouverture d'un projet contenant une image impossible"

Modified Paths:
--------------
    branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/interpolation/profile/ProfileCalculator.java
    branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/BPaletteEditVisibility.java

Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/interpolation/profile/ProfileCalculator.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/interpolation/profile/ProfileCalculator.java	2008-12-01 14:06:00 UTC (rev 4255)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/interpolation/profile/ProfileCalculator.java	2008-12-01 14:49:27 UTC (rev 4256)
@@ -6,17 +6,10 @@
  */
 package org.fudaa.ctulu.interpolation.profile ;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.fudaa.ctulu.CtuluLib;
 import org.fudaa.ctulu.CtuluLibGeometrie;
 import org.fudaa.ctulu.gis.GISGeometryFactory;
 import org.fudaa.ctulu.gis.GISLib;
 import org.fudaa.ctulu.gis.GISPoint;
-import org.fudaa.ctulu.gis.GISPolyligne;
 
 import com.memoire.fu.FuLog;
 import com.vividsolutions.jts.geom.Coordinate;

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-12-01 14:06:00 UTC (rev 4255)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/BPaletteEditVisibility.java	2008-12-01 14:49:27 UTC (rev 4256)
@@ -153,8 +153,8 @@
     btCont.add(btDown_);
     add(btCont, BuBorderLayout.SOUTH);
     // Ajout des informations \\
+    calque_.addActionListener(this);
     fillCalqueComboBox();
-    calque_.addActionListener(this);
     cb.addChangeListener(this);
     fillTableGeometry();
     updateBtMovement();
@@ -328,6 +328,7 @@
    * choisis ainsi que l'entr\xE9e sp\xE9ciale 'tout les calques'.
    */
   protected void fillCalqueComboBox(){
+    calque_.removeActionListener(this);
     // Changement du contenu de la comboBox
     Object selectedItem=calque_.getSelectedItem();
     calque_.removeAllItems();
@@ -341,6 +342,7 @@
       calque_.setSelectedItem(selectedItem);
     else
       calque_.setSelectedIndex(0);
+    calque_.addActionListener(this);
     updateListen();
   }
 
@@ -350,7 +352,8 @@
   protected void updateListen(){
     // Suppression de l'\xE9coute de tout les models
     for(int i=0;i<listenModels_.length;i++)
-      listenModels_[i].removeModelListener(this);
+      if(listenModels_[i]!=null)
+        listenModels_[i].removeModelListener(this);
     // Mise a jour du tableau de listeners
     if(calque_.getSelectedItem()==allCalquesEntry_){
       listenModels_=new ZModeleEditable[calques_.length];
@@ -369,7 +372,8 @@
     }
     // Ajout de l'\xE9coute de tout les calques
     for(int i=0;i<listenModels_.length;i++){
-      listenModels_[i].addModelListener(this);
+      if(listenModels_[i]!=null)
+        listenModels_[i].addModelListener(this);
     }
   }
 


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