r1911 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui: input sensitivity - Isis-fish-commits

4 Mar 2009

Author: sletellier
Date: 2009-03-04 18:21:15 +0000 (Wed, 04 Mar 2009)
New Revision: 1911

Modified:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeSelectionAdapter.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/MetierUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityNavigationTreeSelectionAdapter.java
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabbedPaneListener.java
Log:
Sensitivity work with tabs

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

--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx	2009-03-04 17:36:39 UTC (rev 1910)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx	2009-03-04 18:21:15 UTC (rev 1911)
@@ -39,11 +39,17 @@
 
     <script><![CDATA[
 import fr.ifremer.isisfish.entities.Metier;
+import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabbedPaneListener;
+
+getVerifier().addCurrentPanel(this);
 setButtonTitle(_("isisfish.input.continueMetiers"));
 setNextPath("$root/$metiers");
 public void refresh() {
-    gearTab.removeChangeListener(getTabListener());
-    gearTab.addChangeListener(getTabListener());
+    if (isSens()){
+        gearTab.addChangeListener(new SensitivityTabbedPaneListener());
+    } else {
+        gearTab.addChangeListener(new InputTabbedPaneListener());
+    }
     getVerifier().addCurrentPanel(selectivityUI ,gearTabUI);
 }
     ]]></script>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx	2009-03-04 17:36:39 UTC (rev 1910)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx	2009-03-04 18:21:15 UTC (rev 1911)
@@ -2,6 +2,8 @@
 
     <!-- ui state when editing -->
     <Boolean id='actif' javaBean='false'/>
+
+    <Boolean id='sens' javaBean='false'/>
     
     <!-- Next button title -->
     <java.lang.String id='buttonTitle' javaBean='""'/>
@@ -31,14 +33,6 @@
 import fr.ifremer.isisfish.ui.sensitivity.FactorWizard;
 import fr.ifremer.isisfish.ui.sensitivity.EditorHelper;
 
-protected ChangeListener tabListener = null;
-
-public ChangeListener getTabListener(){
-    return tabListener;
-}
-public void setTabListener(ChangeListener l){
-    this.tabListener = l;
-}
 public void refresh(){}
 public InputAction getAction() {
     return getContextValue(InputAction.class);

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeSelectionAdapter.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeSelectionAdapter.java	2009-03-04 17:36:39 UTC (rev 1910)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeSelectionAdapter.java	2009-03-04 18:21:15 UTC (rev 1911)
@@ -95,7 +95,7 @@
         // apply refresh method (should a contract for all this ui with a method refresh...)
         try {
             currentUI = (InputContentUI) newUI;
-            currentUI.setTabListener(new InputTabbedPaneListener());
+            currentUI.setSens(false);
             context.getContextValue(InputSaveVerifier.class).addCurrentPanel(currentUI);
             currentNode = node;
         } catch (Exception e) {

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-03-04 17:36:39 UTC (rev 1910)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java	2009-03-04 18:21:15 UTC (rev 1911)
@@ -6,6 +6,7 @@
 package fr.ifremer.isisfish.ui.input;
 
 import fr.ifremer.isisfish.IsisFishDAOHelper;
+import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabUI;
 import fr.ifremer.isisfish.ui.widget.ErrorDialogUI;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -308,6 +309,10 @@
         for (InputContentUI ui : panels){
             editable = !currentEntities.isEmpty();
             this.currentPanels.add(ui);
+            if (rootUI == null){
+                ui.setSens(true);
+                ui.setLayer(true);
+            }
             ui.refresh();
             ui.setActif(editable);
         }

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx	2009-03-04 17:36:39 UTC (rev 1910)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx	2009-03-04 18:21:15 UTC (rev 1911)
@@ -40,11 +40,17 @@
 import fr.ifremer.isisfish.entities.TripType;
 import fr.ifremer.isisfish.entities.MetierImpl;
 import fr.ifremer.isisfish.entities.Metier;
+import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabbedPaneListener;
 
+getVerifier().addCurrentPanel(this);
 setButtonTitle(_("isisfish.input.continueTripTypes"));
 setNextPath("$root/$tripTypes");
-metierTab.addChangeListener(new InputTabbedPaneListener());
 public void refresh() {
+    if (isSens()){
+        metierTab.addChangeListener(new SensitivityTabbedPaneListener());
+    } else {
+        metierTab.addChangeListener(new InputTabbedPaneListener());
+    }
     getVerifier().addCurrentPanel(metierSeasonSpeciesUI, metierSeasonInfoUI, metierTabUI);
 }
     ]]></script>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx	2009-03-04 17:36:39 UTC (rev 1910)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx	2009-03-04 18:21:15 UTC (rev 1911)
@@ -45,12 +45,17 @@
 import fr.ifremer.isisfish.entities.Gear;
 import fr.ifremer.isisfish.entities.Population;
 import fr.ifremer.isisfish.entities.PopulationImpl;
+import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabbedPaneListener;
 
+getVerifier().addCurrentPanel(this);
 setButtonTitle(_("isisfish.input.continueGears"));
 setNextPath("$root/$gears");
 public void refresh(){
-    populationTab.removeChangeListener(getTabListener());
-    populationTab.addChangeListener(getTabListener());
+    if (isSens()){
+        populationTab.addChangeListener(new SensitivityTabbedPaneListener());
+    } else {
+        populationTab.addChangeListener(new InputTabbedPaneListener());
+    }
     getVerifier().addCurrentPanel(populationMigrationUI, populationRecruitementUI, populationCapturabilityUI, populationSeasonsUI, populationZoneUI, populationEquationUI, populationGroupUI, populationBasicsUI);
 }
     ]]>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx	2009-03-04 17:36:39 UTC (rev 1910)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx	2009-03-04 18:21:15 UTC (rev 1911)
@@ -39,11 +39,18 @@
 
     <script><![CDATA[
 
+import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabbedPaneListener;
+
 setButtonTitle(_("isisfish.input.continueStrategies"));
 setNextPath("$root/$strategies");
+
+getVerifier().addCurrentPanel(this);
 public void refresh() {
-    setOfVesselsTab.removeChangeListener(getTabListener());
-    setOfVesselsTab.addChangeListener(getTabListener());
+    if (isSens()){
+        setOfVesselsTab.addChangeListener(new SensitivityTabbedPaneListener());
+    } else {
+        setOfVesselsTab.addChangeListener(new InputTabbedPaneListener());
+    }
     getVerifier().addCurrentPanel(effortDescriptionUI, setOfVesselsTabsUI);
 }
     ]]></script>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx	2009-03-04 17:36:39 UTC (rev 1910)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx	2009-03-04 18:21:15 UTC (rev 1911)
@@ -36,10 +36,15 @@
 		     +-->
 <fr.ifremer.isisfish.ui.input.InputContentUI>
     <script><![CDATA[
+import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabbedPaneListener;
 
+getVerifier().addCurrentPanel(this);
 public void refresh() {
-    strategyTab.removeChangeListener(getTabListener());
-    strategyTab.addChangeListener(getTabListener());
+    if (isSens()){
+        strategyTab.addChangeListener(new SensitivityTabbedPaneListener());
+    } else {
+        strategyTab.addChangeListener(new InputTabbedPaneListener());
+    }
     getVerifier().addCurrentPanel(strategyMonthInfoUI, strategyTabUI);
 }
     ]]></script>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityNavigationTreeSelectionAdapter.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityNavigationTreeSelectionAdapter.java	2009-03-04 17:36:39 UTC (rev 1910)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityNavigationTreeSelectionAdapter.java	2009-03-04 18:21:15 UTC (rev 1911)
@@ -98,7 +98,7 @@
         try {
             currentUI = (InputContentUI) newUI;
             if (currentUI != null){
-                currentUI.setTabListener(new SensitivityTabbedPaneListener());
+                currentUI.setSens(true);
                 context.getContextValue(InputSaveVerifier.class).addCurrentPanel(currentUI);
                 currentUI.setLayer(true);
             }

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabbedPaneListener.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabbedPaneListener.java	2009-03-04 17:36:39 UTC (rev 1910)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabbedPaneListener.java	2009-03-04 18:21:15 UTC (rev 1911)
@@ -36,6 +36,7 @@
                 pane.setSelectedIndex(selectedIndex);
             }
             ui = (InputContentUI) pane.getSelectedComponent();
+            ui.setSens(true);
             ui.setLayer(true);
             ui.refresh();
             cacheSelectedIndex = pane.getSelectedIndex();

    

r1911 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui: input sensitivity

sletellier＠users.labs.libre-entreprise.org

tags

participants (1)