From sletellier@users.labs.libre-entreprise.org Mon Jun 15 00:25:56 2026
From: sletellier@users.labs.libre-entreprise.org
To: isis-fish-commits@list.isis-fish.org
Subject: [Isis-fish-commits] r1911 - in
	isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui: input	sensitivity
Date: Wed, 04 Mar 2009 19:21:16 +0100
Message-ID: <20090304182116.2A4CD461A7B@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8283871428469127154=="

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

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/InputNavigation=
TreeSelectionAdapter.java
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifi=
er.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.ja=
xx
   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/Sensitivi=
tyNavigationTreeSelectionAdapter.java
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/Sensitivi=
tyTabbedPaneListener.java
Log:
Sensitivity work with tabs

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

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNav=
igationTreeSelectionAdapter.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/InputNavigatio=
nTreeSelectionAdapter.java	2009-03-04 17:36:39 UTC (rev 1910)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigatio=
nTreeSelectionAdapter.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 me=
thod refresh...)
         try {
             currentUI =3D (InputContentUI) newUI;
-            currentUI.setTabListener(new InputTabbedPaneListener());
+            currentUI.setSens(false);
             context.getContextValue(InputSaveVerifier.class).addCurrentPanel=
(currentUI);
             currentNode =3D node;
         } catch (Exception e) {

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSav=
eVerifier.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/InputSaveVerif=
ier.java	2009-03-04 17:36:39 UTC (rev 1910)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerif=
ier.java	2009-03-04 18:21:15 UTC (rev 1911)
@@ -6,6 +6,7 @@
 package fr.ifremer.isisfish.ui.input;
=20
 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 =3D !currentEntities.isEmpty();
             this.currentPanels.add(ui);
+            if (rootUI =3D=3D 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
=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/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;
=20
+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/Populati=
onUI.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/PopulationUI.j=
axx	2009-03-04 17:36:39 UTC (rev 1910)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.j=
axx	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;
=20
+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, populationRecruitem=
entUI, populationCapturabilityUI, populationSeasonsUI, populationZoneUI, popu=
lationEquationUI, populationGroupUI, populationBasicsUI);
 }
     ]]>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVes=
selsUI.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/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 @@
=20
     <script><![CDATA[
=20
+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/Strategy=
UI.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/StrategyUI.jax=
x	2009-03-04 17:36:39 UTC (rev 1910)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jax=
x	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;
=20
+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/Se=
nsitivityNavigationTreeSelectionAdapter.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/sensitivity/Sensitiv=
ityNavigationTreeSelectionAdapter.java	2009-03-04 17:36:39 UTC (rev 1910)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/Sensitiv=
ityNavigationTreeSelectionAdapter.java	2009-03-04 18:21:15 UTC (rev 1911)
@@ -98,7 +98,7 @@
         try {
             currentUI =3D (InputContentUI) newUI;
             if (currentUI !=3D null){
-                currentUI.setTabListener(new SensitivityTabbedPaneListener()=
);
+                currentUI.setSens(true);
                 context.getContextValue(InputSaveVerifier.class).addCurrentP=
anel(currentUI);
                 currentUI.setLayer(true);
             }

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/Se=
nsitivityTabbedPaneListener.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/sensitivity/Sensitiv=
ityTabbedPaneListener.java	2009-03-04 17:36:39 UTC (rev 1910)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/Sensitiv=
ityTabbedPaneListener.java	2009-03-04 18:21:15 UTC (rev 1911)
@@ -36,6 +36,7 @@
                 pane.setSelectedIndex(selectedIndex);
             }
             ui =3D (InputContentUI) pane.getSelectedComponent();
+            ui.setSens(true);
             ui.setLayer(true);
             ui.refresh();
             cacheSelectedIndex =3D pane.getSelectedIndex();


--===============8283871428469127154==--