This is an automated email from the git hooks/post-receive script. New commit to branch feature/7609 in repository observe. See http://git.codelutin.com/observe.git commit d928d248e49c637c93ef843069a24696d129300c Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Oct 21 11:23:18 2015 +0200 merge du model suite au rebase sur develop (refs #7609) --- .../table/impl/seine/NonTargetCatchUIHandler.java | 9 --------- .../src/main/xmi/observe-services-dto-seine.zargo | Bin 61461 -> 61805 bytes 2 files changed, 9 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUIHandler.java index 2d864f0..0d3e5f9 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUIHandler.java @@ -36,14 +36,12 @@ import fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto; import fr.ird.observe.services.dto.referential.seine.SpeciesFateDto; import fr.ird.observe.services.dto.seine.NonTargetCatchDto; import fr.ird.observe.services.dto.seine.NonTargetCatchDtos; -import fr.ird.observe.services.dto.seine.NonTargetLengthDto; import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchDto; import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchDtos; import fr.ird.observe.services.service.seine.NonTargetCatchService; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.table.ContentTableModel; import fr.ird.observe.ui.content.table.ContentTableUIHandler; -import jaxx.runtime.context.JAXXContextEntryDef; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; @@ -69,13 +67,6 @@ public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeineNonTa /** Logger */ static private Log log = LogFactory.getLog(NonTargetCatchUIHandler.class); - /** l'entrée dans le contexte pour récupérer la liste complete des speciess */ - protected final JAXXContextEntryDef<List<SpeciesDto>> ALL_ESPECES_ENTRY = - UIHelper.newListContextEntryDef("NonTargetCatchUI-all-speciess"); - - protected final JAXXContextEntryDef<List<NonTargetLengthDto>> ALL_TAILLES_TO_DELETE_ENTRY = - UIHelper.newListContextEntryDef("NonTargetCatchUI-all-taille-to-delete"); - /** * Ecoute les modifications de la propriété {@link NonTargetCatchDto#getTotalCount()}, * et repasser alors le flag {@link NonTargetCatchDto#getTotalCountComputedSource()} à diff --git a/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo b/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo index b801974..15adf22 100644 Binary files a/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo and b/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo differ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.