[Isis-fish-commits] r3552 - trunk/src/main/java/fr/ifremer/isisfish/ui/input

1 Dec 2011

Author: echatellier
Date: 2011-12-01 16:41:13 +0100 (Thu, 01 Dec 2011)
New Revision: 3552

Url: http://forge.codelutin.com/repositories/revision/isis-fish/3552

Log:
Fix change model not reset on node swicth

Modified:
   trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx
   trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx
   trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx
   trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java
   trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx
   trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx
   trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx
   trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx
   trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx
   trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx
   trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx
   trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx
   trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx
   trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx
   trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx

Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx
===================================================================

--- trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx	2011-12-01 15:22:24 UTC (rev 3551)
+++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx	2011-12-01 15:41:13 UTC (rev 3552)
@@ -96,6 +96,11 @@
     });
 }
 
+@Override
+public void resetChangeModel() {
+    changeModel.setStayChanged(false);
+}
+
 /*public void refresh() {
     SetOfVessels setOfVessels = getSaveVerifier().getEntity(SetOfVessels.class);
 

Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx	2011-12-01 15:22:24 UTC (rev 3551)
+++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx	2011-12-01 15:41:13 UTC (rev 3552)
@@ -63,6 +63,12 @@
     gearTabUI.setLayer(active);
     selectivityUI.setLayer(active);
 }
+
+@Override
+public void resetChangeModel() {
+    gearTabUI.resetChangeModel();
+    selectivityUI.resetChangeModel();
+}
     ]]></script>
     <JPanel id="body">
         <JTabbedPane constraints='BorderLayout.CENTER' id="gearTab">

Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx	2011-12-01 15:22:24 UTC (rev 3551)
+++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx	2011-12-01 15:41:13 UTC (rev 3552)
@@ -83,6 +83,16 @@
 
 public abstract B getBean();
 
+/**
+ * Pas très safe, le bean doit s'appeler changeModel dans l'heritage "FORCEMENT"
+ *
+ * FIXME echatellier 20111201 small fix because save
+ * button has to reset internal ui change model state
+ */
+public void resetChangeModel() {
+
+}
+
 public InputAction getAction() {
     return getContextValue(InputAction.class);
 }

Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java	2011-12-01 15:22:24 UTC (rev 3551)
+++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java	2011-12-01 15:41:13 UTC (rev 3552)
@@ -249,6 +249,10 @@
             InputUI inputUI = inputContentUI.getParentContainer(InputUI.class);
             inputUI.getHandler().updateTreeNode(inputUI, topiaEntity.getTopiaId());
 
+            // FIXME echatellier 20111201 small fix because save
+            // button has to reset internal ui change model state
+            inputContentUI.resetChangeModel();
+            
             noModif();
             
             //rootUI.setStatusMessage(_("isisfish.message.save.finished"));

Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx	2011-12-01 15:22:24 UTC (rev 3551)
+++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx	2011-12-01 15:41:13 UTC (rev 3552)
@@ -75,6 +75,11 @@
     });
 }
 
+@Override
+public void resetChangeModel() {
+    changeModel.setStayChanged(false);
+}
+
 protected void setSeasonModel() {
     java.util.List<MetierSeasonInfo> metierSeasonInfo = getBean().getMetierSeasonInfo();
     MetierSeasonInfoComboModel seasonModel = new MetierSeasonInfoComboModel(metierSeasonInfo);

Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx	2011-12-01 15:22:24 UTC (rev 3551)
+++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx	2011-12-01 15:41:13 UTC (rev 3552)
@@ -97,6 +97,11 @@
         });
     }
 
+    @Override
+    public void resetChangeModel() {
+        changeModel.setStayChanged(false);
+    }
+
     protected void save() {
         getSaveVerifier().save();
         setMetierSeasonInfoCombo();

Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx	2011-12-01 15:22:24 UTC (rev 3551)
+++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx	2011-12-01 15:41:13 UTC (rev 3552)
@@ -56,6 +56,13 @@
     metierSeasonInfoUI.setLayer(active);
     metierSeasonSpeciesUI.setLayer(active);
 }
+
+@Override
+public void resetChangeModel() {
+    metierTabUI.resetChangeModel();
+    metierSeasonInfoUI.resetChangeModel();
+    metierSeasonSpeciesUI.resetChangeModel();
+}
     ]]></script>
     <JPanel id="body">
         <JTabbedPane id="metierTab" constraints='BorderLayout.CENTER'>

Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx	2011-12-01 15:22:24 UTC (rev 3551)
+++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx	2011-12-01 15:41:13 UTC (rev 3552)
@@ -95,6 +95,11 @@
     });
 }
 
+@Override
+public void resetChangeModel() {
+    changeModel.setStayChanged(false);
+}
+
 /*public void refresh() {
     //if (!isActive()) {
         setPopGroupNotNull(false);

Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx	2011-12-01 15:22:24 UTC (rev 3551)
+++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx	2011-12-01 15:41:13 UTC (rev 3552)
@@ -67,6 +67,11 @@
     });
 }
 
+@Override
+public void resetChangeModel() {
+    changeModel.setStayChanged(false);
+}
+
 public void refresh() {
     Population population = getSaveVerifier().getEntity(Population.class);
     

Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx	2011-12-01 15:22:24 UTC (rev 3551)
+++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx	2011-12-01 15:41:13 UTC (rev 3552)
@@ -99,6 +99,11 @@
     });
 }
 
+@Override
+public void resetChangeModel() {
+    changeModel.setStayChanged(false);
+}
+
 protected void create() {
     PopulationSeasonInfo seasonNew = getContextValue(InputAction.class).createPopulationSeasonInfo(getBean());
     setPopulationSeasonInfo(seasonNew);

Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx	2011-12-01 15:22:24 UTC (rev 3551)
+++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx	2011-12-01 15:41:13 UTC (rev 3552)
@@ -60,6 +60,19 @@
     populationMigrationUI.setLayer(active);
     populationPriceUI.setLayer(active);
 }
+
+@Override
+public void resetChangeModel() {
+    populationBasicsUI.resetChangeModel();
+    populationZoneUI.resetChangeModel();
+    populationSeasonsUI.resetChangeModel();
+    populationEquationUI.resetChangeModel();
+    populationRecruitementUI.resetChangeModel();
+    populationGroupUI.resetChangeModel();
+    populationCapturabilityUI.resetChangeModel();
+    populationMigrationUI.resetChangeModel();
+    populationPriceUI.resetChangeModel();
+}
     ]]>
     </script>
     <JPanel id='body'>

Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx	2011-12-01 15:22:24 UTC (rev 3551)
+++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx	2011-12-01 15:41:13 UTC (rev 3552)
@@ -67,6 +67,11 @@
     });
 }
 
+@Override
+public void resetChangeModel() {
+    changeModel.setStayChanged(false);
+}
+
 public void refresh() {
 
     Gear gear = (Gear)getSaveVerifier().getEntity(Gear.class);

Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx	2011-12-01 15:22:24 UTC (rev 3551)
+++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx	2011-12-01 15:41:13 UTC (rev 3552)
@@ -51,6 +51,13 @@
     effortDescriptionUI.setLayer(active);
     effortParametersUI.setLayer(active);
 }
+
+@Override
+public void resetChangeModel() {
+    setOfVesselsBasicsUI.resetChangeModel();
+    effortDescriptionUI.resetChangeModel();
+    effortParametersUI.resetChangeModel();
+}
     ]]></script>
     <JPanel id="body">
         <JTabbedPane id="setOfVesselsTab">

Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx	2011-12-01 15:22:24 UTC (rev 3551)
+++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx	2011-12-01 15:41:13 UTC (rev 3552)
@@ -143,6 +143,11 @@
     });
 }
 
+@Override
+public void resetChangeModel() {
+    changeModel.setStayChanged(false);
+}
+
 /*@Override
 public void refresh() {
     //getSaveVerifier().addCurrentPanel(strategyJanuary, strategyFebuary, strategyMarch,

Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx	2011-12-01 15:22:24 UTC (rev 3551)
+++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx	2011-12-01 15:41:13 UTC (rev 3552)
@@ -43,6 +43,12 @@
     strategyTabUI.setLayer(active);
     strategyMonthInfoUI.setLayer(active);
 }
+
+@Override
+public void resetChangeModel() {
+    strategyTabUI.resetChangeModel();
+    strategyMonthInfoUI.resetChangeModel();
+}
     ]]></script>
     <JPanel id="body">
         <JTabbedPane id="strategyTab">

    

[Isis-fish-commits] r3552 - trunk/src/main/java/fr/ifremer/isisfish/ui/input

echatellier＠users.forge.codelutin.com