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

4 Feb 2009

Author: sletellier
Date: 2009-02-04 15:41:06 +0000 (Wed, 04 Feb 2009)
New Revision: 1789

Modified:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/NoneUI.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/VesselTypeUI.jaxx
Log:
Utilisation d'un de saisie par d?\195?\169fault

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

--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java	2009-02-04 15:39:12 UTC (rev 1788)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java	2009-02-04 15:41:06 UTC (rev 1789)
@@ -321,7 +321,7 @@
      *
      * @param name name of region
      */
-    public void loadRegion(InputUI ui, String name) {
+    public FisheryRegion loadRegion(InputUI ui, String name) {
         if (log.isTraceEnabled()) {
             log.trace("loadRegion called");
         }
@@ -335,16 +335,18 @@
                 fisheryRegion = RegionStorage.getFisheryRegion(isisContext);
                 ui.setContextValue(regionStorage);
                 ui.setContextValue(isisContext);
-                ui.setContextValue(fisheryRegion);
+                return fisheryRegion;
                 // FIXME session shoul be closed
                 // but make lazy init later
                 //isisContext.rollbackTransaction();
                 //isisContext.closeContext();
             }
+            return null;
         } catch (Exception eee) {
             log.error("Can't load region", eee);
             showMsgBox(eee);
         }
+        return null;
     }
 
     /**

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java	2009-02-04 15:39:12 UTC (rev 1788)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java	2009-02-04 15:41:06 UTC (rev 1789)
@@ -294,6 +294,9 @@
             currentEntity.addPropertyChangeListener(new PropertyChangeListener() {
                 @Override
                 public void propertyChange(PropertyChangeEvent evt) {
+                    if (log.isDebugEnabled()){
+                        log.debug("PropetyChanged : " + evt.getPropertyName() + " New Value : " + evt.getNewValue());
+                    }
                     topiaChanged();
                 }
             });

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx	2009-02-04 15:39:12 UTC (rev 1788)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx	2009-02-04 15:41:06 UTC (rev 1789)
@@ -36,6 +36,10 @@
 
     <jaxx.runtime.swing.CardLayout2 id='cardlayout'/>
 
+    <java.awt.CardLayout id='cardlayoutPrincipal'/>
+    
+    <fr.ifremer.isisfish.entities.FisheryRegionImpl id='region' javaBean='null'/>
+
     <script><![CDATA[
 import fr.ifremer.isisfish.ui.Common;
 import fr.ifremer.isisfish.ui.WelcomeSaveVerifier;
@@ -68,6 +72,7 @@
 import jaxx.runtime.swing.navigation.NavigationTreeModelBuilder;
 import jaxx.runtime.swing.navigation.NavigationUtil;
 import fr.ifremer.isisfish.entities.FisheryRegion;
+import fr.ifremer.isisfish.entities.FisheryRegionImpl;
 import jaxx.runtime.swing.navigation.NavigationTreeCellRenderer;
 import jaxx.runtime.swing.navigation.NavigationTreeModel;
 import jaxx.runtime.Decorator;
@@ -77,9 +82,7 @@
 import fr.ifremer.isisfish.datastore.RegionStorage;
 
 getContextValue(WelcomeSaveVerifier.class).addSaveVerifier(getVerifier());
-protected FisheryRegion getRegion(){
-    return getContextValue(FisheryRegion.class);
-}
+
 protected InputAction getAction(){
     return getContextValue(InputAction.class);
 }
@@ -108,7 +111,14 @@
     });
 }
 protected void loadRegion(String name){
-    getAction().loadRegion(this, name);
+    setRegion((FisheryRegionImpl)getAction().loadRegion(this, name));
+    if (getRegion() == null){
+        regionNull();
+    }
+    else{
+        setTreeModel();
+        getCardlayoutPrincipal().show(inputPanePrincipal,"normale");
+    }
 }
 protected void setTreeModel(){
     if (getRegion() != null){
@@ -148,8 +158,14 @@
     setFieldCurrentRegionModel();
     fieldCurrentRegion.setSelectedItem(name);
     JButtonNewRegion.setEnabled(false);
+    fieldNewRegion.setText("");
     setInfoText(_("isisfish.message.creation.finished"));
 }
+protected void regionNull(){
+    getCardlayoutPrincipal().show(inputPanePrincipal,"none");
+    DefaultTreeModel model = new DefaultTreeModel(null);
+    navigation.setModel(model);
+}
 protected void newChanged(){
     JButtonNewRegion.setEnabled(true);
 }
@@ -183,8 +199,9 @@
 }
 protected void removeRegion(){
     setInfoText(_("isisfish.message.removing.region" + getRegionStorage().getName()));
+    setInfoText(getContextValue(InputAction.class).removeRegion(getRegionStorage(), false));
     setFieldCurrentRegionModel();
-    setInfoText(getContextValue(InputAction.class).removeRegion(getRegionStorage(), false));
+    regionNull();
 }
 protected void commitRegionInCVS(){
     setInfoText(_("isisfish.message.commiting.region" + getRegionStorage().getName()));
@@ -237,6 +254,9 @@
                 </JScrollPane>
             </JPanel>
         </JPanel>
-        <JPanel id="inputPane"  layout='{cardlayout}'/>
+        <JPanel id='inputPanePrincipal' layout='{getCardlayoutPrincipal()}'>
+            <NoneUI id='noneUI' constraints='{"none"}'/>
+            <JPanel id="inputPane"  layout='{getCardlayout()}' constraints='{"normale"}'/>
+        </JPanel>
     </JSplitPane>
 </JPanel>
\ No newline at end of file

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/NoneUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/NoneUI.jaxx	2009-02-04 15:39:12 UTC (rev 1788)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/NoneUI.jaxx	2009-02-04 15:41:06 UTC (rev 1789)
@@ -1,3 +1,3 @@
 <JPanel layout='{new BorderLayout()}'>
-    <JLabel id='none' horizontalAlignment="0" text="isisfish.input.selectNodeTree" constraints='BorderLayout.CENTER'/>
+    <JLabel id='none' horizontalAlignment="0" text="isisfish.input.selectRegion" constraints='BorderLayout.CENTER'/>
 </JPanel>
\ No newline at end of file

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 15:39:12 UTC (rev 1788)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx	2009-02-04 15:41:06 UTC (rev 1789)
@@ -58,6 +58,14 @@
 protected OMToolSet toolSet = new OMToolSet();
 protected OpenMapEvents mapListener = null;
 
+boolean portChanged = true;
+
+portMap.setFisheryRegion(getRegion());
+portMap.setSelectionMode(CellSelectionLayer.SINGLE_SELECTION);
+portMap.setActiveMouseMode(new SelectMouseMode());
+toolSet.setupListeners(portMap);
+toolMap.add((Component)toolSet);
+setMapListener();
 setButtonTitle(_("isisfish.input.continueSpecies"));
 setNextPath("$root/$species");
 addPropertyChangeListener("bean", new PropertyChangeListener() {
@@ -81,24 +89,16 @@
     getVerifier().setDeleteButton(remove);
     Port port = getVerifier().getEntity(Port.class);
     setBean((PortImpl) port);
-    portMap.setFisheryRegion(getRegion());
-    if(mapListener == null){
-        portMap.setSelectionMode(CellSelectionLayer.SINGLE_SELECTION);
-        portMap.setActiveMouseMode(new SelectMouseMode());
-        toolSet.setupListeners(portMap);
-        toolMap.add((Component)toolSet);
-        setMapListener();
-    }
+    fillList();
+}
+protected void fillList(){
     if (getBean() != null){
+        portChanged = false;
         portCell.fillList(getRegion().getCell(), getBean().getCell());
+        portCell.setSelectedValue(getBean().getCell());
+        portChanged = true;
     }
-    refreshMap();
 }
-protected void refreshMap(){
-    java.util.List<Cell> cells = new ArrayList<Cell>();
-    cells.add((Cell)portCell.getSelectedValue());
-    portMap.setSelectedCells(cells);
-}
 protected void setMapListener(){
     if (mapListener == null){
         mapListener = new OpenMapEvents(portMap, new SelectMouseMode(false), CellSelectionLayer.SINGLE_SELECTION) {
@@ -110,12 +110,16 @@
                         getBean().setCell(c);
                     }
                 }
-                refresh();
                 return true;
             }
         };
     }
 }
+protected void portChanged(){
+    if (portChanged){
+        getBean().setCell((Cell)portCell.getSelectedValue());
+    }
+}
     ]]>
     </script>
     <Table id='body'>
@@ -143,7 +147,7 @@
                         <row>
                             <cell columns='2' fill='both' weighty='0.7' weightx='1.0'>
                                 <JScrollPane>
-                                    <JList id="portCell" selectionMode="0" onMouseClicked='getBean().setCell((Cell)portCell.getSelectedValue());refreshMap();' enabled='{isActif()}'/>
+                                    <JList id="portCell" selectedValue='{getBean().getCell()}' selectionMode="0" onMouseClicked='portChanged()' enabled='{isActif()}'/>
                                 </JScrollPane>
                             </cell>
                         </row>
@@ -178,7 +182,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='portMap' javaBean='new fr.ifremer.isisfish.map.IsisMapBean()' constraints='BorderLayout.CENTER'/>
+                        <fr.ifremer.isisfish.map.IsisMapBean id='portMap' selectedCells='{getBean().getCell()}' javaBean='new fr.ifremer.isisfish.map.IsisMapBean()' constraints='BorderLayout.CENTER'/>
                     </JPanel>
                 </JSplitPane>
             </cell>

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 15:39:12 UTC (rev 1788)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx	2009-02-04 15:41:06 UTC (rev 1789)
@@ -42,6 +42,8 @@
 import fr.ifremer.isisfish.entities.TripType;
 import fr.ifremer.isisfish.types.TimeUnit;
 
+boolean tripTypeChanged = true;
+
 setButtonTitle(_("isisfish.input.continueSetOfVessels"));
 setNextPath("$root/$setOfVessels");
 addPropertyChangeListener("bean", new PropertyChangeListener() {
@@ -73,16 +75,20 @@
     VesselType vesselType = getVerifier().getEntity(VesselType.class);
     setBean((VesselTypeImpl) vesselType);
     if (getBean() != null){
+        tripTypeChanged = false;
         vesselTypeTripType.fillList(getRegion().getTripType(), getBean().getTripType() == null ? null : getBean().getTripType());
+        tripTypeChanged = true;
     }
 }
 protected void tripTypeChanged(){
-    Object[] values = vesselTypeTripType.getSelectedValues();
-    Collection<TripType> tripTypes = new LinkedList<TripType>();
-    for (Object o : values){
-        tripTypes.add((TripType)o);
+    if (tripTypeChanged){
+        Object[] values = vesselTypeTripType.getSelectedValues();
+        Collection<TripType> tripTypes = new LinkedList<TripType>();
+        for (Object o : values){
+            tripTypes.add((TripType)o);
+        }
+        getBean().setTripType(tripTypes);
     }
-    getBean().setTripType(tripTypes);
 }
     ]]></script>
     <Table id='body' constraints='BorderLayout.CENTER'>

    

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

sletellier＠users.labs.libre-entreprise.org

tags

participants (1)