r1687 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input - Isis-fish-commits

18 Dec 2008

Author: sletellier
Date: 2008-12-18 14:22:08 +0000 (Thu, 18 Dec 2008)
New Revision: 1687

Modified:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx
Log:
Debug final !

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx
===================================================================

--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx	2008-12-18 13:47:04 UTC (rev 1686)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx	2008-12-18 14:22:08 UTC (rev 1687)
@@ -93,11 +93,12 @@
     setBean((CellImpl) cell);
     jaxx.runtime.swing.Utils.fillComboBox(fieldCell,action.getFisheryRegion().getCell(), cell);
 
+    cellMap = new IsisMapBean();
+    cellMap.setSelectionMode(CellSelectionLayer.SINGLE_SELECTION);
+    cellMap.setActiveMouseMode(new SelectMouseMode());
     cellMap.setFisheryRegion(action.getFisheryRegion());
     toolSet.setupListeners(cellMap);
     toolMap.add((Component)toolSet);
-//    cellMap.setSelectionMode(CellSelectionLayer.SINGLE_SELECTION);
-//    cellMap.setActiveMouseMode(new SelectMouseMode());
     setMapListener();
     cellMapPanel.add(toolMap, BorderLayout.NORTH);
     cellMapPanel.add(cellMap, BorderLayout.CENTER);

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx	2008-12-18 13:47:04 UTC (rev 1686)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx	2008-12-18 14:22:08 UTC (rev 1687)
@@ -45,6 +45,8 @@
         import fr.ifremer.isisfish.entities.FisheryRegion;
         import com.bbn.openmap.gui.OMToolSet;
         import fr.ifremer.isisfish.map.IsisMapBean;
+        import fr.ifremer.isisfish.map.CellSelectionLayer;
+        import com.bbn.openmap.event.SelectMouseMode;
         import fr.ifremer.isisfish.map.OpenMapToolPanel;
         import fr.ifremer.isisfish.ui.WelcomePanelUI;
 
@@ -59,6 +61,8 @@
         }
         protected void init(){
             cellMap = new IsisMapBean();
+            cellMap.setSelectionMode(CellSelectionLayer.SINGLE_SELECTION);
+            cellMap.setActiveMouseMode(new SelectMouseMode());
             toolSet.setupListeners(cellMap);
             toolMap.add((Component)toolSet);
             fisheryRegionMapPanel.add(toolMap, BorderLayout.NORTH);
@@ -79,6 +83,9 @@
             refreshMap();
         }
         protected void refreshMap(){
+//            cellMap = new IsisMapBean();
+//            cellMap.setSelectionMode(CellSelectionLayer.SINGLE_SELECTION);
+//            cellMap.setActiveMouseMode(new SelectMouseMode());
             cellMap.setFisheryRegion(region);
             cellMap.repaint();
         }

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx	2008-12-18 13:47:04 UTC (rev 1686)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx	2008-12-18 14:22:08 UTC (rev 1687)
@@ -93,6 +93,9 @@
 
 
         }
+        portMap = new IsisMapBean();
+        portMap.setSelectionMode(CellSelectionLayer.SINGLE_SELECTION);
+        portMap.setActiveMouseMode(new SelectMouseMode());
         portMap.setFisheryRegion(getContextValue(InputAction.class).getFisheryRegion());
         toolSet.setupListeners(portMap);
         toolMap.add((Component)toolSet);

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx	2008-12-18 13:47:04 UTC (rev 1686)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx	2008-12-18 14:22:08 UTC (rev 1687)
@@ -58,7 +58,7 @@
     import java.util.logging.Level;
     import java.util.logging.Logger;
 
-    protected IsisMapBean zoneMap = new IsisMapBean();
+    protected IsisMapBean zoneMap = null;
     protected OpenMapToolPanel toolMap = new OpenMapToolPanel();
     protected OMToolSet toolSet = new OMToolSet();
     protected MapMouseListener mapListener = null;
@@ -101,12 +101,17 @@
             fieldZoneName.setText("");
             fieldZoneComment.setText("");
         }
-        zoneMap.setFisheryRegion(getContextValue(InputAction.class).getFisheryRegion());
-        toolSet.setupListeners(zoneMap);
-        toolMap.add((Component)toolSet);
-        setMapListener();
-        zoneMapPanel.add(toolMap, BorderLayout.NORTH);
-        zoneMapPanel.add(zoneMap, BorderLayout.CENTER);
+        if (zoneMap == null){
+            zoneMap = new IsisMapBean();
+            zoneMap.setActiveMouseMode(new SelectMouseMode(false));
+            zoneMap.setSelectionMode(CellSelectionLayer.MULT_SELECTION);
+            zoneMap.setFisheryRegion(getContextValue(InputAction.class).getFisheryRegion());
+            toolSet.setupListeners(zoneMap);
+            toolMap.add((Component)toolSet);
+            setMapListener();
+            zoneMapPanel.add(toolMap, BorderLayout.NORTH);
+            zoneMapPanel.add(zoneMap, BorderLayout.CENTER);
+        }
         refreshMap();
     }
     protected void setMapListener(){

    

r1687 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input

sletellier＠users.labs.libre-entreprise.org

tags

participants (1)