[Git][ultreia.io/ird-observe][develop-5.x] 3 commits: mettre dans le même ordre les binders et les décorateurs (See #737)

3 Mar 2017

Tony CHEMIT pushed to branch develop-5.x at ultreia.io / ird-observe


Commits:
c1cb277f by Tony CHEMIT at 2017-03-02T18:20:51+01:00
mettre dans le même ordre les binders et les décorateurs (See #737)

- - - - -
07ea97e9 by Tony CHEMIT at 2017-03-03T14:06:47+01:00
Correction de la valeur non déclanchée lors du changement de section (See #740)

- - - - -
26afb510 by Tony CHEMIT at 2017-03-03T14:07:37+01:00
section mal recopiée par hibernate (See #737)

- - - - -


7 changed files:

- application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jcss
- pom.xml
- + services-dto/src/main/java/fr/ird/observe/services/dto/longline/CatchLonglineDto.java
- services-dto/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java
- services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BasketBinder.java
- services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BranchlineBinder.java
- services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SectionBinder.java


Changes:

=====================================
application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jcss
=====================================

--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jcss
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jcss
@@ -73,6 +73,7 @@
 #section {
   property:{CatchLonglineDto.PROPERTY_SECTION};
   selectedItem:{tableEditBean.getSection()};
+  force:true;
   _listNoLoad:{true};
 }
 


=====================================
pom.xml
=====================================
--- a/pom.xml
+++ b/pom.xml
@@ -169,7 +169,7 @@
 
     <eugenePluginVersion>3.0-alpha-10</eugenePluginVersion>
     <processorPluginVersion>1.3</processorPluginVersion>
-    <jaxxVersion>2.40</jaxxVersion>
+    <jaxxVersion>2.41</jaxxVersion>
     <nuitonI18nVersion>3.6.3</nuitonI18nVersion>
     <nuitonConfigVersion>3.2</nuitonConfigVersion>
     <topiaVersion>3.2.1</topiaVersion>


=====================================
services-dto/src/main/java/fr/ird/observe/services/dto/longline/CatchLonglineDto.java
=====================================
--- /dev/null
+++ b/services-dto/src/main/java/fr/ird/observe/services/dto/longline/CatchLonglineDto.java
@@ -0,0 +1,39 @@
+package fr.ird.observe.services.dto.longline;
+
+/*-
+ * #%L
+ * ObServe :: Services DTO
+ * %%
+ * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io
+ * %%
+ * 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%
+ */
+
+import fr.ird.observe.services.dto.DataReference;
+
+import javax.annotation.Generated;
+
+@Generated(value = "org.nuiton.eugene.java.BeanTransformer", date = "Wed Mar 01 18:04:05 CET 2017")
+public class CatchLonglineDto extends GeneratedCatchLonglineDto {
+
+
+    public void setSection(DataReference<SectionDto> section) {
+        super.setSection(section);
+        System.out.println("WTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTF ???? to section: "+section);
+    }
+
+    private static final long serialVersionUID = 3846975004402399536L;
+} //CatchLonglineDto


=====================================
services-dto/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java
=====================================
--- a/services-dto/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java
+++ b/services-dto/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java
@@ -200,25 +200,25 @@ public enum DataReferenceSetDefinitions {
                          .addProperty(String.class, SetLonglineDto.PROPERTY_HOME_ID)),
 
     SECTION(newDefinitionBuilder(SectionDto.class)
-                    .addProperty(Integer.class, SectionDto.PROPERTY_HAULING_IDENTIFIER)
-                    .addProperty(Integer.class, SectionDto.PROPERTY_SETTING_IDENTIFIER)),
+                    .addProperty(Integer.class, SectionDto.PROPERTY_SETTING_IDENTIFIER)
+                    .addProperty(Integer.class, SectionDto.PROPERTY_HAULING_IDENTIFIER)),
 
     BASKET(newDefinitionBuilder(BasketDto.class)
-                   .addProperty(Integer.class, BasketDto.PROPERTY_HAULING_IDENTIFIER)
-                   .addProperty(Integer.class, BasketDto.PROPERTY_SETTING_IDENTIFIER)),
+                   .addProperty(Integer.class, BasketDto.PROPERTY_SETTING_IDENTIFIER)
+                   .addProperty(Integer.class, BasketDto.PROPERTY_HAULING_IDENTIFIER)),
 
     BRANCHLINE(newDefinitionBuilder(BranchlineDto.class)
-                       .addProperty(Integer.class, BranchlineDto.PROPERTY_HAULING_IDENTIFIER)
-                       .addProperty(Integer.class, BranchlineDto.PROPERTY_SETTING_IDENTIFIER)),
+                       .addProperty(Integer.class, BranchlineDto.PROPERTY_SETTING_IDENTIFIER)
+                       .addProperty(Integer.class, BranchlineDto.PROPERTY_HAULING_IDENTIFIER)),
 
     BASKET_WITH_SECTION(newDefinitionBuilder(BasketWithSectionIdDto.class)
-                                .addProperty(Integer.class, BasketWithSectionIdDto.PROPERTY_HAULING_IDENTIFIER)
                                 .addProperty(Integer.class, BasketWithSectionIdDto.PROPERTY_SETTING_IDENTIFIER)
+                                .addProperty(Integer.class, BasketWithSectionIdDto.PROPERTY_HAULING_IDENTIFIER)
                                 .addProperty(String.class, BasketWithSectionIdDto.PROPERTY_SECTION_ID)),
 
     BRANCHLINE_WITH_BASKET(newDefinitionBuilder(BranchlineWithBasketIdDto.class)
-                                   .addProperty(Integer.class, BranchlineWithBasketIdDto.PROPERTY_HAULING_IDENTIFIER)
                                    .addProperty(Integer.class, BranchlineWithBasketIdDto.PROPERTY_SETTING_IDENTIFIER)
+                                   .addProperty(Integer.class, BranchlineWithBasketIdDto.PROPERTY_HAULING_IDENTIFIER)
                                    .addProperty(String.class, BranchlineWithBasketIdDto.PROPERTY_BASKET_ID)),
 
     FLOATLINES_COMPOSITION(newDefinitionBuilder(FloatlinesCompositionDto.class)


=====================================
services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BasketBinder.java
=====================================
--- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BasketBinder.java
+++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BasketBinder.java
@@ -69,14 +69,14 @@ public class BasketBinder extends DataBinderSupport<Basket, BasketDto> {
     @Override
     public DataReference<BasketDto> toDataReference(ReferentialLocale referentialLocale, Basket entity) {
 
-        return toDataReference(entity, entity.getHaulingIdentifier(), entity.getSettingIdentifier());
+        return toDataReference(entity, entity.getSettingIdentifier(), entity.getHaulingIdentifier());
 
     }
 
     @Override
     public DataReference<BasketDto> toDataReference(ReferentialLocale referentialLocale, BasketDto dto) {
 
-        return toDataReference(dto, dto.getHaulingIdentifier(), dto.getSettingIdentifier());
+        return toDataReference(dto, dto.getSettingIdentifier(), dto.getHaulingIdentifier());
 
     }
 }


=====================================
services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BranchlineBinder.java
=====================================
--- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BranchlineBinder.java
+++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BranchlineBinder.java
@@ -115,14 +115,14 @@ public class BranchlineBinder extends DataBinderSupport<Branchline, BranchlineDt
     @Override
     public DataReference<BranchlineDto> toDataReference(ReferentialLocale referentialLocale, Branchline entity) {
 
-        return toDataReference(entity, entity.getHaulingIdentifier(), entity.getSettingIdentifier());
+        return toDataReference(entity, entity.getSettingIdentifier(), entity.getHaulingIdentifier());
 
     }
 
     @Override
     public DataReference<BranchlineDto> toDataReference(ReferentialLocale referentialLocale, BranchlineDto dto) {
 
-        return toDataReference(dto, dto.getHaulingIdentifier(), dto.getSettingIdentifier());
+        return toDataReference(dto, dto.getSettingIdentifier(), dto.getHaulingIdentifier());
 
     }
 }


=====================================
services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SectionBinder.java
=====================================
--- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SectionBinder.java
+++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SectionBinder.java
@@ -65,14 +65,18 @@ public class SectionBinder extends DataBinderSupport<Section, SectionDto> {
     @Override
     public DataReference<SectionDto> toDataReference(ReferentialLocale referentialLocale, Section entity) {
 
-        return toDataReference(entity, entity.getHaulingIdentifier(), entity.getSettingIdentifier());
+        //FIXME-tchemit Je ne sais pas pourquoi mais si on utilise ces deux variables inline
+        //FIXME-tchemit alors les valeurs sont inversées!!! pb proxy hibernate
+        Integer settingIdentifier = entity.getSettingIdentifier();
+        Integer haulingIdentifier = entity.getHaulingIdentifier();
+        return toDataReference(entity, settingIdentifier, haulingIdentifier);
 
     }
 
     @Override
     public DataReference<SectionDto> toDataReference(ReferentialLocale referentialLocale, SectionDto dto) {
 
-        return toDataReference(dto, dto.getHaulingIdentifier(), dto.getSettingIdentifier());
+        return toDataReference(dto, dto.getSettingIdentifier(), dto.getHaulingIdentifier());
 
     }
 }



View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/compare/a6591545b50f649be57d9775a4...

    

Tony CHEMIT

tags

participants (1)