From chatellier@users.labs.libre-entreprise.org Mon Jun 15 00:26:11 2026
From: chatellier@users.labs.libre-entreprise.org
To: isis-fish-commits@list.isis-fish.org
Subject: [Isis-fish-commits] r2328 -
	isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
Date: Fri, 05 Jun 2009 15:33:17 +0200
Message-ID: <20090605133317.3A439461707@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2810681094575031037=="

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

Author: chatellier
Date: 2009-06-05 13:33:16 +0000 (Fri, 05 Jun 2009)
New Revision: 2328

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/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
Log:
Improve Tab Swaping perfs.
Add only one change listener per tab pane.

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-06-05 13:20:47 UTC (rev 2327)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx	20=
09-06-05 13:33:16 UTC (rev 2328)
@@ -20,19 +20,17 @@
 <fr.ifremer.isisfish.ui.input.InputContentUI>
=20
     <script><![CDATA[
-import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabbedPaneListener;
-
 // constructor code
 setButtonTitle(_("isisfish.input.continueMetiers"));
 setNextPath("$root/$metiers");
=20
 @Override
 public void refresh() {
-    if (isSensitivity()) {
-        gearTab.addChangeListener(new SensitivityTabbedPaneListener());
-    } else {
-        gearTab.addChangeListener(new InputTabbedPaneListener());
-    }
+
+    // install change listener
+    // (depends on sensitivity can't be done on constructor)
+    installChangeListener(gearTab);
+
     getVerifier().addCurrentPanel(selectivityUI, gearTabUI);
 }
=20

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-06-05 13:20:47 UTC (rev 2327)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI=
.jaxx	2009-06-05 13:33:16 UTC (rev 2328)
@@ -63,7 +63,10 @@
 import fr.ifremer.isisfish.ui.util.UtilsUI;
 import fr.ifremer.isisfish.ui.sensitivity.FactorWizardUI;
 import fr.ifremer.isisfish.ui.sensitivity.EditorHelper;
+import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabbedPaneListener;
=20
+protected ChangeListener tabbedPaneChangeListener;
+
 /**
  * This method is UI entry point.
  *
@@ -150,6 +153,30 @@
     }
 }
=20
+/**
+ * Install tabbed pane change listener depending on sensitivity.
+ * (init at first call)
+ *
+ * @param tabbedPane tabbed pane to install change listener
+ */
+protected void installChangeListener(JTabbedPane tabbedPane) {
+
+    // remove already registred listeners
+    for (ChangeListener changeListener : tabbedPane.getChangeListeners()) {
+        tabbedPane.removeChangeListener(changeListener);
+    }
+   =20
+    if (tabbedPaneChangeListener =3D=3D null) {
+        if (isSensitivity()) {
+            tabbedPaneChangeListener =3D new SensitivityTabbedPaneListener();
+        } else {
+            tabbedPaneChangeListener =3D new InputTabbedPaneListener();
+        }
+    }
+   =20
+    tabbedPane.addChangeListener(tabbedPaneChangeListener);=20
+}
+
 ]]></script>
     <JPanel id=3D'body' constraints=3D'BorderLayout.CENTER'/>
     <JButton id=3D'next' text=3D'{getButtonTitle()}' constraints=3D'BorderLa=
yout.SOUTH' visible=3D'{getNextPath() !=3D null}' onActionPerformed=3D'goTo()=
'/>

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-06-05 13:20:47 UTC (rev 2327)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx	=
2009-06-05 13:33:16 UTC (rev 2328)
@@ -20,20 +20,17 @@
 <fr.ifremer.isisfish.ui.input.InputContentUI>
=20
 <script><![CDATA[
-import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabbedPaneListener;
-
-//getVerifier().addCurrentPanel(this);
+// Constructor code
 setButtonTitle(_("isisfish.input.continueTripTypes"));
 setNextPath("$root/$tripTypes");
=20
 @Override
 public void refresh() {
-    if (isSensitivity()) {
-        metierTab.addChangeListener(new SensitivityTabbedPaneListener());
-    } else {
-        metierTab.addChangeListener(new InputTabbedPaneListener());
-    }
-   =20
+
+    // install change listener
+    // (depends on sensitivity c'ant be done on constructor)
+    installChangeListener(metierTab);
+
     // add tab in reverse order
     // metierTabUI at last, for this tab refresh at end, and save/cancel but=
ton linked to
     // entity change

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-06-05 13:20:47 UTC (rev 2327)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.j=
axx	2009-06-05 13:33:16 UTC (rev 2328)
@@ -26,23 +26,25 @@
     <script><![CDATA[
 import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabbedPaneListener;
=20
-//getVerifier().addCurrentPanel(this);
 setButtonTitle(_("isisfish.input.continueGears"));
 setNextPath("$root/$gears");
=20
 @Override
 public void refresh() {
-    if (isSensitivity()) {
-        populationTab.addChangeListener(new SensitivityTabbedPaneListener());
-    } else {
-        populationTab.addChangeListener(new InputTabbedPaneListener());
-    }
-    getVerifier().addCurrentPanel(populationMigrationUI, populationRecruitem=
entUI, populationCapturabilityUI, populationSeasonsUI, populationZoneUI, popu=
lationEquationUI, populationGroupUI, populationBasicsUI);
+
+    // install change listener
+    // (depends on sensitivity can't be done on constructor)
+    installChangeListener(populationTab);
+
+    // reverse ordre is no more needed
+    getVerifier().addCurrentPanel(populationMigrationUI, populationRecruitem=
entUI, populationCapturabilityUI,
+        populationSeasonsUI, populationZoneUI, populationEquationUI, populat=
ionGroupUI, populationBasicsUI);
 }
=20
 @Override
 public void setActionButtons() {
-
+    // active les bouton sur le premier onglet
+    populationBasicsUI.setActionButtons();
 }
     ]]>
     </script>

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-06-05 13:20:47 UTC (rev 2327)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI=
.jaxx	2009-06-05 13:33:16 UTC (rev 2328)
@@ -21,19 +21,17 @@
 <fr.ifremer.isisfish.ui.input.InputContentUI>
=20
     <script><![CDATA[
-import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabbedPaneListener;
-
 setButtonTitle(_("isisfish.input.continueStrategies"));
 setNextPath("$root/$strategies");
 //getVerifier().addCurrentPanel(this);
=20
 @Override
 public void refresh() {
-    if (isSensitivity()) {
-        setOfVesselsTab.addChangeListener(new SensitivityTabbedPaneListener(=
));
-    } else {
-        setOfVesselsTab.addChangeListener(new InputTabbedPaneListener());
-    }
+
+    // install change listener
+    // (depends on sensitivity can't be done on constructor)
+    installChangeListener(setOfVesselsTab);
+
     getVerifier().addCurrentPanel(effortDescriptionUI, setOfVesselsTabsUI);
 }
=20

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-06-05 13:20:47 UTC (rev 2327)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jax=
x	2009-06-05 13:33:16 UTC (rev 2328)
@@ -20,18 +20,13 @@
=20
 <fr.ifremer.isisfish.ui.input.InputContentUI>
     <script><![CDATA[
-import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabbedPaneListener;
-
-// is this add needed ?
-//getVerifier().addCurrentPanel(this);
-
 @Override
 public void refresh() {
-    if (isSensitivity()) {
-        strategyTab.addChangeListener(new SensitivityTabbedPaneListener());
-    } else {
-        strategyTab.addChangeListener(new InputTabbedPaneListener());
-    }
+
+    // install change listener
+    // (depends on sensitivity can't be done on constructor)
+    installChangeListener(strategyTab);
+
     getVerifier().addCurrentPanel(strategyMonthInfoUI, strategyTabUI);
 }
=20


--===============2810681094575031037==--