Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe

Commits:

10 changed files:

Changes:

  • client-core/pom.xml
    ... ... @@ -336,10 +336,10 @@
    336 336
         </dependency>
    
    337 337
         <!-- Pour avoir les traductions de la configuration dans un seul bundle ... !-->
    
    338 338
         <!--<dependency>-->
    
    339
    -      <!--<groupId>${project.groupId}</groupId>-->
    
    340
    -      <!--<artifactId>server-configuration</artifactId>-->
    
    341
    -      <!--<version>${project.version}</version>-->
    
    342
    -      <!--<scope>runtime</scope>-->
    
    339
    +    <!--<groupId>${project.groupId}</groupId>-->
    
    340
    +    <!--<artifactId>server-configuration</artifactId>-->
    
    341
    +    <!--<version>${project.version}</version>-->
    
    342
    +    <!--<scope>runtime</scope>-->
    
    343 343
         <!--</dependency>-->
    
    344 344
         <dependency>
    
    345 345
           <groupId>${project.groupId}</groupId>
    
    ... ... @@ -365,8 +365,8 @@
    365 365
           <artifactId>persistence</artifactId>
    
    366 366
         </dependency>
    
    367 367
         <!--<dependency>-->
    
    368
    -      <!--<groupId>io.ultreia.java4all.topia</groupId>-->
    
    369
    -      <!--<artifactId>service-migration</artifactId>-->
    
    368
    +    <!--<groupId>io.ultreia.java4all.topia</groupId>-->
    
    369
    +    <!--<artifactId>service-migration</artifactId>-->
    
    370 370
         <!--</dependency>-->
    
    371 371
     
    
    372 372
         <dependency>
    
    ... ... @@ -759,7 +759,6 @@
    759 759
                 <artifactId>common-dto</artifactId>
    
    760 760
                 <version>${observeToolkitVersion}</version>
    
    761 761
               </dependency>
    
    762
    -
    
    763 762
             </dependencies>
    
    764 763
           </plugin>
    
    765 764
     
    

  • client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/config/TranslateAction.java
    ... ... @@ -72,7 +72,7 @@ public class TranslateAction extends MenuActionSupport {
    72 72
             projectUI.addWindowListener(new WindowAdapter() {
    
    73 73
                 @Override
    
    74 74
                 public void windowClosed(WindowEvent e) {
    
    75
    -                if (model.getLastExport() != null) {
    
    75
    +                if (model.getLastExportDate() != null) {
    
    76 76
                         log.info("Found existing i18n export, will reload i18n");
    
    77 77
                         UIHelper.displayInfo(t("observe.title.reload.i18n"), t("observe.message.reload.i18n"));
    
    78 78
                         ObserveUICallback.application.run();
    

  • client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SamplePartLogbookUIHandler.java
    ... ... @@ -10,12 +10,12 @@ package fr.ird.observe.client.ui.content.data.longline.logbook;
    10 10
      * it under the terms of the GNU General Public License as
    
    11 11
      * published by the Free Software Foundation, either version 3 of the
    
    12 12
      * License, or (at your option) any later version.
    
    13
    - * 
    
    13
    + *
    
    14 14
      * This program is distributed in the hope that it will be useful,
    
    15 15
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
    
    16 16
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    
    17 17
      * GNU General Public License for more details.
    
    18
    - * 
    
    18
    + *
    
    19 19
      * You should have received a copy of the GNU General Public
    
    20 20
      * License along with this program.  If not, see
    
    21 21
      * <http://www.gnu.org/licenses/gpl-3.0.html>.
    
    ... ... @@ -61,9 +61,13 @@ public class SamplePartLogbookUIHandler extends NotStandaloneContentTableUIHandl
    61 61
     
    
    62 62
         private static final Logger log = LogManager.getLogger(SamplePartLogbookUIHandler.class);
    
    63 63
         private final PropertyChangeListener speciesChanged;
    
    64
    +    private final PropertyChangeListener lengthChanged;
    
    65
    +    private final PropertyChangeListener weightChanged;
    
    64 66
     
    
    65 67
         SamplePartLogbookUIHandler() {
    
    66 68
             speciesChanged = evt -> onSpeciesChanged((SpeciesReference) evt.getNewValue());
    
    69
    +        lengthChanged = evt -> onLengthChanged((Float) evt.getNewValue());
    
    70
    +        weightChanged = evt -> onWeightChanged((Float) evt.getNewValue());
    
    67 71
         }
    
    68 72
     
    
    69 73
         @Override
    
    ... ... @@ -156,6 +160,8 @@ public class SamplePartLogbookUIHandler extends NotStandaloneContentTableUIHandl
    156 160
     
    
    157 161
             SamplePartLogbookDto tableEditBean = getModel().getTableEditBean();
    
    158 162
             tableEditBean.removePropertyChangeListener(SamplePartLogbookDto.PROPERTY_SPECIES, speciesChanged);
    
    163
    +        tableEditBean.removePropertyChangeListener(SamplePartLogbookDto.PROPERTY_LENGTH, lengthChanged);
    
    164
    +        tableEditBean.removePropertyChangeListener(SamplePartLogbookDto.PROPERTY_WEIGHT, weightChanged);
    
    159 165
     
    
    160 166
             SpeciesReference species = bean.getSpecies();
    
    161 167
             log.debug(prefix + "selected species " + species);
    
    ... ... @@ -197,26 +203,23 @@ public class SamplePartLogbookUIHandler extends NotStandaloneContentTableUIHandl
    197 203
             UIHelper.askFocus(requestFocus);
    
    198 204
     
    
    199 205
             tableEditBean.addPropertyChangeListener(SamplePartLogbookDto.PROPERTY_SPECIES, speciesChanged);
    
    206
    +        tableEditBean.addPropertyChangeListener(SamplePartLogbookDto.PROPERTY_LENGTH, lengthChanged);
    
    207
    +        tableEditBean.addPropertyChangeListener(SamplePartLogbookDto.PROPERTY_WEIGHT, weightChanged);
    
    200 208
     
    
    209
    +        onLengthChanged(tableEditBean.getLength());
    
    210
    +        onWeightChanged(tableEditBean.getWeight());
    
    201 211
         }
    
    202 212
     
    
    203
    -    private Optional<SizeMeasureTypeReference> getSpeciesDefaultSizeMeasureType(SpeciesReference species) {
    
    204
    -        Optional<SizeMeasureTypeReference> result = Optional.empty();
    
    205
    -        if (species != null) {
    
    213
    +    @Override
    
    214
    +    public SamplePartLogbookUIModel getModel() {
    
    215
    +        return ui.getModel();
    
    216
    +    }
    
    206 217
     
    
    207
    -            String sizeMeasureId = species.getSizeMeasureTypeId();
    
    208
    -            result = ui.getSizeMeasureType().getData().stream()
    
    209
    -                    .filter(s -> s.getId().equals(sizeMeasureId)).findFirst();
    
    210
    -        }
    
    211
    -        return result;
    
    218
    +    public void resetDefaultSizeMeasureType() {
    
    219
    +        ui.getSizeMeasureType().setSelectedItem(null);
    
    220
    +        ui.getSizeMeasureType().setSelectedItem(ui.getModel().getDefaultSizeMeasureType());
    
    212 221
         }
    
    213 222
     
    
    214
    -    /**
    
    215
    -     * Le mode de saisie a été mis à jour.
    
    216
    -     *
    
    217
    -     * @param newMode le nouveau de mode de saisie à utiliser
    
    218
    -     * @since 3.0
    
    219
    -     */
    
    220 223
         void updateAcquisitionMode(AcquisitionMode newMode) {
    
    221 224
             log.debug(prefix + String.format("Change acquisition mode to %s", newMode));
    
    222 225
             if (newMode == null) {
    
    ... ... @@ -244,7 +247,7 @@ public class SamplePartLogbookUIHandler extends NotStandaloneContentTableUIHandl
    244 247
                         // on supprime le weight (si il a été saisie)
    
    245 248
                         editBean.setWeight(null);
    
    246 249
                         editBean.setWeightMeasureType(null);
    
    247
    -                    // on supprime aussi l'count (pour forcer la saisie)
    
    250
    +                    // on supprime aussi le count (pour forcer la saisie)
    
    248 251
                         editBean.setCount(null);
    
    249 252
                     }
    
    250 253
                     break;
    
    ... ... @@ -260,7 +263,7 @@ public class SamplePartLogbookUIHandler extends NotStandaloneContentTableUIHandl
    260 263
     
    
    261 264
                     if (createMode) {
    
    262 265
     
    
    263
    -                    // on positionne l'count à 1 (seule valeur possible)
    
    266
    +                    // on positionne le count à 1 (seule valeur possible)
    
    264 267
                         editBean.setCount(1);
    
    265 268
                     }
    
    266 269
                     break;
    
    ... ... @@ -273,14 +276,44 @@ public class SamplePartLogbookUIHandler extends NotStandaloneContentTableUIHandl
    273 276
             }
    
    274 277
         }
    
    275 278
     
    
    279
    +    private Optional<SizeMeasureTypeReference> getSpeciesDefaultSizeMeasureType(SpeciesReference species) {
    
    280
    +        Optional<SizeMeasureTypeReference> result = Optional.empty();
    
    281
    +        if (species != null) {
    
    282
    +
    
    283
    +            String sizeMeasureId = species.getSizeMeasureTypeId();
    
    284
    +            result = ui.getSizeMeasureType().getData().stream()
    
    285
    +                    .filter(s -> s.getId().equals(sizeMeasureId)).findFirst();
    
    286
    +        }
    
    287
    +        return result;
    
    288
    +    }
    
    289
    +
    
    276 290
         private void onSpeciesChanged(SpeciesReference species) {
    
    277 291
             Optional<SizeMeasureTypeReference> sizeMeasureType = getSpeciesDefaultSizeMeasureType(species);
    
    278 292
             ui.getModel().setDefaultSizeMeasureType(sizeMeasureType.orElse(null));
    
    279 293
             resetDefaultSizeMeasureType();
    
    280 294
         }
    
    281 295
     
    
    282
    -    public void resetDefaultSizeMeasureType() {
    
    283
    -        ui.getSizeMeasureType().setSelectedItem(null);
    
    284
    -        ui.getSizeMeasureType().setSelectedItem(ui.getModel().getDefaultSizeMeasureType());
    
    296
    +    private void onLengthChanged(Float newValue) {
    
    297
    +        SamplePartLogbookUIModel model = getModel();
    
    298
    +        SamplePartLogbookDto tableEditBean = model.getTableEditBean();
    
    299
    +        if (newValue == null) {
    
    300
    +            tableEditBean.setLengthMeasureMethod(null);
    
    301
    +        } else {
    
    302
    +            if (tableEditBean.getLengthMeasureMethod() == null) {
    
    303
    +                tableEditBean.setLengthMeasureMethod(model.getDefaultLengthMeasureMethod());
    
    304
    +            }
    
    305
    +        }
    
    306
    +    }
    
    307
    +
    
    308
    +    private void onWeightChanged(Float newValue) {
    
    309
    +        SamplePartLogbookUIModel model = getModel();
    
    310
    +        SamplePartLogbookDto tableEditBean = model.getTableEditBean();
    
    311
    +        if (newValue == null) {
    
    312
    +            tableEditBean.setWeightMeasureMethod(null);
    
    313
    +        } else {
    
    314
    +            if (tableEditBean.getWeightMeasureMethod() == null) {
    
    315
    +                tableEditBean.setWeightMeasureMethod(model.getDefaultWeightMeasureMethod());
    
    316
    +            }
    
    317
    +        }
    
    285 318
         }
    
    286 319
     }

  • client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SamplePartLogbookUIModel.java
    ... ... @@ -10,12 +10,12 @@ package fr.ird.observe.client.ui.content.data.longline.logbook;
    10 10
      * it under the terms of the GNU General Public License as
    
    11 11
      * published by the Free Software Foundation, either version 3 of the
    
    12 12
      * License, or (at your option) any later version.
    
    13
    - * 
    
    13
    + *
    
    14 14
      * This program is distributed in the hope that it will be useful,
    
    15 15
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
    
    16 16
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    
    17 17
      * GNU General Public License for more details.
    
    18
    - * 
    
    18
    + *
    
    19 19
      * You should have received a copy of the GNU General Public
    
    20 20
      * License along with this program.  If not, see
    
    21 21
      * <http://www.gnu.org/licenses/gpl-3.0.html>.
    
    ... ... @@ -30,7 +30,10 @@ import fr.ird.observe.client.validation.ClientValidationContext;
    30 30
     import fr.ird.observe.dto.data.longline.SampleLogbookDto;
    
    31 31
     import fr.ird.observe.dto.data.longline.SamplePartLogbookDto;
    
    32 32
     import fr.ird.observe.dto.data.longline.SamplePartLogbookHelper;
    
    33
    +import fr.ird.observe.dto.referential.LengthMeasureMethodReference;
    
    34
    +import fr.ird.observe.dto.referential.SexReference;
    
    33 35
     import fr.ird.observe.dto.referential.SizeMeasureTypeReference;
    
    36
    +import fr.ird.observe.dto.referential.WeightMeasureMethodReference;
    
    34 37
     import fr.ird.observe.navigation.model.select.ObserveSelectNode;
    
    35 38
     
    
    36 39
     import java.util.Arrays;
    
    ... ... @@ -46,9 +49,19 @@ import java.util.List;
    46 49
      */
    
    47 50
     public class SamplePartLogbookUIModel extends ContentTableUIModel<SampleLogbookDto, SamplePartLogbookDto> {
    
    48 51
     
    
    49
    -    public static final String PROPERTY_DEFAULT_SIZE_MEASURE_TYPE = "defaultSizeMeasureType";
    
    52
    +    private static final String PROPERTY_DEFAULT_SIZE_MEASURE_TYPE = "defaultSizeMeasureType";
    
    53
    +    //FIXME-PROTECTED-ID
    
    54
    +    private static final String SAMPLE_PART_LOGBOOK_DEFAULT_LENGTH_MEASURE_METHOD_ID = "fr.ird.observe.entities.referentiel.LengthMeasureMethod#666#01";
    
    55
    +    //FIXME-PROTECTED-ID
    
    56
    +    private static final String SAMPLE_PART_LOGBOOK_DEFAULT_WEIGHT_MEASURE_METHOD_ID = "fr.ird.observe.entities.referentiel.WeightMeasureMethod#666#02";
    
    57
    +    //FIXME-PROTECTED-ID
    
    58
    +    private static final String SAMPLE_PART_LOGBOOK_DEFAULT_SEX_ID = "fr.ird.observe.entities.referentiel.Sex#1239832686122#0.5";
    
    50 59
         private static final long serialVersionUID = 1L;
    
    60
    +
    
    51 61
         private SizeMeasureTypeReference defaultSizeMeasureType;
    
    62
    +    private SexReference defaultSex;
    
    63
    +    private LengthMeasureMethodReference defaultLengthMeasureMethod;
    
    64
    +    private WeightMeasureMethodReference defaultWeightMeasureMethod;
    
    52 65
     
    
    53 66
         public SamplePartLogbookUIModel(SamplePartLogbookUI ui, ObserveSelectNode<?> selectNode) {
    
    54 67
             super(SampleLogbookDto.class,
    
    ... ... @@ -83,6 +96,33 @@ public class SamplePartLogbookUIModel extends ContentTableUIModel<SampleLogbookD
    83 96
             setAddMessageOnOpen(false);
    
    84 97
         }
    
    85 98
     
    
    99
    +    @Override
    
    100
    +    public void initModel(ContentTableUI<SampleLogbookDto, SamplePartLogbookDto, ?> ui, List<ContentTableMeta<SamplePartLogbookDto>> contentTableMetas) {
    
    101
    +        super.initModel(ui, contentTableMetas);
    
    102
    +        defaultSex = ui.getDataSource().getReferentialReferenceSet(SexReference.class).tryGetReferenceById(SAMPLE_PART_LOGBOOK_DEFAULT_SEX_ID).orElseThrow(IllegalStateException::new);
    
    103
    +        defaultLengthMeasureMethod = ui.getDataSource().getReferentialReferenceSet(LengthMeasureMethodReference.class).tryGetReferenceById(SAMPLE_PART_LOGBOOK_DEFAULT_LENGTH_MEASURE_METHOD_ID).orElseThrow(IllegalStateException::new);
    
    104
    +        defaultWeightMeasureMethod = ui.getDataSource().getReferentialReferenceSet(WeightMeasureMethodReference.class).tryGetReferenceById(SAMPLE_PART_LOGBOOK_DEFAULT_WEIGHT_MEASURE_METHOD_ID).orElseThrow(IllegalStateException::new);
    
    105
    +    }
    
    106
    +
    
    107
    +    @Override
    
    108
    +    public SamplePartLogbookDto newTableEditBean() {
    
    109
    +        SamplePartLogbookDto result = super.newTableEditBean();
    
    110
    +        result.setSex(getDefaultSex());
    
    111
    +        return result;
    
    112
    +    }
    
    113
    +
    
    114
    +    public LengthMeasureMethodReference getDefaultLengthMeasureMethod() {
    
    115
    +        return defaultLengthMeasureMethod;
    
    116
    +    }
    
    117
    +
    
    118
    +    public WeightMeasureMethodReference getDefaultWeightMeasureMethod() {
    
    119
    +        return defaultWeightMeasureMethod;
    
    120
    +    }
    
    121
    +
    
    122
    +    public SexReference getDefaultSex() {
    
    123
    +        return defaultSex;
    
    124
    +    }
    
    125
    +
    
    86 126
         @Override
    
    87 127
         protected ObserveSelectNode<?> computeSelectNode() {
    
    88 128
             return super.computeSelectNode();
    

  • client-core/src/main/java/fr/ird/observe/client/ui/util/ObserveValidationMessageTableRenderer.java
    ... ... @@ -25,7 +25,7 @@ package fr.ird.observe.client.ui.util;
    25 25
     import fr.ird.observe.client.ui.admin.validate.ValidationMessageTableModel;
    
    26 26
     import fr.ird.observe.dto.decoration.ObserveI18nDecoratorHelper;
    
    27 27
     import fr.ird.observe.services.service.actions.validate.ValidationResultDtoMessage;
    
    28
    -import org.nuiton.i18n.util.BeanPropertyI18nKeyProducer;
    
    28
    +import io.ultreia.java4all.i18n.spi.bean.BeanPropertyI18nKeyProducer;
    
    29 29
     import org.nuiton.jaxx.validator.swing.SwingValidatorUtil;
    
    30 30
     import org.nuiton.validator.NuitonValidatorScope;
    
    31 31
     
    

  • client-core/src/main/java/fr/ird/observe/client/ui/util/ObserveValidatorMessageTableRenderer.java
    ... ... @@ -23,10 +23,10 @@ package fr.ird.observe.client.ui.util;
    23 23
      */
    
    24 24
     
    
    25 25
     import fr.ird.observe.dto.decoration.ObserveI18nDecoratorHelper;
    
    26
    +import io.ultreia.java4all.i18n.spi.bean.BeanPropertyI18nKeyProducer;
    
    26 27
     import org.apache.commons.lang3.BooleanUtils;
    
    27 28
     import org.apache.logging.log4j.LogManager;
    
    28 29
     import org.apache.logging.log4j.Logger;
    
    29
    -import org.nuiton.i18n.util.BeanPropertyI18nKeyProducer;
    
    30 30
     import org.nuiton.jaxx.validator.swing.SwingValidatorMessage;
    
    31 31
     import org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableModel;
    
    32 32
     import org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableRenderer;
    

  • dto/src/main/java/fr/ird/observe/dto/decoration/ObserveI18nDecoratorHelper.java
    ... ... @@ -23,8 +23,8 @@ package fr.ird.observe.dto.decoration;
    23 23
      */
    
    24 24
     
    
    25 25
     import com.google.auto.service.AutoService;
    
    26
    -import org.nuiton.i18n.util.BeanPropertyI18nKeyProducer;
    
    27
    -import org.nuiton.i18n.util.BeanPropertyI18nKeyProducerProvider;
    
    26
    +import io.ultreia.java4all.i18n.spi.bean.BeanPropertyI18nKeyProducer;
    
    27
    +import io.ultreia.java4all.i18n.spi.bean.BeanPropertyI18nKeyProducerProvider;
    
    28 28
     
    
    29 29
     /**
    
    30 30
      * Created on 03/09/16.
    

  • dto/src/main/java/fr/ird/observe/dto/decoration/ObserveI18nLabelsBuilder.java
    ... ... @@ -28,7 +28,7 @@ import fr.ird.observe.dto.IdHelper;
    28 28
     import fr.ird.observe.dto.data.DataDto;
    
    29 29
     import fr.ird.observe.dto.referential.I18nReferentialDto;
    
    30 30
     import fr.ird.observe.dto.referential.ReferentialDto;
    
    31
    -import org.nuiton.i18n.util.BeanPropertyI18nKeyProducerSupport;
    
    31
    +import io.ultreia.java4all.i18n.spi.bean.BeanPropertyI18nKeyProducerSupport;
    
    32 32
     
    
    33 33
     import java.util.Map;
    
    34 34
     
    

  • persistence/src/main/resources/db/migration/6.1/09_fill_object_material-common.sql
    ... ... @@ -19,27 +19,7 @@
    19 19
     -- <http://www.gnu.org/licenses/gpl-3.0.html>.
    
    20 20
     -- #L%
    
    21 21
     ---
    
    22
    ----
    
    23
    --- #%L
    
    24
    --- ObServe :: Persistence
    
    25
    --- %%
    
    26
    --- Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io
    
    27
    --- %%
    
    28
    --- This program is free software: you can redistribute it and/or modify
    
    29
    --- it under the terms of the GNU General Public License as
    
    30
    --- published by the Free Software Foundation, either version 3 of the
    
    31
    --- License, or (at your option) any later version.
    
    32
    ---
    
    33
    --- This program is distributed in the hope that it will be useful,
    
    34
    --- but WITHOUT ANY WARRANTY; without even the implied warranty of
    
    35
    --- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    
    36
    --- GNU General Public License for more details.
    
    37
    ---
    
    38
    --- You should have received a copy of the GNU General Public
    
    39
    --- License along with this program.  If not, see
    
    40
    --- <http://www.gnu.org/licenses/gpl-3.0.html>.
    
    41
    --- #L%
    
    42
    ----
    
    22
    +
    
    43 23
     INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#1.3',0,'2018-11-12','2018-11-12 17:27:06.06232','',null,'FOB',null,1,false,null,null,false,false,'FOB','FOB','FOB',null,null,null,null,null,true,true,null);
    
    44 24
     INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.1',0,'2018-11-12','2018-11-12 17:27:06.06232','1',null,'FAD','fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#1.3',1,false,null,null,false,false,'FAD','FAD','FAD',null,null,null,null,null,false,false,null);
    
    45 25
     INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.2',1,'2018-11-12','2018-11-12 17:27:06.06232','1-1',null,'DFAD','fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.1',1,false,null,'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0',false,false,'DFAD (drifting FAD)','DFAD (FAD dérivant)','DFAD (FAD a la deriva)',null,null,null,null,null,true,false,null);
    

  • pom.xml
    ... ... @@ -27,7 +27,7 @@
    27 27
       <parent>
    
    28 28
         <groupId>io.ultreia.maven</groupId>
    
    29 29
         <artifactId>pom</artifactId>
    
    30
    -    <version>2018.8.3</version>
    
    30
    +    <version>2018.8.8</version>
    
    31 31
       </parent>
    
    32 32
     
    
    33 33
       <groupId>fr.ird.observe</groupId>
    
    ... ... @@ -150,13 +150,13 @@
    150 150
         <devMode>true</devMode>
    
    151 151
     
    
    152 152
         <!--persistence model version-->
    
    153
    -    <observe.model.version>7.4</observe.model.version>
    
    153
    +    <observe.model.version>7.0</observe.model.version>
    
    154 154
     
    
    155 155
         <!-- build timestamp configuration -->
    
    156 156
         <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format>
    
    157 157
         <buildDate>${maven.build.timestamp}</buildDate>
    
    158 158
     
    
    159
    -    <observeToolkitVersion>4.8-SNAPSHOT</observeToolkitVersion>
    
    159
    +    <observeToolkitVersion>4.9-SNAPSHOT</observeToolkitVersion>
    
    160 160
         <!--<lib.version.java4all.topia>1.1.1</lib.version.java4all.topia>-->
    
    161 161
         <!--<lib.version.java4all.eugene>3.0-alpha-22</lib.version.java4all.eugene>-->
    
    162 162
         <!--<lib.version.java4all.jaxx>3.0-alpha-45-SNAPSHOT</lib.version.java4all.jaxx>-->
    
    ... ... @@ -373,19 +373,20 @@
    373 373
           <reporting>
    
    374 374
             <plugins>
    
    375 375
     
    
    376
    -          <!--<plugin>-->
    
    377
    -            <!--<groupId>io.ultreia.java4all.config</groupId>-->
    
    378
    -            <!--<artifactId>config-maven-plugin</artifactId>-->
    
    379
    -            <!--<version>${lib.version.java4all.config}</version>-->
    
    380
    -            <!--<inherited>false</inherited>-->
    
    381
    -            <!--<reportSets>-->
    
    382
    -              <!--<reportSet>-->
    
    383
    -                <!--<reports>-->
    
    384
    -                  <!--<report>aggregate-report</report>-->
    
    385
    -                <!--</reports>-->
    
    386
    -              <!--</reportSet>-->
    
    387
    -            <!--</reportSets>-->
    
    388
    -          <!--</plugin>-->
    
    376
    +          <plugin>
    
    377
    +            <groupId>io.ultreia.java4all.config</groupId>
    
    378
    +            <artifactId>config-maven-plugin</artifactId>
    
    379
    +            <version>${lib.version.java4all.config}</version>
    
    380
    +            <inherited>false</inherited>
    
    381
    +            <reportSets>
    
    382
    +              <reportSet>
    
    383
    +                <reports>
    
    384
    +                  <report>aggregate-report</report>
    
    385
    +                </reports>
    
    386
    +              </reportSet>
    
    387
    +            </reportSets>
    
    388
    +
    
    389
    +          </plugin>
    
    389 390
     
    
    390 391
               <plugin>
    
    391 392
                 <artifactId>maven-project-info-reports-plugin</artifactId>