This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 18f6d90066868c465a56b2a501e1205560a65847 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Sep 24 19:26:43 2015 +0200 Fix merge --- .../ui/content/impl/seine/FloatingObjectUIHandler.java | 11 ----------- .../ird/observe/ui/content/impl/seine/SetSeineUIHandler.java | 11 ----------- 2 files changed, 22 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIHandler.java index 5314afd..7fef2ec 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIHandler.java @@ -24,7 +24,6 @@ package fr.ird.observe.ui.content.impl.seine; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.constants.DataContextType; -import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.services.service.seine.FloatingObjectService; @@ -214,16 +213,6 @@ public class FloatingObjectUIHandler extends ContentUIHandler<FloatingObjectDto> } } - @Override - protected FormDto<FloatingObjectDto> loadToEdit(String id) { - return null; - } - - @Override - protected FormDto<FloatingObjectDto> loadToReadDto(String id) { - return null; - } - protected boolean doDelete(FloatingObjectDto bean) throws Exception { if (askToDelete(bean)) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java index 3b17d4f..8dd1f8d 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java @@ -24,7 +24,6 @@ package fr.ird.observe.ui.content.impl.seine; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.constants.DataContextType; -import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.constants.seine.SchoolType; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.SetSeineDto; @@ -347,16 +346,6 @@ public class SetSeineUIHandler extends ContentUIHandler<SetSeineDto> { } } - @Override - protected FormDto<SetSeineDto> loadToEdit(String id) { - return null; - } - - @Override - protected FormDto<SetSeineDto> loadToReadDto(String id) { - return null; - } - protected boolean doDelete(SetSeineDto bean) throws Exception { if (askToDelete(bean)) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.