This is an automated email from the git hooks/post-receive script. New commit to branch feature/6688 in repository tutti. See http://git.codelutin.com/tutti.git commit 21abd49cb17fea2b1d5c8f9f0402a43485bc1008 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Feb 21 16:12:14 2015 +0100 add fishingOperation on SpeciesAbleBatch + usefull method to create one from his parent --- .../entities/data/SpeciesAbleBatchs.java | 37 ++++++++++++++++----- .../src/main/xmi/tutti-persistence.zargo | Bin 58181 -> 58384 bytes 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SpeciesAbleBatchs.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SpeciesAbleBatchs.java index 0277f23..f388142 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SpeciesAbleBatchs.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SpeciesAbleBatchs.java @@ -49,22 +49,43 @@ public class SpeciesAbleBatchs { } - public static <B extends SpeciesAbleBatch> void setChildBatchs(B target, List<B> targetChilds) { + public static <B extends SpeciesAbleBatch> B createNewChild(B parent) { - if (target instanceof SpeciesBatch) { - ((SpeciesBatch) target).setChildBatchs((List<SpeciesBatch>) targetChilds); + B child = newInstance(parent); + child.setFishingOperation(parent.getFishingOperation()); + child.setSpecies(parent.getSpecies()); + SpeciesAbleBatchs.setParentBatch(parent, child); + SpeciesAbleBatchs.addChildBatch(parent, child); + return child; + + } + + public static <B extends SpeciesAbleBatch> void setChildBatchs(B parent, List<B> childs) { + + if (parent instanceof SpeciesBatch) { + ((SpeciesBatch) parent).setChildBatchs((List<SpeciesBatch>) childs); + } else { + ((BenthosBatch) parent).setChildBatchs((List<BenthosBatch>) childs); + } + + } + + public static <B extends SpeciesAbleBatch> void setParentBatch(B parent, B child) { + + if (parent instanceof SpeciesBatch) { + ((SpeciesBatch) child).setParentBatch((SpeciesBatch) parent); } else { - ((BenthosBatch) target).setChildBatchs((List<BenthosBatch>) targetChilds); + ((BenthosBatch) child).setParentBatch((BenthosBatch) parent); } } - public static <B extends SpeciesAbleBatch> void setParentBatch(B target, B targetChild) { + public static <B extends SpeciesAbleBatch> void addChildBatch(B child, B parent) { - if (target instanceof SpeciesBatch) { - ((SpeciesBatch) targetChild).setParentBatch((SpeciesBatch) target); + if (child instanceof SpeciesBatch) { + ((SpeciesBatch) parent).addChildBatchs((SpeciesBatch) child); } else { - ((BenthosBatch) targetChild).setParentBatch((BenthosBatch) target); + ((BenthosBatch) parent).addChildBatchs((BenthosBatch) child); } } diff --git a/tutti-persistence/src/main/xmi/tutti-persistence.zargo b/tutti-persistence/src/main/xmi/tutti-persistence.zargo index 62ab6db..ef953ba 100644 Binary files a/tutti-persistence/src/main/xmi/tutti-persistence.zargo and b/tutti-persistence/src/main/xmi/tutti-persistence.zargo differ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.