From sletellier@users.labs.libre-entreprise.org Mon Jun 15 00:25:46 2026
From: sletellier@users.labs.libre-entreprise.org
To: isis-fish-commits@list.isis-fish.org
Subject: [Isis-fish-commits] r1647 -
	isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
Date: Tue, 09 Dec 2008 14:49:16 +0100
Message-ID: <20081209134916.F265D461BF1@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2039308753082247175=="

--===============2039308753082247175==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Author: sletellier
Date: 2008-12-09 13:49:16 +0000 (Tue, 09 Dec 2008)
New Revision: 1647

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/InputAction.java
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx
Log:
FisheryRegionUI

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryR=
egionUI.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionU=
I.jaxx	2008-12-09 13:48:54 UTC (rev 1646)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionU=
I.jaxx	2008-12-09 13:49:16 UTC (rev 1647)
@@ -34,122 +34,341 @@
 		     + FisheryRegion
 		     +-->
 <JPanel id=3D"inputFisheryRegion" layout=3D'{new BorderLayout()}'>
+    <script>
+        <![CDATA[
+        import fr.ifremer.isisfish.entities.FisheryRegion;
+        import com.bbn.openmap.gui.OMToolSet;
+        import fr.ifremer.isisfish.map.IsisMapBean;
+        import fr.ifremer.isisfish.map.OpenMapToolPanel;
+        import fr.ifremer.isisfish.ui.WelcomePanelUI;
+
+        protected boolean changed =3D false;
+        protected FisheryRegion region =3D null;
+        protected IsisMapBean cellMap =3D null;
+        protected OpenMapToolPanel toolMap =3D new OpenMapToolPanel();
+        protected OMToolSet toolSet =3D new OMToolSet();
+
+        public FisheryRegionUI(InputAction action){
+            setContextValue(action);
+        }
+        public void refresh(){
+            jaxx.runtime.Util.assignment(region =3D getContextValue(InputAct=
ion.class).getFisheryRegion(), "region", fr.ifremer.isisfish.ui.input.Fishery=
RegionUI.this);
+            fieldRegion.setText(region.getName());
+            fieldLatMin.setText(region.getMinLatitude() + "");
+            fieldLatMax.setText(region.getMaxLatitude() + "");
+            fieldLongMin.setText(region.getMinLongitude() + "");
+            fieldLongMax.setText(region.getMaxLongitude() + "");
+            fieldCellLengthLatitude.setText(region.getCellLengthLatitude() +=
 "");
+            fieldCellLengthLongitude.setText(region.getCellLengthLongitude()=
 + "");
+            setFieldMapfilesModel(region);
+            fieldComment.setText(region.getComment());
+            refreshMap();
+        }
+        protected void refreshMap(){
+            cellMap =3D new IsisMapBean();
+            cellMap.setFisheryRegion(region);
+            cellMap.setSelectionMode(0);
+            toolSet.setupListeners(cellMap);
+            toolMap.add((Component)toolSet);
+            fisheryRegionMapPanel.add(toolMap, BorderLayout.NORTH);
+            fisheryRegionMapPanel.add(cellMap, BorderLayout.CENTER);
+            cellMap.repaint();
+//            cellMap.setSelectedCells(cell);
+        }
+        protected void setFieldMapfilesModel(FisheryRegion region){
+            DefaultListModel model =3D new DefaultListModel();
+            java.util.List<String> mapList =3D region.getMapFileList();
+            if (mapList !=3D null){
+                int cnt =3D 0;
+                for (String map : mapList){
+                    model.add(cnt, map);
+                    cnt++;
+                }
+            }
+            fieldMapfiles.setModel(model);
+        }
+        protected void valueChanged(boolean b){
+            jaxx.runtime.Util.assignment(changed =3D b, "changed", fr.ifreme=
r.isisfish.ui.input.FisheryRegionUI.this);
+            save.setEnabled(b);
+            cancel.setEnabled(b);
+        }
+        protected void regionChanged(){
+            region.setName(fieldRegion.getText());
+            refreshMap();
+        }
+        protected void latMinChanged(){
+            region.setMinLatitude(Float.parseFloat(fieldLatMin.getText()));
+            refreshMap();
+        }
+        protected void latMaxChanged(){
+            region.setMaxLatitude(Float.parseFloat(fieldLatMax.getText()));
+            refreshMap();
+        }
+        protected void longMinChanged(){
+            region.setMinLongitude(Float.parseFloat(fieldLongMin.getText()));
+            refreshMap();
+        }
+        protected void longMaxChanged(){
+            region.setMaxLongitude(Float.parseFloat(fieldLongMax.getText()));
+            refreshMap();
+        }
+        protected void cellLenghtLatChanged(){
+            region.setCellLengthLatitude(Float.parseFloat(fieldCellLengthLat=
itude.getText()));
+            refreshMap();
+        }
+        protected void cellLenghtLongChanged(){
+            region.setCellLengthLongitude(Float.parseFloat(fieldCellLengthLo=
ngitude.getText()));
+            refreshMap();
+        }
+        protected void mapFieldChanged(){
+            Object[] values =3D fieldMapfiles.getSelectedValues();
+            java.util.List<String> valuesList =3D new ArrayList<String>();
+            if (values !=3D null){
+                for (Object o : values){
+                    valuesList.add((String)o);
+                }
+            }
+            region.setMapFileList(valuesList);
+            refreshMap();
+        }
+        protected void addMap(){
+            getContextValue(InputAction.class).addMap();
+            refreshMap();
+        }
+        protected void delMap(){
+            getContextValue(InputAction.class).removeMap(fieldMapfiles.getSe=
lectedValues());
+            refreshMap();
+        }
+        protected void commentChanged(){
+            region.setComment(fieldComment.getText());
+            refreshMap();
+        }
+        protected void cellFillChanged(){
+        }
+        protected void cellFile(){
+            getContextValue(InputAction.class).loadCellFile(fieldCellFile.ge=
tText());
+            refreshMap();
+        }
+        protected void save(){
+            setMsg(_("isisfish.message.checking.cell"));
+            getContextValue(InputAction.class).saveFisheryRegion("FisheryReg=
ion");
+            getParentContainer(InputUI.class).setTreeModel();
+            getParentContainer(InputUI.class).setTreeSelection("$root");
+            valueChanged(false);
+            setMsg(_("isisfish.message.save.finished"));
+        }
+        protected void cancel(){
+            getContextValue(InputAction.class).cancel("FisheryRegion");
+            valueChanged(false);
+        }
+        protected void check(){
+            getContextValue(InputAction.class).checkFisheryRegion();
+            setMsg(_("isisfish.message.check.region"));
+        }
+        protected void goToCell(){
+            getParentContainer(InputUI.class).setTreeSelection("$root/$cells=
");
+        }
+        protected void setMsg(String msg){
+            getParentContainer(WelcomePanelUI.class).setInfoText(msg);
+        }
+        ]]>
+    </script>
     <JSplitPane id=3D"FisheryRegionTab" name=3D"FisheryRegion"
-	             oneTouchExpandable=3D"true" dividerLocation=3D"200" orientatio=
n=3D"VERTICAL">
-        <JPanel name=3D"isisfish.fisheryRegion.title">
-   =20
-<!-- Fixme : ContextDataSource
-<ContextDataSource id=3D"FisheryRegion" context=3D"current" source=3D"Fisher=
yRegion"/>
--->=20
-   =20
-
+	             oneTouchExpandable=3D"true" dividerLocation=3D"200" orientatio=
n=3D"HORIZONTAL" constraints=3D'BorderLayout.CENTER'>
+        <Table>
     <!-- Widget -->
-            <JLabel text=3D"isisfish.fisheryRegion.name"/>
-            <JTextField id=3D"fieldRegion">
+            <row>
+                <cell columns=3D'3'>
+                    <JLabel text=3D"isisfish.fisheryRegion.name"/>
+                </cell>
+            </row>
+            <row>
+                <cell columns=3D'3' fill=3D'horizontal' weightx=3D'1.0'>
+                    <JTextField id=3D"fieldRegion" onKeyTyped=3D'valueChange=
d(true)' onFocusLost=3D'regionChanged()'/>
 <!-- Fixme : DocumentEvents
 origin=3D"$RegionStorage/name"
 <DocumentEvents id=3D"updateRegion" onChangedUpdate=3D"Update($fieldRegion/t=
ext)"/>
 -->
-            </JTextField>
-            <JLabel text=3D"isisfish.fisheryRegion.area"/>
-            <JLabel text=3D"isisfish.fisheryRegion.latitude.min"/>
-            <JTextField id=3D"fieldLatMin">
+                </cell>
+            </row>
+            <row>
+                <cell columns=3D'3'>
+                    <JLabel text=3D"isisfish.fisheryRegion.area"/>
+                </cell>
+            </row>
+            <row>
+                <cell>
+                    <JLabel text=3D"isisfish.fisheryRegion.latitude.min"/>
+                </cell>
+                <cell columns=3D'2' fill=3D'horizontal' weightx=3D'1.0'>
+                    <JTextField id=3D"fieldLatMin" onKeyTyped=3D'valueChange=
d(true)' onFocusLost=3D'latMinChanged()'/>
 <!-- Fixme : DocumentEvents
 origin=3D"$FisheryRegion/minLatitude"
 <DocumentEvents onModified=3D"Update($fieldLatMin/text)"/>
 -->
-            </JTextField>
-            <JLabel text=3D"isisfish.fisheryRegion.latitude.max"/>
-            <JTextField id=3D"fieldLatMax">
+                </cell>
+            </row>
+            <row>
+                <cell>
+                    <JLabel text=3D"isisfish.fisheryRegion.latitude.max"/>
+                </cell>
+                <cell columns=3D'2' fill=3D'horizontal' weightx=3D'1.0'>
+                  <JTextField id=3D"fieldLatMax" onKeyTyped=3D'valueChanged(=
true)' onFocusLost=3D'latMaxChanged()'/>
 <!-- Fixme : DocumentEvents
 origin=3D"$FisheryRegion/maxLatitude"
 <DocumentEvents onModified=3D"Update($fieldLatMax/text)"/>
 -->
-            </JTextField>
-            <JLabel text=3D"isisfish.fisheryRegion.longitude.min"/>
-            <JTextField id=3D"fieldLongMin">
+                </cell>
+            </row>
+            <row>
+                <cell>
+                    <JLabel text=3D"isisfish.fisheryRegion.longitude.min"/>
+                </cell>
+                <cell columns=3D'2' fill=3D'horizontal' weightx=3D'1.0'>
+                    <JTextField id=3D"fieldLongMin" onKeyTyped=3D'valueChang=
ed(true)' onFocusLost=3D'longMinChanged()'/>
 <!-- Fixme : DocumentEvents
 origin=3D"$FisheryRegion/minLongitude"
 <DocumentEvents onModified=3D"Update($fieldLongMin/text)"/>
 -->
-            </JTextField>
-            <JLabel text=3D"isisfish.fisheryRegion.longitude.max"/>
-            <JTextField id=3D"fieldLongMax">
+                </cell>
+            </row>
+            <row>
+                <cell>
+                    <JLabel text=3D"isisfish.fisheryRegion.longitude.max"/>
+                </cell>
+                <cell columns=3D'2' fill=3D'horizontal' weightx=3D'1.0'>
+                    <JTextField id=3D"fieldLongMax" onKeyTyped=3D'valueChang=
ed(true)' onFocusLost=3D'longMaxChanged()'/>
 <!-- Fixme : DocumentEvents
 origin=3D"$FisheryRegion/maxLongitude"
 <DocumentEvents onModified=3D"Update($fieldLongMax/text)"/>
 -->
-            </JTextField>
-            <JLabel text=3D"isisfish.fisheryRegion.spatial"/>
-            <JLabel text=3D"isisfish.fisheryRegion.latitude"/>
-            <JTextField id=3D"fieldCellLengthLatitude">
+                </cell>
+            </row>
+            <row>
+                <cell columns=3D'3'>
+                     <JLabel text=3D"isisfish.fisheryRegion.spatial"/>
+                </cell>
+            </row>
+            <row>
+                <cell>
+                    <JLabel text=3D"isisfish.fisheryRegion.latitude"/>
+                </cell>
+                <cell columns=3D'2' fill=3D'horizontal' weightx=3D'1.0'>
+                    <JTextField id=3D"fieldCellLengthLatitude" onKeyTyped=3D=
'valueChanged(true)' onFocusLost=3D'cellLenghtLatChanged()'/>
 <!-- Fixme : DocumentEvents
 origin=3D"$FisheryRegion/cellLengthLatitude"
 <DocumentEvents onModified=3D"Update($fieldCellLengthLatitude/text)"/>
 -->
-            </JTextField>
-            <JLabel text=3D"isisfish.fisheryRegion.longitude"/>
-            <JTextField id=3D"fieldCellLengthLongitude">
+                </cell>
+            </row>
+            <row>
+                <cell>
+                    <JLabel text=3D"isisfish.fisheryRegion.longitude"/>
+                </cell>
+                <cell columns=3D'2' fill=3D'horizontal' weightx=3D'1.0'>
+                    <JTextField id=3D"fieldCellLengthLongitude" onKeyTyped=
=3D'valueChanged(true)' onFocusLost=3D'cellLenghtLongChanged()'/>
 <!-- Fixme : DocumentEvents
 origin=3D"$FisheryRegion/cellLengthLongitude"
 <DocumentEvents onModified=3D"Update($fieldCellLengthLongitude/text)"/>
 -->
-            </JTextField>
-            <JScrollPane>
-                <JList id=3D"fieldMapfiles">
-<!-- Fixme : ListModel
-           <ListModel origin=3D"$FisheryRegion/mapFileList"/>
--->
-                </JList>
-            </JScrollPane>
-            <JPanel>
-                <JButton id=3D"buttonAddMap" text=3D"isisfish.fisheryRegion.=
addMap"/>
+                </cell>
+            </row>
+            <row>
+                <cell columns=3D'3' fill=3D'both' weightx=3D'1.0' weighty=3D=
'0.6'>
+                    <JScrollPane>
+                        <JList id=3D"fieldMapfiles" onMouseClicked=3D'mapFie=
ldChanged()'/>
+        <!-- Fixme : ListModel
+                   <ListModel origin=3D"$FisheryRegion/mapFileList"/>
+        -->
+                    </JScrollPane>
+                </cell>
+            </row>
+            <row>
+                <cell columns=3D'3' fill=3D'horizontal' weightx=3D'1.0'>
+                    <Table>
+                        <row>
+                            <cell fill=3D'horizontal' weightx=3D'0.5'>
+                                <JButton id=3D"buttonAddMap" text=3D"isisfis=
h.fisheryRegion.addMap" onActionPerformed=3D'addMap()'/>
 <!--
 actionCommand=3D"input.InputFisheryRegion.addMap($FisheryRegion, $fieldMapfi=
les)"
 -->
-                <JButton id=3D"buttonRemoveMap" text=3D"isisfish.fisheryRegi=
on.delMap"/>
+                            </cell>
+                            <cell fill=3D'horizontal' weightx=3D'0.5'>
+                                 <JButton id=3D"buttonRemoveMap" text=3D"isi=
sfish.fisheryRegion.delMap" onActionPerformed=3D'delMap()'/>
 <!--
 actionCommand=3D"input.InputFisheryRegion.removeMap($FisheryRegion, $fieldMa=
pfiles)"
 -->
-            </JPanel>
-            <JLabel text=3D"isisfish.fisheryRegion.comments"/>
-            <JScrollPane>
-                <JTextArea id=3D"fieldComment">
+                            </cell>
+                        </row>
+                    </Table>
+                </cell>
+            </row>
+            <row>
+                <cell columns=3D'3'>
+                    <JLabel text=3D"isisfish.fisheryRegion.comments"/>
+                </cell>
+            </row>
+            <row>
+                <cell columns=3D'3' fill=3D'both' weightx=3D'1.0' weighty=3D=
'0.4'>
+                    <JScrollPane>
+                        <JTextArea id=3D"fieldComment" onKeyTyped=3D'valueCh=
anged(true)' onFocusLost=3D'commentChanged()'/>
 <!-- Fixme : DocumentEvents
 origin=3D"$FisheryRegion/comment"
 <DocumentEvents onModified=3D"Update($fieldComment/text)"/>
 -->
-                </JTextArea>
-            </JScrollPane>
-            <JLabel text=3D"isisfish.fisheryRegion.selectFile"/>
-            <JLabel text=3D"isisfish.fisheryRegion.ofCells"/>
-            <JPanel>
-                <JTextField id=3D"fieldCellFile"/>
-                <JButton id=3D"buttonCellFile" text=3D"isisfish.common.ellip=
sis"/>
+                    </JScrollPane>
+                </cell>
+            </row>
+            <row>
+                <cell columns=3D'3'>
+                    <JLabel text=3D"isisfish.fisheryRegion.selectFile"/>
+                </cell>
+            </row>
+            <row>
+                <cell columns=3D'3'>
+                    <JLabel text=3D"isisfish.fisheryRegion.ofCells"/>
+                </cell>
+            </row>
+            <row>
+                <cell columns=3D'3' fill=3D'horizontal' weightx=3D'1.0'>
+                    <Table>
+                        <row>
+                            <cell columns=3D'4' fill=3D'horizontal' weightx=
=3D'1.0'>
+                                <JTextField id=3D"fieldCellFile" onKeyTyped=
=3D'valueChanged(true)' onFocusLost=3D'cellFillChanged()'/>
+                            </cell>
+                            <cell>
+                                <JButton id=3D"buttonCellFile" text=3D"isisf=
ish.common.ellipsis" onActionPerformed=3D'cellFile()'/>
 <!--
 actionCommand=3D"input.InputFisheryRegion.loadCellFile($fieldCellFile)"
 -->
-            </JPanel>
-            <JPanel id=3D"panelRegionButtonAction">
-                <JButton text=3D"isisfish.common.save"/>
+                            </cell>
+                        </row>
+                    </Table>
+                </cell>
+            </row>
+            <row>
+                <cell fill=3D'horizontal' weightx=3D'0.3'>
+                    <JButton id=3D'save' enabled=3D'false' text=3D"isisfish.=
common.save" onActionPerformed=3D'save()'/>
 <!--
 origin=3D"$EntityModified"
 actionCommand=3D'thread:input.InputFisheryRegion.save("FisheryRegion", $Fish=
eryRegion);refreshView($inputFisheryRegion)'
 -->
-                <JButton text=3D"isisfish.common.cancel"/>
+                </cell>
+                <cell fill=3D'horizontal' weightx=3D'0.3'>
+                    <JButton id=3D'cancel' enabled=3D'false' text=3D"isisfis=
h.common.cancel" onActionPerformed=3D'cancel()'/>
 <!--
 origin=3D"$EntityModified"
 actionCommand=3D'input.Input.cancel("FisheryRegion", $FisheryRegion);refresh=
View($inputFisheryRegion)'
 -->
-                <JButton text=3D"isisfish.common.check"/>
+                </cell>
+                <cell fill=3D'horizontal' weightx=3D'0.3'>
+                    <JButton id=3D'check' text=3D"isisfish.common.check" onA=
ctionPerformed=3D'check()'/>
 <!--
 actionCommand=3D'thread:input.InputFisheryRegion.check($FisheryRegion)'
 -->
-            </JPanel>
-        </JPanel>
-<!--
-	                <xpanel xml=3D"input/FisheryRegion.xml"/>
--->
+                </cell>
+            </row>
+       </Table>
         <JPanel id=3D"fisheryRegionMapPanel" layout=3D'{new BorderLayout()}'>
 <!--
 	                    <OpenMapToolPanel constraints=3D'"BorderLayout.NORTH"' =
id=3D"fisheryRegionMapTool">
@@ -162,7 +381,7 @@
 -->
         </JPanel>
     </JSplitPane>
-    <JButton text=3D"isisfish.input.continueCells"/>
+    <JButton text=3D"isisfish.input.continueCells" constraints=3D'BorderLayo=
ut.SOUTH' onActionPerformed=3D'goToCell()'/>
 <!--
 			     actionCommand=3D"UIHelper.setTreeSelection('Cells')"
 -->

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAct=
ion.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.ja=
va	2008-12-09 13:48:54 UTC (rev 1646)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.ja=
va	2008-12-09 13:49:16 UTC (rev 1647)
@@ -44,6 +44,7 @@
 import fr.ifremer.isisfish.datastore.StorageException;
 import fr.ifremer.isisfish.datastore.update.ImportFromV2;
 import fr.ifremer.isisfish.entities.Cell;
+import fr.ifremer.isisfish.entities.CellDAO;
 import fr.ifremer.isisfish.entities.EffortDescription;
 import fr.ifremer.isisfish.entities.EffortDescriptionDAO;
 import fr.ifremer.isisfish.entities.Equation;
@@ -69,10 +70,16 @@
 import fr.ifremer.isisfish.entities.VesselType;
 import fr.ifremer.isisfish.entities.Zone;
 import fr.ifremer.isisfish.types.Month;
+import fr.ifremer.isisfish.ui.input.check.CheckRegion;
+import fr.ifremer.isisfish.ui.input.check.CheckResult;
+import fr.ifremer.isisfish.ui.input.check.CheckResultFrame;
 import fr.ifremer.isisfish.ui.widget.ErrorDialogUI;
+import fr.ifremer.isisfish.util.CellPointcomparator;
+import java.awt.geom.Point2D;
 import java.io.File;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.swing.JOptionPane;
@@ -984,4 +991,177 @@
       }
       return null;       =20
     }
+// FisheryRegion
+        /**
+    * @param list la list dans lequel il faut ajouter la carte
+    */
+    public Object addMap(){
+        log.debug("AddMap called");
+
+        File shp =3D FileUtil.getFile(".*\\.shp", "shp file");
+        try {
+            if (shp !=3D null) {
+                // copy shp and ssx to region map directory
+                String basename =3D FileUtil.basename(shp, ".shp");
+
+                String srcMap =3D shp.getPath();
+                srcMap =3D srcMap.substring(0, srcMap.length() - ".shp".leng=
th());
+                File ssx =3D new File(srcMap + ".ssx");
+
+                RegionStorage regionStorage =3D RegionStorage.getRegion(fish=
eryRegion.getName());
+                File destDir =3D regionStorage.getMapRepository();
+
+                // copy shp file
+                File destShp =3D new File(destDir, basename + ".shp");
+                FileUtil.copy(shp, destShp);
+
+                // copy ssx file
+                File destSsx =3D new File(destDir, basename + ".ssx");
+                if (ssx.exists()) {
+                    FileUtil.copy(ssx, destSsx);
+                } else {
+                    log.info("Ssx file don't exist, try to generate it");
+                }
+
+                List<String> maps =3D fisheryRegion.getMapFileList();
+                maps.add(basename);
+                fisheryRegion.setMapFileList(maps);
+            }
+        }catch(Exception eee){
+            log.error("Can't copy .shp or .ssx file for: " + shp, eee);
+            showMsgBox(eee);
+        }
+        return null;
+    }
+
+    /**
+    * @param list la list dans lequel il faut retirer la carte
+    */
+    public Object removeMap(Object[] selectedMaps){
+        log.debug("removeMap called");
+        try {
+
+            List<String> maps =3D fisheryRegion.getMapFileList();
+
+            RegionStorage regionStorage =3D RegionStorage.getRegion(fisheryR=
egion.getName());
+            File mapDir =3D regionStorage.getMapRepository();
+
+            for (Object map : selectedMaps) {
+                maps.remove(map);
+                // remove on disk too, if possible
+                File shp =3D new File(mapDir, map + ".shp");
+                shp.delete();
+                File ssx =3D new File(mapDir, map + ".ssx");
+                ssx.delete();
+            }
+
+            fisheryRegion.setMapFileList(maps);
+
+        }catch(Exception eee){
+            log.error("Can't remove map", eee);
+            showMsgBox(eee);
+        }
+        return null;
+    }
+
+    /**
+     * Affiche une boite de dialogue demandant a l'utilisateur de rentrer
+     * un nom de fichier, et met ce nom dans la textField.
+     * Passe le saveButton en enabled pour marque que la region a ete modifi=
=C3=A9
+     */
+     public void loadCellFile(String cellFile){
+         log.debug("loadCell called");
+         // FIXME todo loadCellFile
+     }
+
+    public Object saveFisheryRegion(String  type){
+        log.debug("save called");
+        try{
+            TopiaContext isisContext =3D fisheryRegion.getTopiaContext();
+
+//            frame.setInfoText(_("isisfish.message.checking.cell"));
+            int latNumber =3D (int)Math.round((fisheryRegion.getMaxLatitude(=
) - fisheryRegion.getMinLatitude()) / fisheryRegion.getCellLengthLatitude());
+            int lonNumber =3D (int)Math.round((fisheryRegion.getMaxLongitude=
() - fisheryRegion.getMinLongitude()) / fisheryRegion.getCellLengthLongitude(=
));
+
+//            frame.setProgressMin(0);
+//            frame.setProgressMax(latNumber * lonNumber);
+            int progresscpt =3D 0;
+
+            // il faut peut-etre creer ou supprimer des mailles
+            CellPointcomparator cellPointcomparator =3D new CellPointcompara=
tor();
+            CellDAO cellPS =3D IsisFishDAOHelper.getCellDAO(isisContext);
+            List<Cell> cells =3D cellPS.findAll();
+            Collections.sort(cells, cellPointcomparator);
+            Point2D.Float point =3D new Point2D.Float();
+
+            for(float lati =3D fisheryRegion.getMinLatitude();lati<fisheryRe=
gion.getMaxLatitude();lati+=3DfisheryRegion.getCellLengthLatitude()){
+                lati =3D Math.round(lati*1000f);
+                lati=3D lati / 1000.0f;
+                for(float longi =3D fisheryRegion.getMinLongitude();longi<fi=
sheryRegion.getMaxLongitude();longi+=3DfisheryRegion.getCellLengthLongitude()=
){
+                    longi =3D  Math.round(longi*1000f) / 1000.0f;
+                    point.setLocation(lati, longi);
+                    int position =3D Collections.binarySearch(cells, point, =
cellPointcomparator);
+                    if(position >=3D 0){
+                        // deja existant on l'enleve de la liste, et on ne c=
ree rien
+                        cells.remove(position);
+                    } else {
+                        // n'existe pas on la cree
+                        Cell cell =3D cellPS.create();
+                        cell.setName("La"+lati+"Lo"+longi);
+                        cell.setLatitude(lati);
+                        cell.setLongitude(longi);
+                        cell.setLand(false);
+                        cell.update();
+                    }
+//                    frame.setProgressValue(++progresscpt);
+                }
+            }
+
+            // on est pas en autoUpdate donc il faut faire le update avant l=
e commit
+            fisheryRegion.update();
+
+            // toutes les mailles restantes dans la liste sont des mailles e=
n trop
+            // on les supprimes
+//            frame.setInfoText(_("isisfish.message.remove.unnecessary.cells=
"));
+//            frame.setProgressMin(0);
+//            frame.setProgressMax(cells.size());
+            progresscpt =3D 0;
+            for(Cell cell:cells){
+                // FIXME il faudrait aussi rechercher les objets dependants
+                // des mailles que l'on va supprimer et demander confirmation
+                // a l'utilisateur qu'il souhaite reellement supprimer tous
+                // ces objets. Si ce n'est pas le cas, on sort tout de suite
+                // avant le commit
+                cellPS.delete(cell);
+//                frame.setProgressValue(++progresscpt);
+            }
+
+//            frame.setInfoText(_("isisfish.message.commit"));
+            isisContext.commitTransaction();
+//            frame.refreshView("inputFisheryRegion");
+
+//            frame.setInfoText(_("isisfish.message.save.finished"));
+        }catch(Exception eee){
+            log.error(_("isisfish.error.save.region"), eee);
+            showMsgBox(eee);
+        }
+        return null;
+    }
+
+    public Object checkFisheryRegion(){
+        try {
+            log.debug("check called: ");
+//            frame.setInfoText(_("isisfish.message.check.region"));
+            CheckResult result =3D new CheckResult();
+            CheckRegion.check(fisheryRegion, result);
+            CheckResultFrame dialog =3D new CheckResultFrame();
+            dialog.setCheckResult(result);
+            dialog.setVisible(true);
+        }catch(Exception eee){
+            log.error(_("isisfish.error.check.region"), eee);
+            showMsgBox(eee);
+        }
+        return null;
+    }
+
 }

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.=
jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx	2=
008-12-09 13:48:54 UTC (rev 1646)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx	2=
008-12-09 13:49:16 UTC (rev 1647)
@@ -232,7 +232,7 @@
                 NavigationTreeModelBuilder builder =3D new NavigationTreeMod=
elBuilder("/");
                 FisheryRegion fisheryRegion =3D getContextValue(InputAction.=
class).getFisheryRegion();
                 setContextValue(fisheryRegion);
-                NavigationTreeNode root =3D builder.build(null, regionName, =
JAXXContextEntryDef.newDef(FisheryRegion.class), "$root", NoneUI.class, null);
+                NavigationTreeNode root =3D builder.build(null, regionName, =
JAXXContextEntryDef.newDef(FisheryRegion.class), "$root", FisheryRegionUI.cla=
ss, null);
                 NavigationTreeNode cells =3D builder.build(root, "Cells", ".=
./cell", "$cells", CellUI.class, null);
                 NavigationTreeNode zones =3D builder.build(root, "Zones", ".=
./zone", "$zones", ZoneUI.class, null);
                 NavigationTreeNode ports =3D builder.build(root, "Ports", ".=
./port", "$ports", PortUI.class, null);


--===============2039308753082247175==--