[Observe-commits] 01/02: chargement des objets flottants (refs #7553)

5 Oct 2015

This is an automated email from the git hooks/post-receive script.

New commit to branch feature/7553 in repository observe.

See http://git.codelutin.com/observe.git

commit 2248f2570efe180aa04ae10457f1540ad4ebffd1
Author: Kevin Morin <morin@codelutin.com>
Date:   Fri Oct 2 11:47:19 2015 +0200

    chargement des objets flottants (refs #7553)
---
 .../open/impl/seine/ActivitySeineUIHandler.java    | 35 +++++++++++-----------
 .../open/impl/seine/ActivitySeineUIModel.java      | 11 ++++---
 .../tree/loadors/ActivitySeineNodeChildLoador.java | 15 +++++-----
 .../v1/seine/FloatingObjectServiceController.java  |  8 ++---
 .../service/seine/FloatingObjectService.java       |  6 ++--
 .../service/seine/FloatingObjectServiceTopia.java  | 29 ++++++++++++++----
 6 files changed, 59 insertions(+), 45 deletions(-)

diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java
index a6435d5..52161f7 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java
@@ -21,30 +21,29 @@
  */
 package fr.ird.observe.ui.content.open.impl.seine;
 
+import fr.ird.observe.ObserveSwingApplicationContext;
 import fr.ird.observe.business.db.DataContext;
-
-
 import fr.ird.observe.business.db.constants.DataContextType;
 import fr.ird.observe.db.ObserveSwingDataSource;
+import fr.ird.observe.services.dto.ReferenceDto;
+import fr.ird.observe.services.dto.ReferenceSetDto;
+import fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDto;
 import fr.ird.observe.services.dto.seine.ActivitySeineDto;
 import fr.ird.observe.services.dto.seine.RouteDto;
 import fr.ird.observe.services.dto.seine.TripSeineDto;
+import fr.ird.observe.services.service.ReferentialService;
 import fr.ird.observe.ui.content.ContentMode;
 import fr.ird.observe.ui.content.ContentUIModel;
 import fr.ird.observe.ui.content.open.ContentOpenableUIHandler;
-import jaxx.runtime.swing.ErrorDialogUI;
 import jaxx.runtime.validator.swing.SwingValidatorMessage;
 import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.nuiton.util.DateUtil;
 import org.nuiton.validator.NuitonValidatorScope;
 
 import javax.swing.event.TableModelEvent;
 import javax.swing.event.TableModelListener;
-import java.util.Date;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Set;
 
 import static org.nuiton.i18n.I18n.n;
@@ -425,18 +424,18 @@ public class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySei
 
     public String getActivity6Label() {
 
-        //FIXME
-//        try {
-//            List<VesselActivitySeine> activitys = getDataService().getList(getDataSource(), VesselActivitySeine.class);
-//            for (VesselActivitySeine a : activitys) {
-//                if (ActivitySeineImpl.ACTIVITY_FIN_DE_PECHE.equals(a.getCode())) {
-//                    String label = getDecoratorService().decorate(a);
-//                    return label;
-//                }
-//            }
-//        } catch (DataSourceException ex) {
-//            ErrorDialogUI.showError(ex);
-//        }
+        ReferentialService service = ObserveSwingApplicationContext.get().newService(ReferentialService.class);
+        ReferenceSetDto<VesselActivitySeineDto> activities = service.getReferentialReferenceSet(VesselActivitySeineDto.class);
+
+        for (ReferenceDto vesselActivity : activities.getReference()) {
+            //FIXME
+//                if (ActivitySeineDto.ACTIVITY_FIN_DE_PECHE.equals(a.getCode())) {
+            if ("6".equals(vesselActivity.getPropertyValue(VesselActivitySeineDto.PROPERTY_CODE))) {
+                String label = getDecoratorService().decorate(VesselActivitySeineDto.class.getSimpleName(),
+                                                              vesselActivity);
+                return label;
+            }
+        }
         throw new IllegalStateException(t("observe.error.no.activity.6"));
     }
 
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIModel.java
index cbb7e4b..648a1f0 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIModel.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIModel.java
@@ -24,13 +24,10 @@ package fr.ird.observe.ui.content.open.impl.seine;
 
 import com.google.common.collect.ImmutableSet;
 import fr.ird.observe.business.BinderService;
-import fr.ird.observe.services.dto.referential.ReferentialReferenceDto;
-import fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDto;
 import fr.ird.observe.services.dto.seine.ActivitySeineDto;
 import fr.ird.observe.ui.content.open.ContentOpenableUIModel;
 import org.nuiton.util.beans.BinderModelBuilder;
 
-import java.io.Serializable;
 import java.util.Set;
 
 /**
@@ -99,9 +96,11 @@ public class ActivitySeineUIModel extends ContentOpenableUIModel<ActivitySeineDt
     }
 
     public boolean isChangedZoneOperation() {
-        ReferentialReferenceDto<VesselActivitySeineDto> vesselActivitySeine = bean.getVesselActivitySeine();
-        Serializable code = vesselActivitySeine.getPropertyValue(VesselActivitySeineDto.PROPERTY_CODE);
-        return vesselActivitySeine != null && ACTIVITY_CHANGED_ZONE.equals(code);
+        //FIXME
+//        ReferentialReferenceDto<VesselActivitySeineDto> vesselActivitySeine = bean.getVesselActivitySeine();
+//        Serializable code = vesselActivitySeine.getPropertyValue(VesselActivitySeineDto.PROPERTY_CODE);
+//        return vesselActivitySeine != null && ACTIVITY_CHANGED_ZONE.equals(code);
+        return false;
     }
 
     @Override
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivitySeineNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivitySeineNodeChildLoador.java
index 8aa8449..6e98c4c 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivitySeineNodeChildLoador.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivitySeineNodeChildLoador.java
@@ -21,19 +21,22 @@
  */
 package fr.ird.observe.ui.tree.loadors;
 
-import fr.ird.observe.db.ObserveSwingDataSource;
+import fr.ird.observe.ObserveSwingApplicationContext;
 import fr.ird.observe.services.dto.ReferenceDto;
+import fr.ird.observe.services.dto.ReferenceDtos;
+import fr.ird.observe.services.dto.ReferenceSetDto;
 import fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDto;
 import fr.ird.observe.services.dto.seine.FloatingObjectDto;
 import fr.ird.observe.services.dto.seine.SetSeineDto;
+import fr.ird.observe.services.service.seine.FloatingObjectService;
 import fr.ird.observe.ui.tree.FloatingObjectSeineNode;
-import fr.ird.observe.ui.tree.ObserveDataProvider;
 import fr.ird.observe.ui.tree.ObserveNode;
 import fr.ird.observe.ui.tree.ObserveTreeHelper;
 import fr.ird.observe.ui.tree.SetSeineNode;
 import jaxx.runtime.swing.nav.NavDataProvider;
 import jaxx.runtime.swing.nav.tree.NavTreeBridge;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import static org.nuiton.i18n.I18n.n;
@@ -115,12 +118,10 @@ public class ActivitySeineNodeChildLoador extends AbstractReferenceDtoChildLoado
                                         String parentId,
                                         NavDataProvider dataProvider) throws Exception {
 
-        ObserveSwingDataSource dataSource = ((ObserveDataProvider) dataProvider).getDataSource();
-        //FIXME
-//        List<FloatingObject> data = getDataService().getFloatinObjectStubByActivitySeine(dataSource, parentId);
-//        return data;
-        return null;
+        FloatingObjectService service = ObserveSwingApplicationContext.get().newService(FloatingObjectService.class);
+        ReferenceSetDto<FloatingObjectDto> floatingObjectByActivitySeine = service.getFloatingObjectByActivitySeine(parentId);
 
+        return new ArrayList<>(ReferenceDtos.castToCollectionOfReferenceDto(floatingObjectByActivitySeine.getReference()));
     }
 
 }
diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/FloatingObjectServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/FloatingObjectServiceController.java
index a819989..aad77db 100644
--- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/FloatingObjectServiceController.java
+++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/FloatingObjectServiceController.java
@@ -24,12 +24,10 @@ package fr.ird.observe.application.web.controller.v1.seine;
 
 import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport;
 import fr.ird.observe.services.dto.FormDto;
+import fr.ird.observe.services.dto.ReferenceSetDto;
 import fr.ird.observe.services.dto.seine.FloatingObjectDto;
-import fr.ird.observe.services.dto.seine.FloatingObjectStubDto;
 import fr.ird.observe.services.service.seine.FloatingObjectService;
 
-import java.util.List;
-
 /**
  * @author Sylvain Bavencoff - bavencoff@codelutin.com
  */
@@ -40,8 +38,8 @@ public class FloatingObjectServiceController extends ObserveAuthenticatedService
     }
 
     @Override
-    public List<FloatingObjectStubDto> getFloatingObjectStubByActivitySeine(String activitySeineId) {
-        return service.getFloatingObjectStubByActivitySeine(activitySeineId);
+    public ReferenceSetDto<FloatingObjectDto> getFloatingObjectByActivitySeine(String activitySeineId) {
+        return service.getFloatingObjectByActivitySeine(activitySeineId);
     }
 
     @Override
diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectService.java
index 424aa7d..f34a186 100644
--- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectService.java
+++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectService.java
@@ -24,23 +24,21 @@ package fr.ird.observe.services.service.seine;
 
 import fr.ird.observe.services.ObserveService;
 import fr.ird.observe.services.dto.FormDto;
+import fr.ird.observe.services.dto.ReferenceSetDto;
 import fr.ird.observe.services.dto.seine.FloatingObjectDto;
-import fr.ird.observe.services.dto.seine.FloatingObjectStubDto;
 import fr.ird.observe.services.spi.DeleteRequest;
 import fr.ird.observe.services.spi.PostRequest;
 import fr.ird.observe.services.spi.ReadDataPermission;
 import fr.ird.observe.services.spi.Write;
 import fr.ird.observe.services.spi.WriteDataPermission;
 
-import java.util.List;
-
 /**
  * @author Sylvain Bavencoff - bavencoff@codelutin.com
  */
 public interface FloatingObjectService extends ObserveService {
 
     @ReadDataPermission
-    List<FloatingObjectStubDto> getFloatingObjectStubByActivitySeine(String activitySeineId);
+    ReferenceSetDto<FloatingObjectDto> getFloatingObjectByActivitySeine(String activitySeineId);
 
     @ReadDataPermission
     FormDto<FloatingObjectDto> loadToRead(String floatingObjectId);
diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectServiceTopia.java
index de441c3..529467b 100644
--- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectServiceTopia.java
+++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectServiceTopia.java
@@ -23,32 +23,35 @@ package fr.ird.observe.services.service.seine;
  */
 
 import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
 import fr.ird.observe.entities.constants.ReferenceLocale;
 import fr.ird.observe.entities.seine.ActivitySeine;
 import fr.ird.observe.entities.seine.FloatingObject;
 import fr.ird.observe.services.ObserveServiceTopia;
 import fr.ird.observe.services.dto.FormDto;
+import fr.ird.observe.services.dto.ReferenceDto;
+import fr.ird.observe.services.dto.ReferenceDtos;
+import fr.ird.observe.services.dto.ReferenceSetDto;
+import fr.ird.observe.services.dto.ReferenceSetDtos;
 import fr.ird.observe.services.dto.seine.ActivitySeineDto;
 import fr.ird.observe.services.dto.seine.FloatingObjectDto;
 import fr.ird.observe.services.dto.seine.FloatingObjectStubDto;
 import fr.ird.observe.services.service.DataNotFoundException;
 
-import java.util.List;
+import java.util.LinkedHashSet;
 
 /**
  * @author Sylvain Bavencoff - bavencoff@codelutin.com
  */
 public class FloatingObjectServiceTopia extends ObserveServiceTopia implements FloatingObjectService {
 
-
     @Override
-    public List<FloatingObjectStubDto> getFloatingObjectStubByActivitySeine(String activitySeineId) {
+    public ReferenceSetDto<FloatingObjectDto> getFloatingObjectByActivitySeine(String activitySeineId) {
 
         ReferenceLocale referenceLocale = getReferenceLocale();
 
         ActivitySeine activitySeine = loadEntity(ActivitySeineDto.class, ActivitySeine.class, activitySeineId);
 
-        List<FloatingObjectStubDto> stubs = Lists.newLinkedList();
 
         for(FloatingObject floatingObject : activitySeine.getFloatingObject()) {
 
@@ -58,7 +61,23 @@ public class FloatingObjectServiceTopia extends ObserveServiceTopia implements F
 
         }
 
-        return stubs;
+        LinkedHashSet<ReferenceDto<FloatingObjectDto>> stubs = Sets.newLinkedHashSet();
+
+        for (FloatingObject floatingObject : activitySeine.getFloatingObject()) {
+
+            ReferenceDto<FloatingObjectDto> stub = ReferenceDtos.newReferenceDto(FloatingObjectDto.class,
+                                                                                 Lists.newArrayList(FloatingObjectDto.PROPERTY_ID,
+                                                                                                    FloatingObjectDto.PROPERTY_OBJECT_TYPE));
+
+            stub.setId(floatingObject.getTopiaId());
+            stub.setPropertyValue(FloatingObjectDto.PROPERTY_OBJECT_TYPE, referenceLocale.getLabel(floatingObject.getObjectType()));
+
+            stubs.add(stub);
+
+        }
+
+        ReferenceSetDto<FloatingObjectDto> result = ReferenceSetDtos.newReferenceSetDto(FloatingObjectDto.class, stubs, null);
+        return result;
     }
 
     @Override

-- 
To stop receiving notification emails like this one, please contact
codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.

    

[Observe-commits] 01/02: chargement des objets flottants (refs #7553)

codelutin.com scm