From kmorin@users.forge.codelutin.com Tue Apr 16 19:36:18 2013
From: kmorin@users.forge.codelutin.com
To: tutti-commits@list.forge.codelutin.com
Subject: [Tutti-commits] r809 -	=?utf-8?q?trunk/tutti-ui-swing/src/main/java?=
 =?utf-8?q?/fr/ifremer/tutti/ui/swing/content/operation/catches?=
Date: Tue, 16 Apr 2013 19:36:18 +0200
Message-ID: <20130416173618.D774D15979@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1053856170944424343=="

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

Author: kmorin
Date: 2013-04-16 19:36:18 +0200 (Tue, 16 Apr 2013)
New Revision: 809

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

Log:
fixes #2306 [ERGO] masquer bouton "?\195?\169l?\195?\169vation des poids" dan=
s "captures accidentelles" et "observations individuelles"

Modified:
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/opera=
tion/catches/ComputeWeightsAction.java
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/opera=
tion/catches/EditCatchesUI.jaxx
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/opera=
tion/catches/EditCatchesUIHandler.java

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/conten=
t/operation/catches/ComputeWeightsAction.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/oper=
ation/catches/ComputeWeightsAction.java	2013-04-16 17:04:47 UTC (rev 808)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/oper=
ation/catches/ComputeWeightsAction.java	2013-04-16 17:36:18 UTC (rev 809)
@@ -68,7 +68,7 @@
=20
         BatchContainer<BenthosBatch> computedBenthosBatches;
         Float totalBenthosSortedWeight;
-        int rowIndex =3D 0;
+        Integer rowIndex =3D null;
         try {
             computedBenthosBatches =3D
                     tuttiWeightComputingService.getComputedBenthosBatches(mo=
del.getFishingOperation());
@@ -79,8 +79,10 @@
             throw e;
=20
         } finally {
-            getUI().getTabPane().setSelectedIndex(2);
-            AbstractSelectTableAction.doSelectCell(getUI().getBenthosTabCont=
ent().getTable(), rowIndex, 1);
+            if (rowIndex !=3D null) {
+                getUI().getTabPane().setSelectedIndex(2);
+                AbstractSelectTableAction.doSelectCell(getUI().getBenthosTab=
Content().getTable(), rowIndex, 1);
+            }
         }
=20
         BatchContainer<MarineLitterBatch> computedMarineLitterBatches =3D

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/conten=
t/operation/catches/EditCatchesUI.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/oper=
ation/catches/EditCatchesUI.jaxx	2013-04-16 17:04:47 UTC (rev 808)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/oper=
ation/catches/EditCatchesUI.jaxx	2013-04-16 17:36:18 UTC (rev 809)
@@ -421,13 +421,21 @@
   </JTabbedPane>
=20
   <!-- Actions -->
-  <JPanel layout=3D'{new BorderLayout()}' constraints=3D'BorderLayout.SOUTH'>
-    <JPanel id=3D'createFishingOperationActions' layout=3D'{new GridLayout(1=
,0)}'
-            constraints=3D'BorderLayout.CENTER'>
-      <JButton id=3D'cancelButton'/>
-      <JButton id=3D'saveButton'/>
+  <Table id=3D'createFishingOperationActions'
+         constraints=3D'BorderLayout.SOUTH'
+         fill=3D'both'
+         insets=3D'0'>
+    <row>
+      <cell weightx=3D"1">
+        <JButton id=3D'cancelButton'/>
+      </cell>
+      <cell weightx=3D"1">
+        <JButton id=3D'saveButton'/>
+      </cell>
+      <cell weightx=3D"1">
       <JButton id=3D'computeSpeciesBatchButton'/>
-    </JPanel>
-  </JPanel>
+      </cell>
+    </row>
+  </Table>
=20
 </JPanel>
\ No newline at end of file

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/conten=
t/operation/catches/EditCatchesUIHandler.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/oper=
ation/catches/EditCatchesUIHandler.java	2013-04-16 17:04:47 UTC (rev 808)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/oper=
ation/catches/EditCatchesUIHandler.java	2013-04-16 17:36:18 UTC (rev 809)
@@ -186,6 +186,7 @@
         ui.getSpeciesTabContent().getSpeciesBatchAttachmentsButton().onClose=
UI();
         ui.getBenthosTabContent().getBenthosBatchAttachmentsButton().onClose=
UI();
         ui.getMarineLitterTabContent().getMarineLitterBatchAttachmentsButton=
().onCloseUI();
+        ui.getComputeSpeciesBatchButton().setVisible(newIndex < 4);
         return super.onTabChanged(currentIndex, newIndex);
     }
=20


--===============1053856170944424343==--