This is an automated email from the git hooks/post-receive script. New commit to branch feature/7600-PS-VerifOperationSurObjetFlottant in repository tutti. See http://git.codelutin.com/tutti.git commit e2b4792b01ba0229868558a9455969289cb20f30 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Mar 7 15:10:51 2016 +0100 vider les champs au changement de type d'opération --- .../FloatingObjectTransmittingBuoyOperationUIHandler.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java index bd40ea3..0d4681c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java @@ -274,10 +274,10 @@ public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIH case 1: - //FIXME transmittingBuoy = reset ? null : objets.get(0); objectOperation = reset ? getObjectOperation(operations, codeOperations[0]) : null; + bindEditBalise(ui.getTransmittingBuoy1(), objectOperation, transmittingBuoy); editorPanel.setLayout(new GridLayout(1, 0)); @@ -289,7 +289,7 @@ public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIH break; case 2: - //FIXME + transmittingBuoy = reset ? null : objets.get(0); objectOperation = reset ? getObjectOperation(operations, codeOperations[0]) : null; bindEditBalise(ui.getTransmittingBuoy1(), objectOperation, transmittingBuoy); @@ -323,11 +323,10 @@ public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIH ReferentialReference<TransmittingBuoyOperationDto> transmittingBuoyOperation, TransmittingBuoyDto transmittingBuoy) { - //FIXME -// getModel().getChildLoador().load(transmittingBuoy, editBean, false); - if (transmittingBuoy == null) { + TransmittingBuoyDtos.copyTransmittingBuoyDto(new TransmittingBuoyDto(), editBean); + editBean.setTransmittingBuoyOperation(transmittingBuoyOperation); if (log.isDebugEnabled()) { @@ -341,6 +340,11 @@ public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIH // toujours appartient au navire editBean.setOwnership(Ownership.ceVessel); } + + } else { + + TransmittingBuoyDtos.copyTransmittingBuoyDto(editBean, transmittingBuoy); + } FloatingObjectTransmittingBuoyDto bean = getBean(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.