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

Commits:

17 changed files:

Changes:

  • client-core/src/main/i18n/getters/java.getter
    ... ... @@ -299,16 +299,6 @@ observe.choice.quit
    299 299 
     observe.choice.replace
    300 300 
     observe.choice.save
    301 301 
     observe.choice.useRemoteStorage
    302 
    -observe.common.ActivityLogbookDto.action.goToOpen.short
    303 
    -observe.common.ActivityLogbookDto.action.goToOpen.tip
    304 
    -observe.common.ActivityLonglineLogbookDto.action.chooseRelatedObservedActivity
    305 
    -observe.common.FloatingObjectReference.action.add
    306 
    -observe.common.FloatingObjectReference.action.add.tip
    307 
    -observe.common.FloatingObjectReference.choose.title
    308 
    -observe.common.RouteLogbookDto.action.goToOpen.short
    309 
    -observe.common.SampleLogbook.action.addSampleSpecies
    310 
    -observe.common.SampleLogbook.action.addSampleSpecies.tip
    311 
    -observe.common.TripLonglineSampleDto.message.not.open
    312 302 
     observe.common.action.moveBottom
    313 303 
     observe.common.action.moveBottom.tip
    314 304 
     observe.common.action.moveDown
    ... ... @@ -422,6 +412,9 @@ observe.data.ll.landing.TripLonglineLanding.action.moves
    422 412 
     observe.data.ll.landing.TripLonglineLanding.action.moves.tip
    423 413 
     observe.data.ll.landing.TripLonglineLanding.action.selectTransshipment
    424 414 
     observe.data.ll.landing.TripLonglineLanding.message.not.open
    415 
    +observe.data.ll.logbook.ActivityLogbook.action.chooseRelatedObservedActivity
    416 
    +observe.data.ll.logbook.ActivityLogbook.action.goToOpen.short
    417 
    +observe.data.ll.logbook.ActivityLogbook.action.goToOpen.tip
    425 418 
     observe.data.ll.logbook.ActivityLonglineLogbook.action.addSample
    426 419 
     observe.data.ll.logbook.ActivityLonglineLogbook.action.addSample.tip
    427 420 
     observe.data.ll.logbook.ActivityLonglineLogbook.action.addSet
    ... ... @@ -487,6 +480,8 @@ observe.data.ll.logbook.HooksCompositionLogbook.table.hookType
    487 480 
     observe.data.ll.logbook.HooksCompositionLogbook.table.hookType.tip
    488 481 
     observe.data.ll.logbook.HooksCompositionLogbook.table.proportion
    489 482 
     observe.data.ll.logbook.HooksCompositionLogbook.table.proportion.tip
    483 
    +observe.data.ll.logbook.SampleLogbook.action.addSampleSpecies
    484 
    +observe.data.ll.logbook.SampleLogbook.action.addSampleSpecies.tip
    490 485 
     observe.data.ll.logbook.SamplePartLogbook.table.count
    491 486 
     observe.data.ll.logbook.SamplePartLogbook.table.count.tip
    492 487 
     observe.data.ll.logbook.SamplePartLogbook.table.length
    ... ... @@ -665,6 +660,9 @@ observe.data.ll.observation.WeightMeasureObs.table.weight
    665 660 
     observe.data.ll.observation.WeightMeasureObs.table.weight.tip
    666 661 
     observe.data.ll.observation.WeightMeasureObs.table.weightMeasureType
    667 662 
     observe.data.ll.observation.WeightMeasureObs.table.weightMeasureType.tip
    663 
    +observe.data.ps.FloatingObjectReference.action.add
    664 
    +observe.data.ps.FloatingObjectReference.action.add.tip
    665 
    +observe.data.ps.FloatingObjectReference.choose.title
    668 666 
     observe.data.ps.common.GearUseFeatures.delete
    669 667 
     observe.data.ps.common.GearUseFeatures.table.comment
    670 668 
     observe.data.ps.common.GearUseFeatures.table.comment.tip
    ... ... @@ -736,6 +734,7 @@ observe.data.ps.logbook.FloatingObject.not.a.reference
    736 734 
     observe.data.ps.logbook.FloatingObject.notComputed
    737 735 
     observe.data.ps.logbook.FloatingObject.table.type
    738 736 
     observe.data.ps.logbook.Route.action.delete.tip
    737 
    +observe.data.ps.logbook.Route.action.goToOpen.short
    739 738 
     observe.data.ps.logbook.Route.action.goToOpen.tip
    740 739 
     observe.data.ps.logbook.Route.action.moves
    741 740 
     observe.data.ps.logbook.Route.action.moves.tip
    ... ... @@ -744,6 +743,7 @@ observe.data.ps.logbook.Sample.action.goToOpen.short
    744 743 
     observe.data.ps.logbook.Sample.action.goToOpen.tip
    745 744 
     observe.data.ps.logbook.Sample.action.moves
    746 745 
     observe.data.ps.logbook.Sample.action.moves.tip
    746 
    +observe.data.ps.logbook.Sample.message.not.open
    747 747 
     observe.data.ps.logbook.SampleSpeciesSize.table.count
    748 748 
     observe.data.ps.logbook.SampleSpeciesSize.table.count.tip
    749 749 
     observe.data.ps.logbook.SampleSpeciesSize.table.sizeClass
    ... ... @@ -1045,6 +1045,7 @@ observe.ui.tree.data.ps.logbook.route.unsaved
    1045 1045 
     observe.ui.tree.data.ps.logbook.set.unsaved
    1046 1046 
     observe.ui.tree.data.ps.obs.activity.list
    1047 1047 
     observe.ui.tree.data.ps.obs.activity.unsaved
    1048 
    +observe.ui.tree.data.ps.obs.catches
    1048 1049 
     observe.ui.tree.data.ps.obs.floatingObject.unsaved
    1049 1050 
     observe.ui.tree.data.ps.obs.nonTargetCatchRelease
    1050 1051 
     observe.ui.tree.data.ps.obs.objectObservedSpecies

  • client-core/src/main/i18n/getters/jaxx.getter
    ... ... @@ -76,9 +76,6 @@ observe.actions.validate.select.mode
    76 76 
     observe.actions.validate.select.mode.tip
    77 77 
     observe.actions.validate.select.scope
    78 78 
     observe.actions.validate.select.scope.tip
    79 
    -observe.common.Sample.action.resetDefaultSizeMeasureType.tip
    80 
    -observe.common.TargetCatchDto.table.well.tip
    81 
    -observe.common.TripLonglineSampleLogbookDto.comment
    82 79 
     observe.common.description
    83 80 
     observe.common.directory
    84 81 
     observe.common.file
    ... ... @@ -686,7 +683,9 @@ observe.data.ps.logbook.Route.title
    686 683 
     observe.data.ps.logbook.Route.titles
    687 684 
     observe.data.ps.logbook.Sample.action.create
    688 685 
     observe.data.ps.logbook.Sample.action.create.tip
    686 
    +observe.data.ps.logbook.Sample.action.resetDefaultSizeMeasureType.tip
    689 687 
     observe.data.ps.logbook.Sample.bigsWeight
    688 
    +observe.data.ps.logbook.Sample.comment
    690 689 
     observe.data.ps.logbook.Sample.message.cantAdd
    691 690 
     observe.data.ps.logbook.Sample.sampleQuality
    692 691 
     observe.data.ps.logbook.Sample.sampleType
    ... ... @@ -871,6 +870,7 @@ observe.data.ps.wellplan.WellPlan.title
    871 870 
     observe.data.ps.wellplan.WellPlan.weight
    872 871 
     observe.data.ps.wellplan.WellPlan.weightCategory
    873 872 
     observe.data.ps.wellplan.WellPlan.well
    873 
    +observe.data.table.well.tip
    874 874 
     observe.info.selected.validators
    875 875 
     observe.info.validation.credentials
    876 876 
     observe.menu.actions

  • client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/ChooseRelatedObservedActivityUIAction.java
    ... ... @@ -47,7 +47,7 @@ public class ChooseRelatedObservedActivityUIAction extends AbstractContentUIActi
    47 47 
         private final ActivityLonglinePairingResultItemDecorator decorator;
    48 48
    49 49 
         public ChooseRelatedObservedActivityUIAction(ObserveMainUI mainUI) {
    50 
    -        super(mainUI, ACTION_NAME, n("observe.common.ActivityLonglineLogbookDto.action.chooseRelatedObservedActivity"), n("observe.common.ActivityLonglineLogbookDto.action.chooseRelatedObservedActivity"), "data-calcule", ObserveKeyStrokes.KEY_STROKE_CHOOSE_RELATED_OBSERVATION_ACTIVITY);
    50 
    +        super(mainUI, ACTION_NAME, n("observe.data.ll.logbook.ActivityLogbook.action.chooseRelatedObservedActivity"), n("observe.data.ll.logbook.ActivityLogbook.action.chooseRelatedObservedActivity"), "data-calcule", ObserveKeyStrokes.KEY_STROKE_CHOOSE_RELATED_OBSERVATION_ACTIVITY);
    51 51 
             ObserveSwingApplicationContext applicationContext = ObserveSwingApplicationContext.get();
    52 52 
             DecoratorService decoratorService = applicationContext.getDecoratorService();
    53 53 
             decorator = new ActivityLonglinePairingResultItemDecorator(decoratorService, applicationContext.getConfig().getLocale());
    ... ... @@ -87,7 +87,7 @@ public class ChooseRelatedObservedActivityUIAction extends AbstractContentUIActi
    87 87 
     //        String continueActionText = t("observe.choice.continue");
    88 88 
     //        Object[] options = {continueActionText, t("observe.choice.cancel")};
    89 89 
     //        JPanel panel = new JPanel(new BorderLayout());
    90 
    -//        panel.add(BorderLayout.NORTH, new JLabel(t("observe.common.ActivityLonglineLogbookDto.action.chooseRelatedObservedActivity.message",
    90 
    +//        panel.add(BorderLayout.NORTH, new JLabel(t("observe.data.ll.logbook.ActivityLogbook.action.chooseRelatedObservedActivity.message",
    91 91 
     //                                                   pairingConfig.getLonglineActivityPairingMaxTime(), pairingConfig.getLonglineActivityPairingMaxDistance())));
    92 92 
     //        panel.add(BorderLayout.CENTER, editor);
    93 93 
     //
    ... ... @@ -106,7 +106,7 @@ public class ChooseRelatedObservedActivityUIAction extends AbstractContentUIActi
    106 106 
     //        jButton.setEnabled(false);
    107 107 
     //        editor.addPropertyChangeListener("selectedItem", evt -> jButton.setEnabled(evt.getNewValue() != null));
    108 108 
     //
    109 
    -//        int response = UIHelper.askUser(ObserveSwingApplicationContext.get().getMainUI(), pane, t("observe.common.ActivityLonglineLogbookDto.action.chooseRelatedObservedActivity.title"), options);
    109 
    +//        int response = UIHelper.askUser(ObserveSwingApplicationContext.get().getMainUI(), pane, t("observe.data.ll.logbook.ActivityLogbook.action.chooseRelatedObservedActivity.title"), options);
    110 110 
     //
    111 111 
     //        ActivityLonglinePairingResultItem newActivityLonglineObs = null;
    112 112 
     //        if (response == 0) {

  • client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/add/AddSampleSpeciesSeineUIAction.java
    ... ... @@ -42,7 +42,7 @@ public class AddSampleSpeciesSeineUIAction extends AbstractContentUIAction {
    42 42 
         public static final String ACTION_NAME = AddSampleSpeciesSeineUIAction.class.getName();
    43 43
    44 44 
         public AddSampleSpeciesSeineUIAction(ObserveMainUI mainUI) {
    45 
    -        super(mainUI, ACTION_NAME, t("observe.common.SampleLogbook.action.addSampleSpecies"), t("observe.common.SampleLogbook.action.addSampleSpecies.tip"), "add", ObserveKeyStrokes.KEY_STROKE_ADD_SAMPLE);
    45 
    +        super(mainUI, ACTION_NAME, t("observe.data.ll.logbook.SampleLogbook.action.addSampleSpecies"), t("observe.data.ll.logbook.SampleLogbook.action.addSampleSpecies.tip"), "add", ObserveKeyStrokes.KEY_STROKE_ADD_SAMPLE);
    46 46 
         }
    47 47
    48 48 
         @Override

  • client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/logbook/add/AddActivitySeineFloatingObjectUIAction.java
    ... ... @@ -90,7 +90,7 @@ public class AddActivitySeineFloatingObjectUIAction extends AbstractContentUIAct
    90 90 
                     userConfigs.add(b);
    91 91 
                     a.install(b, pane);
    92 92 
                 }
    93 
    -            int response = UIHelper.askUser(pane, t("observe.common.FloatingObjectReference.choose.title"), options);
    93 
    +            int response = UIHelper.askUser(pane, t("observe.data.ps.FloatingObjectReference.choose.title"), options);
    94 94 
                 Object value = pane.getValue();
    95 95 
                 if (value instanceof FloatingObjectPreset) {
    96 96 
                     floatingObjectPresetsManager.setReferenceToUse((FloatingObjectPreset) value);

  • client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/logbook/dcp/AddFloatingObjectPresetUIAction.java
    ... ... @@ -60,7 +60,7 @@ public class AddFloatingObjectPresetUIAction extends AbstractContentUIAction {
    60 60 
         private static final Logger log = LogManager.getLogger(AddFloatingObjectPresetUIAction.class);
    61 61
    62 62 
         public AddFloatingObjectPresetUIAction(ObserveMainUI mainUI) {
    63 
    -        super(mainUI, ACTION_NAME, t("observe.common.FloatingObjectReference.action.add"), t("observe.common.FloatingObjectReference.action.add.tip"), "add", ObserveKeyStrokes.KEY_STROKE_ADD_FLOATING_OBJECT_REFERENCE);
    63 
    +        super(mainUI, ACTION_NAME, t("observe.data.ps.FloatingObjectReference.action.add"), t("observe.data.ps.FloatingObjectReference.action.add.tip"), "add", ObserveKeyStrokes.KEY_STROKE_ADD_FLOATING_OBJECT_REFERENCE);
    64 64 
         }
    65 65
    66 66 
         @Override
    ... ... @@ -92,7 +92,7 @@ public class AddFloatingObjectPresetUIAction extends AbstractContentUIAction {
    92 92 
                     }
    93 93 
                 }
    94 94 
             });
    95 
    -        int response = UIHelper.askUser(pane, t("observe.common.FloatingObjectReference.choose.title"), options);
    95 
    +        int response = UIHelper.askUser(pane, t("observe.data.ps.FloatingObjectReference.choose.title"), options);
    96 96
    97 97 
             if (response != 0) {
    98 98 
                 // user cancel

  • client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectSeineLogbookActivityAction.java
    ... ... @@ -38,8 +38,8 @@ public class SelectSeineLogbookActivityAction extends SelectEditDataAction {
    38 38 
             super(mainUI,
    39 39 
                   ObserveSeineActivityLogbookEditNode.class,
    40 40 
                   (int) 'F',
    41 
    -              t("observe.common.ActivityLogbookDto.action.goToOpen.short"),
    42 
    -              t("observe.common.ActivityLogbookDto.action.goToOpen.tip"));
    41 
    +              t("observe.data.ll.logbook.ActivityLogbook.action.goToOpen.short"),
    42 
    +              t("observe.data.ll.logbook.ActivityLogbook.action.goToOpen.tip"));
    43 43 
         }
    44 44
    45 45 
     }

  • client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectSeineLogbookRouteAction.java
    ... ... @@ -38,7 +38,7 @@ public class SelectSeineLogbookRouteAction extends SelectEditDataAction {
    38 38 
             super(mainUI,
    39 39 
                   ObserveSeineRouteLogbookEditNode.class,
    40 40 
                   (int) 'E',
    41 
    -              t("observe.common.RouteLogbookDto.action.goToOpen.short"),
    41 
    +              t("observe.data.ps.logbook.Route.action.goToOpen.short"),
    42 42 
                   t("observe.data.ps.logbook.Route.action.goToOpen.tip"));
    43 43 
         }
    44 44 
     }

  • client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/CatchUI.jcss
    ... ... @@ -25,5 +25,5 @@
    25 25 
     }
    26 26
    27 27 
     #wellLabel {
    28 
    -  toolTipText:"observe.common.TargetCatchDto.table.well.tip";
    28 
    +  toolTipText:"observe.data.table.well.tip";
    29 29 
     }

  • client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleSpeciesSizeUI.jcss
    ... ... @@ -30,7 +30,7 @@
    30 30
    31 31 
     #defaultSizeMeasureType {
    32 32 
       actionIcon:combobox-reset2;
    33 
    -  toolTipText:"observe.common.Sample.action.resetDefaultSizeMeasureType.tip";
    33 
    +  toolTipText:"observe.data.ps.logbook.Sample.action.resetDefaultSizeMeasureType.tip";
    34 34 
       enabled:{model.getDefaultSizeMeasureType() != null};
    35 35 
       focusable:false;
    36 36 
     }

  • client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleSpeciesUI.jcss
    ... ... @@ -38,7 +38,7 @@
    38 38 
     }
    39 39
    40 40 
     #comment {
    41 
    -  title:"observe.common.TripLonglineSampleLogbookDto.comment";
    41 
    +  title:"observe.data.ps.logbook.Sample.comment";
    42 42 
     }
    43 43
    44 44 
     #sampleSpeciesSizeUI {

  • client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleUI.jcss
    ... ... @@ -29,11 +29,11 @@
    29 29 
     }
    30 30
    31 31 
     #wellLabel {
    32 
    -  toolTipText:"observe.common.TargetCatchDto.table.well.tip";
    32 
    +  toolTipText:"observe.data.table.well.tip";
    33 33 
     }
    34 34
    35 35 
     #comment {
    36 
    -  title:"observe.common.TripLonglineSampleLogbookDto.comment";
    36 
    +  title:"observe.data.ps.logbook.Sample.comment";
    37 37 
     }
    38 38
    39 39 
     #reopen {

  • client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleUIModel.java
    ... ... @@ -38,7 +38,7 @@ public class SampleUIModel extends ContentOpenableUIModel<SampleDto, SampleRefer
    38 38 
         private static final long serialVersionUID = 1L;
    39 39
    40 40 
         public SampleUIModel() {
    41 
    -        super(SampleDto.class, I18n.n("observe.common.TripLonglineSampleDto.message.not.open"));
    41 
    +        super(SampleDto.class, I18n.n("observe.data.ps.logbook.Sample.message.not.open"));
    42 42 
         }
    43 43
    44 44 
     }

  • client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/wellplan/TripWellPlanUI.jcss
    ... ... @@ -28,5 +28,5 @@
    28 28 
     }
    29 29
    30 30 
     #wellLabel {
    31 
    -  toolTipText:"observe.common.TargetCatchDto.table.well.tip";
    31 
    +  toolTipText:"observe.data.table.well.tip";
    32 32 
     }

  • observe-i18n/src/main/i18n/translations/observe_en_GB.properties The diff for this file was not included because it is too large.
  • observe-i18n/src/main/i18n/translations/observe_es_ES.properties The diff for this file was not included because it is too large.
  • observe-i18n/src/main/i18n/translations/observe_fr_FR.properties The diff for this file was not included because it is too large.

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