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" dans "captures accidentelles" et "observations individuelles" Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ComputeWeightsAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ComputeWeightsAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/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/operation/catches/ComputeWeightsAction.java 2013-04-16 17:36:18 UTC (rev 809) @@ -68,7 +68,7 @@ BatchContainer<BenthosBatch> computedBenthosBatches; Float totalBenthosSortedWeight; - int rowIndex = 0; + Integer rowIndex = null; try { computedBenthosBatches = tuttiWeightComputingService.getComputedBenthosBatches(model.getFishingOperation()); @@ -79,8 +79,10 @@ throw e; } finally { - getUI().getTabPane().setSelectedIndex(2); - AbstractSelectTableAction.doSelectCell(getUI().getBenthosTabContent().getTable(), rowIndex, 1); + if (rowIndex != null) { + getUI().getTabPane().setSelectedIndex(2); + AbstractSelectTableAction.doSelectCell(getUI().getBenthosTabContent().getTable(), rowIndex, 1); + } } BatchContainer<MarineLitterBatch> computedMarineLitterBatches = Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/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/operation/catches/EditCatchesUI.jaxx 2013-04-16 17:36:18 UTC (rev 809) @@ -421,13 +421,21 @@ </JTabbedPane> <!-- Actions --> - <JPanel layout='{new BorderLayout()}' constraints='BorderLayout.SOUTH'> - <JPanel id='createFishingOperationActions' layout='{new GridLayout(1,0)}' - constraints='BorderLayout.CENTER'> - <JButton id='cancelButton'/> - <JButton id='saveButton'/> + <Table id='createFishingOperationActions' + constraints='BorderLayout.SOUTH' + fill='both' + insets='0'> + <row> + <cell weightx="1"> + <JButton id='cancelButton'/> + </cell> + <cell weightx="1"> + <JButton id='saveButton'/> + </cell> + <cell weightx="1"> <JButton id='computeSpeciesBatchButton'/> - </JPanel> - </JPanel> + </cell> + </row> + </Table> </JPanel> \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/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/operation/catches/EditCatchesUIHandler.java 2013-04-16 17:36:18 UTC (rev 809) @@ -186,6 +186,7 @@ ui.getSpeciesTabContent().getSpeciesBatchAttachmentsButton().onCloseUI(); ui.getBenthosTabContent().getBenthosBatchAttachmentsButton().onCloseUI(); ui.getMarineLitterTabContent().getMarineLitterBatchAttachmentsButton().onCloseUI(); + ui.getComputeSpeciesBatchButton().setVisible(newIndex < 4); return super.onTabChanged(currentIndex, newIndex); }