branch develop updated (9b591df -> 26b3b39)
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 9b591df [jgitflow-maven-plugin]Updating develop poms back to pre merge state new ffa1c92 Move to codelutinpom 3 new 26b3b39 Ne pas conserve en cache le modèle de catégorisation (termine #7253) 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 26b3b399cc8a3e82ea391d31ea3af357b7b4dee5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 24 15:13:00 2015 +0200 Ne pas conserve en cache le modèle de catégorisation (termine #7253) commit ffa1c92d6aacdbccb39a03c4e6445338a2ef3634 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 24 15:10:35 2015 +0200 Move to codelutinpom 3 Summary of changes: pom.xml | 11 +---------- .../ifremer/tutti/service/catches/WeightComputingService.java | 8 ++------ 2 files changed, 3 insertions(+), 16 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 ffa1c92d6aacdbccb39a03c4e6445338a2ef3634 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 24 15:10:35 2015 +0200 Move to codelutinpom 3 --- pom.xml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index 497b3ac..ed88090 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>codelutinpom</artifactId> - <version>2.3</version> + <version>3</version> </parent> <groupId>fr.ifremer</groupId> @@ -121,15 +121,6 @@ <projectId>tutti</projectId> - <!-- Java version --> - <javaVersion>1.7</javaVersion> - <!--TODO remove this when idea won't ask to change jdk level at each pom modification--> - <maven.compiler.source>${javaVersion}</maven.compiler.source> - <!--TODO remove this when idea won't ask to change jdk level at each pom modification--> - <maven.compiler.target>${javaVersion}</maven.compiler.target> - <signatureArtifactId>java17</signatureArtifactId> - <signatureVersion>1.0</signatureVersion> - <!-- libraries version --> <nuitonI18nVersion>3.3</nuitonI18nVersion> <nuitonValidatorVersion>3.0</nuitonValidatorVersion> -- 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 26b3b399cc8a3e82ea391d31ea3af357b7b4dee5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 24 15:13:00 2015 +0200 Ne pas conserve en cache le modèle de catégorisation (termine #7253) --- .../fr/ifremer/tutti/service/catches/WeightComputingService.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightComputingService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightComputingService.java index 3e2128b..adc8e66 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightComputingService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightComputingService.java @@ -27,7 +27,6 @@ import fr.ifremer.tutti.persistence.entities.data.BenthosBatch; import fr.ifremer.tutti.persistence.entities.data.BenthosBatchFrequency; import fr.ifremer.tutti.persistence.entities.data.CatchBatch; import fr.ifremer.tutti.persistence.entities.data.MarineLitterBatch; -import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModelEntry; import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; import fr.ifremer.tutti.persistence.entities.data.SpeciesBatchFrequency; @@ -59,15 +58,12 @@ public class WeightComputingService extends AbstractTuttiService { protected DecoratorService decoratorService; - protected SampleCategoryModel sampleCategoryModel; - @Override public void setServiceContext(TuttiServiceContext context) { super.setServiceContext(context); persistenceService = getService(PersistenceService.class); validationService = getService(ValidationService.class); - decoratorService = getService(DecoratorService.class); - sampleCategoryModel = context.getSampleCategoryModel(); + decoratorService = getService(DecoratorService.class);; } /** @@ -304,7 +300,7 @@ public class WeightComputingService extends AbstractTuttiService { protected String getCategoryLabel(Integer sampleCategoryId) { SampleCategoryModelEntry category = - sampleCategoryModel.getCategoryById(sampleCategoryId); + context.getSampleCategoryModel().getCategoryById(sampleCategoryId); String result = category.getLabel(); return result; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm