This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit dd3e0838194a37330c9ab6705fae97256ff4edf9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 12 04:08:41 2016 +0200 bien remplir le benthos avec le... benthos (See #8234) + nettoyage code --- .../catches/actions/ComputeBatchWeightsAction.java | 35 +--------------------- 1 file changed, 1 insertion(+), 34 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/actions/ComputeBatchWeightsAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/actions/ComputeBatchWeightsAction.java index f13aac7..a976727 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/actions/ComputeBatchWeightsAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/actions/ComputeBatchWeightsAction.java @@ -166,7 +166,7 @@ public class ComputeBatchWeightsAction extends LongActionSupport<EditCatchesUIMo if (computedBenthosBatches == null) { totalBenthosSortedWeight = 0f; } else { - totalBenthosSortedWeight = computeSpeciesBatches(persistenceService, computedSpeciesBatches, benthosBatchRows = new ArrayList<>()); + totalBenthosSortedWeight = computeSpeciesBatches(persistenceService, computedBenthosBatches, benthosBatchRows = new ArrayList<>()); } } catch (TuttiWeightComputingException e) { @@ -477,39 +477,6 @@ public class ComputeBatchWeightsAction extends LongActionSupport<EditCatchesUIMo } -// protected void treatBenthosBatchError(TuttiWeightComputingException e) { -// -// int index = e.getIndex(); -// -// SpeciesBatchUIModel benthosBatchUIModel = getBenthosBatchUI().getModel(); -// -// SpeciesBatchRowModel row; -// if (benthosBatchUIModel.getSpeciesSortMode() != SpeciesSortMode.NONE) { -// -// // must resort rows in natural order (in service we use this order) -// List<SpeciesBatchRowModel> rows = new ArrayList<>(benthosBatchUIModel.getRows()); -// SpeciesBatchNaturalOrderComparator.sort(rows); -// // get the row -// row = rows.get(index); -// // get the correct rowIndex in the sorted list -// index = benthosBatchUIModel.getRows().indexOf(row); -// -// } else { -// -// // correct order can directly get row from list -// List<SpeciesBatchRowModel> rows = benthosBatchUIModel.getRows(); -// row = rows.get(index); -// -// } -// -// JXTable table = getBenthosBatchUI().getTable(); -// SpeciesBatchTableModel tableModel = (SpeciesBatchTableModel) table.getModel(); -// Set<SampleCategoryColumnIdentifier<SpeciesBatchRowModel>> sampleCols = tableModel.getSampleCols(); -// -// selectBatchCell(table, index, row, e.getProperty(), sampleCols, SpeciesBatchTableModel.WEIGHT); -// -// } - protected void selectBatchCell(JXTable table, int index, SpeciesBatchRowModel row, -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.