[Observe-commits] [Git][ultreiaio/ird-observe][develop] 4 commits: update pom

18 May 2022


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


Commits:
0225b6af by Tony Chemit at 2022-05-18T17:32:36+02:00
update pom

- - - - -
80dca4bc by Tony Chemit at 2022-05-18T17:32:36+02:00
stop error stack trace when on jdk.internal

- - - - -
6597128a by Tony Chemit at 2022-05-19T00:19:46+02:00
Petites améliorations sur l'onglet de choix des espèces ciblées par la marée - Closes #2353

- - - - -
7fa12afd by Tony Chemit at 2022-05-19T00:19:46+02:00
Fix some titled border issue

- - - - -


27 changed files:

- client/core/src/main/java/fr/ird/observe/client/datasource/api/cache/ReferencesCache.java
- client/core/src/main/java/fr/ird/observe/client/datasource/h2/server/H2ServerUI.jcss
- client/core/src/main/java/fr/ird/observe/client/util/init/UIInitHelper.java
- client/core/src/main/resources/fr/ird/observe/client/ui/ObserveCommon.jcss
- client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/config/ConfigUI.jcss
- client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/DataSynchroUI.jcss
- client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/ReferentialSynchroUI.jcss
- client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIInitializer.java
- client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ContentReferentialUI.jcss
- client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/wizard/connexion/DataSourceSelector.jcss
- client/datasource/editor/api/src/main/resources/fr/ird/observe/client/datasource/editor/api/content/data/sample/CommonSample.jcss
- client/datasource/editor/api/src/main/resources/fr/ird/observe/client/datasource/editor/api/content/referential/CommonContentI18nReferentialUI.jcss
- client/datasource/editor/api/src/main/resources/fr/ird/observe/client/datasource/editor/api/content/referential/CommonContentReferentialUI.jcss
- client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/LengthLengthParameterUI.jcss
- client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/LengthWeightParameterUI.jcss
- client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/SpeciesUI.jcss
- client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/common/TripUI.jcss
- client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetCatchUI.jcss
- client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/LonglinePositionAware.jcss
- client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUI.jcss
- client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/FloatingObjectUICommon.jcss
- client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/FloatingObjectPresetUI.jcss
- client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SetNonTargetCatchReleaseUI.jcss
- client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SetUI.jcss
- core/api/dto/src/main/java/fr/ird/observe/spi/decoration/ObserveI18nDecoratorHelper.java
- pom.xml
- server/core/src/main/java/fr/ird/observe/server/controller/ObserveWebErrorController.java


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;
 import fr.ird.observe.dto.reference.ReferentialDtoReferenceDefinition;
 import fr.ird.observe.dto.reference.ReferentialDtoReferenceSet;
 import fr.ird.observe.spi.module.ObserveBusinessProject;
+import io.ultreia.java4all.decoration.Decorator;
 import io.ultreia.java4all.jaxx.widgets.combobox.FilterableComboBox;
 import io.ultreia.java4all.jaxx.widgets.list.DoubleList;
 import io.ultreia.java4all.jaxx.widgets.list.ListHeader;
@@ -323,6 +324,11 @@ public class ReferencesCache {
         }
         //FIXME A finir (bien vérifier que la sélection n'est plus dans l'univers)
         List<R> selected = list.getModel().getSelected();
+        Decorator decorator = list.getModel().getUniverseModel().getDecorator();
+        Integer index = list.getIndex();
+        Boolean reverseSort = list.isReverseSort();
+        decorator.sort(data, index, reverseSort);
+        decorator.sort(selected, index, reverseSort);
         list.setUniverse(data);
         list.setSelected(selected);
         list.putClientProperty("data", data);
@@ -338,6 +344,11 @@ public class ReferencesCache {
         }
         //FIXME A finir (bien vérifier que la sélection n'est plus dans l'univers)
         List<R> selected = list.getModel().getSelected();
+        Decorator decorator = list.getModel().getUniverseModel().getDecorator();
+        Integer index = list.getIndex();
+        Boolean reverseSort = list.isReverseSort();
+        decorator.sort(data, index, reverseSort);
+        decorator.sort(selected, index, reverseSort);
         list.setUniverse(data);
         list.setSelected(selected);
         list.putClientProperty("data", data);


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


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


=====================================
client/core/src/main/resources/fr/ird/observe/client/ui/ObserveCommon.jcss
=====================================
@@ -150,7 +150,7 @@ TimeEditor {
 }
 
 DoubleList {
-  showDecorator:false;
+  showDecorator:true;
   showReset:true;
   showSelectPopupEnabled: false;
   filterable:false;


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


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


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


=====================================
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
     private <R extends DataDtoReference> void prepareDataDoubleList(Class<R> dtoClass, DoubleList<R> editor) {
         Decorator decorator = getDecorator(dtoClass, editor);
         String entityLabel = t(I18nDecoratorHelper.getType(dtoClass));
-        editor.getPopupSortLabel().setText(t("observe.data.Data.type", entityLabel));
+        String title = t("observe.data.Data.type", entityLabel);
+//        editor.getPopupSortLabel().setText(title);
+        editor.setLabel(title);
         editor.putClientProperty("decorator", decorator);
         editor.init(decorator, new ArrayList<>(), new ArrayList<>());
         JList<R> selectedList = editor.getSelectedList();
@@ -436,7 +438,9 @@ public class ContentUIInitializer<UI extends ContentUI> extends UIInitializerSup
     private <R extends ReferentialDtoReference> void prepareReferentialDoubleList(Class<R> dtoClass, DoubleList<R> editor) {
         Decorator decorator = getDecorator(dtoClass, editor);
         String entityLabel = t(I18nDecoratorHelper.getType(dtoClass));
-        editor.getPopupSortLabel().setText(t("observe.referential.Referential.type", entityLabel));
+        String title = t("observe.referential.Referential.type", entityLabel);
+//        editor.getPopupSortLabel().setText(title);
+        editor.setLabel(title);
         editor.putClientProperty("decorator", decorator);
         editor.init(decorator, new ArrayList<>(), new ArrayList<>());
         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 {
 }
 
 #editTable {
-  border:{new TitledBorder(t("observe.referential.Referential.characteristics"))};
+  border:{new TitledBorder(t("observe.referential.Referential.characteristics") + "      ")};
 }
 
 #editExtraTable {
@@ -77,7 +77,7 @@ JLabel {
 }
 
 #editI18nTable {
-  border:{new TitledBorder(t("observe.Common.labels"))};
+  border:{new TitledBorder(t("observe.Common.labels") + "      ")};
   visible:false;
 }
 


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


=====================================
client/datasource/editor/api/src/main/resources/fr/ird/observe/client/datasource/editor/api/content/data/sample/CommonSample.jcss
=====================================
@@ -25,7 +25,7 @@
 }
 
 #acquisitionModePanel {
-  border:{new TitledBorder(t("observe.Common.acquisitionMode"))};
+  border:{new TitledBorder(t("observe.Common.acquisitionMode") + "      ")};
 }
 
 #acquisitionModeNumber {
@@ -45,7 +45,7 @@
 }
 
 #speciesAndMeasureTypesPanel {
-  border:{new TitledBorder(t("observe.Common.speciesAndMeasureTypes"))};
+  border:{new TitledBorder(t("observe.Common.speciesAndMeasureTypes") + "      ")};
 }
 
 #sizeMeasureType {


=====================================
client/datasource/editor/api/src/main/resources/fr/ird/observe/client/datasource/editor/api/content/referential/CommonContentI18nReferentialUI.jcss
=====================================
@@ -42,11 +42,11 @@ BeanCheckBox {
 }
 
 #editI18nTable2 {
-  border:{new TitledBorder(t("observe.Common.labels"))};
+  border:{new TitledBorder(t("observe.Common.labels") + "      ")};
 }
 
 .caracteristic {
-  border:{new TitledBorder(t("observe.referential.Referential.characteristics"))};
+  border:{new TitledBorder(t("observe.referential.Referential.characteristics") + "      ")};
 }
 
 #coefficientsInformation {


=====================================
client/datasource/editor/api/src/main/resources/fr/ird/observe/client/datasource/editor/api/content/referential/CommonContentReferentialUI.jcss
=====================================
@@ -42,11 +42,11 @@ BeanCheckBox {
 }
 
 #editI18nTable2 {
-  border:{new TitledBorder(t("observe.Common.labels"))};
+  border:{new TitledBorder(t("observe.Common.labels") + "      ")};
 }
 
 .caracteristic {
-  border:{new TitledBorder(t("observe.referential.Referential.characteristics"))};
+  border:{new TitledBorder(t("observe.referential.Referential.characteristics") + "      ")};
 }
 
 #uriLabel {


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


=====================================
client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/LengthWeightParameterUI.jcss
=====================================
@@ -30,9 +30,9 @@
 }
 
 #relationTable {
-  border:{new TitledBorder(t("observe.referential.WithFormula.equation"))};
+  border:{new TitledBorder(t("observe.referential.WithFormula.equation") + "      ")};
 }
 
 #meanValuesTable {
-  border:{new TitledBorder(t("observe.referential.common.LengthWeightParameter.meanValues"))};
+  border:{new TitledBorder(t("observe.referential.common.LengthWeightParameter.meanValues") + "      ")};
 }


=====================================
client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/SpeciesUI.jcss
=====================================
@@ -25,9 +25,9 @@
 }
 
 #ocean {
-  border:{new TitledBorder(t("observe.referential.common.Species.oceanList") + "    ")};
+  border:{new TitledBorder(t("observe.referential.common.Species.oceanList") + "      ")};
 }
 
 #editTaillePoids {
-  border:{new TitledBorder(t("observe.referential.common.Species.taillePoids.characteristics") + "    ")};
+  border:{new TitledBorder(t("observe.referential.common.Species.taillePoids.characteristics") + "      ")};
 }


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


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


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


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


=====================================
client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/FloatingObjectUICommon.jcss
=====================================
@@ -44,7 +44,7 @@
 }
 
 #computedPanel {
-  border:{new TitledBorder(t("observe.Common.computedValues"))};
+  border:{new TitledBorder(t("observe.Common.computedValues") + "      ")};
 }
 
 #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 {
 }
 
 #generalPanel {
-  border:{new TitledBorder(t("observe.Common.generalTab"))};
+  border:{new TitledBorder(t("observe.Common.generalTab") + "      ")};
 }
 
 #materialsPanel {
-  border:{new TitledBorder(t("observe.data.ps.observation.FloatingObject.materialsTab"))};
+  border:{new TitledBorder(t("observe.data.ps.observation.FloatingObject.materialsTab") + "      ")};
 }
 
 #keepObjectOperation {
@@ -85,11 +85,11 @@ JLabel {
 }
 
 #buoy1 {
-  border:{new TitledBorder(t("observe.Common.first.buoy"))};
+  border:{new TitledBorder(t("observe.Common.first.buoy") + "      ")};
 }
 
 #buoy2 {
-  border:{new TitledBorder(t("observe.Common.second.buoy"))};
+  border:{new TitledBorder(t("observe.Common.second.buoy") + "      ")};
 }
 
 #noBuoyEditor {


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


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


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


=====================================
pom.xml
=====================================
@@ -23,7 +23,7 @@
   <parent>
     <groupId>io.ultreia.maven</groupId>
     <artifactId>pom</artifactId>
-    <version>2022.54</version>
+    <version>2022.56</version>
   </parent>
   <groupId>fr.ird.observe</groupId>
   <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 {
                 for (StackTraceElement stackTraceElement : exception.getStackTrace()) {
                     if (stackTraceElement.getClassName().contains("sun.reflect.")) {
                         continue;
+                    }if (stackTraceElement.getClassName().contains("jdk.internal")) {
+                        continue;
                     }
                     stackTraceElements.add(stackTraceElement);
                 }



View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/4f5bd5bcbdcd02a0510cbadda...

-- 
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/4f5bd5bcbdcd02a0510cbadda...
You're receiving this email because of your account on gitlab.com.

    

[Observe-commits] [Git][ultreiaio/ird-observe][develop] 4 commits: update pom

Tony CHEMIT (＠tchemit)