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

Commits:

4 changed files:

Changes:

  • client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/common/GearUseFeaturesUIHandler.java
    ... ... @@ -29,6 +29,7 @@ import fr.ird.observe.client.datasource.editor.content.data.table.ContentTableUI
    29 29 
     import fr.ird.observe.client.datasource.editor.content.data.table.ContentTableUILayoutFocusTraversalPolicy;
    30 30 
     import fr.ird.observe.client.datasource.editor.content.ui.table.EditableTableModelSupport;
    31 31 
     import fr.ird.observe.client.util.UIHelper;
    32 
    +import fr.ird.observe.dto.IdDto;
    32 33 
     import fr.ird.observe.dto.data.ll.common.GearUseFeaturesDto;
    33 34 
     import fr.ird.observe.dto.data.ll.common.GearUseFeaturesMeasurementDto;
    34 35 
     import fr.ird.observe.dto.data.ll.common.TripGearUseFeaturesDto;
    ... ... @@ -55,6 +56,7 @@ import java.beans.PropertyChangeListener;
    55 56 
     import java.util.ArrayList;
    56 57 
     import java.util.Collections;
    57 58 
     import java.util.Comparator;
    59 
    +import java.util.Date;
    58 60 
     import java.util.List;
    59 61 
     import java.util.stream.Collectors;
    60 62
    ... ... @@ -319,7 +321,7 @@ public class GearUseFeaturesUIHandler extends ContentTableUIHandler<TripGearUseF
    319 321
    320 322 
             return gearDto.getGearCaracteristic().stream()
    321 323 
                     .map(input -> {
    322 
    -                    GearUseFeaturesMeasurementDto measurementLonglineDto = new GearUseFeaturesMeasurementDto();
    324 
    +                    GearUseFeaturesMeasurementDto measurementLonglineDto = IdDto.newDto(GearUseFeaturesMeasurementDto.class, new Date());
    323 325 
                         measurementLonglineDto.setGearCaracteristic(input);
    324 326 
                         if (input.getGearCaracteristicType().isBoolean()) {
    325 327 
                             measurementLonglineDto.setMeasurementValue(Boolean.FALSE.toString());

  • client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/SizeMeasureTableModel.java
    ... ... @@ -23,9 +23,12 @@ package fr.ird.observe.client.datasource.editor.content.data.ll.observation;
    23 23 
      */
    24 24
    25 25 
     import fr.ird.observe.client.datasource.editor.content.ui.table.EditableTableWithCacheTableModelSupport;
    26 
    +import fr.ird.observe.dto.IdDto;
    26 27 
     import fr.ird.observe.dto.data.ll.observation.SizeMeasureDto;
    27 28 
     import fr.ird.observe.dto.referential.common.SizeMeasureTypeReference;
    28 29
    30 
    +import java.util.Date;
    31 
    +
    29 32 
     /**
    30 33 
      * Created on 12/3/14.
    31 34 
      *
    ... ... @@ -48,6 +51,7 @@ public class SizeMeasureTableModel extends EditableTableWithCacheTableModelSuppo
    48 51 
         @Override
    49 52 
         protected boolean isRowValid(SizeMeasureDto valid) {
    50 53 
             Float size = valid.getSize();
    54 
    +        //FIXME This is a hardcoded validation ?
    51 55 
             return !(valid.getSizeMeasureType() == null || size == null) && size > 0 && size < 1000;
    52 56 
         }
    53 57
    ... ... @@ -97,7 +101,7 @@ public class SizeMeasureTableModel extends EditableTableWithCacheTableModelSuppo
    97 101
    98 102 
         @Override
    99 103 
         protected SizeMeasureDto createNewRow() {
    100 
    -        return new SizeMeasureDto();
    104 
    +        return IdDto.newDto(SizeMeasureDto.class, new Date());
    101 105 
         }
    102 106
    103 107 
     }

  • client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/WeightMeasureTableModel.java
    ... ... @@ -23,9 +23,12 @@ package fr.ird.observe.client.datasource.editor.content.data.ll.observation;
    23 23 
      */
    24 24
    25 25 
     import fr.ird.observe.client.datasource.editor.content.ui.table.EditableTableWithCacheTableModelSupport;
    26 
    +import fr.ird.observe.dto.IdDto;
    26 27 
     import fr.ird.observe.dto.data.ll.observation.WeightMeasureDto;
    27 28 
     import fr.ird.observe.dto.referential.common.WeightMeasureTypeReference;
    28 29
    30 
    +import java.util.Date;
    31 
    +
    29 32 
     /**
    30 33 
      * Created on 12/3/14.
    31 34 
      *
    ... ... @@ -48,12 +51,13 @@ public class WeightMeasureTableModel extends EditableTableWithCacheTableModelSup
    48 51 
         @Override
    49 52 
         public boolean isRowValid(WeightMeasureDto valid) {
    50 53 
             Float weight = valid.getWeight();
    54 
    +        //FIXME This is a hardcoded validation ?
    51 55 
             return !(valid.getWeightMeasureType() == null || weight == null) && weight > 0 && weight < 1000;
    52 56 
         }
    53 57
    54 58 
         @Override
    55 59 
         protected WeightMeasureDto createNewRow() {
    56 
    -        return new WeightMeasureDto();
    60 
    +        return IdDto.newDto(WeightMeasureDto.class, new Date());
    57 61 
         }
    58 62
    59 63 
         @Override

  • client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/common/GearUseFeaturesUIHandler.java
    ... ... @@ -29,6 +29,7 @@ import fr.ird.observe.client.datasource.editor.content.data.table.ContentTableUI
    29 29 
     import fr.ird.observe.client.datasource.editor.content.data.table.ContentTableUILayoutFocusTraversalPolicy;
    30 30 
     import fr.ird.observe.client.datasource.editor.content.ui.table.EditableTableModelSupport;
    31 31 
     import fr.ird.observe.client.util.UIHelper;
    32 
    +import fr.ird.observe.dto.IdDto;
    32 33 
     import fr.ird.observe.dto.data.ps.common.GearUseFeaturesDto;
    33 34 
     import fr.ird.observe.dto.data.ps.common.GearUseFeaturesMeasurementDto;
    34 35 
     import fr.ird.observe.dto.data.ps.common.TripGearUseFeaturesDto;
    ... ... @@ -55,6 +56,7 @@ import java.beans.PropertyChangeListener;
    55 56 
     import java.util.ArrayList;
    56 57 
     import java.util.Collections;
    57 58 
     import java.util.Comparator;
    59 
    +import java.util.Date;
    58 60 
     import java.util.List;
    59 61 
     import java.util.stream.Collectors;
    60 62
    ... ... @@ -152,7 +154,7 @@ public class GearUseFeaturesUIHandler extends ContentTableUIHandler<TripGearUseF
    152 154
    153 155 
             return gearDto.getGearCaracteristic().stream()
    154 156 
                     .map(input -> {
    155 
    -                    GearUseFeaturesMeasurementDto measurementSeineDto = new GearUseFeaturesMeasurementDto();
    157 
    +                    GearUseFeaturesMeasurementDto measurementSeineDto = IdDto.newDto(GearUseFeaturesMeasurementDto.class, new Date());
    156 158 
                         if (input.getGearCaracteristicType().isBoolean()) {
    157 159 
                             measurementSeineDto.setMeasurementValue(Boolean.FALSE.toString());
    158 160 
                         }

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.