From chatellier@users.labs.libre-entreprise.org Mon Jun 15 00:26:10 2026
From: chatellier@users.labs.libre-entreprise.org
To: isis-fish-commits@list.isis-fish.org
Subject: [Isis-fish-commits] r2292 -
	isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
Date: Fri, 29 May 2009 15:32:33 +0200
Message-ID: <20090529133233.8E7A8461707@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2802080446582150051=="

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

Author: chatellier
Date: 2009-05-29 13:32:33 +0000 (Fri, 29 May 2009)
New Revision: 2292

Modified:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthIn=
foUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMont=
hInfoUI.jaxx
Log:
Ajout d'une bordure avec les noms des mois pour les strategies

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/Strategy=
MonthInfoUI.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/StrategyMonthI=
nfoUI.jaxx	2009-05-28 17:24:56 UTC (rev 2291)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthI=
nfoUI.jaxx	2009-05-29 13:32:33 UTC (rev 2292)
@@ -1,7 +1,6 @@
 <!--
 /* *##%
- * Copyright (C) 2005
- *     Ifremer, Code Lutin, Cedric Pineau, Benjamin Poussin
+ * Copyright (C) 2005 - 2009 Ifremer, Code Lutin
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,24 +16,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, US=
A.
  *##%*/
-
-/* *
- * IsisFish.java
- *
- * Created: 1 aout 2005 18:37:25 CEST
- *
- * @author Benjamin POUSSIN <poussin at codelutin.com>
- * @version $Revision: 1312 $
- *
- * Last update: $Date: 2008-08-28 10:21:07 +0200 (jeu, 28 ao=C3=BB 2008) $
- * by : $Author: sletellier $
- */
  -->
=20
 <fr.ifremer.isisfish.ui.input.InputContentUI>
=20
     <script><![CDATA[
-import fr.ifremer.isisfish.types.Month;
+import org.apache.commons.lang.StringUtils;
=20
 public void refresh() {
     getVerifier().setSaveButton(save);
@@ -51,60 +38,69 @@
     strategyOctober.init(9);
     strategyNovember.init(10);
     strategyDecember.init(11);
-    getVerifier().addCurrentPanel(strategyJanuary, strategyFebuary, strategy=
March, strategyApril, strategyMay, strategyJune, strategyJuly, strategyAugust=
, strategySeptember, strategyOctober, strategyNovember, strategyDecember);
+    getVerifier().addCurrentPanel(strategyJanuary, strategyFebuary, strategy=
March,
+          strategyApril, strategyMay, strategyJune,
+          strategyJuly, strategyAugust, strategySeptember,
+          strategyOctober, strategyNovember, strategyDecember);
 }
     ]]></script>
     <JPanel id=3D'body' layout=3D'{new BorderLayout()}'>
         <Table constraints=3D'BorderLayout.CENTER'>
             <row>
-                <cell fill=3D'both' weightx=3D'0.25' weighty=3D'0.3'>
-                    <StrategyOneMonthInfoUI id=3D'strategyJanuary' construct=
orParams=3D'this'/>
+                <cell fill=3D'both' weightx=3D'0.25' weighty=3D'0.3' insets=
=3D'0'>
+                    <StrategyOneMonthInfoUI id=3D'strategyJanuary' construct=
orParams=3D'this'
+                    border=3D'{BorderFactory.createTitledBorder(StringUtils.=
capitalize(_("isisfish.month.january")))}' />
                 </cell>
-                <cell fill=3D'both' weightx=3D'0.25' weighty=3D'0.3'>
-                    <StrategyOneMonthInfoUI id=3D'strategyFebuary' construct=
orParams=3D'this'/>
+                <cell fill=3D'both' weightx=3D'0.25' weighty=3D'0.3' insets=
=3D'0'>
+                    <StrategyOneMonthInfoUI id=3D'strategyFebuary' construct=
orParams=3D'this'
+                    border=3D'{BorderFactory.createTitledBorder(StringUtils.=
capitalize(_("isisfish.month.february")))}' />
                 </cell>
-                <cell fill=3D'both' weightx=3D'0.25' weighty=3D'0.3'>
-                    <StrategyOneMonthInfoUI id=3D'strategyMarch' constructor=
Params=3D'this'/>
+                <cell fill=3D'both' weightx=3D'0.25' weighty=3D'0.3' insets=
=3D'0'>
+                    <StrategyOneMonthInfoUI id=3D'strategyMarch' constructor=
Params=3D'this'
+                    border=3D'{BorderFactory.createTitledBorder(StringUtils.=
capitalize(_("isisfish.month.march")))}' />
                 </cell>
-                <cell fill=3D'both' weightx=3D'0.25' weighty=3D'0.3'>
-                    <StrategyOneMonthInfoUI id=3D'strategyApril' constructor=
Params=3D'this'/>
+                <cell fill=3D'both' weightx=3D'0.25' weighty=3D'0.3' insets=
=3D'0'>
+                    <StrategyOneMonthInfoUI id=3D'strategyApril' constructor=
Params=3D'this'
+                    border=3D'{BorderFactory.createTitledBorder(StringUtils.=
capitalize(_("isisfish.month.april")))}' />
                 </cell>
             </row>
             <row>
-                <cell fill=3D'both' weightx=3D'0.25' weighty=3D'0.3'>
-                    <StrategyOneMonthInfoUI id=3D'strategyMay' constructorPa=
rams=3D'this'/>
+                <cell fill=3D'both' weightx=3D'0.25' weighty=3D'0.3' insets=
=3D'0'>
+                    <StrategyOneMonthInfoUI id=3D'strategyMay' constructorPa=
rams=3D'this'
+                    border=3D'{BorderFactory.createTitledBorder(StringUtils.=
capitalize(_("isisfish.month.may")))}' />
                 </cell>
-                <cell fill=3D'both' weightx=3D'0.25' weighty=3D'0.3'>
-                    <StrategyOneMonthInfoUI id=3D'strategyJune' constructorP=
arams=3D'this'/>
+                <cell fill=3D'both' weightx=3D'0.25' weighty=3D'0.3' insets=
=3D'0'>
+                    <StrategyOneMonthInfoUI id=3D'strategyJune' constructorP=
arams=3D'this'
+                    border=3D'{BorderFactory.createTitledBorder(StringUtils.=
capitalize(_("isisfish.month.june")))}' />
                 </cell>
-                <cell fill=3D'both' weightx=3D'0.25' weighty=3D'0.3'>
-                    <StrategyOneMonthInfoUI id=3D'strategyJuly' constructorP=
arams=3D'this'/>
+                <cell fill=3D'both' weightx=3D'0.25' weighty=3D'0.3' insets=
=3D'0'>
+                    <StrategyOneMonthInfoUI id=3D'strategyJuly' constructorP=
arams=3D'this'
+                    border=3D'{BorderFactory.createTitledBorder(StringUtils.=
capitalize(_("isisfish.month.july")))}' />
                 </cell>
-                <cell fill=3D'both' weightx=3D'0.25' weighty=3D'0.3'>
-                    <StrategyOneMonthInfoUI id=3D'strategyAugust' constructo=
rParams=3D'this'/>
+                <cell fill=3D'both' weightx=3D'0.25' weighty=3D'0.3' insets=
=3D'0'>
+                    <StrategyOneMonthInfoUI id=3D'strategyAugust' constructo=
rParams=3D'this'
+                    border=3D'{BorderFactory.createTitledBorder(StringUtils.=
capitalize(_("isisfish.month.august")))}' />
                 </cell>
             </row>
             <row>
-                <cell fill=3D'both' weightx=3D'0.25' weighty=3D'0.3'>
-                    <StrategyOneMonthInfoUI id=3D'strategySeptember' constru=
ctorParams=3D'this'/>
+                <cell fill=3D'both' weightx=3D'0.25' weighty=3D'0.3' insets=
=3D'0'>
+                    <StrategyOneMonthInfoUI id=3D'strategySeptember' constru=
ctorParams=3D'this'
+                    border=3D'{BorderFactory.createTitledBorder(StringUtils.=
capitalize(_("isisfish.month.september")))}' />
                 </cell>
-                <cell fill=3D'both' weightx=3D'0.25' weighty=3D'0.3'>
-                    <StrategyOneMonthInfoUI id=3D'strategyOctober' construct=
orParams=3D'this'/>
+                <cell fill=3D'both' weightx=3D'0.25' weighty=3D'0.3' insets=
=3D'0'>
+                    <StrategyOneMonthInfoUI id=3D'strategyOctober' construct=
orParams=3D'this'
+                    border=3D'{BorderFactory.createTitledBorder(StringUtils.=
capitalize(_("isisfish.month.october")))}' />
                 </cell>
-                <cell fill=3D'both' weightx=3D'0.25' weighty=3D'0.3'>
-                    <StrategyOneMonthInfoUI id=3D'strategyNovember' construc=
torParams=3D'this'/>
+                <cell fill=3D'both' weightx=3D'0.25' weighty=3D'0.3' insets=
=3D'0'>
+                    <StrategyOneMonthInfoUI id=3D'strategyNovember' construc=
torParams=3D'this'
+                    border=3D'{BorderFactory.createTitledBorder(StringUtils.=
capitalize(_("isisfish.month.november")))}' />
                 </cell>
-                <cell fill=3D'both' weightx=3D'0.25' weighty=3D'0.3'>
-                    <StrategyOneMonthInfoUI id=3D'strategyDecember' construc=
torParams=3D'this'/>
+                <cell fill=3D'both' weightx=3D'0.25' weighty=3D'0.3' insets=
=3D'0'>
+                    <StrategyOneMonthInfoUI id=3D'strategyDecember' construc=
torParams=3D'this'
+                    border=3D'{BorderFactory.createTitledBorder(StringUtils.=
capitalize(_("isisfish.month.december")))}' />
                 </cell>
             </row>
         </Table>
-
-        <!--
-         |
-         | Button action
-         |
-         +-->
         <Table constraints=3D'BorderLayout.SOUTH'>
             <row>
                 <cell fill=3D'horizontal' weightx=3D'0.5'>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/Strategy=
OneMonthInfoUI.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/StrategyOneMon=
thInfoUI.jaxx	2009-05-28 17:24:56 UTC (rev 2291)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMon=
thInfoUI.jaxx	2009-05-29 13:32:33 UTC (rev 2292)
@@ -1,7 +1,6 @@
 <!--
 /* *##%
- * Copyright (C) 2005
- *     Ifremer, Code Lutin, Cedric Pineau, Benjamin Poussin
+ * Copyright (C) 2005 - 2009 Ifremer, Code Lutin
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,21 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, US=
A.
  *##%*/
-
-/* *
- * IsisFish.java
- *
- * Created: 1 aout 2005 18:37:25 CEST
- *
- * @author Benjamin POUSSIN <poussin at codelutin.com>
- * @version $Revision: 1312 $
- *
- * Last update: $Date: 2008-08-28 10:21:07 +0200 (jeu, 28 ao=C3=BB 2008) $
- * by : $Author: sletellier $
- */
  -->
=20
-
 <fr.ifremer.isisfish.ui.input.InputContentUI>
=20
     <!-- bean property -->
@@ -40,38 +26,32 @@
     <fr.ifremer.isisfish.entities.StrategyMonthInfoImpl id=3D'strategyMonthI=
nfo' javaBean=3D'null'/>
=20
     <script><![CDATA[
-
-import fr.ifremer.isisfish.entities.StrategyMonthInfo;
 import fr.ifremer.isisfish.entities.StrategyMonthInfoImpl;
 import fr.ifremer.isisfish.entities.Strategy;
 import fr.ifremer.isisfish.entities.StrategyImpl;
 import org.codelutin.math.matrix.gui.MatrixPanelEvent;
 import org.codelutin.math.matrix.gui.MatrixPanelListener;
 import jaxx.runtime.swing.editor.NumberEditor;
-import fr.ifremer.isisfish.types.Month;
 import fr.ifremer.isisfish.entities.TripType;
-import fr.ifremer.isisfish.ui.widget.editor.GenericCell;
=20
-MatrixPanelListener matrixListener =3D null;
+protected MatrixPanelListener matrixListener;
=20
-int month =3D 0;
-PropertyChangeListener listener =3D null;
+protected int month =3D 0;
+protected PropertyChangeListener listener;
=20
 addPropertyChangeListener("strategyMonthInfo", new PropertyChangeListener() {
     public void propertyChange(PropertyChangeEvent evt) {
         if (evt.getOldValue() !=3D null || evt.getNewValue() =3D=3D null) {
-            // remove previous binding on getBean()
-            //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldC=
ellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCel=
lLand.selected", "fieldCellComment.text");fieldPopulationBasicsName.setText("=
");
             numberOfTrips.setText("");
             fieldStrategyMonthInfoMinInactivityDays.setModelText("");
             fieldStrategyMonthInfoProportion.setMatrix(null);
         }
         if (evt.getNewValue() !=3D null) {
-            // add binding on getBean()
-            //jaxx.runtime.SwingUtil.applyDataBinding(get$Table0(), "fieldCe=
llName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCell=
Land.selected", "fieldCellComment.text");
+
         }
     }
 });
+
 fieldStrategyMonthInfoProportion.addPropertyChangeListener(new PropertyChang=
eListener() {
     @Override
     public void propertyChange(PropertyChangeEvent evt) {
@@ -82,47 +62,54 @@
         }
     }
 });
+
 public void refresh() {
     Strategy strategy =3D (Strategy)getVerifier().getEntity(Strategy.class);
     setBean((StrategyImpl) strategy);
-    if (getBean() !=3D null){
+    if (getBean() !=3D null) {
         Object[] monthInfos =3D getBean().getStrategyMonthInfo().toArray();
-        if (monthInfos.length !=3D 0){
+        if (monthInfos.length !=3D 0) {
             setStrategyMonthInfo((StrategyMonthInfoImpl) monthInfos[month]);
             getVerifier().addCurrentEntity(getStrategyMonthInfo());
         }
     }
-    if (getStrategyMonthInfo() !=3D null){
+    if (getStrategyMonthInfo() !=3D null) {
        numberOfTrips.putClientProperty("beanID", getStrategyMonthInfo().getT=
opiaId());
        fieldStrategyMonthInfoProportion.putClientProperty("beanID", getStrat=
egyMonthInfo().getTopiaId());
        fieldStrategyMonthInfoMinInactivityDays.putClientProperty("beanID", g=
etStrategyMonthInfo().getTopiaId());
        ActionListener[] listeners =3D fieldStrategyMonthInfoTripType.getActi=
onListeners();
-       for (ActionListener listener : listeners){
+       for (ActionListener listener : listeners) {
            fieldStrategyMonthInfoTripType.removeActionListener(listener);
        }
        jaxx.runtime.SwingUtil.fillComboBox(fieldStrategyMonthInfoTripType,ge=
tRegion().getTripType(), getStrategyMonthInfo().getTripType(), true);
-       for (ActionListener listener : listeners){
+       for (ActionListener listener : listeners) {
            fieldStrategyMonthInfoTripType.addActionListener(listener);
        }
-       setMatrix();
+       setProportionMetierMatrix();
        fieldStrategyMonthInfoMinInactivityDays.init();
     }
     matrixListener =3D new MatrixPanelListener() {
-
         @Override
-        public void matrixChanged(MatrixPanelEvent arg0) {
-            if (getStrategyMonthInfo() !=3D null && fieldStrategyMonthInfoPr=
oportion.getMatrix() !=3D null){
+        public void matrixChanged(MatrixPanelEvent event) {
+            if (getStrategyMonthInfo() !=3D null && fieldStrategyMonthInfoPr=
oportion.getMatrix() !=3D null) {
                 getStrategyMonthInfo().setProportionMetier(fieldStrategyMont=
hInfoProportion.getMatrix().copy());
             }
         }
     };
     fieldStrategyMonthInfoProportion.addMatrixListener(matrixListener);
 }
-public void init(int m){
+
+public void init(int m) {
     month =3D m;
 }
-protected void setMatrix(){
-    fieldStrategyMonthInfoProportion.setMatrix(getStrategyMonthInfo().getPro=
portionMetier() =3D=3D null ? null : getStrategyMonthInfo().getProportionMeti=
er().copy());
+
+protected void setProportionMetierMatrix() {
+    if (getStrategyMonthInfo().getProportionMetier() !=3D null) {
+        fieldStrategyMonthInfoProportion.setMatrix(getStrategyMonthInfo().ge=
tProportionMetier().copy());
+    }
+    else {
+        fieldStrategyMonthInfoProportion.setMatrix(null);
+    }
 }
     ]]></script>
     <Table id=3D'body'>


--===============2802080446582150051==--