[Fudaa-svn-commit] SF.net SVN: fudaa:[4105] branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ ebli

[<had...@us...>]

Revision: 4105
          http://fudaa.svn.sourceforge.net/fudaa/?rev=4105&view=rev
Author:   hadouxad
Date:     2008-10-28 16:55:15 +0000 (Tue, 28 Oct 2008)

Log Message:
-----------
corrections bugs

Modified Paths:
--------------
    branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/action/EbliCalqueActionTimeChooser.java
    branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetCreatorLegende.java
    branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/graphe/EbliWidgetCreatorLegende.java
    branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/persist/EbliWidgetSerializeXml.java

Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/action/EbliCalqueActionTimeChooser.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/action/EbliCalqueActionTimeChooser.java	2008-10-28 16:48:50 UTC (rev 4104)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/action/EbliCalqueActionTimeChooser.java	2008-10-28 16:55:15 UTC (rev 4105)
@@ -20,7 +20,6 @@
 import javax.swing.tree.TreeSelectionModel;
 
 import org.fudaa.ctulu.CtuluLib;
-
 import org.fudaa.ebli.calque.BArbreCalqueModel;
 import org.fudaa.ebli.commun.BPalettePanelInterface;
 import org.fudaa.ebli.commun.EbliActionPaletteTreeModel;
@@ -105,7 +104,10 @@
   }
 
   public ListModel getListModel() {
+    if (target_ instanceof BSelecteurListTimeTarget)
     return target_ == null ? null : ((BSelecteurListTimeTarget) target_).getTimeListModel();
+    else
+      return null;
   }
 
   public ListSelectionModel getListSelectionModel() {

Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetCreatorLegende.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetCreatorLegende.java	2008-10-28 16:48:50 UTC (rev 4104)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetCreatorLegende.java	2008-10-28 16:55:15 UTC (rev 4105)
@@ -4,7 +4,6 @@
 import java.util.Map;
 
 import org.fudaa.ebli.calque.BCalque;
-import org.fudaa.ebli.calque.BCalqueAffichage;
 import org.fudaa.ebli.calque.BCalqueLegende;
 import org.fudaa.ebli.calque.BCalqueLegendePanel;
 import org.fudaa.ebli.calque.ZEbliCalquesPanel;
@@ -14,10 +13,7 @@
 import org.fudaa.ebli.visuallibrary.EbliWidgetBordureSingle;
 import org.fudaa.ebli.visuallibrary.EbliWidgetWithBordure;
 import org.fudaa.ebli.visuallibrary.creator.EbliWidgetCreator;
-import org.netbeans.api.visual.widget.Widget;
 
-import com.sun.corba.se.spi.legacy.connection.GetEndPointInfoAgainException;
-
 /**
  * Creator pour les legendes des calques
  * 
@@ -130,6 +126,9 @@
 						//g=new BCalqueLegendePanel((BCalqueAffichage) calqueCible_,calqueCible_.getTitle());
 						BCalqueLegendePanel legendePanel=((CalqueLegendeWidgetAdapter)calque.getCqLegend()).legendePanel_;
 						g=legendePanel;
+						// -- mise a jour des sattelites --//
+            ((EbliWidgetControllerCalque) widget.getController()).setNodeLegende((EbliNode) parameters.get("node"));
+						
 					}
 							
 					

Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/graphe/EbliWidgetCreatorLegende.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/graphe/EbliWidgetCreatorLegende.java	2008-10-28 16:48:50 UTC (rev 4104)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/graphe/EbliWidgetCreatorLegende.java	2008-10-28 16:55:15 UTC (rev 4105)
@@ -5,6 +5,7 @@
 import org.fudaa.ebli.courbe.EGGraphe;
 import org.fudaa.ebli.courbe.EGGrapheTreeModel;
 import org.fudaa.ebli.visuallibrary.EbliNode;
+import org.fudaa.ebli.visuallibrary.EbliNodeDefault;
 import org.fudaa.ebli.visuallibrary.EbliScene;
 import org.fudaa.ebli.visuallibrary.EbliWidget;
 import org.fudaa.ebli.visuallibrary.EbliWidgetBordureSingle;
@@ -90,6 +91,11 @@
         if (nodeGraphe != null && nodeGraphe.getCreator() instanceof EbliWidgetCreatorGraphe) {
           // -- on recupere le graphe --//
           g = ((EbliWidgetCreatorGraphe) nodeGraphe.getCreator()).getGraphe();
+       // -- mise a jour des sattelites --//
+          ((EbliWidgetGraphe) nodeGraphe.getWidget().getIntern()).setNodeLegende((EbliNodeDefault) parameters
+              .get("node"));
+          
+          
         } else g = new EGGraphe(new EGGrapheTreeModel());
 
       } else g = new EGGraphe(new EGGrapheTreeModel());

Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/persist/EbliWidgetSerializeXml.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/persist/EbliWidgetSerializeXml.java	2008-10-28 16:48:50 UTC (rev 4104)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/persist/EbliWidgetSerializeXml.java	2008-10-28 16:55:15 UTC (rev 4105)
@@ -161,7 +161,7 @@
     // -- creation du creator specicalis\xE9 --//
     // EbliWidgetCreator creator= (EbliWidgetCreator) EbliWidgetCreatorShape.class.forName(type).newInstance();
     final EbliWidgetCreator creator = EbliWidgetCreatorClassLoader.forName(type);
-
+    parameters.put("node", newNode);
     // -- creation des datas --//
     creator.setPersistData(data, parameters);
 


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