branch develop updated (0a3db77 -> 3227fb7)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from 0a3db77 Livrable #8230 Merge branch 'feature/8230' into develop new dd3e083 bien remplir le benthos avec le... benthos (See #8234) + nettoyage code new 3227fb7 Livrable #8234 Merge branch 'feature/8234' into develop The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 3227fb72a8005d7dd839e7e3508f635003393ba2 Merge: 0a3db77 dd3e083 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 12 04:08:43 2016 +0200 Livrable #8234 Merge branch 'feature/8234' into develop 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 Summary of changes: .../catches/actions/ComputeBatchWeightsAction.java | 35 +--------------------- 1 file changed, 1 insertion(+), 34 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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>.
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 3227fb72a8005d7dd839e7e3508f635003393ba2 Merge: 0a3db77 dd3e083 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 12 04:08:43 2016 +0200 Livrable #8234 Merge branch 'feature/8234' into develop .../catches/actions/ComputeBatchWeightsAction.java | 35 +--------------------- 1 file changed, 1 insertion(+), 34 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm