From tchemit@users.forge.codelutin.com Wed Mar 13 14:30:25 2013
From: tchemit@users.forge.codelutin.com
To: tutti-commits@list.forge.codelutin.com
Subject: [Tutti-commits] r607 - in trunk/tutti-ui-swing/src/main:
	java/fr/ifremer/tutti/ui/swing/content/home resources/i18n
Date: Wed, 13 Mar 2013 14:30:25 +0100
Message-ID: <20130313133025.3F18615A3A@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4359164696375441670=="

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

Author: tchemit
Date: 2013-03-13 14:30:25 +0100 (Wed, 13 Mar 2013)
New Revision: 607

Url: http://forge.codelutin.com/projects/tutti/repository/revisions/607

Log:
fixes #2131: Saisie possible des captures d'une campagne dont la s?\195?\169r=
ie n'a pas de zone

Modified:
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/=
SelectCruiseUI.css
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/=
SelectCruiseUI.jaxx
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/=
SelectCruiseUIHandler.java
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/=
SelectCruiseUIModel.java
   trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properti=
es
   trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properti=
es

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/conten=
t/home/SelectCruiseUI.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home=
/SelectCruiseUI.css	2013-03-13 12:08:40 UTC (rev 606)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home=
/SelectCruiseUI.css	2013-03-13 13:30:25 UTC (rev 607)
@@ -32,6 +32,17 @@
   _help: {"tuttihelp.selectCruise.help"};
 }
=20
+#warningContainer {
+  background: {new java.awt.Color(245, 218, 88)};
+  visible: {!model.isProgramValid()};
+}
+
+#warningLabel {
+  actionIcon: warning;
+  border: {new javax.swing.border.EmptyBorder(5, 10, 5, 10)};
+  text: "tutti.warn.invalid.program";
+}
+
 #programLabel {
   text: "tutti.label.program";
   actionIcon: program;
@@ -186,7 +197,7 @@
   text: "tutti.action.editCatches";
   mnemonic: E;
   _tuttiAction: {EditCatchesAction.class};
-  enabled: {model.isValid() && uiContext.isCruiseFilled()};
+  enabled: {model.isProgramValid() && uiContext.isCruiseFilled()};
   toolTipText: "tuttihelp.selectCruise.action.editCatches.tip";
   _help: {"tuttihelp.selectCruise.action.editCatches.help"};
 }
@@ -197,6 +208,6 @@
   toolTipText: "tuttihelp.selectCruise.action.validateCatches.tip";
   mnemonic: V;
   _tuttiAction: {ValidateCatchesAction.class};
-  enabled: {model.isValid() && uiContext.isCruiseFilled()};
+  enabled: {model.isProgramValid() && uiContext.isCruiseFilled()};
   _help: {"tuttihelp.selectCruise.action.validateCatches.help"};
 }

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/conten=
t/home/SelectCruiseUI.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
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home=
/SelectCruiseUI.jaxx	2013-03-13 12:08:40 UTC (rev 606)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home=
/SelectCruiseUI.jaxx	2013-03-13 13:30:25 UTC (rev 607)
@@ -82,6 +82,13 @@
=20
   <Table fill=3D'both' constraints=3D'BorderLayout.CENTER'>
     <row>
+      <cell columns=3D"3">
+        <JPanel id=3D'warningContainer' layout=3D'{new BorderLayout(10, 10)}=
'>
+          <JLabel id=3D'warningLabel' constraints=3D'BorderLayout.CENTER'/>
+        </JPanel>
+      </cell>
+    </row>
+    <row>
       <cell anchor=3D'west'>
         <JLabel id=3D'programLabel'/>
       </cell>

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/conten=
t/home/SelectCruiseUIHandler.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
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home=
/SelectCruiseUIHandler.java	2013-03-13 12:08:40 UTC (rev 606)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home=
/SelectCruiseUIHandler.java	2013-03-13 13:30:25 UTC (rev 607)
@@ -173,14 +173,17 @@
                 Program newValue =3D (Program) evt.getNewValue();
                 boolean noProgram =3D newValue =3D=3D null;
                 context.setProgramId(noProgram ? null : newValue.getId());
-                List<Cruise> campaigns;
+                if (log.isInfoEnabled()) {
+                    log.info("Selected program: "+newValue);
+                }
+                List<Cruise> cruises;
                 if (noProgram) {
-                    campaigns =3D Lists.newArrayList();
+                    cruises =3D Lists.newArrayList();
                 } else {
-                    campaigns =3D persistenceService.getAllCruise(newValue.g=
etId());
+                    cruises =3D persistenceService.getAllCruise(newValue.get=
Id());
                 }
                 SelectCruiseUIModel source =3D (SelectCruiseUIModel) evt.get=
Source();
-                source.setCruises(campaigns);
+                source.setCruises(cruises);
                 source.setCruise(null);
             }
         });

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/conten=
t/home/SelectCruiseUIModel.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
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home=
/SelectCruiseUIModel.java	2013-03-13 12:08:40 UTC (rev 606)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home=
/SelectCruiseUIModel.java	2013-03-13 13:30:25 UTC (rev 607)
@@ -45,6 +45,8 @@
=20
     public static final String PROPERTY_PROGRAM =3D "program";
=20
+    public static final String PROPERTY_PROGRAM_VALID =3D "programValid";
+
     public static final String PROPERTY_CRUISES =3D "cruises";
=20
     public static final String PROPERTY_CRUISE =3D "cruise";
@@ -94,12 +96,17 @@
         this.program =3D program;
         firePropertyChange(PROPERTY_PROGRAM, oldValue, program);
         firePropertyChange(PROPERTY_PROGRAM_FOUND, oldValue !=3D null, progr=
am !=3D null);
+        firePropertyChange(PROPERTY_PROGRAM_VALID, null, isProgramValid());
     }
=20
     public boolean isProgramFound() {
         return program !=3D null;
     }
=20
+    public boolean isProgramValid() {
+        return program =3D=3D null || program.getZone() !=3D null;
+    }
+
     public List<Cruise> getCruises() {
         return cruises;
     }

Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.p=
roperties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.propert=
ies	2013-03-13 12:08:40 UTC (rev 606)
+++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.propert=
ies	2013-03-13 13:30:25 UTC (rev 607)
@@ -532,6 +532,7 @@
 tutti.validator.warning.longitude.outOfBounds=3D
 tutti.validator.warning.longitude.second.outOfBounds=3D
 tutti.warn.invalid.batch.model=3D
+tutti.warn.invalid.program=3D
 tutti.weights.rate.difference.totalAndSorted.description=3D
 tuttihelp.createSpeciesBatch.action.addSpecies.tip=3D
 tuttihelp.createSpeciesBatch.action.cancel.tip=3D

Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.p=
roperties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.propert=
ies	2013-03-13 12:08:40 UTC (rev 606)
+++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.propert=
ies	2013-03-13 13:30:25 UTC (rev 607)
@@ -552,6 +552,7 @@
 tutti.validator.warning.longitude.outOfBounds=3DLa Latitude doit =C3=AAtre c=
omprise entre -180.0 et 180.0
 tutti.validator.warning.longitude.second.outOfBounds=3DLa seconde de la long=
itude doit =C3=AAtre comprise entre 0 et 60
 tutti.warn.invalid.batch.model=3DL'arbre d'=C3=A9chantillonage n'est pas com=
patible. Les captures ne seront pas visibles.
+tutti.warn.invalid.program=3DLe programme s=C3=A9lectionn=C3=A9 ne poss=C3=
=A8de pas de zone, il ne peut pas =C3=AAtre =C3=A9dit=C3=A9.
 tuttihelp.createSpeciesBatch.action.addSpecies.tip=3DS=C3=A9lectionner une a=
utre esp=C3=A8ce
 tuttihelp.createSpeciesBatch.action.cancel.tip=3D
 tuttihelp.createSpeciesBatch.action.save.tip=3D


--===============4359164696375441670==--