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

19 Dec 2008

Author: sletellier
Date: 2008-12-19 16:17:44 +0000 (Fri, 19 Dec 2008)
New Revision: 1708

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/PopulationBasicsUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationOneEquationUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.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-19 16:14:28 UTC (rev 1707)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx	2008-12-19 16:17:44 UTC (rev 1708)
@@ -92,11 +92,12 @@
     setBean((CellImpl) cell);
     jaxx.runtime.swing.Utils.fillComboBox(fieldCell,action.getFisheryRegion().getCell(), cell);
     cellMap.setFisheryRegion(action.getFisheryRegion());
-    if (cellMap == null){
+    if (mapListener == null){
         cellMap.setSelectionMode(CellSelectionLayer.SINGLE_SELECTION);
         cellMap.setActiveMouseMode(new SelectMouseMode());
         toolSet.setupListeners(cellMap);
         toolMap.add((Component)toolSet);
+        map.add(toolMap, BorderLayout.NORTH);
         setMapListener();
     }
 
@@ -208,7 +209,9 @@
                         </cell>
                     </row>
                 </Table>
-                <fr.ifremer.isisfish.map.IsisMapBean id='cellMap' javaBean='new fr.ifremer.isisfish.map.IsisMapBean()'/>
+                <JPanel id='map' layout='{new BorderLayout()}'>
+                    <fr.ifremer.isisfish.map.IsisMapBean id='cellMap' javaBean='new fr.ifremer.isisfish.map.IsisMapBean()'/>
+                </JPanel>
             </JSplitPane>
         </cell>
     </row>

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-19 16:14:28 UTC (rev 1707)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx	2008-12-19 16:17:44 UTC (rev 1708)
@@ -67,6 +67,7 @@
                 cellMap.setFisheryRegion(region);
                 toolSet.setupListeners(cellMap);
                 toolMap.add((Component)toolSet);
+                map.add(toolMap, BorderLayout.NORTH);
             }
         }
         public void refresh(){
@@ -332,8 +333,9 @@
                         </cell>
                     </row>
                </Table>
-                <!--JPanel id="fisheryRegionMapPanel" layout='{new BorderLayout()}'/-->
-                <fr.ifremer.isisfish.map.IsisMapBean id='cellMap' javaBean='new fr.ifremer.isisfish.map.IsisMapBean()'/>
+                <JPanel id='map' layout='{new BorderLayout()}'>
+                    <fr.ifremer.isisfish.map.IsisMapBean id='cellMap' javaBean='new fr.ifremer.isisfish.map.IsisMapBean()'/>
+                </JPanel>
             </JSplitPane>
         </cell>
     </row>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx	2008-12-19 16:14:28 UTC (rev 1707)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx	2008-12-19 16:17:44 UTC (rev 1708)
@@ -216,7 +216,7 @@
         }
     }
     protected void saveGrowthModel(){
-        getContextValue(InputAction.class).saveAsModel("Population", "Java", editor.getText());
+        getContextValue(InputAction.class).saveAsModel("PopulationGrowth", "Java", editor.getText());
         setFieldPopulationBasicsGrowthModel();
         setInfoText(_("isisfish.message.saveModel.finished"));
 //        Equation e = getEquation();
@@ -238,7 +238,7 @@
         }
     }
     protected void saveGrowthReverseModel(){
-        getContextValue(InputAction.class).saveAsModel("Population", "Java", editor.getText());
+        getContextValue(InputAction.class).saveAsModel("PopulationGrowth", "Java", editor.getText());
         setfieldPopulationBasicsGrowthReverseModel();
         setInfoText(_("isisfish.message.saveModel.finished"));
 //        Equation e = getEquation();

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx	2008-12-19 16:14:28 UTC (rev 1707)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx	2008-12-19 16:17:44 UTC (rev 1708)
@@ -171,7 +171,7 @@
     </row>
     <row>
         <cell columns='2' anchor='west'>
-            <JCheckBox id="fieldUseEquationMigration" text="isisfish.populationMigration.useEquation" onActionPerformed='useEquationChanged()' enabled='{isActif()}'/>
+            <JCheckBox id="fieldUseEquationMigration" selected='true' text="isisfish.populationMigration.useEquation" onActionPerformed='useEquationChanged()' enabled='{isActif()}'/>
         </cell>
     </row>
     <row>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationOneEquationUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationOneEquationUI.jaxx	2008-12-19 16:14:28 UTC (rev 1707)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationOneEquationUI.jaxx	2008-12-19 16:17:44 UTC (rev 1708)
@@ -122,12 +122,20 @@
         if (e != null){
              getContextValue(InputAction.class).saveAsModel(e.getCategory(), e.getLanguage(), e.getContent());
         }
+        else{
+            getContextValue(InputAction.class).saveAsModel(name, "Java", editor.getText());
+            setComboModel(f, name);
+            }
+//        setInfoText(_("isisfish.message.saveModel.finished"));
     }
     protected void openEditor(){
         Equation e = getEquation();
         if (e != null){
              getContextValue(InputAction.class).openEditor(e.getCategory(), e.getName(),  clazz, e.getContent(), editor);
         }
+        else{
+            getContextValue(InputAction.class).openEditor(name,"new",c, editor.getText(), editor);
+        }
     }
     ]]>
     </script>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx	2008-12-19 16:14:28 UTC (rev 1707)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx	2008-12-19 16:17:44 UTC (rev 1708)
@@ -114,12 +114,20 @@
         if (e != null){
              getContextValue(InputAction.class).saveAsModel(e.getCategory(), e.getLanguage(), e.getContent());
         }
+        else{
+            getContextValue(InputAction.class).saveAsModel("Reproduction", "Java", editor.getText());
+            setFieldPopulationReproductionEquationModel();
+            setInfoText(_("isisfish.message.saveModel.finished"));
+        }
     }
     protected void openEditor(){
         Equation e = getEquation();
         if (e != null){
              getContextValue(InputAction.class).openEditor(e.getCategory(), e.getName(),  fr.ifremer.isisfish.equation.PopulationGrowth.class, e.getContent(), editor);
         }
+        else{
+            getContextValue(InputAction.class).openEditor("Reproduction","new",  fr.ifremer.isisfish.equation.PopulationGrowth.class, editor.getText(), editor);
+        }
     }
     protected void monthGapChanged(){
         pop.setMonthGapBetweenReproRecrutement(Integer.parseInt(fieldPopulationMonthGapBetweenReproRecrutement.getText()));

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx	2008-12-19 16:14:28 UTC (rev 1707)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx	2008-12-19 16:17:44 UTC (rev 1708)
@@ -142,8 +142,8 @@
             }
             ip.setLabelRenderer(Month.MONTH);
             ip.setModel(interval);
-            valueChanged(true);
         }
+        valueChanged(true);
     }
     protected void groupChangedChanged(){
         PopulationSeasonInfo selected = getPopulationSeasonInfo();
@@ -181,14 +181,14 @@
     }
     protected void remove(){
         setInfoText(getContextValue(InputAction.class).remove());
+        TopiaEntity species = (TopiaEntity) getContextValue(InputAction.class).getSpecies();
+        getParentContainer(InputUI.class).setTreeModel();
+        getParentContainer(InputUI.class).setTreeSelection("$root/$species/" + species.getTopiaId() + "/$populations");
         valueChanged(false);
         refresh();
     }
     protected void setInfoText(String txt){
         WelcomePanelUI root = getParentContainer(WelcomePanelUI.class);
-        TopiaEntity species = (TopiaEntity) getContextValue(InputAction.class).getSpecies();
-        getParentContainer(InputUI.class).setTreeModel();
-        getParentContainer(InputUI.class).setTreeSelection("$root/$species/" + species.getTopiaId() + "/$populations");
         root.setInfoText(txt);
     }
     protected void valueChanged(boolean b){

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-19 16:14:28 UTC (rev 1707)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx	2008-12-19 16:17:44 UTC (rev 1708)
@@ -93,11 +93,12 @@
 
         }
         portMap.setFisheryRegion(getContextValue(InputAction.class).getFisheryRegion());
-        if(portMap == null){
+        if(mapListener == null){
             portMap.setSelectionMode(CellSelectionLayer.SINGLE_SELECTION);
             portMap.setActiveMouseMode(new SelectMouseMode());
             toolSet.setupListeners(portMap);
             toolMap.add((Component)toolSet);
+            map.add(toolMap, BorderLayout.NORTH);
             setMapListener();
         }
         refreshMap();
@@ -237,7 +238,9 @@
                         </cell>
                     </row>
                 </Table>
-                <fr.ifremer.isisfish.map.IsisMapBean id='portMap' javaBean='new fr.ifremer.isisfish.map.IsisMapBean()'/>
+                <JPanel id='map' layout='{new BorderLayout()}'>
+                    <fr.ifremer.isisfish.map.IsisMapBean id='portMap' javaBean='new fr.ifremer.isisfish.map.IsisMapBean()' constraints='BorderLayout.CENTER'/>
+                </JPanel>
             </JSplitPane>
         </cell>
     </row>

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-19 16:14:28 UTC (rev 1707)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx	2008-12-19 16:17:44 UTC (rev 1708)
@@ -103,11 +103,12 @@
             fieldZoneComment.setText("");
         }
         zoneMap.setFisheryRegion(getContextValue(InputAction.class).getFisheryRegion());
-        if (zoneMap == null){
+        if (mapListener == null){
             zoneMap.setActiveMouseMode(new SelectMouseMode(false));
             zoneMap.setSelectionMode(CellSelectionLayer.MULT_SELECTION);
             toolSet.setupListeners(zoneMap);
             toolMap.add((Component)toolSet);
+            map.add(toolMap, BorderLayout.NORTH);
             setMapListener();
         }
         refreshMap();
@@ -250,7 +251,9 @@
                         </cell>
                     </row>
                 </Table>
-                <fr.ifremer.isisfish.map.IsisMapBean id='zoneMap' javaBean='new fr.ifremer.isisfish.map.IsisMapBean()'/>
+                <JPanel id='map' layout='{new BorderLayout()}'>
+                    <fr.ifremer.isisfish.map.IsisMapBean id='zoneMap' javaBean='new fr.ifremer.isisfish.map.IsisMapBean()'/>
+                </JPanel>
             </JSplitPane>
         </cell>
     </row>

    

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

sletellier＠users.labs.libre-entreprise.org

tags

participants (1)