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

Commits:

27 changed files:

Changes:

  • client/core/src/main/java/fr/ird/observe/client/datasource/api/cache/ReferencesCache.java
    ... ... @@ -36,6 +36,7 @@ import fr.ird.observe.dto.reference.ReferentialDtoReference;
    36 36 
     import fr.ird.observe.dto.reference.ReferentialDtoReferenceDefinition;
    37 37 
     import fr.ird.observe.dto.reference.ReferentialDtoReferenceSet;
    38 38 
     import fr.ird.observe.spi.module.ObserveBusinessProject;
    39 
    +import io.ultreia.java4all.decoration.Decorator;
    39 40 
     import io.ultreia.java4all.jaxx.widgets.combobox.FilterableComboBox;
    40 41 
     import io.ultreia.java4all.jaxx.widgets.list.DoubleList;
    41 42 
     import io.ultreia.java4all.jaxx.widgets.list.ListHeader;
    ... ... @@ -323,6 +324,11 @@ public class ReferencesCache {
    323 324 
             }
    324 325 
             //FIXME A finir (bien vérifier que la sélection n'est plus dans l'univers)
    325 326 
             List<R> selected = list.getModel().getSelected();
    327 
    +        Decorator decorator = list.getModel().getUniverseModel().getDecorator();
    328 
    +        Integer index = list.getIndex();
    329 
    +        Boolean reverseSort = list.isReverseSort();
    330 
    +        decorator.sort(data, index, reverseSort);
    331 
    +        decorator.sort(selected, index, reverseSort);
    326 332 
             list.setUniverse(data);
    327 333 
             list.setSelected(selected);
    328 334 
             list.putClientProperty("data", data);
    ... ... @@ -338,6 +344,11 @@ public class ReferencesCache {
    338 344 
             }
    339 345 
             //FIXME A finir (bien vérifier que la sélection n'est plus dans l'univers)
    340 346 
             List<R> selected = list.getModel().getSelected();
    347 
    +        Decorator decorator = list.getModel().getUniverseModel().getDecorator();
    348 
    +        Integer index = list.getIndex();
    349 
    +        Boolean reverseSort = list.isReverseSort();
    350 
    +        decorator.sort(data, index, reverseSort);
    351 
    +        decorator.sort(selected, index, reverseSort);
    341 352 
             list.setUniverse(data);
    342 353 
             list.setSelected(selected);
    343 354 
             list.putClientProperty("data", data);

  • client/core/src/main/java/fr/ird/observe/client/datasource/h2/server/H2ServerUI.jcss
    ... ... @@ -62,5 +62,5 @@
    62 62 
     }
    63 63
    64 64 
     #serverModeParameters {
    65 
    -  border: {new TitledBorder(t("observe.ui.title.h2.server.parameters"))};
    65 
    +  border: {new TitledBorder(t("observe.ui.title.h2.server.parameters") + "      ")};
    66 66 
     }

  • client/core/src/main/java/fr/ird/observe/client/util/init/UIInitHelper.java
    ... ... @@ -223,7 +223,7 @@ public class UIInitHelper {
    223 223 
                 editor.setProperty(editor.getName());
    224 224 
             }
    225 225 
             editor.setI18nPrefix("observe.common.");
    226 
    -        editor.setShowDecorator(false);
    226 
    +        editor.setShowDecorator(true);
    227 227 
             editor.setShowReset(true);
    228 228 
             editor.setShowSelectPopupEnabled(false);
    229 229 
             editor.setFilterable(false);
    ... ... @@ -279,7 +279,7 @@ public class UIInitHelper {
    279 279 
             editor.setDateFormat("dd/MM/yyyy");
    280 280 
             editor.init();
    281 281 
             editor.getDateEditor().getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(KeyStroke.getKeyStroke(KeyEvent.VK_F5, 0), "none");
    282 
    -        init(editor.getDayDateEditor(), editor.getModel()::getDate, editor.getModel()::setDate);
    282 
    +        init(editor.getDayDateEditor(), editor.getModel()::getDayDate, editor.getModel()::setDayDate);
    283 283 
         }
    284 284
    285 285 
         public static void init(DateEditor editor) {

  • client/core/src/main/resources/fr/ird/observe/client/ui/ObserveCommon.jcss
    ... ... @@ -150,7 +150,7 @@ TimeEditor {
    150 150 
     }
    151 151
    152 152 
     DoubleList {
    153 
    -  showDecorator:false;
    153 
    +  showDecorator:true;
    154 154 
       showReset:true;
    155 155 
       showSelectPopupEnabled: false;
    156 156 
       filterable:false;

  • client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/config/ConfigUI.jcss
    ... ... @@ -30,7 +30,7 @@
    30 30 
     }
    31 31
    32 32 
     #operations {
    33 
    -  border:{new TitledBorder(t("observe.ui.datasource.editor.actions.operations"))};
    33 
    +  border:{new TitledBorder(t("observe.ui.datasource.editor.actions.operations") + "      ")};
    34 34 
     }
    35 35
    36 36 
     #leftSourceConfig {

  • client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/DataSynchroUI.jcss
    ... ... @@ -26,7 +26,7 @@
    26 26 
     }
    27 27
    28 28 
     #actionsToConsumePane {
    29 
    -  border:{new TitledBorder(t("observe.ui.datasource.editor.actions.synchro.data.actionsToPerform"))};
    29 
    +  border:{new TitledBorder(t("observe.ui.datasource.editor.actions.synchro.data.actionsToPerform") + "      ")};
    30 30 
       verticalScrollBarPolicy:{JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED};
    31 31 
     }
    32 32

  • client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/ReferentialSynchroUI.jcss
    ... ... @@ -26,7 +26,7 @@
    26 26 
     }
    27 27
    28 28 
     #actionsToConsumePane {
    29 
    -  border:{new TitledBorder(t("observe.ui.datasource.editor.actions.synchro.data.actionsToPerform"))};
    29 
    +  border:{new TitledBorder(t("observe.ui.datasource.editor.actions.synchro.data.actionsToPerform") + "      ")};
    30 30 
       verticalScrollBarPolicy:{JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED};
    31 31 
     }
    32 32

  • client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIInitializer.java
    ... ... @@ -423,7 +423,9 @@ public class ContentUIInitializer<UI extends ContentUI> extends UIInitializerSup
    423 423 
         private <R extends DataDtoReference> void prepareDataDoubleList(Class<R> dtoClass, DoubleList<R> editor) {
    424 424 
             Decorator decorator = getDecorator(dtoClass, editor);
    425 425 
             String entityLabel = t(I18nDecoratorHelper.getType(dtoClass));
    426 
    -        editor.getPopupSortLabel().setText(t("observe.data.Data.type", entityLabel));
    426 
    +        String title = t("observe.data.Data.type", entityLabel);
    427 
    +//        editor.getPopupSortLabel().setText(title);
    428 
    +        editor.setLabel(title);
    427 429 
             editor.putClientProperty("decorator", decorator);
    428 430 
             editor.init(decorator, new ArrayList<>(), new ArrayList<>());
    429 431 
             JList<R> selectedList = editor.getSelectedList();
    ... ... @@ -436,7 +438,9 @@ public class ContentUIInitializer<UI extends ContentUI> extends UIInitializerSup
    436 438 
         private <R extends ReferentialDtoReference> void prepareReferentialDoubleList(Class<R> dtoClass, DoubleList<R> editor) {
    437 439 
             Decorator decorator = getDecorator(dtoClass, editor);
    438 440 
             String entityLabel = t(I18nDecoratorHelper.getType(dtoClass));
    439 
    -        editor.getPopupSortLabel().setText(t("observe.referential.Referential.type", entityLabel));
    441 
    +        String title = t("observe.referential.Referential.type", entityLabel);
    442 
    +//        editor.getPopupSortLabel().setText(title);
    443 
    +        editor.setLabel(title);
    440 444 
             editor.putClientProperty("decorator", decorator);
    441 445 
             editor.init(decorator, new ArrayList<>(), new ArrayList<>());
    442 446 
             JList<R> selectedList = editor.getSelectedList();

  • client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ContentReferentialUI.jcss
    ... ... @@ -69,7 +69,7 @@ JLabel {
    69 69 
     }
    70 70
    71 71 
     #editTable {
    72 
    -  border:{new TitledBorder(t("observe.referential.Referential.characteristics"))};
    72 
    +  border:{new TitledBorder(t("observe.referential.Referential.characteristics") + "      ")};
    73 73 
     }
    74 74
    75 75 
     #editExtraTable {
    ... ... @@ -77,7 +77,7 @@ JLabel {
    77 77 
     }
    78 78
    79 79 
     #editI18nTable {
    80 
    -  border:{new TitledBorder(t("observe.Common.labels"))};
    80 
    +  border:{new TitledBorder(t("observe.Common.labels") + "      ")};
    81 81 
       visible:false;
    82 82 
     }
    83 83

  • client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/wizard/connexion/DataSourceSelector.jcss
    ... ... @@ -21,7 +21,7 @@
    21 21 
      */
    22 22
    23 23 
     #sourceConfig {
    24 
    -  border:{new TitledBorder(model.getSourceLabel() + "  ")};
    24 
    +  border:{new TitledBorder(model.getSourceLabel() + "      ")};
    25 25 
     }
    26 26
    27 27 
     #sourceInfoLabel {

  • client/datasource/editor/api/src/main/resources/fr/ird/observe/client/datasource/editor/api/content/data/sample/CommonSample.jcss
    ... ... @@ -25,7 +25,7 @@
    25 25 
     }
    26 26
    27 27 
     #acquisitionModePanel {
    28 
    -  border:{new TitledBorder(t("observe.Common.acquisitionMode"))};
    28 
    +  border:{new TitledBorder(t("observe.Common.acquisitionMode") + "      ")};
    29 29 
     }
    30 30
    31 31 
     #acquisitionModeNumber {
    ... ... @@ -45,7 +45,7 @@
    45 45 
     }
    46 46
    47 47 
     #speciesAndMeasureTypesPanel {
    48 
    -  border:{new TitledBorder(t("observe.Common.speciesAndMeasureTypes"))};
    48 
    +  border:{new TitledBorder(t("observe.Common.speciesAndMeasureTypes") + "      ")};
    49 49 
     }
    50 50
    51 51 
     #sizeMeasureType {

  • client/datasource/editor/api/src/main/resources/fr/ird/observe/client/datasource/editor/api/content/referential/CommonContentI18nReferentialUI.jcss
    ... ... @@ -42,11 +42,11 @@ BeanCheckBox {
    42 42 
     }
    43 43
    44 44 
     #editI18nTable2 {
    45 
    -  border:{new TitledBorder(t("observe.Common.labels"))};
    45 
    +  border:{new TitledBorder(t("observe.Common.labels") + "      ")};
    46 46 
     }
    47 47
    48 48 
     .caracteristic {
    49 
    -  border:{new TitledBorder(t("observe.referential.Referential.characteristics"))};
    49 
    +  border:{new TitledBorder(t("observe.referential.Referential.characteristics") + "      ")};
    50 50 
     }
    51 51
    52 52 
     #coefficientsInformation {

  • client/datasource/editor/api/src/main/resources/fr/ird/observe/client/datasource/editor/api/content/referential/CommonContentReferentialUI.jcss
    ... ... @@ -42,11 +42,11 @@ BeanCheckBox {
    42 42 
     }
    43 43
    44 44 
     #editI18nTable2 {
    45 
    -  border:{new TitledBorder(t("observe.Common.labels"))};
    45 
    +  border:{new TitledBorder(t("observe.Common.labels") + "      ")};
    46 46 
     }
    47 47
    48 48 
     .caracteristic {
    49 
    -  border:{new TitledBorder(t("observe.referential.Referential.characteristics"))};
    49 
    +  border:{new TitledBorder(t("observe.referential.Referential.characteristics") + "      ")};
    50 50 
     }
    51 51
    52 52 
     #uriLabel {

  • client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/LengthLengthParameterUI.jcss
    ... ... @@ -30,6 +30,6 @@
    30 30 
     }
    31 31
    32 32 
     #relationTable {
    33 
    -  border:{new TitledBorder(t("observe.referential.WithFormula.equation"))};
    33 
    +  border:{new TitledBorder(t("observe.referential.WithFormula.equation") + "      ")};
    34 34 
     }
    35 35

  • client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/LengthWeightParameterUI.jcss
    ... ... @@ -30,9 +30,9 @@
    30 30 
     }
    31 31
    32 32 
     #relationTable {
    33 
    -  border:{new TitledBorder(t("observe.referential.WithFormula.equation"))};
    33 
    +  border:{new TitledBorder(t("observe.referential.WithFormula.equation") + "      ")};
    34 34 
     }
    35 35
    36 36 
     #meanValuesTable {
    37 
    -  border:{new TitledBorder(t("observe.referential.common.LengthWeightParameter.meanValues"))};
    37 
    +  border:{new TitledBorder(t("observe.referential.common.LengthWeightParameter.meanValues") + "      ")};
    38 38 
     }

  • client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/SpeciesUI.jcss
    ... ... @@ -25,9 +25,9 @@
    25 25 
     }
    26 26
    27 27 
     #ocean {
    28 
    -  border:{new TitledBorder(t("observe.referential.common.Species.oceanList") + "    ")};
    28 
    +  border:{new TitledBorder(t("observe.referential.common.Species.oceanList") + "      ")};
    29 29 
     }
    30 30
    31 31 
     #editTaillePoids {
    32 
    -  border:{new TitledBorder(t("observe.referential.common.Species.taillePoids.characteristics") + "    ")};
    32 
    +  border:{new TitledBorder(t("observe.referential.common.Species.taillePoids.characteristics") + "      ")};
    33 33 
     }

  • client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/common/TripUI.jcss
    ... ... @@ -60,7 +60,7 @@
    60 60 
     }
    61 61
    62 62 
     #availableDataPanel {
    63 
    -  border:{new TitledBorder(t("observe.data.ll.common.Trip.availableData") + "  ")};
    63 
    +  border:{new TitledBorder(t("observe.data.ll.common.Trip.availableData") + "      ")};
    64 64 
     }
    65 65
    66 66 
     #generateHomeId {

  • client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetCatchUI.jcss
    ... ... @@ -34,7 +34,7 @@
    34 34 
     }
    35 35
    36 36 
     #acquisitionMode {
    37 
    -  border:{new TitledBorder(t("observe.Common.acquisitionMode"))};
    37 
    +  border:{new TitledBorder(t("observe.Common.acquisitionMode") + "      ")};
    38 38 
       layout:{new GridLayout(0,1)};
    39 39 
     }
    40 40

  • client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/LonglinePositionAware.jcss
    ... ... @@ -21,7 +21,7 @@
    21 21 
      */
    22 22
    23 23 
     #locationOnLonglinePanel {
    24 
    -  border:{new TitledBorder(t("observe.Common.locationOnLongline"))};
    24 
    +  border:{new TitledBorder(t("observe.Common.locationOnLongline") + "      ")};
    25 25 
     }
    26 26
    27 27 
     #section {

  • client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUI.jcss
    ... ... @@ -38,7 +38,7 @@
    38 38 
     }
    39 39
    40 40 
     #acquisitionMode {
    41 
    -  border:{new TitledBorder(t("observe.Common.acquisitionMode"))};
    41 
    +  border:{new TitledBorder(t("observe.Common.acquisitionMode") + "      ")};
    42 42 
       layout:{new GridLayout(0,1)};
    43 43 
     }
    44 44

  • client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/FloatingObjectUICommon.jcss
    ... ... @@ -44,7 +44,7 @@
    44 44 
     }
    45 45
    46 46 
     #computedPanel {
    47 
    -  border:{new TitledBorder(t("observe.Common.computedValues"))};
    47 
    +  border:{new TitledBorder(t("observe.Common.computedValues") + "      ")};
    48 48 
     }
    49 49
    50 50 
     #computedWhenArrivingBiodegradable {

  • client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/FloatingObjectPresetUI.jcss
    ... ... @@ -25,11 +25,11 @@ JLabel {
    25 25 
     }
    26 26
    27 27 
     #generalPanel {
    28 
    -  border:{new TitledBorder(t("observe.Common.generalTab"))};
    28 
    +  border:{new TitledBorder(t("observe.Common.generalTab") + "      ")};
    29 29 
     }
    30 30
    31 31 
     #materialsPanel {
    32 
    -  border:{new TitledBorder(t("observe.data.ps.observation.FloatingObject.materialsTab"))};
    32 
    +  border:{new TitledBorder(t("observe.data.ps.observation.FloatingObject.materialsTab") + "      ")};
    33 33 
     }
    34 34
    35 35 
     #keepObjectOperation {
    ... ... @@ -85,11 +85,11 @@ JLabel {
    85 85 
     }
    86 86
    87 87 
     #buoy1 {
    88 
    -  border:{new TitledBorder(t("observe.Common.first.buoy"))};
    88 
    +  border:{new TitledBorder(t("observe.Common.first.buoy") + "      ")};
    89 89 
     }
    90 90
    91 91 
     #buoy2 {
    92 
    -  border:{new TitledBorder(t("observe.Common.second.buoy"))};
    92 
    +  border:{new TitledBorder(t("observe.Common.second.buoy") + "      ")};
    93 93 
     }
    94 94
    95 95 
     #noBuoyEditor {

  • client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SetNonTargetCatchReleaseUI.jcss
    ... ... @@ -29,7 +29,7 @@
    29 29 
     }
    30 30
    31 31 
     #acquisitionModePanel {
    32 
    -  border:{new TitledBorder(t("observe.Common.acquisitionMode"))};
    32 
    +  border:{new TitledBorder(t("observe.Common.acquisitionMode") + "      ")};
    33 33 
       layout:{new GridLayout(1,0)};
    34 34 
     }
    35 35

  • client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SetUI.jcss
    ... ... @@ -57,5 +57,5 @@
    57 57 
     }
    58 58
    59 59 
     #sonarUsedAvantSetPane {
    60 
    -  border:{new TitledBorder(null, t("observe.data.ps.observation.Set.sonarUsedAvantSet", 1, 0, getFont()))};
    60 
    +  border:{new TitledBorder(null, t("observe.data.ps.observation.Set.sonarUsedAvantSet") + "      ", 1, 0, getFont())};
    61 61 
     }

  • core/api/dto/src/main/java/fr/ird/observe/spi/decoration/ObserveI18nDecoratorHelper.java
    ... ... @@ -38,7 +38,7 @@ import java.util.Set;
    38 38 
     @AutoService(BeanPropertyI18nKeyProducerProvider.class)
    39 39 
     public class ObserveI18nDecoratorHelper extends I18nDecoratorHelper {
    40 40
    41 
    -    public static final Set<String> CODE_PROPERTIES = Set.of("code", "vesselCode");
    41 
    +    public static final Set<String> CODE_PROPERTIES = Set.of("code", "vesselCode", "faoCode");
    42 42 
         private ObserveI18nLabelsBuilder labelsBuilder;
    43 43
    44 44 
         public ObserveI18nDecoratorHelper() {

  • pom.xml
    ... ... @@ -23,7 +23,7 @@
    23 23 
       <parent>
    24 24 
         <groupId>io.ultreia.maven</groupId>
    25 25 
         <artifactId>pom</artifactId>
    26 
    -    <version>2022.54</version>
    26 
    +    <version>2022.56</version>
    27 27 
       </parent>
    28 28 
       <groupId>fr.ird.observe</groupId>
    29 29 
       <artifactId>ird-observe</artifactId>

  • server/core/src/main/java/fr/ird/observe/server/controller/ObserveWebErrorController.java
    ... ... @@ -75,6 +75,8 @@ public class ObserveWebErrorController extends WebMotionController {
    75 75 
                     for (StackTraceElement stackTraceElement : exception.getStackTrace()) {
    76 76 
                         if (stackTraceElement.getClassName().contains("sun.reflect.")) {
    77 77 
                             continue;
    78 
    +                    }if (stackTraceElement.getClassName().contains("jdk.internal")) {
    79 
    +                        continue;
    78 80 
                         }
    79 81 
                         stackTraceElements.add(stackTraceElement);
    80 82 
                     }

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