[tutti] branch feature/5842 updated (3cd4263 -> 07977ca)
This is an automated email from the git hooks/post-receive script. New change to branch feature/5842 in repository tutti. See http://git.codelutin.com/tutti.git from 3cd4263 refs #5842 use adagio 3.6.4 (fix catch batch loading) + remove quantification measurement at synchronize action operation + foacotrize code between speciesBatch and benthosBatch new 07977ca refs #5842 fix build The 1 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 07977cae0583f412928ab41e5aacba9291903f02 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Oct 21 16:32:35 2014 +0200 refs #5842 fix build Summary of changes: .../content/operation/catches/benthos/BenthosBatchRowModel.java | 8 +++++++- .../content/operation/catches/species/SpeciesBatchRowModel.java | 7 ++++++- 2 files changed, 13 insertions(+), 2 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 feature/5842 in repository tutti. See http://git.codelutin.com/tutti.git commit 07977cae0583f412928ab41e5aacba9291903f02 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Oct 21 16:32:35 2014 +0200 refs #5842 fix build --- .../content/operation/catches/benthos/BenthosBatchRowModel.java | 8 +++++++- .../content/operation/catches/species/SpeciesBatchRowModel.java | 7 ++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchRowModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchRowModel.java index 0746823..4ab6c92 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchRowModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchRowModel.java @@ -33,6 +33,7 @@ import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.SampleCategory; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModelEntry; +import fr.ifremer.tutti.persistence.entities.data.SpeciesAbleBatch; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.ui.swing.content.operation.catches.SampleCategoryAble; @@ -439,7 +440,7 @@ public class BenthosBatchRowModel extends AbstractTuttiBeanUIModel<BenthosBatch, } @Override - public void setChildBatchs(List<BenthosBatch> childBatchs) { + public void setChildBatchs(List childBatchs) { } @Override @@ -452,6 +453,11 @@ public class BenthosBatchRowModel extends AbstractTuttiBeanUIModel<BenthosBatch, editObject.setRankOrder(rankOrder); } + @Override + public void setParentBatch(SpeciesAbleBatch parentBatch) { + + } + //------------------------------------------------------------------------// //-- SampleCategoryAble --// //------------------------------------------------------------------------// diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchRowModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchRowModel.java index 3aae78b..f634fd7 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchRowModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchRowModel.java @@ -30,6 +30,7 @@ import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.SampleCategory; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModelEntry; +import fr.ifremer.tutti.persistence.entities.data.SpeciesAbleBatch; import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; import fr.ifremer.tutti.persistence.entities.data.SpeciesBatchFrequency; import fr.ifremer.tutti.persistence.entities.data.SpeciesBatchs; @@ -428,7 +429,7 @@ public class SpeciesBatchRowModel extends AbstractTuttiBeanUIModel<SpeciesBatch, } @Override - public void setChildBatchs(List<SpeciesBatch> childBatchs) { + public void setChildBatchs(List childBatchs) { } @Override @@ -441,6 +442,10 @@ public class SpeciesBatchRowModel extends AbstractTuttiBeanUIModel<SpeciesBatch, editObject.setRankOrder(rankOrder); } + @Override + public void setParentBatch(SpeciesAbleBatch parentBatch) { + } + //------------------------------------------------------------------------// //-- SampleCategoryAble --// //------------------------------------------------------------------------// -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm