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

5 Feb 2009

Author: sletellier
Date: 2009-02-05 13:37:22 +0000 (Thu, 05 Feb 2009)
New Revision: 1793

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/PortUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx
Log:
Debug inputUI

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	2009-02-04 16:45:44 UTC (rev 1792)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx	2009-02-05 13:37:22 UTC (rev 1793)
@@ -49,9 +49,17 @@
 
 protected OMToolSet toolSet = new OMToolSet();
 protected OpenMapEvents mapListener = null;
+boolean cellChanged = true;
 
+cellMap = new fr.ifremer.isisfish.map.IsisMapBean();
 setButtonTitle(_("isisfish.input.continueZones"));
 setNextPath("$root/$zones");
+cellMap.setFisheryRegion(getRegion());
+cellMap.setSelectionMode(CellSelectionLayer.SINGLE_SELECTION);
+cellMap.setActiveMouseMode(new SelectMouseMode());
+toolSet.setupListeners(cellMap);
+toolMap.add((Component)toolSet);
+setMapListener();
 addPropertyChangeListener("bean", new PropertyChangeListener() {
     public void propertyChange(PropertyChangeEvent evt) {
         if (evt.getOldValue() != null || evt.getNewValue() == null) {
@@ -74,19 +82,10 @@
     getVerifier().setCancelButton(cancel);
     Cell cell = getVerifier().getEntity(Cell.class);
     setBean((CellImpl) cell);
+    cellChanged = false;
     jaxx.runtime.swing.Utils.fillComboBox(fieldCell,getRegion().getCell(), getBean());
-    cellMap.setFisheryRegion(getRegion());
-    if (mapListener == null){
-        cellMap.setSelectionMode(CellSelectionLayer.SINGLE_SELECTION);
-        cellMap.setActiveMouseMode(new SelectMouseMode());
-        toolSet.setupListeners(cellMap);
-        toolMap.add((Component)toolSet);
-        setMapListener();
-    }
-
-    if (getBean() != null){
-        cellMap.setSelectedCells(getBean());
-    }
+    cellChanged = true;
+    cellMap.setSelectedCells(getBean());
 }
 protected void setMapListener(){
     if (mapListener == null){
@@ -95,7 +94,10 @@
             @Override
             public boolean onMouseClicked() {
                 for (Cell c : cellMap.getSelectedCells()){
-                    getParentContainer(InputUI.class).setTreeSelection("$root/$cells/" + c.getTopiaId());
+                    if (!c.getTopiaId().equals(getBean().getTopiaId())){
+                        jaxx.runtime.swing.Utils.fillComboBox(fieldCell,getRegion().getCell(), c);
+                        return true;
+                    }
                 }
                 return true;
             }
@@ -104,16 +106,18 @@
 }
 
 protected void fieldCellChanged() {
-    Cell c = (Cell)fieldCell.getSelectedItem();
-    if (c==null) {
-        return;
+    if (cellChanged){
+        Cell c = (Cell)fieldCell.getSelectedItem();
+        if (c==null) {
+            return;
+        }
+        Cell oldC = getBean();
+        if (oldC != null && c.getTopiaId().equals(oldC.getTopiaId())) {
+            // avoid reentrant code
+            return;
+        }
+        getParentContainer(InputUI.class).setTreeSelection("$root/$cells/"+c.getTopiaId());
     }
-    Cell oldC = getBean();
-    if (oldC != null && c.getTopiaId().equals(oldC.getTopiaId())) {
-        // avoid reentrant code
-        return;
-    }
-    getParentContainer(InputUI.class).setTreeSelection("$root/$cells/"+c.getTopiaId());
 }
 ]]></script>
         <JPanel id='body' layout='{new BorderLayout()}'>
@@ -180,7 +184,7 @@
                 </Table>
                 <JPanel id='map' layout='{new BorderLayout()}'>
                     <fr.ifremer.isisfish.map.OpenMapToolPanel id='toolMap' javaBean='new fr.ifremer.isisfish.map.OpenMapToolPanel()' constraints='BorderLayout.NORTH'/>
-                    <fr.ifremer.isisfish.map.IsisMapBean id='cellMap' javaBean='new fr.ifremer.isisfish.map.IsisMapBean()' constraints='BorderLayout.CENTER'/>
+                    <fr.ifremer.isisfish.map.IsisMapBean id='cellMap' constraints='BorderLayout.CENTER'/>
                 </JPanel>
             </JSplitPane>
         </JPanel>

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	2009-02-04 16:45:44 UTC (rev 1792)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx	2009-02-05 13:37:22 UTC (rev 1793)
@@ -107,7 +107,16 @@
             public boolean onMouseClicked() {
                 for (Cell c : portMap.getSelectedCells()){
                     if (getBean() != null){
-                        getBean().setCell(c);
+                        if (getBean().getCell() != null){
+                            if (getBean().getCell().getTopiaId().equals(c.getTopiaId())){
+                                getBean().setCell(c);
+                                return true;
+                            }
+                        }
+                        else{
+                            getBean().setCell(c);
+                            return true;
+                        }
                     }
                 }
                 return true;

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx	2009-02-04 16:45:44 UTC (rev 1792)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx	2009-02-05 13:37:22 UTC (rev 1793)
@@ -130,7 +130,7 @@
         </row>
         <row>
             <cell columns='2' fill='both' weightx='1.0'  weighty='1.0'>
-                <org.codelutin.math.matrix.gui.MatrixPanelEditor id="fieldStrategyMonthInfoProportion" linearModelShowDefault='{true}' linearModel='{true}' matrix='{getStrategyMonthInfo().getProportionMetier().copy()}' enabled='{isActif()}'/>
+                <org.codelutin.math.matrix.gui.MatrixPanelEditor id="fieldStrategyMonthInfoProportion" linearModelShowDefault='{true}' linearModel='{true}' matrix='{getStrategyMonthInfo().getProportionMetier() == null ? null : getStrategyMonthInfo().getProportionMetier().copy()}' enabled='{isActif()}'/>
             </cell>
         </row>
     </Table>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx	2009-02-04 16:45:44 UTC (rev 1792)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx	2009-02-05 13:37:22 UTC (rev 1793)
@@ -76,7 +76,7 @@
     setBean((VesselTypeImpl) vesselType);
     if (getBean() != null){
         tripTypeChanged = false;
-        vesselTypeTripType.fillList(getRegion().getTripType(), getBean().getTripType() == null ? null : getBean().getTripType());
+        vesselTypeTripType.fillList(getRegion().getTripType(), getBean().getTripType() == null ? (Object) null : getBean().getTripType());
         tripTypeChanged = true;
     }
 }

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	2009-02-04 16:45:44 UTC (rev 1792)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx	2009-02-05 13:37:22 UTC (rev 1793)
@@ -51,7 +51,14 @@
 
 protected OMToolSet toolSet = new OMToolSet();
 protected MapMouseListener mapListener = null;
-
+boolean cellChanged = true;
+zoneMap = new fr.ifremer.isisfish.map.IsisMapBean();
+zoneMap.setFisheryRegion(getRegion());
+zoneMap.setActiveMouseMode(new SelectMouseMode(false));
+zoneMap.setSelectionMode(CellSelectionLayer.MULT_SELECTION);
+toolSet.setupListeners(zoneMap);
+toolMap.add((Component)toolSet);
+setMapListener();
 setButtonTitle(_("isisfish.input.continuePorts"));
 setNextPath("$root/$ports");
 addPropertyChangeListener("bean", new PropertyChangeListener() {
@@ -64,7 +71,6 @@
 //            jaxx.runtime.Util.removeDataBinding($InputContentUI0, "fieldZoneName.text", "fieldZoneComment.text");
             fieldZoneName.setText("");
             fieldZoneComment.setText("");
-            //zoneCells.fillList(getRegion().getCell(), java.util.Collections.EMPTY_LIST);
         }
         if (evt.getNewValue() != null) {
             // add binding on getBean()
@@ -80,23 +86,13 @@
     getVerifier().setDeleteButton(remove);
     Zone zone = getVerifier().getEntity(Zone.class);
     setBean((ZoneImpl) zone);
-    if (log.isDebugEnabled()) {
-        log.debug("zone nb cells : "+ ( zone==null ? 0 : zone.getCell().size() ) );
-    }
     setZoneCells();
-    zoneMap.setFisheryRegion(getRegion());
-    if (mapListener == null){
-        zoneMap.setActiveMouseMode(new SelectMouseMode(false));
-        zoneMap.setSelectionMode(CellSelectionLayer.MULT_SELECTION);
-        toolSet.setupListeners(zoneMap);
-        toolMap.add((Component)toolSet);
-        setMapListener();
-    }
-    refreshMap();
 }
 protected void setZoneCells(){
     if (getBean() != null){
+        cellChanged = false;
         zoneCells.fillList(getRegion().getCell(), getBean().getCell());
+        cellChanged = true;
     }
 }
 protected void setMapListener(){
@@ -104,25 +100,22 @@
         mapListener = new OpenMapEvents(zoneMap, new SelectMouseMode(false), CellSelectionLayer.MULT_SELECTION) {
             @Override
             public boolean onMouseClicked() {
-                java.util.List<Cell> selectedCell = zoneMap.getSelectedCells();
-                getBean().setCell(selectedCell);
-                setZoneCells();
-                return true;
+                zoneCells.fillList(getRegion().getCell(), zoneMap.getSelectedCells());
+                zoneCellsChange();
+                return false;
             }
         };
         zoneMap.addMapMouseListener(mapListener);
     }
 }
-protected void refreshMap(){
-    zoneMap.setSelectedCells(getBean() == null ? java.util.Collections.EMPTY_LIST : getBean().getCell());
-}
 protected void zoneCellsChange() {
-    java.util.List<Cell> cells = new ArrayList<Cell>();
-    for (Object o : zoneCells.getSelectedValues()){
-        cells.add((Cell) o);
+    if (cellChanged){
+        java.util.List<Cell> cells = new ArrayList<Cell>();
+        for (Object o : zoneCells.getSelectedValues()){
+            cells.add((Cell) o);
+        }
+        getBean().setCell(cells);
     }
-    getBean().setCell(cells);
-    refreshMap();
 }
 ]]>
     </script>
@@ -194,7 +187,7 @@
                         javaBean='new fr.ifremer.isisfish.map.OpenMapToolPanel()'
                         constraints='BorderLayout.NORTH'/>
                         <fr.ifremer.isisfish.map.IsisMapBean id='zoneMap'
-                        javaBean='new fr.ifremer.isisfish.map.IsisMapBean()'
+                        selectedCells='{getBean().getCell()}'
                         constraints='BorderLayout.CENTER'/>
                     </JPanel>
                 </JSplitPane>

    

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

sletellier＠users.labs.libre-entreprise.org

tags

participants (1)