From scm@users.codelutin.com Thu Oct 22 10:35:58 2015
From: "codelutin.com scm" <scm@users.codelutin.com>
To: observe-commits@list.forge.codelutin.com
Subject: [Observe-commits]  01/04: migration des =?utf-8?q?=C3=A9crans?= des
 capteurs pour les palangre (refs #7619)
Date: Thu, 22 Oct 2015 10:35:59 +0200
Message-ID: <20151022083558.808695C1277@goh.codelutin.com>
In-Reply-To: <20151022083558.8793.25359@bihar.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5710527915096649697=="

--===============5710527915096649697==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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 4bbd9ebec65925be085ee7fadf4e14870d18e861
Author: Sylvain Bavencoff <bavencoff@codelutin.com>
Date:   Thu Oct 22 10:27:14 2015 +0200

    migration des =C3=A9crans des capteurs pour les palangre (refs #7619)
---
 .../content/table/impl/longline/SensorUsedUI.jaxx  | 12 +++----
 .../table/impl/longline/SensorUsedUIHandler.java   | 39 +++++++++-----------=
--
 .../table/impl/longline/SensorUsedUIModel.java     | 35 ++++++++++++++-----
 ...ctivityLongLineSensorUsedServiceController.java |  5 +--
 .../ActivityLongLineSensorUsedService.java         |  3 +-
 .../ActivityLongLineSensorUsedServiceTopia.java    |  8 +++--
 6 files changed, 58 insertions(+), 44 deletions(-)

diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/conten=
t/table/impl/longline/SensorUsedUI.jaxx b/observe-application-swing/src/main/=
java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUI.jaxx
index 2cf644c..92599e3 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table=
/impl/longline/SensorUsedUI.jaxx
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table=
/impl/longline/SensorUsedUI.jaxx
@@ -21,19 +21,17 @@
   -->
=20
 <fr.ird.observe.ui.content.table.ContentTableUI
-  superGenericType=3D'ActivityLonglineDto, SensorUsedDto'
+  superGenericType=3D'ActivityLonglineSensorUsedDto, SensorUsedDto'
   contentTitle=3D'{n("observe.sensorUsed.title")}'
   saveNewEntryText=3D'{n("observe.sensorUsed.action.create")}'
-  saveNewEntryTip=3D'{n("observe.sensorUsed.action.create.tip")}'
-
-  >
+  saveNewEntryTip=3D'{n("observe.sensorUsed.action.create.tip")}'>
=20
   <style source=3D"../../CommonTable.css"/>
=20
   <import>
     fr.ird.observe.services.dto.ReferenceDto
     fr.ird.observe.services.dto.CommentableDto
-    fr.ird.observe.services.dto.longline.ActivityLonglineDto
+    fr.ird.observe.services.dto.longline.ActivityLonglineSensorUsedDto
     fr.ird.observe.services.dto.longline.SensorUsedDto
     fr.ird.observe.services.dto.referential.longline.SensorTypeDto
     fr.ird.observe.services.dto.referential.longline.SensorBrandDto
@@ -55,7 +53,7 @@
   <SensorUsedUIModel id=3D'model'/>
=20
   <!-- edit bean -->
-  <ActivityLonglineDto id=3D'bean'/>
+  <ActivityLonglineSensorUsedDto id=3D'bean'/>
=20
   <!-- table edit bean -->
   <SensorUsedDto id=3D'tableEditBean'/>
@@ -65,7 +63,7 @@
=20
   <!-- le validateur de l'=C3=A9cran -->
   <BeanValidator id=3D'validator' autoField=3D'true' context=3D'n1-update-se=
nsorUsed'
-                 beanClass=3D'fr.ird.observe.services.dto.longline.ActivityL=
onglineDto'
+                 beanClass=3D'fr.ird.observe.services.dto.longline.ActivityL=
onglineSensorUsedDto'
                  errorTableModel=3D'{getErrorTableModel()}'/>
=20
   <!-- le validateur d'une entr=C3=A9e de tableau -->
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/conten=
t/table/impl/longline/SensorUsedUIHandler.java b/observe-application-swing/sr=
c/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUIHandler=
.java
index 71e7cfd..3f4b5ab 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table=
/impl/longline/SensorUsedUIHandler.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table=
/impl/longline/SensorUsedUIHandler.java
@@ -29,13 +29,14 @@ import fr.ird.observe.ObserveSwingApplicationContext;
 import fr.ird.observe.ObserveSwingTechnicalException;
 import fr.ird.observe.business.db.constants.DataContextType;
 import fr.ird.observe.services.dto.FormDto;
-import fr.ird.observe.services.dto.longline.ActivityLonglineDto;
-import fr.ird.observe.services.dto.longline.ActivityLonglineDtos;
+import fr.ird.observe.services.dto.ReferenceDto;
+import fr.ird.observe.services.dto.longline.ActivityLonglineSensorUsedDto;
+import fr.ird.observe.services.dto.longline.ActivityLonglineSensorUsedDtos;
 import fr.ird.observe.services.dto.longline.SensorUsedDto;
 import fr.ird.observe.services.dto.referential.longline.SensorBrandDto;
 import fr.ird.observe.services.dto.referential.longline.SensorDataFormatDto;
 import fr.ird.observe.services.dto.referential.longline.SensorTypeDto;
-import fr.ird.observe.services.service.longline.ActivityLonglineService;
+import fr.ird.observe.services.service.longline.ActivityLongLineSensorUsedSe=
rvice;
 import fr.ird.observe.ui.ObserveMainUI;
 import fr.ird.observe.ui.UIHelper;
 import fr.ird.observe.ui.content.table.ContentTableUIHandler;
@@ -65,7 +66,7 @@ import static org.nuiton.i18n.I18n.t;
  * @author Tony Chemit - chemit@codelutin.com
  * @since 3.7
  */
-public class SensorUsedUIHandler extends ContentTableUIHandler<ActivityLongl=
ineDto, SensorUsedDto> {
+public class SensorUsedUIHandler extends ContentTableUIHandler<ActivityLongl=
ineSensorUsedDto, SensorUsedDto> {
=20
     /** Logger */
     static private Log log =3D LogFactory.getLog(SensorUsedUIHandler.class);
@@ -107,9 +108,9 @@ public class SensorUsedUIHandler extends ContentTableUIHa=
ndler<ActivityLonglineD
                                             n("observe.sensorUsed.table.data=
Location"),
                                             n("observe.sensorUsed.table.data=
Location.tip"));
=20
-        UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableC=
ellRenderer(renderer, SensorTypeDto.class));
-        UIHelper.setTableColumnRenderer(table, 1, UIHelper.newDecorateTableC=
ellRenderer(renderer, SensorBrandDto.class));
-        UIHelper.setTableColumnRenderer(table, 2, UIHelper.newDecorateTableC=
ellRenderer(renderer, SensorDataFormatDto.class));
+        UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableC=
ellRenderer(renderer, ReferenceDto.class, SensorTypeDto.class.getSimpleName()=
));
+        UIHelper.setTableColumnRenderer(table, 1, UIHelper.newDecorateTableC=
ellRenderer(renderer, ReferenceDto.class, SensorBrandDto.class.getSimpleName(=
)));
+        UIHelper.setTableColumnRenderer(table, 2, UIHelper.newDecorateTableC=
ellRenderer(renderer, ReferenceDto.class, SensorDataFormatDto.class.getSimple=
Name()));
         UIHelper.setTableColumnRenderer(table, 3, UIHelper.newStringTableCel=
lRenderer(renderer, 10, true));
         UIHelper.setTableColumnRenderer(table, 4, UIHelper.newBooleanTableCe=
llRenderer(renderer, new Predicate<Object>() {
             @Override
@@ -183,22 +184,14 @@ public class SensorUsedUIHandler extends ContentTableUI=
Handler<ActivityLonglineD
=20
     public void exportData() {
=20
-        //FIXME
-//        String filename;
-//        try {
-//            filename =3D getDataService().getSensorUsedDataFilename(getDat=
aSource(), getTableEditBean());
-//        } catch (DataSourceException e) {
-//            throw new ObserveTechnicalException("Could not obtain sensorUs=
er data export filename", e);
-//        }
+        String filename =3D getTableEditBean().getDataFilename();
=20
         File file =3D JaxxFileChooser
                 .forSaving()
                 .setParent(getUi())
                 .setTitle(t("observe.title.choose.sensorUsed.exportData"))
                 .setApprovalText(t("observe.action.choose.sensorUsed.exportD=
ata"))
-                        //FIXME
-//                .setFilename(filename)
-                .setFilename(null)
+                .setFilename(filename)
                 .setUseAcceptAllFileFilter(true)
                 .choose();
=20
@@ -235,19 +228,19 @@ public class SensorUsedUIHandler extends ContentTableUI=
Handler<ActivityLonglineD
     }
=20
     @Override
-    protected void doPersist(ActivityLonglineDto bean) {
-        getActivityLonglineService().save(getSelectedParentId(), bean);
+    protected void doPersist(ActivityLonglineSensorUsedDto bean) {
+        getActivityLonglineSensorUsedService().save(bean);
     }
=20
     @Override
     protected void loadEditBean(String beanId) {
-        FormDto<ActivityLonglineDto> formDto =3D getActivityLonglineService(=
).loadToEdit(beanId);
+        FormDto<ActivityLonglineSensorUsedDto> formDto =3D getActivityLongli=
neSensorUsedService().loadToEdit(beanId);
         getModel().setFormDto(formDto);
-        ActivityLonglineDtos.copyActivityLonglineDto(formDto.getForm(), getB=
ean());
+        ActivityLonglineSensorUsedDtos.copyActivityLonglineSensorUsedDto(for=
mDto.getForm(), getBean());
     }
=20
-    protected ActivityLonglineService getActivityLonglineService() {
-        return ObserveSwingApplicationContext.get().newService(ActivityLongl=
ineService.class);
+    protected ActivityLongLineSensorUsedService getActivityLonglineSensorUse=
dService() {
+        return ObserveSwingApplicationContext.get().newService(ActivityLongL=
ineSensorUsedService.class);
     }
=20
 }
\ No newline at end of file
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/conten=
t/table/impl/longline/SensorUsedUIModel.java b/observe-application-swing/src/=
main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUIModel.java
index 0516c35..48127fc 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table=
/impl/longline/SensorUsedUIModel.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table=
/impl/longline/SensorUsedUIModel.java
@@ -24,12 +24,15 @@ package fr.ird.observe.ui.content.table.impl.longline;
=20
 import com.google.common.collect.Lists;
 import fr.ird.observe.services.dto.longline.ActivityLonglineDto;
+import fr.ird.observe.services.dto.longline.ActivityLonglineSensorUsedDto;
 import fr.ird.observe.services.dto.longline.SensorUsedDto;
+import fr.ird.observe.services.dto.longline.SensorUsedDtos;
 import fr.ird.observe.ui.content.table.ContentTableMeta;
 import fr.ird.observe.ui.content.table.ContentTableModel;
 import fr.ird.observe.ui.content.table.ContentTableUIModel;
 import fr.ird.observe.ui.content.table.ObserveContentTableUI;
=20
+import java.util.Collection;
 import java.util.List;
=20
 /**
@@ -38,18 +41,17 @@ import java.util.List;
  * @author Tony Chemit - chemit@codelutin.com
  * @since 3.7
  */
-public class SensorUsedUIModel extends ContentTableUIModel<ActivityLonglineD=
to, SensorUsedDto> {
+public class SensorUsedUIModel extends ContentTableUIModel<ActivityLonglineS=
ensorUsedDto, SensorUsedDto> {
=20
     private static final long serialVersionUID =3D 1L;
=20
     public SensorUsedUIModel(SensorUsedUI ui) {
=20
-        super(ActivityLonglineDto.class,
+        super(ActivityLonglineSensorUsedDto.class,
               SensorUsedDto.class,
               new String[]{
-                      //FIXME
-//                      ActivityLonglineDto.PROPERTY_SENSOR_USED,
-                      ActivityLonglineDto.PROPERTY_COMMENT},
+                      ActivityLonglineSensorUsedDto.PROPERTY_SENSOR_USED,
+                      ActivityLonglineSensorUsedDto.PROPERTY_COMMENT},
               new String[]{SensorUsedDto.PROPERTY_DATA,
                            SensorUsedDto.PROPERTY_DATA_FILENAME,
                            SensorUsedDto.PROPERTY_DATA_LOCATION,
@@ -71,8 +73,25 @@ public class SensorUsedUIModel extends ContentTableUIModel=
<ActivityLonglineDto,
     }
=20
     @Override
-    protected ContentTableModel<ActivityLonglineDto, SensorUsedDto> createTa=
bleModel(ObserveContentTableUI<ActivityLonglineDto, SensorUsedDto> ui, List<C=
ontentTableMeta<SensorUsedDto>> contentTableMetas) {
-        // FIXME
-        return null;
+    protected ContentTableModel<ActivityLonglineSensorUsedDto, SensorUsedDto=
> createTableModel(
+            ObserveContentTableUI<ActivityLonglineSensorUsedDto, SensorUsedD=
to> ui,
+            List<ContentTableMeta<SensorUsedDto>> contentTableMetas) {
+
+        return new ContentTableModel<ActivityLonglineSensorUsedDto, SensorUs=
edDto>(ui, contentTableMetas) {
+            @Override
+            protected Collection<SensorUsedDto> getChilds(ActivityLonglineSe=
nsorUsedDto bean) {
+                return bean.getSensorUsed();
+            }
+
+            @Override
+            protected void load(SensorUsedDto source, SensorUsedDto target) {
+                SensorUsedDtos.copySensorUsedDto(source, target);
+            }
+
+            @Override
+            protected void setChilds(ActivityLonglineSensorUsedDto parent, L=
ist<SensorUsedDto> childs) {
+                parent.setSensorUsed(childs);
+            }
+        };
     }
 }
diff --git a/observe-application-web/src/main/java/fr/ird/observe/application=
/web/controller/v1/longline/ActivityLongLineSensorUsedServiceController.java =
b/observe-application-web/src/main/java/fr/ird/observe/application/web/contro=
ller/v1/longline/ActivityLongLineSensorUsedServiceController.java
index d357d02..9ac9b71 100644
--- a/observe-application-web/src/main/java/fr/ird/observe/application/web/co=
ntroller/v1/longline/ActivityLongLineSensorUsedServiceController.java
+++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/co=
ntroller/v1/longline/ActivityLongLineSensorUsedServiceController.java
@@ -25,6 +25,7 @@ package fr.ird.observe.application.web.controller.v1.longli=
ne;
 import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServ=
iceControllerSupport;
 import fr.ird.observe.services.dto.FormDto;
 import fr.ird.observe.services.dto.longline.ActivityLonglineSensorUsedDto;
+import fr.ird.observe.services.dto.result.SaveResultDto;
 import fr.ird.observe.services.service.longline.ActivityLongLineSensorUsedSe=
rvice;
=20
 /**
@@ -47,7 +48,7 @@ public class ActivityLongLineSensorUsedServiceController ex=
tends ObserveAuthenti
     }
=20
     @Override
-    public String save(FormDto<ActivityLonglineSensorUsedDto> form) {
-        return service.save(form);
+    public SaveResultDto save(ActivityLonglineSensorUsedDto dto) {
+        return service.save(dto);
     }
 }
diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/servi=
ce/longline/ActivityLongLineSensorUsedService.java b/observe-services-api/src=
/main/java/fr/ird/observe/services/service/longline/ActivityLongLineSensorUse=
dService.java
index 83200f8..643754b 100644
--- a/observe-services-api/src/main/java/fr/ird/observe/services/service/long=
line/ActivityLongLineSensorUsedService.java
+++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/long=
line/ActivityLongLineSensorUsedService.java
@@ -25,6 +25,7 @@ package fr.ird.observe.services.service.longline;
 import fr.ird.observe.services.ObserveService;
 import fr.ird.observe.services.dto.FormDto;
 import fr.ird.observe.services.dto.longline.ActivityLonglineSensorUsedDto;
+import fr.ird.observe.services.dto.result.SaveResultDto;
 import fr.ird.observe.services.spi.PostRequest;
 import fr.ird.observe.services.spi.ReadDataPermission;
 import fr.ird.observe.services.spi.Write;
@@ -44,6 +45,6 @@ public interface ActivityLongLineSensorUsedService extends =
ObserveService {
     @WriteDataPermission
     @Write
     @PostRequest
-    String save(FormDto<ActivityLonglineSensorUsedDto> form);
+    SaveResultDto save(ActivityLonglineSensorUsedDto dto);
=20
 }
diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/ser=
vice/longline/ActivityLongLineSensorUsedServiceTopia.java b/observe-services-=
topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLine=
SensorUsedServiceTopia.java
index d44984a..b4c6a88 100644
--- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/lo=
ngline/ActivityLongLineSensorUsedServiceTopia.java
+++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/lo=
ngline/ActivityLongLineSensorUsedServiceTopia.java
@@ -31,6 +31,8 @@ import fr.ird.observe.services.dto.longline.SensorUsedDto;
 import fr.ird.observe.services.dto.referential.longline.SensorBrandDto;
 import fr.ird.observe.services.dto.referential.longline.SensorDataFormatDto;
 import fr.ird.observe.services.dto.referential.longline.SensorTypeDto;
+import fr.ird.observe.services.dto.result.SaveResultDto;
+import fr.ird.observe.services.dto.result.SaveResultDtos;
=20
 /**
  * @author Sylvain Bavencoff - bavencoff@codelutin.com
@@ -66,13 +68,13 @@ public class ActivityLongLineSensorUsedServiceTopia exten=
ds ObserveServiceTopia
     }
=20
     @Override
-    public String save(FormDto<ActivityLonglineSensorUsedDto> form) {
+    public SaveResultDto save(ActivityLonglineSensorUsedDto dto) {
=20
-        ActivityLongline activityLongline =3D dtoToEntity(ActivityLonglineSe=
nsorUsedDto.class, ActivityLongline.class, form.getForm());
+        ActivityLongline activityLongline =3D dtoToEntity(ActivityLonglineSe=
nsorUsedDto.class, ActivityLongline.class, dto);
=20
         activityLongline =3D saveEntity(ActivityLongline.class, activityLong=
line);
=20
-        return activityLongline.getTopiaId();
+        return SaveResultDtos.newSaveResult(activityLongline.getTopiaId(), a=
ctivityLongline.getLastUpdate());
=20
     }
 }

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

--===============5710527915096649697==--


From scm@users.codelutin.com Thu Oct 22 10:35:58 2015
From: "codelutin.com scm" <scm@users.codelutin.com>
To: observe-commits@list.forge.codelutin.com
Subject: [Observe-commits] 03/04: ajout des validateurs (refs #7619)
Date: Thu, 22 Oct 2015 10:36:01 +0200
Message-ID: <20151022083558.B1CC25D1715@goh.codelutin.com>
In-Reply-To: <20151022083558.8793.25359@bihar.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3773677279737809263=="

--===============3773677279737809263==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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 fe6c58456937f14b983ec9eb037e581be2c2c811
Author: Sylvain Bavencoff <bavencoff@codelutin.com>
Date:   Thu Oct 22 10:34:30 2015 +0200

    ajout des validateurs (refs #7619)
---
 .../content/table/impl/longline/SensorUsedUI.jaxx  |  2 +-
 ...ineSensorUsedDto-n1-update-error-validation.xml | 39 ++++++++++++
 .../SensorUsedDto-n1-update-error-validation.xml   | 72 ++++++++++++++++++++=
++
 .../SensorUsedDto-n1-update-warning-validation.xml | 39 ++++++++++++
 4 files changed, 151 insertions(+), 1 deletion(-)

diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/conten=
t/table/impl/longline/SensorUsedUI.jaxx b/observe-application-swing/src/main/=
java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUI.jaxx
index 92599e3..30bf5a6 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table=
/impl/longline/SensorUsedUI.jaxx
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table=
/impl/longline/SensorUsedUI.jaxx
@@ -62,7 +62,7 @@
   <ContentTableModel id=3D'tableModel'/>
=20
   <!-- le validateur de l'=C3=A9cran -->
-  <BeanValidator id=3D'validator' autoField=3D'true' context=3D'n1-update-se=
nsorUsed'
+  <BeanValidator id=3D'validator' autoField=3D'true' context=3D'n1-update'
                  beanClass=3D'fr.ird.observe.services.dto.longline.ActivityL=
onglineSensorUsedDto'
                  errorTableModel=3D'{getErrorTableModel()}'/>
=20
diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/serv=
ices/dto/longline/ActivityLonglineSensorUsedDto-n1-update-error-validation.xm=
l b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/=
longline/ActivityLonglineSensorUsedDto-n1-update-error-validation.xml
new file mode 100644
index 0000000..e0387a2
--- /dev/null
+++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dt=
o/longline/ActivityLonglineSensorUsedDto-n1-update-error-validation.xml
@@ -0,0 +1,39 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+<!--
+  #%L
+  ObServe :: Validation
+  %%
+  Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit
+  %%
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as
+  published by the Free Software Foundation, either version 3 of the
+  License, or (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public
+  License along with this program.  If not, see
+  <http://www.gnu.org/licenses/gpl-3.0.html>.
+  #L%
+  -->
+
+<!DOCTYPE validators PUBLIC
+  "-//Apache Struts//XWork Validator 1.0.3//EN"
+  "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd">
+<validators>
+
+  <field name=3D"comment">
+
+    <!-- comentaire de moins de 1024 caract=C3=A8res -->
+    <field-validator type=3D"stringlength">
+      <param name=3D"maxLength">1024</param>
+      <message>validator.activity.comment.tobig</message>
+    </field-validator>
+
+  </field>
+
+</validators>
diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/serv=
ices/dto/longline/SensorUsedDto-n1-update-error-validation.xml b/observe-appl=
ication-swing/src/main/resources/fr/ird/observe/services/dto/longline/SensorU=
sedDto-n1-update-error-validation.xml
new file mode 100644
index 0000000..a7e3292
--- /dev/null
+++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dt=
o/longline/SensorUsedDto-n1-update-error-validation.xml
@@ -0,0 +1,72 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+<!--
+  #%L
+  ObServe :: Validation
+  %%
+  Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit
+  %%
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as
+  published by the Free Software Foundation, either version 3 of the
+  License, or (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public
+  License along with this program.  If not, see
+  <http://www.gnu.org/licenses/gpl-3.0.html>.
+  #L%
+  -->
+
+<!DOCTYPE validators PUBLIC
+  "-//Apache Struts//XWork Validator 1.0.3//EN"
+  "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd">
+<validators>
+
+  <field name=3D"sensorType">
+
+    <!-- pas de sensorType selectionnee -->
+    <field-validator type=3D"required" short-circuit=3D"true">
+      <message>validator.sensorUsed.required.sensorType</message>
+    </field-validator>
+
+    <!-- sensorType desactive  -->
+    <field-validator type=3D"fieldexpression" short-circuit=3D"true">
+      <param name=3D"expression">
+        <![CDATA[ sensorType.enabled ]]>
+      </param>
+      <message>validator.sensorUsed.desactivated.sensorType</message>
+    </field-validator>
+
+  </field>
+
+  <field name=3D"sensorDataFormat">
+
+    <!-- sensorDataFormat desactive -->
+    <field-validator type=3D"fieldexpression" short-circuit=3D"true">
+      <param name=3D"expression">
+        <![CDATA[ sensorDataFormat =3D=3D null || sensorDataFormat.enabled ]=
]>
+      </param>
+      <message>validator.sensorUsed.desactivated.sensorDataFormat</message>
+    </field-validator>
+
+  </field>
+
+  <field name=3D"sensorBrand">
+
+    <!-- sensorBrand desactive -->
+    <field-validator type=3D"fieldexpression" short-circuit=3D"true">
+      <param name=3D"expression">
+        <![CDATA[ sensorBrand =3D=3D null || sensorBrand.enabled ]]>
+      </param>
+      <message>validator.sensorUsed.desactivated.sensorBrand</message>
+    </field-validator>
+
+  </field>
+
+
+
+</validators>
diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/serv=
ices/dto/longline/SensorUsedDto-n1-update-warning-validation.xml b/observe-ap=
plication-swing/src/main/resources/fr/ird/observe/services/dto/longline/Senso=
rUsedDto-n1-update-warning-validation.xml
new file mode 100644
index 0000000..3ed781f
--- /dev/null
+++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dt=
o/longline/SensorUsedDto-n1-update-warning-validation.xml
@@ -0,0 +1,39 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+<!--
+  #%L
+  ObServe :: Validation
+  %%
+  Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit
+  %%
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as
+  published by the Free Software Foundation, either version 3 of the
+  License, or (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public
+  License along with this program.  If not, see
+  <http://www.gnu.org/licenses/gpl-3.0.html>.
+  #L%
+  -->
+
+<!DOCTYPE validators PUBLIC
+  "-//Apache Struts//XWork Validator 1.0.3//EN"
+  "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd">
+<validators>
+
+  <field name=3D"sensorSerialNo">
+
+    <!-- sensorSerialNo non renseign=C3=A9 -->
+    <field-validator type=3D"required" short-circuit=3D"true">
+      <message>validator.sensorUsed.null.sensorSerialNo</message>
+    </field-validator>
+
+  </field>
+
+
+</validators>

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

--===============3773677279737809263==--


From scm@users.codelutin.com Thu Oct 22 10:35:58 2015
From: "codelutin.com scm" <scm@users.codelutin.com>
To: observe-commits@list.forge.codelutin.com
Subject: [Observe-commits] branch develop updated (2b2575f -> cf1efc6)
Date: Thu, 22 Oct 2015 10:35:58 +0200
Message-ID: <20151022083558.8793.25359@bihar.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0476316341042895999=="

--===============0476316341042895999==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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

New change to branch develop in repository observe.

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

      from  2b2575f   Ne plus mettre l'id dans la map de r=C3=A9f=C3=A9rence
       new  4bbd9eb   migration des =C3=A9crans des capteurs pour les palangr=
e (refs #7619)
       new  2e9ab24   binder aussi les proprit=C3=A9es dont la valeur est nul=
l.
       new  fe6c584   ajout des validateurs (refs #7619)
       new  cf1efc6   Merge branch 'feature/7619' into develop

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Detailed log of new commits:

commit cf1efc6109577a887b632df674efb49e3b471264
Merge: 2b2575f fe6c584
Author: Sylvain Bavencoff <bavencoff@codelutin.com>
Date:   Thu Oct 22 10:35:18 2015 +0200

    Merge branch 'feature/7619' into develop

commit fe6c58456937f14b983ec9eb037e581be2c2c811
Author: Sylvain Bavencoff <bavencoff@codelutin.com>
Date:   Thu Oct 22 10:34:30 2015 +0200

    ajout des validateurs (refs #7619)

commit 2e9ab243d6859c172d55f7df7d3829c7de7f520d
Author: Sylvain Bavencoff <bavencoff@codelutin.com>
Date:   Thu Oct 22 10:28:49 2015 +0200

    binder aussi les proprit=C3=A9es dont la valeur est null.

commit 4bbd9ebec65925be085ee7fadf4e14870d18e861
Author: Sylvain Bavencoff <bavencoff@codelutin.com>
Date:   Thu Oct 22 10:27:14 2015 +0200

    migration des =C3=A9crans des capteurs pour les palangre (refs #7619)

Summary of changes:
 .../content/table/impl/longline/SensorUsedUI.jaxx  | 14 ++++----
 .../table/impl/longline/SensorUsedUIHandler.java   | 39 +++++++++-----------=
--
 .../table/impl/longline/SensorUsedUIModel.java     | 35 ++++++++++++++-----
 ...ineSensorUsedDto-n1-update-error-validation.xml |  0
 .../SensorUsedDto-n1-update-error-validation.xml   |  0
 .../SensorUsedDto-n1-update-warning-validation.xml |  0
 ...ctivityLongLineSensorUsedServiceController.java |  5 +--
 .../ActivityLongLineSensorUsedService.java         |  3 +-
 .../services/builder/DtoToEntityBuilder.java       | 12 +++----
 .../ActivityLongLineSensorUsedServiceTopia.java    |  8 +++--
 10 files changed, 65 insertions(+), 51 deletions(-)
 copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/=
longline/SetLongline-n1-update-globalComposition-error-validation.xml =3D> ob=
serve-application-swing/src/main/resources/fr/ird/observe/services/dto/longli=
ne/ActivityLonglineSensorUsedDto-n1-update-error-validation.xml (100%)
 copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/=
longline/SensorUsed-n1-update-error-validation.xml =3D> observe-application-s=
wing/src/main/resources/fr/ird/observe/services/dto/longline/SensorUsedDto-n1=
-update-error-validation.xml (100%)
 copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/=
longline/SensorUsed-n1-update-warning-validation.xml =3D> observe-application=
-swing/src/main/resources/fr/ird/observe/services/dto/longline/SensorUsedDto-=
n1-update-warning-validation.xml (100%)

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

--===============0476316341042895999==--


From scm@users.codelutin.com Thu Oct 22 10:35:58 2015
From: "codelutin.com scm" <scm@users.codelutin.com>
To: observe-commits@list.forge.codelutin.com
Subject: [Observe-commits]  02/04: binder aussi les =?utf-8?q?proprit=C3=A9e?=
 =?utf-8?q?s?= dont la valeur est null.
Date: Thu, 22 Oct 2015 10:36:00 +0200
Message-ID: <20151022083558.8EC745D16AD@goh.codelutin.com>
In-Reply-To: <20151022083558.8793.25359@bihar.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1361497126119847749=="

--===============1361497126119847749==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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 2e9ab243d6859c172d55f7df7d3829c7de7f520d
Author: Sylvain Bavencoff <bavencoff@codelutin.com>
Date:   Thu Oct 22 10:28:49 2015 +0200

    binder aussi les proprit=C3=A9es dont la valeur est null.
---
 .../fr/ird/observe/services/builder/DtoToEntityBuilder.java  | 12 ++++++----=
--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/bui=
lder/DtoToEntityBuilder.java b/observe-services-topia/src/main/java/fr/ird/ob=
serve/services/builder/DtoToEntityBuilder.java
index 407b2c1..75fd352 100644
--- a/observe-services-topia/src/main/java/fr/ird/observe/services/builder/Dt=
oToEntityBuilder.java
+++ b/observe-services-topia/src/main/java/fr/ird/observe/services/builder/Dt=
oToEntityBuilder.java
@@ -23,7 +23,7 @@ package fr.ird.observe.services.builder;
  */
=20
 import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Maps;
 import com.google.common.reflect.TypeToken;
 import fr.ird.observe.services.ObserveServiceTopia;
 import fr.ird.observe.services.dto.IdDto;
@@ -76,9 +76,9 @@ public class DtoToEntityBuilder<D extends IdDto, E extends =
TopiaEntity> implemen
         Preconditions.checkNotNull(dto, "'dto' can't be null.");
         Preconditions.checkNotNull(entity, "'entity' can't be null.");
=20
-        Map<String, Object> dtoProperties =3D binder.obtainProperties(dto);
+        Map<String, Object> dtoProperties =3D binder.obtainProperties(dto, t=
rue);
=20
-        ImmutableMap.Builder<String, Object> entityProperties =3D new Immuta=
bleMap.Builder<>();
+        Map<String, Object> entityProperties =3D Maps.newHashMap();
=20
         for (Map.Entry<String, Object> entry : dtoProperties.entrySet()) {
=20
@@ -188,7 +188,7 @@ public class DtoToEntityBuilder<D extends IdDto, E extend=
s TopiaEntity> implemen
=20
         }
=20
-        binder.injectProperties(entityProperties.build(), entity);
+        binder.injectProperties(entityProperties, entity, true);
=20
     }
=20
@@ -247,13 +247,13 @@ public class DtoToEntityBuilder<D extends IdDto, E exte=
nds TopiaEntity> implemen
=20
     }
=20
-    protected void addProperty(String propertyName, Object propertyValue, Im=
mutableMap.Builder<String, Object> entitiesPropertiesBuilder) {
+    protected void addProperty(String propertyName, Object propertyValue, Ma=
p<String, Object> entitiesProperties) {
=20
         if (IdDto.PROPERTY_ID.equals(propertyName)) {
             propertyName =3D TopiaEntity.PROPERTY_TOPIA_ID;
         }
=20
-        entitiesPropertiesBuilder.put(propertyName, propertyValue);
+        entitiesProperties.put(propertyName, propertyValue);
=20
     }
 }

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

--===============1361497126119847749==--


From scm@users.codelutin.com Thu Oct 22 10:35:59 2015
From: "codelutin.com scm" <scm@users.codelutin.com>
To: observe-commits@list.forge.codelutin.com
Subject: [Observe-commits] 04/04: Merge branch 'feature/7619' into develop
Date: Thu, 22 Oct 2015 10:36:02 +0200
Message-ID: <20151022083558.D51E15D1683@goh.codelutin.com>
In-Reply-To: <20151022083558.8793.25359@bihar.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2051663797677158180=="

--===============2051663797677158180==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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 cf1efc6109577a887b632df674efb49e3b471264
Merge: 2b2575f fe6c584
Author: Sylvain Bavencoff <bavencoff@codelutin.com>
Date:   Thu Oct 22 10:35:18 2015 +0200

    Merge branch 'feature/7619' into develop

 .../content/table/impl/longline/SensorUsedUI.jaxx  | 14 ++---
 .../table/impl/longline/SensorUsedUIHandler.java   | 39 +++++-------
 .../table/impl/longline/SensorUsedUIModel.java     | 35 ++++++++---
 ...ineSensorUsedDto-n1-update-error-validation.xml | 39 ++++++++++++
 .../SensorUsedDto-n1-update-error-validation.xml   | 72 ++++++++++++++++++++=
++
 .../SensorUsedDto-n1-update-warning-validation.xml | 39 ++++++++++++
 ...ctivityLongLineSensorUsedServiceController.java |  5 +-
 .../ActivityLongLineSensorUsedService.java         |  3 +-
 .../services/builder/DtoToEntityBuilder.java       | 12 ++--
 .../ActivityLongLineSensorUsedServiceTopia.java    |  8 ++-
 10 files changed, 215 insertions(+), 51 deletions(-)

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

--===============2051663797677158180==--