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

Commits:

13 changed files:

Changes:

  • client-datasource-actions/src/main/i18n/getters/java.getter
    ... ... @@ -12,7 +12,6 @@ observe.action.config.export.required.write.data
    12 12 
     observe.action.continue
    13 13 
     observe.action.copy
    14 14 
     observe.action.copy.to.clipBoard
    15 
    -observe.action.do.backup
    16 15 
     observe.action.do.backup.tip
    17 16 
     observe.action.goto.next.stage
    18 17 
     observe.action.goto.next.stage.tip

  • client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/save/SaveLocalUI.jcss
    ... ... @@ -56,7 +56,7 @@
    56 56 
       enabled:{stepModel.isDoBackup()};
    57 57 
     }
    58 58
    59 
    -#chooseBackupFile {
    59 
    +#chooseBackupDirectory {
    60 60 
       enabled:{stepModel.isDoBackup()};
    61 61 
     }
    62 62

  • client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/save/actions/ChooseBackupDirectory.java
    ... ... @@ -35,7 +35,7 @@ public class ChooseBackupDirectory extends SaveLocalUIActionSupport {
    35 35
    36 36
    37 37 
         public ChooseBackupDirectory() {
    38 
    -        super(t("observe.action.continue"), t("observe.action.continue"), "fileChooser", ObserveKeyStrokesSupport.KEY_STROKE_STORAGE_DO_CHOOSE_FILE);
    38 
    +        super("", t("observe.action.choose.db.dump.directory"), "fileChooser", ObserveKeyStrokesSupport.KEY_STROKE_STORAGE_DO_CHOOSE_FILE);
    39 39 
         }
    40 40
    41 41 
         @Override
    ... ... @@ -46,6 +46,8 @@ public class ChooseBackupDirectory extends SaveLocalUIActionSupport {
    46 46 
                     t("observe.action.choose.db.dump.directory"),
    47 47 
                     new File(ui.getDirectoryText().getText())
    48 48 
             );
    49 
    -        ui.getHandler().changeDirectory(f);
    49 
    +        if (f != null) {
    50 
    +            ui.getHandler().changeDirectory(f);
    51 
    +        }
    50 52 
         }
    51 53 
     }

  • client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/save/actions/SelectDoBackup.java
    ... ... @@ -22,6 +22,7 @@ package fr.ird.observe.client.datasource.actions.save.actions;
    22 22 
      * #L%
    23 23 
      */
    24 24
    25 
    +import fr.ird.observe.client.datasource.actions.save.SaveLocalModel;
    25 26 
     import fr.ird.observe.client.datasource.actions.save.SaveLocalUI;
    26 27 
     import fr.ird.observe.client.util.ObserveKeyStrokesSupport;
    27 28
    ... ... @@ -32,11 +33,13 @@ import static io.ultreia.java4all.i18n.I18n.t;
    32 33 
     public class SelectDoBackup extends SaveLocalUIActionSupport {
    33 34
    34 35 
         public SelectDoBackup() {
    35 
    -        super(t("observe.action.do.backup"), t("observe.action.do.backup.tip"), null, ObserveKeyStrokesSupport.KEY_STROKE_STORAGE_DO_BACKUP);
    36 
    +        super(t("observe.action.do.backup.tip"), t("observe.action.do.backup.tip"), "save", ObserveKeyStrokesSupport.KEY_STROKE_STORAGE_DO_BACKUP);
    36 37 
         }
    37 38
    38 39 
         @Override
    39 40 
         protected void doActionPerformed(ActionEvent e, SaveLocalUI ui) {
    40 
    -        ui.getStepModel().setDoBackup(ui.getStepModel().isDoBackup());
    41 
    +        SaveLocalModel stepModel = ui.getStepModel();
    42 
    +        boolean newValue = !stepModel.isDoBackup();
    43 
    +        stepModel.setDoBackup(newValue);
    41 44 
         }
    42 45 
     }

  • client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/common/GearUseFeaturesMeasurementsTableModel.java
    ... ... @@ -23,9 +23,12 @@ package fr.ird.observe.client.datasource.editor.content.data.ll.common;
    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.common.GearUseFeaturesMeasurementDto;
    27 28 
     import fr.ird.observe.dto.referential.common.GearCaracteristicReference;
    28 29
    30 
    +import java.util.Date;
    31 
    +
    29 32 
     /**
    30 33 
      * Created on 4/7/15.
    31 34 
      *
    ... ... @@ -134,6 +137,6 @@ public class GearUseFeaturesMeasurementsTableModel extends EditableTableWithCach
    134 137
    135 138 
         @Override
    136 139 
         protected GearUseFeaturesMeasurementDto createNewRow() {
    137 
    -        return new GearUseFeaturesMeasurementDto();
    140 
    +        return IdDto.newDto(GearUseFeaturesMeasurementDto.class, new Date());
    138 141 
         }
    139 142 
     }

  • 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/BasketTableModel.java
    ... ... @@ -22,9 +22,12 @@ package fr.ird.observe.client.datasource.editor.content.data.ll.observation;
    22 22 
      * #L%
    23 23 
      */
    24 24
    25 
    +import fr.ird.observe.dto.IdDto;
    25 26 
     import fr.ird.observe.dto.data.ll.observation.BasketDto;
    26 27 
     import fr.ird.observe.dto.data.ll.observation.SectionTemplate;
    27 28
    29 
    +import java.util.Date;
    30 
    +
    28 31 
     /**
    29 32 
      * Created on 12/11/14.
    30 33 
      *
    ... ... @@ -40,7 +43,7 @@ public class BasketTableModel extends LonglineCompositionObsTableModelSupport<Ba
    40 43
    41 44 
         @Override
    42 45 
         public BasketDto createNewRow() {
    43 
    -        return new BasketDto();
    46 
    +        return IdDto.newDto(BasketDto.class, new Date());
    44 47 
         }
    45 48
    46 49 
         @Override

  • client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/BranchlineTableModel.java
    ... ... @@ -22,6 +22,7 @@ package fr.ird.observe.client.datasource.editor.content.data.ll.observation;
    22 22 
      * #L%
    23 23 
      */
    24 24
    25 
    +import fr.ird.observe.dto.IdDto;
    25 26 
     import fr.ird.observe.dto.data.ll.observation.BranchlineDto;
    26 27
    27 28 
     import java.util.Date;
    ... ... @@ -49,7 +50,7 @@ public class BranchlineTableModel extends LonglineCompositionObsTableModelSuppor
    49 50 
         @Override
    50 51 
         public BranchlineDto createNewRow() {
    51 52
    52 
    -        BranchlineDto branchline = new BranchlineDto();
    53 
    +        BranchlineDto branchline = IdDto.newDto(BranchlineDto.class, new Date());
    53 54 
             branchline.setTimerTimeOnBoard(defaultDate);
    54 55 
             branchline.setTimer(useTimer);
    55 56 
             return branchline;

  • 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/GearUseFeaturesMeasurementsTableModel.java
    ... ... @@ -23,9 +23,12 @@ package fr.ird.observe.client.datasource.editor.content.data.ps.common;
    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.ps.common.GearUseFeaturesMeasurementDto;
    27 28 
     import fr.ird.observe.dto.referential.common.GearCaracteristicReference;
    28 29
    30 
    +import java.util.Date;
    31 
    +
    29 32 
     /**
    30 33 
      * Created on 4/7/15.
    31 34 
      *
    ... ... @@ -129,6 +132,6 @@ public class GearUseFeaturesMeasurementsTableModel extends EditableTableWithCach
    129 132
    130 133 
         @Override
    131 134 
         protected GearUseFeaturesMeasurementDto createNewRow() {
    132 
    -        return new GearUseFeaturesMeasurementDto();
    135 
    +        return IdDto.newDto(GearUseFeaturesMeasurementDto.class, new Date());
    133 136 
         }
    134 137 
     }

  • 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 
                         }

  • client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/FloatingObjectUIHandler.java
    ... ... @@ -338,7 +338,7 @@ public class FloatingObjectUIHandler extends ContentEditUIHandler<FloatingObject
    338 338
    339 339 
             if (transmittingBuoy == null) {
    340 340
    341 
    -            TransmittingBuoyHelper.copyTransmittingBuoyDto(new TransmittingBuoyDto(), editBean);
    341 
    +            TransmittingBuoyHelper.copyTransmittingBuoyDto(TransmittingBuoyDto.newDto(TransmittingBuoyDto.class, new Date()), editBean);
    342 342 
                 editBean.setCreateDate(new Date());
    343 343 
                 editBean.setTransmittingBuoyOperation(operation);
    344 344

    • —
    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.