[tutti] branch develop updated (02fb1cb -> 8d6645d)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 02fb1cb fixes #5790: [TECHNIQUE] Ajout d'une option pour voir la structure des lots dans les logs new 49c3cff clean code new 8d6645d fix developer ids + use codelutinpom stable and jaxx snapshot 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 8d6645dea46a2437d3dc132468cbb9049c1a0dfe Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Sep 15 11:06:11 2014 +0200 fix developer ids + use codelutinpom stable and jaxx snapshot commit 49c3cff1c298fc0e09ea4ffd870722ebf9c3d07a Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Sep 13 08:53:11 2014 +0200 clean code Summary of changes: pom.xml | 8 ++-- .../service/util/BatchPersistenceHelper.java | 44 ---------------------- .../persistence/service/util/BatchTreeHelper.java | 38 ------------------- 3 files changed, 4 insertions(+), 86 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 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>.
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 8d6645dea46a2437d3dc132468cbb9049c1a0dfe Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Sep 15 11:06:11 2014 +0200 fix developer ids + use codelutinpom stable and jaxx snapshot --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 4919ea4..036fe82 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>codelutinpom</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.3</version> </parent> <groupId>fr.ifremer</groupId> @@ -56,7 +56,7 @@ <developers> <developer> - <id>chemit</id> + <id>tchemit</id> <name>Tony Chemit</name> <email>chemit@codelutin.com</email> <organization>CodeLutin</organization> @@ -67,7 +67,7 @@ <timezone>Europe/Paris</timezone> </developer> <developer> - <id>morin</id> + <id>kmorin</id> <name>Kevin Morin</name> <email>morin@codelutin.com</email> <organization>CodeLutin</organization> @@ -132,7 +132,7 @@ <nuitonI18nVersion>3.3</nuitonI18nVersion> <nuitonValidatorVersion>3.0-rc-2</nuitonValidatorVersion> <eugenePluginVersion>2.13</eugenePluginVersion> - <jaxxVersion>2.12</jaxxVersion> + <jaxxVersion>2.13-SNAPSHOT</jaxxVersion> <swingXVersion>1.6.4</swingXVersion> <slf4jVersion>1.7.7</slf4jVersion> <adagioVersion>3.6.3-SNAPSHOT</adagioVersion> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm