[Fudaa-svn-commit] SF.net SVN: fudaa:[7278] trunk/soft/fudaa-crue

[<de...@us...>]

Revision: 7278
          http://fudaa.svn.sourceforge.net/fudaa/?rev=7278&view=rev
Author:   deniger
Date:     2012-06-06 22:57:59 +0000 (Wed, 06 Jun 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingVisualTopComponent.java
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryGisPaletteEdition.java

Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingVisualTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingVisualTopComponent.java	2012-06-06 22:23:23 UTC (rev 7277)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingVisualTopComponent.java	2012-06-06 22:57:59 UTC (rev 7278)
@@ -25,6 +25,7 @@
 import org.fudaa.ebli.commun.EbliLib;
 import org.fudaa.fudaa.crue.modelling.services.ModellingScenarioVisuService;
 import org.fudaa.fudaa.crue.planimetry.PlanimetryVisuPanel;
+import org.fudaa.fudaa.crue.planimetry.PlanimetryVisuPanelBuilder;
 import org.netbeans.api.settings.ConvertAsProperties;
 import org.openide.awt.ActionID;
 import org.openide.awt.ActionReference;
@@ -128,7 +129,7 @@
     main.setLayout(new BorderLayout());
     panel.setPreferredSize(new Dimension(600, 700));
     main.add(createToolbar(panel), BorderLayout.NORTH);
-    main.add(panel.createGisEditionPalette(), BorderLayout.EAST);
+    main.add(panel.createGisEditionPalette(), BorderLayout.WEST);
     main.add(panel);
     EventQueue.invokeLater(new Runnable() {
 
@@ -170,17 +171,7 @@
   }
 
   protected JComponent createToolbar(PlanimetryVisuPanel panel) {
-    List<EbliActionInterface> actions = panel.getController().getActions();
-    final List tools = EbliLib.updateToolButtons(actions, null);
-    JToolBar bar = new JToolBar();
-    for (Object object : tools) {
-      if (object == null) {
-        bar.addSeparator();
-      } else {
-        bar.add((JComponent) object);
-      }
-    }
-    return bar;
+    return PlanimetryVisuPanelBuilder.buildTopComponent(panel);
   }
 
   private void scenarioUnloaded() {

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryGisPaletteEdition.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryGisPaletteEdition.java	2012-06-06 22:23:23 UTC (rev 7277)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryGisPaletteEdition.java	2012-06-06 22:57:59 UTC (rev 7278)
@@ -39,22 +39,15 @@
     if (globalButtons_ == null) {
       globalButtons_ = new ArrayList();
       fillGlobalActions(globalButtons_);
-      for (Iterator it = globalButtons_.iterator(); it.hasNext();) {
-        AbstractButton bt = (AbstractButton) it.next();
-        if (bt == null) {
-          continue;
-        }
-        if (SEGMENT_ACTION.equals(bt.getActionCommand()) || ADD_MULTIPOINT_ACTION.equals(bt.getActionCommand())) {
-          it.remove();
-        }
-
-      }
     }
     for (Object object : globalButtons_) {
       if (object == null) {
         _dest.add(new JSeparator());
       } else {
-        _dest.add((JComponent) object);
+        AbstractButton bt = (AbstractButton) object;
+        if (!SEGMENT_ACTION.equals(bt.getActionCommand()) && !ADD_MULTIPOINT_ACTION.equals(bt.getActionCommand())) {
+          _dest.add((JComponent) object);
+        }
       }
     }
   }

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