This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 49c3cff1c298fc0e09ea4ffd870722ebf9c3d07a Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Sep 13 08:53:11 2014 +0200 clean code --- .../service/util/BatchPersistenceHelper.java | 44 ---------------------- .../persistence/service/util/BatchTreeHelper.java | 38 ------------------- 2 files changed, 82 deletions(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/BatchPersistenceHelper.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/BatchPersistenceHelper.java index 9654452..450b013 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/BatchPersistenceHelper.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/BatchPersistenceHelper.java @@ -568,46 +568,6 @@ public class BatchPersistenceHelper extends AbstractPersistenceService { // --- Sampling Ratio + QuantificationMeasurement --- // batchTreeHelper.setWeightAndSampleRatio(target, weight, sampleCategoryWeight); -// // --- QuantificationMeasurement --- // -// { -// Float weightMeasurement = sampleCategoryWeight; -// -// if (weight != null) { -// -// // on converse toujours les poids le plus fin -// weightMeasurement = weight; -// } -// -//// Float weightMeasurement = null; -//// if (weight == null && sampleCategoryWeight != null) { -//// weightMeasurement = sampleCategoryWeight; -//// -//// } else if (weight != null && sampleCategoryWeight == null) { -//// weightMeasurement = weight; -//// } -//// -//// if (sampleCategoryWeight != null && weight != null) { -//// weightMeasurement = weight; -//// } -// -// Collection<QuantificationMeasurement> quantificationMeasurements = target.getQuantificationMeasurements(); -// Set<QuantificationMeasurement> notChangedQuantificationMeasurements = Sets.newHashSet(); -// if (quantificationMeasurements != null) { -// notChangedQuantificationMeasurements.addAll(quantificationMeasurements); -// } -// -// if (weightMeasurement != null) { -// QuantificationMeasurement quantificationMeasurement = measurementPersistenceHelper.setWeightMeasurementQuantificationMeasurement( -// target, -// weightMeasurement); -// notChangedQuantificationMeasurements.remove(quantificationMeasurement); -// } -// -// if (quantificationMeasurements != null) { -// quantificationMeasurements.removeAll(notChangedQuantificationMeasurements); -// } -// } - // --- Sorting measurement --- // { Collection<SortingMeasurement> sortingMeasurements = target.getSortingMeasurements(); @@ -829,10 +789,6 @@ public class BatchPersistenceHelper extends AbstractPersistenceService { return value; } - //------------------------------------------------------------------------// - //-- Internal methods --// - //------------------------------------------------------------------------// - /** * Check if the given {@code sortingBatch} is a frequency one. * <p/> diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/BatchTreeHelper.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/BatchTreeHelper.java index c54c555..8019173 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/BatchTreeHelper.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/BatchTreeHelper.java @@ -613,40 +613,6 @@ public class BatchTreeHelper extends AbstractPersistenceService { setWeightAndSampleRatio(result, weight, weightBeforeSampling); -// // --- QuantificationMeasurement --- // -// -// Collection<QuantificationMeasurement> quantificationMeasurements = result.getQuantificationMeasurements(); -// Set<QuantificationMeasurement> notChangedQuantificationMeasurements = Sets.newHashSet(); -// if (quantificationMeasurements != null) { -// notChangedQuantificationMeasurements.addAll(quantificationMeasurements); -// } -// -// Float batchReferenceWeight = weightBeforeSampling; -// if (weight != null) { -// batchReferenceWeight = weight; -// } -// -// if (batchReferenceWeight != null) { -// QuantificationMeasurement quantificationMeasurement = measurementPersistenceHelper.setWeightMeasurementQuantificationMeasurement( -// result, -// batchReferenceWeight); -// notChangedQuantificationMeasurements.remove(quantificationMeasurement); -// } -// -//// if (weightBeforeSampling != null || weight != null) { -//// Float batchReferenceWeight = weight; -//// if (batchReferenceWeight == null) { -//// batchReferenceWeight = weightBeforeSampling; -//// } -//// QuantificationMeasurement quantificationMeasurement = measurementPersistenceHelper.setWeightMeasurementQuantificationMeasurement( -//// result, -//// batchReferenceWeight); -//// notChangedQuantificationMeasurements.remove(quantificationMeasurement); -//// } -// if (quantificationMeasurements != null) { -// quantificationMeasurements.removeAll(notChangedQuantificationMeasurements); -// } - return result; } @@ -669,10 +635,6 @@ public class BatchTreeHelper extends AbstractPersistenceService { ToStringBuilder builder = new ToStringBuilder(batch, style); builder.append("id", batch.getId()); builder.append("rankOrder", batch.getRankOrder()); -// builder.append("level", level); -// if (batch.getParentBatch() != null) { -// builder.append("parentId", batch.getParentBatch().getId()); -// } if (batch instanceof CatchBatch) { CatchBatch catchBatch = (CatchBatch) batch; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.