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

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

Revision: 7375
          http://fudaa.svn.sourceforge.net/fudaa/?rev=7375&view=rev
Author:   deniger
Date:     2012-06-21 20:36:45 +0000 (Thu, 21 Jun 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtGeoProfilCasier.java
    trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/metier/emh/EnumInfosEMH.java
    trunk/soft/fudaa-crue/ui-branding/src/main/java/org/fudaa/fudaa/crue/branding/InitGeneralUIInstaller.java
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryGISEditionAction.java
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryVisuPanel.java
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/PlanimetryControllerHelper.java
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryBrancheLayer.java
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryCasierLayer.java
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryCasierLayerModel.java
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryNodeLayerModel.java
    trunk/soft/fudaa-crue/ui-planimetry/src/main/resources/org/fudaa/fudaa/crue/planimetry/Bundle.properties
    trunk/soft/fudaa-crue/ui-planimetry/src/main/resources/org/fudaa/fudaa/crue/planimetry/action/Bundle.properties
    trunk/soft/fudaa-crue/ui-planimetry/src/test/java/org/fudaa/fudaa/crue/planimetry/PlanimetryLauncher.java

Added Paths:
-----------
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/AbstractAddAction.java
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/AddCasierAction.java
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/EditZone.java
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/EditZonePanel.java
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/CreationEMHSelectedType.java
    trunk/soft/fudaa-crue/ui-planimetry/src/main/resources/org/fudaa/fudaa/crue/planimetry/layer/
    trunk/soft/fudaa-crue/ui-planimetry/src/main/resources/org/fudaa/fudaa/crue/planimetry/layer/Bundle.properties

Removed Paths:
-------------
    trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/metier/emh/DonGeoLoc.java

Deleted: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/metier/emh/DonGeoLoc.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/metier/emh/DonGeoLoc.java	2012-06-21 20:34:50 UTC (rev 7374)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/metier/emh/DonGeoLoc.java	2012-06-21 20:36:45 UTC (rev 7375)
@@ -1,11 +0,0 @@
-package org.fudaa.dodico.crue.metier.emh;
-
-/** @pdOid 82676b69-f9b3-4219-965c-808ea63702b0 */
-public class DonGeoLoc extends AbstractInfosEMH {
-  /** @pdOid 7cda1db7-9642-44f1-899f-f66719adb97e */
-  @Override
-  public final EnumInfosEMH getCatType() {
-    return EnumInfosEMH.DON_GEO_LOC;
-  }
-
-}
\ No newline at end of file

Modified: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtGeoProfilCasier.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtGeoProfilCasier.java	2012-06-21 20:34:50 UTC (rev 7374)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtGeoProfilCasier.java	2012-06-21 20:36:45 UTC (rev 7375)
@@ -5,24 +5,27 @@
 import org.fudaa.dodico.crue.metier.annotation.UsedByComparison;
 import org.fudaa.dodico.crue.metier.annotation.Visibility;
 
-/** @pdOid 644b4cd5-433b-4568-b043-3fefd4bca488 */
+/**
+ * @pdOid 644b4cd5-433b-4568-b043-3fefd4bca488
+ */
 public class DonPrtGeoProfilCasier extends DonPrtGeoNomme {
 
-  /** @pdOid ca711117-4b5e-4b0c-a66d-6b9174f265bb */
+  /**
+   * @pdOid ca711117-4b5e-4b0c-a66d-6b9174f265bb
+   */
   private double longueur;
 
   public DonPrtGeoProfilCasier(CrueConfigMetier def) {
     longueur = def.getDefaultDoubleValue("longueur");
   }
-
   /**
-   * @pdRoleInfo migr=no name=PtProfil assc=association37 coll=java.util.List impl=java.util.ArrayList mult=1..*
-   *             type=Composition
+   * @pdRoleInfo migr=no name=PtProfil assc=association37 coll=java.util.List impl=java.util.ArrayList mult=1..* type=Composition
    */
   private java.util.List<PtProfil> ptProfil;
-  /** @pdRoleInfo migr=no name=LitUtile assc=association45 mult=1..1 type=Composition */
+  /**
+   * @pdRoleInfo migr=no name=LitUtile assc=association45 mult=1..1 type=Composition
+   */
   private LitUtile litUtile;
-
   private String commentaire = StringUtils.EMPTY;
 
   public String getCommentaire() {
@@ -33,28 +36,22 @@
     this.commentaire = StringUtils.defaultString(commentaire);
   }
 
-  /** @pdGenerated default getter */
+  /**
+   * @pdGenerated default getter
+   */
   public java.util.List<PtProfil> getPtProfil() {
     if (ptProfil == null) {
       ptProfil = new java.util.ArrayList<PtProfil>();
     }
     return ptProfil;
   }
-  
+
   @UsedByComparison
-  @Visibility(ihm=false)
-  public int getPtProfilSize(){
-    return ptProfil==null?0:ptProfil.size();
+  @Visibility(ihm = false)
+  public int getPtProfilSize() {
+    return ptProfil == null ? 0 : ptProfil.size();
   }
 
-  /** @pdGenerated default iterator getter */
-  public java.util.Iterator getIteratorPtProfil() {
-    if (ptProfil == null) {
-      ptProfil = new java.util.ArrayList<PtProfil>();
-    }
-    return ptProfil.iterator();
-  }
-
   /**
    * @pdGenerated default setter
    * @param newPtProfil
@@ -71,7 +68,9 @@
    * @param newPtProfil
    */
   public void addPtProfil(final PtProfil newPtProfil) {
-    if (newPtProfil == null) { return; }
+    if (newPtProfil == null) {
+      return;
+    }
     if (this.ptProfil == null) {
       this.ptProfil = new java.util.ArrayList<PtProfil>();
     }
@@ -85,7 +84,9 @@
    * @param oldPtProfil
    */
   public void removePtProfil(final PtProfil oldPtProfil) {
-    if (oldPtProfil == null) { return; }
+    if (oldPtProfil == null) {
+      return;
+    }
     if (this.ptProfil != null) {
       if (this.ptProfil.contains(oldPtProfil)) {
         this.ptProfil.remove(oldPtProfil);
@@ -93,14 +94,18 @@
     }
   }
 
-  /** @pdGenerated default removeAll */
+  /**
+   * @pdGenerated default removeAll
+   */
   public void removeAllPtProfil() {
     if (ptProfil != null) {
       ptProfil.clear();
     }
   }
 
-  /** @pdGenerated default parent getter */
+  /**
+   * @pdGenerated default parent getter
+   */
   public LitUtile getLitUtile() {
     return litUtile;
   }
@@ -113,17 +118,17 @@
     this.litUtile = newLitUtile;
   }
 
-  /** @pdOid cd852adc-d66e-471f-8535-f114020deb06 */
+  /**
+   * @pdOid cd852adc-d66e-471f-8535-f114020deb06
+   */
   public double getLongueur() {
     return longueur;
   }
 
   /**
-   * @param newLongueur
-   * @pdOid 65b749d9-88ed-4718-8189-0d7f9471643c
+   * @param newLongueur @pdOid 65b749d9-88ed-4718-8189-0d7f9471643c
    */
   public void setLongueur(final double newLongueur) {
     longueur = newLongueur;
   }
-
 }
\ No newline at end of file

Modified: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/metier/emh/EnumInfosEMH.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/metier/emh/EnumInfosEMH.java	2012-06-21 20:34:50 UTC (rev 7374)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/metier/emh/EnumInfosEMH.java	2012-06-21 20:36:45 UTC (rev 7375)
@@ -12,5 +12,5 @@
  */
 public enum EnumInfosEMH {
 
-  DON_CLIM, DON_CALC_SANS_PRT, DON_GEO_LOC, DON_PRT_CINI, ORD_CALC_SCENARIO, ORD_PRT_CINI_MODELE_BASE, ORD_RES_SCENARIO, PARAM_NUM_MODELE_BASE, RES_PRT_CINIT, RES_PRT_RESEAU, DON_PRT_GEO, RES_PRT_GEO, PARAM_CALC_SCENARIO, DON_FRT_CONTENEUR, DON_CLIM_SCENARIO, DON_LOI_CONTENEUR_SCENARIO, ORD_PRT_GEO_MODELE_BASE, ORD_PRT_RESEAU, RESULTAT, RESULTAT_PAS_DE_TEMPS, LOGS, AVANCEMENT;
+  DON_CLIM, DON_CALC_SANS_PRT, DON_PRT_CINI, ORD_CALC_SCENARIO, ORD_PRT_CINI_MODELE_BASE, ORD_RES_SCENARIO, PARAM_NUM_MODELE_BASE, RES_PRT_CINIT, RES_PRT_RESEAU, DON_PRT_GEO, RES_PRT_GEO, PARAM_CALC_SCENARIO, DON_FRT_CONTENEUR, DON_CLIM_SCENARIO, DON_LOI_CONTENEUR_SCENARIO, ORD_PRT_GEO_MODELE_BASE, ORD_PRT_RESEAU, RESULTAT, RESULTAT_PAS_DE_TEMPS, LOGS, AVANCEMENT;
 }
\ No newline at end of file

Modified: trunk/soft/fudaa-crue/ui-branding/src/main/java/org/fudaa/fudaa/crue/branding/InitGeneralUIInstaller.java
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/src/main/java/org/fudaa/fudaa/crue/branding/InitGeneralUIInstaller.java	2012-06-21 20:34:50 UTC (rev 7374)
+++ trunk/soft/fudaa-crue/ui-branding/src/main/java/org/fudaa/fudaa/crue/branding/InitGeneralUIInstaller.java	2012-06-21 20:36:45 UTC (rev 7375)
@@ -87,6 +87,7 @@
 
   @Override
   public void restored() {
+    System.setProperty("fulog.level", "nothing");
     WindowManager.getDefault().invokeWhenUIReady(this);
 //    UIManager.put("EditorTabDisplayerUI", "org.fudaa.fudaa.crue.branding.NoTabsTabDisplayerUI");
     Lookup.Template<ModuleInfo> template = new Lookup.Template<ModuleInfo>(ModuleInfo.class,

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryGISEditionAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryGISEditionAction.java	2012-06-21 20:34:50 UTC (rev 7374)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryGISEditionAction.java	2012-06-21 20:36:45 UTC (rev 7375)
@@ -18,6 +18,10 @@
     super(_m, _editor, _scene);
   }
 
+  PlanimetryGisPaletteEdition getPalette() {
+    return (PlanimetryGisPaletteEdition) super.palette_;
+  }
+
   @Override
   protected BPalettePanelInterface buildPaletteContent() {
     final PlanimetryGisPaletteEdition bPaletteEdition = new PlanimetryGisPaletteEdition(super.getScene());

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryVisuPanel.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryVisuPanel.java	2012-06-21 20:34:50 UTC (rev 7374)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryVisuPanel.java	2012-06-21 20:36:45 UTC (rev 7375)
@@ -18,6 +18,7 @@
 import javax.swing.Action;
 import javax.swing.JComponent;
 import javax.swing.JMenu;
+import javax.swing.JSeparator;
 import javax.swing.KeyStroke;
 import org.fudaa.ctulu.CtuluLib;
 import org.fudaa.fudaa.crue.planimetry.listener.PlanimetryVisuUpdater;
@@ -32,7 +33,10 @@
 import org.fudaa.ebli.calque.ZSelectionListener;
 import org.fudaa.ebli.commun.EbliActionInterface;
 import org.fudaa.ebli.commun.EbliActionMap;
+import org.fudaa.ebli.commun.EbliComponentFactory;
 import org.fudaa.ebli.commun.EbliLib;
+import org.fudaa.fudaa.crue.planimetry.action.AddCasierAction;
+import org.fudaa.fudaa.crue.planimetry.action.EditZonePanel;
 import org.fudaa.fudaa.sig.layer.FSigEditor;
 import org.fudaa.fudaa.sig.layer.FSigLayerGroup;
 import org.fudaa.fudaa.sig.layer.FSigVisuPanel;
@@ -202,7 +206,12 @@
     return planimetryCalqueContext.getGroupExternController().getGroupExtern();
   }
   boolean gisAlreadyCreation;
+  EditZonePanel editZonePanel;
 
+  public EditZonePanel getEditZonePanel() {
+    return editZonePanel;
+  }
+
   public JComponent createGisEditionPalette() {
     assert gisAlreadyCreation == false;
     gisAlreadyCreation = true;
@@ -211,6 +220,12 @@
     action.setUsedAsTab(true);
     final JComponent content = action.buildContentPane();
     action.updateBeforeShow();
+    editZonePanel = new EditZonePanel();
+    PlanimetryGisPaletteEdition palette = action.getPalette();
+    AddCasierAction addCasier = new AddCasierAction(palette,planimetryCalqueContext, editZonePanel);
+    getPlanimetryVisuController().addEditAction(addCasier);
+    content.add(new JSeparator());
+    content.add(add(addCasier.buildToolButton(EbliComponentFactory.INSTANCE)));
     return content;
   }
 

Added: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/AbstractAddAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/AbstractAddAction.java	                        (rev 0)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/AbstractAddAction.java	2012-06-21 20:36:45 UTC (rev 7375)
@@ -0,0 +1,94 @@
+package org.fudaa.fudaa.crue.planimetry.action;
+
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import javax.swing.Icon;
+import javax.swing.JComponent;
+import javax.swing.event.TreeSelectionEvent;
+import javax.swing.event.TreeSelectionListener;
+import org.fudaa.ebli.calque.ZCalqueAffichageDonnees;
+import org.fudaa.ebli.calque.edition.ZCalqueEditionInteraction;
+import org.fudaa.ebli.commun.EbliActionChangeState;
+import org.fudaa.fudaa.crue.planimetry.PlanimetryGisPaletteEdition;
+import org.fudaa.fudaa.crue.planimetry.controller.PlanimetryController;
+
+/**
+ *
+ * @author deniger ( genesis)
+ */
+public abstract class AbstractAddAction extends EbliActionChangeState implements TreeSelectionListener, PropertyChangeListener {
+
+  PlanimetryController controller;
+  EditZone zone;
+  PlanimetryGisPaletteEdition palette;
+
+  public AbstractAddAction(PlanimetryGisPaletteEdition palette, PlanimetryController controller, EditZone zone, String name,
+                           Icon ic, String cmd) {
+    super(name, ic, cmd);
+    this.controller = controller;
+    this.palette = palette;
+    this.zone = zone;
+    setEnabled(false);
+    controller.getVisuPanel().getArbreCalqueModel().addTreeSelectionListener(this);
+    controller.getVisuPanel().getEditor().getCalqueDessin().addPropertyChangeListener("gele", this);
+  }
+
+  public abstract String getDefaultPaletteAction();
+
+  public boolean isSelectedLayerOk() {
+    return controller.getVisuPanel().getArbreCalqueModel().getSelectedCalque() == getLayer();
+  }
+
+  @Override
+  public void propertyChange(PropertyChangeEvent evt) {
+    if (isUpdating || controller.getVisuPanel().getEditor().isStateChanging()) {
+      return;
+    }
+    final boolean gele = getCalqueDessin().isGele();
+    final boolean selected = isSelected();
+    if (selected && gele) {
+      changeAll();
+    }
+    if (!selected && !gele && isSelectedLayerOk()) {
+      changeAll();
+    }
+  }
+
+  public ZCalqueEditionInteraction getCalqueDessin() {
+    return controller.getVisuPanel().getEditor().getCalqueDessin();
+  }
+
+  @Override
+  public void valueChanged(TreeSelectionEvent e) {
+    if (isUpdating) {
+      return;
+    }
+    if (isSelected() && !isSelectedLayerOk()) {
+      changeAll();
+    }
+  }
+
+  protected abstract ZCalqueAffichageDonnees getLayer();
+
+  protected abstract JComponent getEditionComponent();
+  boolean isUpdating = false;
+
+  @Override
+  public void changeAction() {
+    isUpdating = true;
+    if (isSelected()) {
+      if (!isSelectedLayerOk()) {
+        controller.getVisuPanel().getArbreCalqueModel().setSelectionCalque(getLayer());
+      }
+      zone.active(controller.getHelper().getCreationEMH().getCasierComboBox());
+      if (getCalqueDessin().isGele()) {
+        getCalqueDessin().setGele(false);
+        palette.setButtonSelected(getDefaultPaletteAction());
+      }
+    } else {
+      zone.unactive(controller.getHelper().getCreationEMH().getCasierComboBox());
+      controller.getVisuPanel().setCalqueSelectionActif();
+    }
+    isUpdating = false;
+  }
+}

Added: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/AddCasierAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/AddCasierAction.java	                        (rev 0)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/AddCasierAction.java	2012-06-21 20:36:45 UTC (rev 7375)
@@ -0,0 +1,45 @@
+package org.fudaa.fudaa.crue.planimetry.action;
+
+import java.awt.Color;
+import javax.swing.Icon;
+import javax.swing.JComponent;
+import org.fudaa.ebli.calque.ZCalqueAffichageDonnees;
+import org.fudaa.ebli.calque.edition.BPaletteEdition;
+import org.fudaa.ebli.trace.TraceIcon;
+import org.fudaa.ebli.trace.TraceIconModel;
+import org.fudaa.fudaa.crue.planimetry.PlanimetryGisPaletteEdition;
+import org.fudaa.fudaa.crue.planimetry.controller.PlanimetryController;
+import org.openide.util.NbBundle;
+
+/**
+ *
+ * @author deniger ( genesis)
+ */
+public class AddCasierAction extends AbstractAddAction {
+
+  private static Icon createIcon() {
+    TraceIconModel model = new TraceIconModel(TraceIcon.CARRE, 10, Color.BLACK);
+    model.setBackgroundColor(Color.ORANGE.darker());
+    model.setBackgroundColorPainted(true);
+    return new TraceIcon(model);
+  }
+
+  public AddCasierAction(PlanimetryGisPaletteEdition palette, PlanimetryController controller, EditZone zone) {
+    super(palette, controller, zone, NbBundle.getMessage(AddCasierAction.class, "AddCasierAction.Name"), createIcon(),
+          "ADD_CASIER");
+  }
+
+  public String getDefaultPaletteAction() {
+    return BPaletteEdition.ADD_RECTANGLE_ACTION;
+  }
+
+  @Override
+  protected JComponent getEditionComponent() {
+    return controller.getHelper().getCreationEMH().getCasierComboBox();
+  }
+
+  @Override
+  protected ZCalqueAffichageDonnees getLayer() {
+    return controller.getCasierController().getLayer();
+  }
+}

Added: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/EditZone.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/EditZone.java	                        (rev 0)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/EditZone.java	2012-06-21 20:36:45 UTC (rev 7375)
@@ -0,0 +1,14 @@
+package org.fudaa.fudaa.crue.planimetry.action;
+
+import javax.swing.JComponent;
+
+/**
+ *
+ * @author deniger ( genesis)
+ */
+public interface EditZone {
+  
+  void active(JComponent jc);
+  void unactive(JComponent jc);
+
+}

Added: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/EditZonePanel.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/EditZonePanel.java	                        (rev 0)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/EditZonePanel.java	2012-06-21 20:36:45 UTC (rev 7375)
@@ -0,0 +1,40 @@
+package org.fudaa.fudaa.crue.planimetry.action;
+
+import java.awt.Component;
+import java.awt.FlowLayout;
+import javax.swing.JComponent;
+import javax.swing.JPanel;
+import org.fudaa.ctulu.CtuluLibArray;
+
+/**
+ *
+ * @author deniger ( genesis)
+ */
+public class EditZonePanel implements EditZone {
+
+  JPanel panel = new JPanel(new FlowLayout(FlowLayout.LEFT));
+
+  public JPanel getPanel() {
+    return panel;
+  }
+
+  @Override
+  public void active(JComponent jc) {
+    Component[] components = panel.getComponents();
+    if (CtuluLibArray.containsObject(components, jc)) {
+      return;
+    }
+    panel.add(jc);
+    panel.revalidate();
+  }
+
+  @Override
+  public void unactive(JComponent jc) {
+    Component[] components = panel.getComponents();
+    if (!CtuluLibArray.containsObject(components, jc)) {
+      return;
+    }
+    panel.remove(jc);
+    panel.revalidate();
+  }
+}

Added: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/CreationEMHSelectedType.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/CreationEMHSelectedType.java	                        (rev 0)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/CreationEMHSelectedType.java	2012-06-21 20:36:45 UTC (rev 7375)
@@ -0,0 +1,90 @@
+package org.fudaa.fudaa.crue.planimetry.controller;
+
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import javax.swing.JComboBox;
+import org.apache.commons.lang.StringUtils;
+import org.fudaa.ctulu.gui.CtuluCellTextRenderer;
+import org.fudaa.dodico.crue.metier.emh.EnumBrancheType;
+import org.fudaa.dodico.crue.metier.emh.EnumCasierType;
+import org.fudaa.dodico.crue.metier.transformer.ToStringInternationalizable;
+
+/**
+ *
+ * @author deniger ( genesis)
+ */
+public class CreationEMHSelectedType {
+
+  EnumCasierType casierType = EnumCasierType.EMHCasierProfil;
+  EnumBrancheType brancheType = EnumBrancheType.EMHBrancheSaintVenant;
+
+  public EnumBrancheType getBrancheType() {
+    return brancheType;
+  }
+
+  public void setBrancheType(EnumBrancheType brancheType) {
+    this.brancheType = brancheType;
+  }
+
+  public EnumCasierType getCasierType() {
+    return casierType;
+  }
+
+  public void setCasierType(EnumCasierType casierType) {
+    this.casierType = casierType;
+  }
+  JComboBox cbCasier;
+  JComboBox cbBranche;
+
+  public JComboBox getCasierComboBox() {
+    if (cbCasier == null) {
+//      cbCasier = new JComboBox(EnumCasierType.values());
+      cbCasier = new JComboBox(new Object[]{EnumCasierType.EMHCasierProfil});
+      cbCasier.setRenderer(renderer);
+      cbCasier.setSelectedItem(casierType);
+      cbCasier.addItemListener(new ItemListener() {
+
+        @Override
+        public void itemStateChanged(ItemEvent e) {
+          setCasierType((EnumCasierType) cbCasier.getSelectedItem());
+        }
+      });
+    }
+    return cbCasier;
+  }
+
+  public JComboBox createBrancheComboBox() {
+    if (cbBranche == null) {
+//      List<EnumBrancheType> values = new ArrayList<EnumBrancheType>(Arrays.asList(EnumBrancheType.values()));
+      cbBranche = new JComboBox(EnumBrancheType.values());
+      cbBranche.setRenderer(renderer);
+      cbBranche.setSelectedItem(brancheType);
+      cbBranche.addItemListener(new ItemListener() {
+
+        @Override
+        public void itemStateChanged(ItemEvent e) {
+          setBrancheType((EnumBrancheType) cbBranche.getSelectedItem());
+        }
+      });
+    }
+    return cbCasier;
+  }
+  private CtuluCellTextRenderer renderer = new CtuluCellTextRenderer() {
+
+    @Override
+    protected void setValue(Object _value) {
+      if (_value == null) {
+        super.setValue(StringUtils.EMPTY);
+      } else {
+        super.setValue(((ToStringInternationalizable) _value).geti18n());
+      }
+    }
+  };
+
+  public CtuluCellTextRenderer getRenderer() {
+    return renderer;
+  }
+}

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/PlanimetryControllerHelper.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/PlanimetryControllerHelper.java	2012-06-21 20:34:50 UTC (rev 7374)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/PlanimetryControllerHelper.java	2012-06-21 20:36:45 UTC (rev 7375)
@@ -22,7 +22,12 @@
 public class PlanimetryControllerHelper {
 
   private final PlanimetryController controller;
+  private CreationEMHSelectedType creationEMH = new CreationEMHSelectedType();
 
+  public CreationEMHSelectedType getCreationEMH() {
+    return creationEMH;
+  }
+
   public PlanimetryControllerHelper(PlanimetryController context) {
     this.controller = context;
   }

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryBrancheLayer.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryBrancheLayer.java	2012-06-21 20:34:50 UTC (rev 7374)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryBrancheLayer.java	2012-06-21 20:36:45 UTC (rev 7375)
@@ -7,7 +7,6 @@
 import org.fudaa.ctulu.gis.GISPolyligne;
 import org.fudaa.ctulu.gis.GisAbscCurviligneToCoordinate;
 import org.fudaa.dodico.crue.metier.emh.CatEMHBranche;
-import org.fudaa.dodico.crue.metier.emh.EMH;
 import org.fudaa.ebli.calque.dessin.DeForme;
 import org.fudaa.ebli.geometrie.GrBoite;
 import org.fudaa.ebli.geometrie.GrMorphisme;

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryCasierLayer.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryCasierLayer.java	2012-06-21 20:34:50 UTC (rev 7374)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryCasierLayer.java	2012-06-21 20:36:45 UTC (rev 7375)
@@ -8,7 +8,6 @@
 import org.fudaa.ctulu.gis.GISCoordinateSequenceContainerInterface;
 import org.fudaa.ctulu.gis.GISPolygone;
 import org.fudaa.dodico.crue.metier.emh.CatEMHCasier;
-import org.fudaa.dodico.crue.metier.emh.EMH;
 import org.fudaa.ebli.calque.dessin.DeForme;
 import org.fudaa.ebli.geometrie.GrBoite;
 import org.fudaa.ebli.geometrie.GrMorphisme;
@@ -95,7 +94,8 @@
 
   @Override
   public boolean canAddForme(int _typeForme) {
-    return isEditable() && (_typeForme == DeForme.CARRE || _typeForme == DeForme.CERCLE || _typeForme == DeForme.COURBE_FERMEE);
+    final boolean ok = _typeForme == DeForme.RECTANGLE || _typeForme == DeForme.ELLIPSE || _typeForme == DeForme.POLYGONE;
+    return ok && isEditable();
   }
 
   public static Coordinate getCenter(GISCoordinateSequenceContainerInterface pts) {

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryCasierLayerModel.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryCasierLayerModel.java	2012-06-21 20:34:50 UTC (rev 7374)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryCasierLayerModel.java	2012-06-21 20:36:45 UTC (rev 7375)
@@ -1,7 +1,18 @@
 package org.fudaa.fudaa.crue.planimetry.layer;
 
+import com.vividsolutions.jts.geom.Geometry;
+import org.fudaa.ctulu.CtuluCommandContainer;
+import org.fudaa.ctulu.CtuluUI;
 import org.fudaa.ctulu.gis.GISZoneCollectionLigneBrisee;
+import org.fudaa.dodico.crue.metier.emh.EMHSousModele;
+import org.fudaa.dodico.crue.metier.emh.EnumCasierType;
+import org.fudaa.ebli.calque.edition.ZEditionAttributesDataI;
+import org.fudaa.ebli.geometrie.GrPolygone;
+import org.fudaa.ebli.geometrie.GrPolyligne;
+import org.fudaa.fudaa.crue.common.helper.DialogHelper;
 import org.fudaa.fudaa.crue.planimetry.controller.LayerCasierController;
+import org.fudaa.fudaa.crue.planimetry.controller.PlanimetryControllerHelper;
+import org.openide.util.NbBundle;
 
 /**
  * @author deniger ( genesis)
@@ -19,4 +30,35 @@
   public boolean isGeometryReliee(int _idxGeom) {
     return true;
   }
+
+  @Override
+  public boolean addGeometry(Geometry _p, CtuluCommandContainer _cmd, CtuluUI _ui, ZEditionAttributesDataI _d) {
+    return false;
+  }
+
+  @Override
+  public boolean addGeometry(GrPolygone _p, CtuluCommandContainer _cmd, CtuluUI _ui, ZEditionAttributesDataI _d) {
+    PlanimetryControllerHelper helper = super.getLayerController().getHelper();
+    EMHSousModele sousModele = helper.getDefaultSousModele();
+    if (sousModele == null) {
+      return false;
+    }
+    if (!helper.isVisible(sousModele)) {
+      DialogHelper.showWarn(NbBundle.getMessage(PlanimetryNodeLayerModel.class, "AddEMH.SousModeleParDefautNotVisible"));
+      return false;
+    }
+    EnumCasierType casierType = helper.getCreationEMH().getCasierType();
+    if (casierType == null) {
+      return false;
+    }
+    getLayerController().changeWillBeDone();
+//    return super.addGeometry(_p, _cmd, _ui, _d);
+    getLayerController().changeDone();
+    return true;
+  }
+
+  @Override
+  public boolean addGeometry(GrPolyligne _p, CtuluCommandContainer _cmd, CtuluUI _ui, ZEditionAttributesDataI _d) {
+    return false;
+  }
 }

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryNodeLayerModel.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryNodeLayerModel.java	2012-06-21 20:34:50 UTC (rev 7374)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryNodeLayerModel.java	2012-06-21 20:36:45 UTC (rev 7375)
@@ -5,19 +5,16 @@
 import org.fudaa.ctulu.gis.GISPoint;
 import org.fudaa.ctulu.gis.GISZoneCollectionPoint;
 import org.fudaa.dodico.crue.edition.EditionCreateEMH;
-import org.fudaa.dodico.crue.edition.UniqueNomFinder;
 import org.fudaa.dodico.crue.metier.emh.CatEMHNoeud;
-import org.fudaa.dodico.crue.metier.emh.EMHNoeudNiveauContinu;
-import org.fudaa.dodico.crue.metier.emh.EMHScenario;
 import org.fudaa.dodico.crue.metier.emh.EMHSousModele;
-import org.fudaa.dodico.crue.metier.emh.EnumCatEMH;
 import org.fudaa.dodico.crue.metier.emh.EnumNoeudType;
-import org.fudaa.dodico.crue.metier.factory.EMHRelationFactory;
 import org.fudaa.ebli.calque.edition.ZEditionAttributesDataI;
 import org.fudaa.ebli.geometrie.GrPoint;
+import org.fudaa.fudaa.crue.common.helper.DialogHelper;
 import org.fudaa.fudaa.crue.planimetry.controller.LayerNodeController;
 import org.fudaa.fudaa.crue.planimetry.controller.PlanimetryControllerHelper;
 import org.fudaa.fudaa.crue.planimetry.controller.PlanimetryGisModelContainer;
+import org.openide.util.NbBundle;
 
 /**
  *
@@ -31,14 +28,21 @@
 
   @Override
   public void addPoint(GrPoint _p, ZEditionAttributesDataI _data, CtuluCommandContainer _cmd) {
+    PlanimetryControllerHelper helper = super.getLayerController().getHelper();
+    EMHSousModele sousModele = helper.getDefaultSousModele();
+    if (sousModele == null) {
+      return;
+    }
+    if (!helper.isVisible(sousModele)) {
+      DialogHelper.showWarn(NbBundle.getMessage(PlanimetryNodeLayerModel.class, "AddEMH.SousModeleParDefautNotVisible"));
+      return;
+    }
     getLayerController().changeWillBeDone();
-    PlanimetryControllerHelper helper = super.getLayerController().getHelper();
     helper.scenarioEditionStarted();
     final PlanimetryGisModelContainer planimetryGisAttributeContext = helper.getPlanimetryGisAttributeContext();
-    EMHScenario scenario = planimetryGisAttributeContext.getScenario();
     EditionCreateEMH creationHelper = new EditionCreateEMH();
     //TODO a remplacer
-    final EMHSousModele sousModele = scenario.getModeles().get(0).getSousModeles().get(0);
+
     CatEMHNoeud nd = creationHelper.createNoeud(sousModele, EnumNoeudType.EMHNoeudNiveauContinu);
     GISPoint gisPt = new GISPoint(_p.x_, _p.y_, 0);
     List data = planimetryGisAttributeContext.buildNodeData(nd);

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/resources/org/fudaa/fudaa/crue/planimetry/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/resources/org/fudaa/fudaa/crue/planimetry/Bundle.properties	2012-06-21 20:34:50 UTC (rev 7374)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/resources/org/fudaa/fudaa/crue/planimetry/Bundle.properties	2012-06-21 20:36:45 UTC (rev 7375)
@@ -9,4 +9,4 @@
 RebuildLayout.Action=Reconstruire le r\u00e9seau
 CheckMinDistance.Action=Assurer une distance minimale
 Configure.Action=Configurer l'affichage
-ConfigurationUI.Apply.Name=Appliquer
+ConfigurationUI.Apply.Name=Appliquer
\ No newline at end of file

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/resources/org/fudaa/fudaa/crue/planimetry/action/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/resources/org/fudaa/fudaa/crue/planimetry/action/Bundle.properties	2012-06-21 20:34:50 UTC (rev 7374)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/resources/org/fudaa/fudaa/crue/planimetry/action/Bundle.properties	2012-06-21 20:36:45 UTC (rev 7375)
@@ -4,3 +4,4 @@
 SigLoaderAction.ImportPoints.CheckBox=Importer les {0} point(s)
 SigLoaderAction.ImportLignes.Confirmation=Le fichier comporte {0} ligne(s). Voulez-vous l''importer ?
 SigLoaderAction.ImportPoints.Confirmation=Le fichier comporte {0} point(s). Voulez-vous l''importer ?
+AddCasierAction.Name=Ajouter des casiers

Copied: trunk/soft/fudaa-crue/ui-planimetry/src/main/resources/org/fudaa/fudaa/crue/planimetry/layer/Bundle.properties (from rev 7362, trunk/soft/fudaa-crue/ui-planimetry/src/main/resources/org/fudaa/fudaa/crue/planimetry/Bundle.properties)
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/resources/org/fudaa/fudaa/crue/planimetry/layer/Bundle.properties	                        (rev 0)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/resources/org/fudaa/fudaa/crue/planimetry/layer/Bundle.properties	2012-06-21 20:36:45 UTC (rev 7375)
@@ -0,0 +1 @@
+AddEMH.SousModeleParDefautNotVisible=L'EMH ne peut pas \u00eatre ajout\u00e9 car le sous-mod\u00e8le par d\u00e9fautr n'est pas visible.

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/test/java/org/fudaa/fudaa/crue/planimetry/PlanimetryLauncher.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/test/java/org/fudaa/fudaa/crue/planimetry/PlanimetryLauncher.java	2012-06-21 20:34:50 UTC (rev 7374)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/test/java/org/fudaa/fudaa/crue/planimetry/PlanimetryLauncher.java	2012-06-21 20:36:45 UTC (rev 7375)
@@ -36,6 +36,7 @@
 import org.fudaa.dodico.crue.projet.ScenarioLoader;
 import org.fudaa.dodico.crue.projet.ScenarioLoaderResult;
 import org.fudaa.dodico.crue.projet.coeur.TestCoeurConfig;
+import org.fudaa.fudaa.crue.planimetry.configuration.ContainerActivityVisibility;
 import org.fudaa.fudaa.crue.planimetry.configuration.VisuConfiguration;
 import org.fudaa.fudaa.crue.planimetry.save.PlanimetryGisLoader;
 import org.fudaa.fudaa.crue.planimetry.save.PlanimetryGisSaver;
@@ -60,6 +61,9 @@
     scenario.setIdRegistry(registry);
     final PlanimetryVisuPanel panel = builder.buildCalque(new CtuluUIDefault(), scenario, new VisuConfiguration(),
                                                           readData.getPropDefinition());
+    ContainerActivityVisibility activity=new ContainerActivityVisibility();
+    activity.initialize(scenario);
+    panel.getPlanimetryController().setContainerActivityVisibility(activity);
     final JFrame frame = new JFrame();
 
     JComponent buildInfosCreationComposant = panel.createGisEditionPalette();
@@ -142,6 +146,7 @@
       }
     });
     JPanel bottom = new JPanel(new FlowLayout(FlowLayout.LEFT));
+    bottom.add(panel.getEditZonePanel().getPanel());
     bottom.add(export);
     bottom.add(modify);
     bottom.add(cb);

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