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

Commits:

28 changed files:

Changes:

  • client-configuration/src/main/config/Client.ini
    ... ... @@ -627,6 +627,18 @@ key = ui.temperature.format
    627 627
     type = org.nuiton.jaxx.widgets.temperature.TemperatureFormat
    
    628 628
     defaultValue = "C"
    
    629 629
     
    
    630
    +[option busyStateColor]
    
    631
    +description = observe.config.ui.busyStateColor
    
    632
    +key = ui.busyState.color
    
    633
    +type = java.awt.Color
    
    634
    +defaultValue = "java.awt.Color[r=50,g=50,b=50]"
    
    635
    +
    
    636
    +[option blockStateColor]
    
    637
    +description = observe.config.ui.blockStateColor
    
    638
    +key = ui.blockState.color
    
    639
    +type = java.awt.Color
    
    640
    +defaultValue = "java.awt.Color[r=50,g=50,b=50]"
    
    641
    +
    
    630 642
     [option focusBorderColor]
    
    631 643
     description = observe.config.ui.focusBorderColor
    
    632 644
     key = ui.focusBorder.color
    

  • client-configuration/src/main/i18n/getters/config.getter
    ... ... @@ -92,6 +92,8 @@ observe.config.speciesList.seine.observation.targetCatch
    92 92
     observe.config.swingSessionFile.description
    
    93 93
     observe.config.temperature.format
    
    94 94
     observe.config.ui.autoPopupNumberEditor
    
    95
    +observe.config.ui.blockStateColor
    
    96
    +observe.config.ui.busyStateColor
    
    95 97
     observe.config.ui.changeSynchroSrc
    
    96 98
     observe.config.ui.dcp.error.color
    
    97 99
     observe.config.ui.dcp.not.editable.color
    

  • client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java
    ... ... @@ -59,6 +59,7 @@ import org.nuiton.util.StringUtil;
    59 59
     import org.nuiton.version.Version;
    
    60 60
     import org.nuiton.version.Versions;
    
    61 61
     
    
    62
    +import javax.swing.UIManager;
    
    62 63
     import java.io.File;
    
    63 64
     import java.io.IOException;
    
    64 65
     import java.nio.charset.StandardCharsets;
    
    ... ... @@ -215,7 +216,11 @@ public class ClientConfig extends GeneratedClientConfig implements TemplateGener
    215 216
     
    
    216 217
             File logFile = getLogConfigurationFile();
    
    217 218
     
    
    218
    -        log.info("Chargement du fichier de de log4j depuis " + logFile);
    
    219
    +        if (isVersionSnapshot() || logFile.exists()) {
    
    220
    +            Files.deleteIfExists(logFile.toPath());
    
    221
    +        }
    
    222
    +
    
    223
    +        log.info(String.format("Loading user log file at %s", logFile));
    
    219 224
     
    
    220 225
             ObserveUtil.loadLogConfiguration(ObserveClientResourceManager.Resource.LOG_CONFIGURATION_FILE.getUrl(), logFile.toPath(), this);
    
    221 226
     
    
    ... ... @@ -677,6 +682,8 @@ public class ClientConfig extends GeneratedClientConfig implements TemplateGener
    677 682
             loadUIConfigFile(ObserveClientResourceManager.Resource.ui_navigation_common, dir);
    
    678 683
             loadUIConfigFile(ObserveClientResourceManager.Resource.ui_navigation_ps, dir);
    
    679 684
             loadUIConfigFile(ObserveClientResourceManager.Resource.ui_navigation_ll, dir);
    
    685
    +        UIManager.getDefaults().put("BlockingLayerUI.busyColor", getBusyStateColor());
    
    686
    +        UIManager.getDefaults().put("BlockingLayerUI.blockColor", getBlockStateColor());
    
    680 687
         }
    
    681 688
     
    
    682 689
         private void loadUIConfigFile(ObserveClientResourceManager.Resource resource, File resourceDirectory) {
    

  • client-configuration/src/main/resources/log4j2.xml
    ... ... @@ -51,10 +51,6 @@
    51 51
           <AppenderRef ref="console"/>
    
    52 52
           <AppenderRef ref="File"/>
    
    53 53
         </Logger>
    
    54
    -    <Logger name="org.nuiton.jaxx.validator.swing.SwingValidator" level="error" additivity="false">
    
    55
    -      <AppenderRef ref="console"/>
    
    56
    -      <AppenderRef ref="File"/>
    
    57
    -    </Logger>
    
    58 54
         <Logger name="fr.ird.observe.client.validators" level="warn" additivity="false">
    
    59 55
           <AppenderRef ref="console"/>
    
    60 56
           <AppenderRef ref="File"/>
    

  • client-configuration/src/main/resources/observe-log4j2.xml
    ... ... @@ -63,10 +63,6 @@
    63 63
           <AppenderRef ref="console"/>
    
    64 64
           <AppenderRef ref="File"/>
    
    65 65
         </Logger>
    
    66
    -<!--    <Logger name="org.nuiton.jaxx.runtime.swing.action.JAXXObjectActionSupport" level="info" additivity="false">-->
    
    67
    -<!--      <AppenderRef ref="console"/>-->
    
    68
    -<!--      <AppenderRef ref="File"/>-->
    
    69
    -<!--    </Logger>-->
    
    70 66
         <Logger name="org.hibernate" level="warn" additivity="false">
    
    71 67
           <AppenderRef ref="console"/>
    
    72 68
           <AppenderRef ref="File"/>
    

  • client-core/src/main/java/fr/ird/observe/client/main/ObserveMainUI.jaxx
    ... ... @@ -47,7 +47,7 @@
    47 47
       <ClientConfig id='config' initializer='getContextValue(ClientConfig.class)'/>
    
    48 48
       <MainUIBodyContentManager id="mainUIBodyContentManager" initializer='getContextValue(MainUIBodyContentManager.class)'/>
    
    49 49
     
    
    50
    -  <ObserveBlockingLayerUI id='busyBlockLayerUI'/>
    
    50
    +  <ObserveBlockingLayerUI id='busyBlockLayerUI' styleClass="busyBlockLayerUI"/>
    
    51 51
     
    
    52 52
       <script><![CDATA[
    
    53 53
     
    

  • client-core/src/main/java/fr/ird/observe/client/main/ObserveMainUI.jcss
    ... ... @@ -72,10 +72,7 @@
    72 72
     }
    
    73 73
     
    
    74 74
     #busyBlockLayerUI {
    
    75
    -  useIcon: false;
    
    76
    -  blockingColor: {UIManager.getColor("BlockingLayerUI.blockingColor")};
    
    77 75
       block: {model.isBusy()};
    
    78
    -  acceptedComponentNames: {UIHelper.ACCEPTABLE_COMPONENTS};
    
    79 76
     }
    
    80 77
     
    
    81 78
     #serverMode {
    

  • client-core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java
    ... ... @@ -170,6 +170,8 @@ public class ClientConfigUI extends JXTitledPanel {
    170 170
             helper.addOption(ClientConfigOption.SHOW_MNEMONIC);
    
    171 171
             helper.addOption(ClientConfigOption.COORDINATE_FORMAT);
    
    172 172
     
    
    173
    +        helper.addOption(ClientConfigOption.BUSY_STATE_COLOR);
    
    174
    +        helper.addOption(ClientConfigOption.BLOCK_STATE_COLOR);
    
    173 175
             helper.addOption(ClientConfigOption.FOCUS_BORDER_COLOR);
    
    174 176
             helper.addOption(ClientConfigOption.NO_FOCUS_BORDER_COLOR);
    
    175 177
             helper.addOption(ClientConfigOption.FLOATING_OBJECT_MATERIAL_ERROR_COLOR);
    

  • client-core/src/main/resources/fr/ird/observe/client/ui/ObserveCommon.jcss
    ... ... @@ -172,3 +172,14 @@ BlockingLayerUI {
    172 172
       acceptedComponentTypes: {javax.swing.JScrollBar.class};
    
    173 173
     }
    
    174 174
     
    
    175
    +.busyBlockLayerUI {
    
    176
    +  useIcon: false;
    
    177
    +  blockingColor: {javax.swing.UIManager.getColor("BlockingLayerUI.busyColor")};
    
    178
    +  acceptedComponentNames: {fr.ird.observe.client.util.UIHelper.ACCEPTABLE_COMPONENTS};
    
    179
    +}
    
    180
    +
    
    181
    +.blockBlockLayerUI {
    
    182
    +  useIcon: false;
    
    183
    +  blockingColor: {javax.swing.UIManager.getColor("BlockingLayerUI.blockingColor")};
    
    184
    +  acceptedComponentNames: {fr.ird.observe.client.util.UIHelper.ACCEPTABLE_COMPONENTS};
    
    185
    +}

  • client-core/src/main/resources/observe-ui.properties
    ... ... @@ -189,3 +189,4 @@ color.Table.lastRowColor=255,255,0
    189 189
     color.Table.emptyRowColor=255,255,0
    
    190 190
     color.Table.unvalidCellColor=255,0,0
    
    191 191
     color.BlockingLayerUI.blockingColor=50,50,50
    
    192
    +color.BlockingLayerUI.busyColor=50,50,50

  • client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminTabUI.jcss
    ... ... @@ -92,7 +92,3 @@
    92 92
       columnHeaderView:{UIHelper.newLabel(t("observe.common.step.description") ,"information", 10)};
    
    93 93
     }
    
    94 94
     
    95
    -#busyBlockLayerUI{
    
    96
    -  useIcon:false;
    
    97
    -  blockingColor:{UIManager.getColor("BlockingLayerUI.blockingColor")};
    
    98
    -}

  • client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUI.jaxx
    ... ... @@ -37,13 +37,13 @@
    37 37
       <AdminUIModel id='model' initializer='getContextValue(AdminUIModel.class)'/>
    
    38 38
     
    
    39 39
       <!-- le bloqueur d'ui utilisé par l'assistant -->
    
    40
    -  <ObserveBlockingLayerUI id='tabBusyBlockLayerUI'/>
    
    40
    +  <ObserveBlockingLayerUI id='tabBusyBlockLayerUI' styleClass="busyBlockLayerUI"/>
    
    41 41
     
    
    42 42
       <!-- le bloqueur d'ui lorsqu'une action est en cours ou annulée -->
    
    43
    -  <ObserveBlockingLayerUI id='busyBlockLayerUI'/>
    
    43
    +  <ObserveBlockingLayerUI id='busyBlockLayerUI' styleClass="busyBlockLayerUI"/>
    
    44 44
     
    
    45 45
       <!-- le bloqueur de changement de configuration -->
    
    46
    -  <ObserveBlockingLayerUI id='configBlockLayerUI'/>
    
    46
    +  <ObserveBlockingLayerUI id='configBlockLayerUI' styleClass="blockBlockLayerUI"/>
    
    47 47
     
    
    48 48
       <script><![CDATA[
    
    49 49
     
    

  • client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUI.jcss
    ... ... @@ -24,24 +24,12 @@
    24 24
       layout:{new BorderLayout()};
    
    25 25
     }
    
    26 26
     
    
    27
    -#tabBusyBlockLayerUI {
    
    28
    -  useIcon:false;
    
    29
    -  blockingColor:{UIManager.getColor("BlockingLayerUI.blockingColor")};
    
    30
    -  acceptedComponentNames:{UIHelper.ACCEPTABLE_COMPONENTS};
    
    31
    -}
    
    32
    -
    
    33 27
     #busyBlockLayerUI{
    
    34
    -  useIcon:false;
    
    35 28
       block:{WizardExtUtil.acceptStates(model.getModelState(), WizardState.CANCELED, WizardState.SUCCESSED, WizardState.FAILED)};
    
    36
    -  blockingColor:{UIManager.getColor("BlockingLayerUI.blockingColor")};
    
    37
    -  acceptedComponentNames:{UIHelper.ACCEPTABLE_COMPONENTS};
    
    38 29
     }
    
    39 30
     
    
    40 31
     #configBlockLayerUI {
    
    41
    -  useIcon:false;
    
    42
    -  blockingColor:{UIManager.getColor("BlockingLayerUI.blockingColor")};
    
    43 32
       block:{model.isWasStarted() || WizardExtUtil.acceptStates(model.getModelState(), WizardState.CANCELED)};
    
    44
    -  acceptedComponentNames:{UIHelper.ACCEPTABLE_COMPONENTS};
    
    45 33
     }
    
    46 34
     
    
    47 35
     #tabs {
    

  • client-datasource-editor-api/src/main/i18n/getters/java.getter
    ... ... @@ -239,6 +239,7 @@ observe.tree.action.configure.tip
    239 239
     observe.tree.action.expandAll.tip
    
    240 240
     observe.tree.action.selectAll.tip
    
    241 241
     observe.tree.action.unselectAll.tip
    
    242
    +observe.ui.tree.navigation.loaded
    
    242 243
     observe.ui.tree.referential.common
    
    243 244
     observe.ui.tree.referential.ll.common
    
    244 245
     observe.ui.tree.referential.ll.landing
    

  • client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentUI.jaxx
    ... ... @@ -59,7 +59,7 @@
    59 59
     
    
    60 60
       <String id='contentTitle' javaBean='null'/>
    
    61 61
     
    
    62
    -  <ContentUIBlockingLayerUI id='blockLayerUI' constructorParams="this"/>
    
    62
    +  <ContentUIBlockingLayerUI id='blockLayerUI' constructorParams="this" styleClass="blockBlockLayerUI"/>
    
    63 63
     
    
    64 64
       <script><![CDATA[
    
    65 65
     public abstract ContentUIHandler getHandler();
    

  • client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentUI.jcss
    ... ... @@ -21,8 +21,6 @@
    21 21
      */
    
    22 22
     
    
    23 23
     #blockLayerUI {
    
    24
    -  useIcon:false;
    
    25
    -  blockingColor:{UIManager.getColor("BlockingLayerUI.blockingColor")};
    
    26 24
       block:{body.isVisible() && !model.isEnabled()};
    
    27 25
     }
    
    28 26
     
    

  • client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/ContentTableUI.jaxx
    ... ... @@ -64,7 +64,7 @@
    64 64
       <ListSelectionModel id='selectionModel' initializer='getModel().getSelectionModel()' onValueChanged='getHandler().updateEditor(event)'/>
    
    65 65
     
    
    66 66
       <!-- le bloqueur de l'editeur d'une entrée du tableau -->
    
    67
    -  <ContentTableEditorLayerUI id='editorBlockLayerUI' constructorParams="this"/>
    
    67
    +  <ContentTableEditorLayerUI id='editorBlockLayerUI' constructorParams="this" styleClass="blockBlockLayerUI"/>
    
    68 68
     
    
    69 69
       <DataDto id='bean' initializer='getModel().getBean()'/>
    
    70 70
       <DataDto id='tableEditBean' initializer='getModel().getTableEditBean()'/>
    

  • client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/ContentTableUI.jcss
    ... ... @@ -42,8 +42,6 @@
    42 42
     }
    
    43 43
     
    
    44 44
     #editorBlockLayerUI {
    
    45
    -  useIcon:false;
    
    46
    -  blockingColor:{UIManager.getColor("BlockingLayerUI.blockingColor")};
    
    47 45
       block:{!tableModel.isEditable()};
    
    48 46
     }
    
    49 47
     
    

  • client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ContentReferenceUI.jaxx
    ... ... @@ -60,7 +60,7 @@
    60 60
       <java.lang.String id='pluralTypeI18nKey' initializer='t(ObserveI18nDecoratorHelper.getTypeI18nKey(bean.getClass()))'/>
    
    61 61
       <java.lang.String id='typeI18nKey' initializer='t(ObserveI18nDecoratorHelper.getTypeI18nKey(bean.getClass()))'/>
    
    62 62
     
    
    63
    -  <ObserveBlockingLayerUI id='editKeyTableLayerUI'/>
    
    63
    +  <ObserveBlockingLayerUI id='editKeyTableLayerUI' styleClass="blockBlockLayerUI"/>
    
    64 64
     
    
    65 65
       <CardLayout2Ext id='viewLayout' constructorParams='this, "body"'/>
    
    66 66
     
    

  • client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ContentReferenceUI.jcss
    ... ... @@ -27,8 +27,6 @@
    27 27
     }
    
    28 28
     
    
    29 29
     #editKeyTableLayerUI {
    
    30
    -  useIcon:false;
    
    31
    -  blockingColor:{UIManager.getColor("BlockingLayerUI.blockingColor")};
    
    32 30
       block:{model.isUpdatingMode()};
    
    33 31
     }
    
    34 32
     
    

  • client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/actions/NavigationConfigUIToggleShowActionSupport.java
    ... ... @@ -22,6 +22,8 @@ package fr.ird.observe.client.datasource.editor.tree.navigation.actions;
    22 22
      * #L%
    
    23 23
      */
    
    24 24
     
    
    25
    +import fr.ird.observe.client.ClientUIContext;
    
    26
    +import fr.ird.observe.client.WithClientUIContext;
    
    25 27
     import fr.ird.observe.client.configuration.NavigationTreeConfig;
    
    26 28
     import fr.ird.observe.client.datasource.api.WithObserveDataSourcesManager;
    
    27 29
     import fr.ird.observe.client.datasource.editor.tree.navigation.NavigationTree;
    
    ... ... @@ -29,19 +31,23 @@ import fr.ird.observe.client.datasource.editor.tree.navigation.NavigationTreeMod
    29 31
     import fr.ird.observe.client.datasource.editor.tree.navigation.NavigationUI;
    
    30 32
     import fr.ird.observe.client.datasource.editor.tree.navigation.nodes.NavigationTreeNodeSupport;
    
    31 33
     import fr.ird.observe.services.ObserveServicesProvider;
    
    34
    +import io.ultreia.java4all.lang.Strings;
    
    32 35
     import org.apache.logging.log4j.LogManager;
    
    33 36
     import org.apache.logging.log4j.Logger;
    
    34 37
     
    
    35 38
     import javax.swing.Icon;
    
    36 39
     import javax.swing.KeyStroke;
    
    40
    +import javax.swing.SwingUtilities;
    
    37 41
     import java.awt.event.ActionEvent;
    
    38 42
     
    
    43
    +import static io.ultreia.java4all.i18n.I18n.t;
    
    44
    +
    
    39 45
     /**
    
    40 46
      * Created by tchemit on 03/10/2018.
    
    41 47
      *
    
    42 48
      * @author Tony Chemit - dev@tchemit.fr
    
    43 49
      */
    
    44
    -public abstract class NavigationConfigUIToggleShowActionSupport extends NavigationConfigUIActionSupport implements WithObserveDataSourcesManager {
    
    50
    +public abstract class NavigationConfigUIToggleShowActionSupport extends NavigationConfigUIActionSupport implements WithObserveDataSourcesManager, WithClientUIContext {
    
    45 51
     
    
    46 52
         private static final Logger log = LogManager.getLogger(NavigationConfigUIToggleShowActionSupport.class);
    
    47 53
     
    
    ... ... @@ -51,7 +57,17 @@ public abstract class NavigationConfigUIToggleShowActionSupport extends Navigati
    51 57
     
    
    52 58
         @Override
    
    53 59
         protected void doActionPerformed(ActionEvent e, NavigationUI ui) {
    
    54
    -        tryToUpdateNavigationTree(ui);
    
    60
    +        ClientUIContext clientUIContext = getClientUIContext();
    
    61
    +        clientUIContext.setBusy(true);
    
    62
    +        SwingUtilities.invokeLater(()->{
    
    63
    +            try {
    
    64
    +                long t0 = System.nanoTime();
    
    65
    +                tryToUpdateNavigationTree(ui);
    
    66
    +                clientUIContext.setUiStatus(t("observe.ui.tree.navigation.loaded", Strings.convertTime(System.nanoTime()-t0)));
    
    67
    +            } finally {
    
    68
    +                clientUIContext.setBusy(false);
    
    69
    +            }
    
    70
    +        });
    
    55 71
         }
    
    56 72
     
    
    57 73
         private void tryToUpdateNavigationTree(NavigationUI ui) {
    

  • client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/StorageUI.jaxx
    ... ... @@ -41,7 +41,7 @@
    41 41
     
    
    42 42
       <StorageUIModel id='model' javaBean='getContextValue(StorageUIModel.class)'/>
    
    43 43
     
    
    44
    -  <ObserveBlockingLayerUI id='busyBlockLayerUI'/>
    
    44
    +  <ObserveBlockingLayerUI id='busyBlockLayerUI' styleClass="busyBlockLayerUI"/>
    
    45 45
     
    
    46 46
       <JPanel visible="false">
    
    47 47
         <ChooseDbModeUI id='CHOOSE_DB_MODE' constructorParams='this'/>
    

  • client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/StorageUI.jcss
    ... ... @@ -32,11 +32,6 @@ StorageTabUI {
    32 32
       layout:{new BorderLayout()};
    
    33 33
     }
    
    34 34
     
    
    35
    -#busyBlockLayerUI {
    
    36
    -  useIcon:false;
    
    37
    -  blockingColor:{UIManager.getColor("BlockingLayerUI.blockingColor")};
    
    38
    -}
    
    39
    -
    
    40 35
     #tabs {
    
    41 36
       border:{BorderFactory.createEmptyBorder(6,6,6,6)};
    
    42 37
     }
    

  • client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/common/TripUIHandler.java
    ... ... @@ -82,8 +82,6 @@ class TripUIHandler extends ContentOpenableUIHandler<TripDto, TripReference, Tri
    82 82
     
    
    83 83
         @Override
    
    84 84
         public void afterInit(TripUI ui) {
    
    85
    -        //FIXME in jaxx (tabInfo is modified before registred in JTabbedPane...)
    
    86
    -        ui.getMainTabbedPane().setTitleAt(1, ui.getSpeciesTab().getTitle());
    
    87 85
             super.afterInit(ui);
    
    88 86
     
    
    89 87
             tripUIHelper = new TripUIHelper<TripUI>(ui, prefix) {
    

  • observe-i18n/src/main/i18n/translations/observe_en_GB.properties
    ... ... @@ -543,6 +543,8 @@ observe.config.speciesList.seine.observation.targetCatch=Species for target catc
    543 543
     observe.config.swingSessionFile.description=Swing session file.
    
    544 544
     observe.config.temperature.format=Default temperature format
    
    545 545
     observe.config.ui.autoPopupNumberEditor=Flag sets to true when number editor show automaticly popup
    
    546
    +observe.config.ui.blockStateColor=Color of block state
    
    547
    +observe.config.ui.busyStateColor=Color of busy state
    
    546 548
     observe.config.ui.changeSynchroSrc=Flag sets to true if you can change local source in admin tasks
    
    547 549
     observe.config.ui.dcp.error.color=Color to notify errors while validating floating object materials.
    
    548 550
     observe.config.ui.dcp.not.editable.color=Color to notify not editable floating object material nodes.
    
    ... ... @@ -2962,6 +2964,7 @@ observe.ui.tree.data.ps.routes=Routes
    2962 2964
     observe.ui.tree.data.ps.schoolEstimate=School estimates
    
    2963 2965
     observe.ui.tree.data.ps.set.unsaved=New set
    
    2964 2966
     observe.ui.tree.data.ps.trip.unsaved=New trip
    
    2967
    +observe.ui.tree.navigation.loaded=Navigation tree reloaded (in %s)
    
    2965 2968
     observe.ui.tree.referential.common=Common Referential
    
    2966 2969
     observe.ui.tree.referential.ll.common=Longline Referential - Common
    
    2967 2970
     observe.ui.tree.referential.ll.landing=Longline Referential - Landing
    

  • observe-i18n/src/main/i18n/translations/observe_es_ES.properties
    ... ... @@ -543,6 +543,8 @@ observe.config.speciesList.seine.observation.targetCatch=Especies par las captur
    543 543
     observe.config.swingSessionFile.description=Copia de seguridad del estado del UI.
    
    544 544
     observe.config.temperature.format=Unidad de temperatura
    
    545 545
     observe.config.ui.autoPopupNumberEditor=Para mostrar automáticamente el editor numérico durante la edición de un número
    
    546
    +observe.config.ui.blockStateColor=Color of block state \#TODO
    
    547
    +observe.config.ui.busyStateColor=Color of busy state \#TODO
    
    546 548
     observe.config.ui.changeSynchroSrc=Para autorizar la seleción de la base fuente durante las operaciones sobre la base
    
    547 549
     observe.config.ui.dcp.error.color=Color para notificar los errores sobre la composición de dcps
    
    548 550
     observe.config.ui.dcp.not.editable.color=Color to notify not editable floating object material nodes \#TODO
    
    ... ... @@ -2962,6 +2964,7 @@ observe.ui.tree.data.ps.routes=Rutas
    2962 2964
     observe.ui.tree.data.ps.schoolEstimate=Estimaciones banco
    
    2963 2965
     observe.ui.tree.data.ps.set.unsaved=Nuevo lance
    
    2964 2966
     observe.ui.tree.data.ps.trip.unsaved=Nueva marea
    
    2967
    +observe.ui.tree.navigation.loaded=Navigation tree reloaded (in %s) \#TODO
    
    2965 2968
     observe.ui.tree.referential.common=Referencial commun
    
    2966 2969
     observe.ui.tree.referential.ll.common=Referencial Palangre - Common \#TODO
    
    2967 2970
     observe.ui.tree.referential.ll.landing=Referencial Palangre - Landing \#TODO
    

  • observe-i18n/src/main/i18n/translations/observe_fr_FR.properties
    ... ... @@ -543,6 +543,8 @@ observe.config.speciesList.seine.observation.targetCatch=Espèces pour les captu
    543 543
     observe.config.swingSessionFile.description=Fichier de sauvegarde des états des UI.
    
    544 544
     observe.config.temperature.format=Unité de température
    
    545 545
     observe.config.ui.autoPopupNumberEditor=Pour afficher automatiquement l'éditeur numérique lors de l'édition d'un nombre
    
    546
    +observe.config.ui.blockStateColor=Couleur lorsque l'on bloque une partie de l'application
    
    547
    +observe.config.ui.busyStateColor=Couleur lorsque l'application est occupée
    
    546 548
     observe.config.ui.changeSynchroSrc=Pour autoriser la sélection de la base source dans les opérations sur base
    
    547 549
     observe.config.ui.dcp.error.color=Couleur pour notifier les erreurs sur la composition des dcps
    
    548 550
     observe.config.ui.dcp.not.editable.color=Couleur pour notifier les nœuds non éditables dans l'arbre des matériaux de dcp.
    
    ... ... @@ -2962,6 +2964,7 @@ observe.ui.tree.data.ps.routes=Routes
    2962 2964
     observe.ui.tree.data.ps.schoolEstimate=Estimation banc
    
    2963 2965
     observe.ui.tree.data.ps.set.unsaved=Nouvelle calée
    
    2964 2966
     observe.ui.tree.data.ps.trip.unsaved=Nouvelle marée
    
    2967
    +observe.ui.tree.navigation.loaded=Arbre de navigation rechargé (en %s)
    
    2965 2968
     observe.ui.tree.referential.common=Référentiel commun
    
    2966 2969
     observe.ui.tree.referential.ll.common=Référentiel Palangre - Commun
    
    2967 2970
     observe.ui.tree.referential.ll.landing=Référentiel Palangre - Débarquement
    

  • pom.xml
    ... ... @@ -24,7 +24,7 @@
    24 24
       <parent>
    
    25 25
         <groupId>io.ultreia.maven</groupId>
    
    26 26
         <artifactId>pom</artifactId>
    
    27
    -    <version>2020.14</version>
    
    27
    +    <version>2020.15</version>
    
    28 28
       </parent>
    
    29 29
     
    
    30 30
       <groupId>fr.ird.observe</groupId>
    
    ... ... @@ -170,7 +170,7 @@
    170 170
     
    
    171 171
         <!--    <lib.version.java4all.topia>1.17</lib.version.java4all.topia>-->
    
    172 172
         <!--<lib.version.java4all.eugene>3.0<-alpha-22</lib.version.java4all.eugene>-->
    
    173
    -    <!--    <lib.version.java4all.jaxx>3.0-alpha-64-SNAPSHOT</lib.version.java4all.jaxx>-->
    
    173
    +        <lib.version.java4all.jaxx>3.0-alpha-66-SNAPSHOT</lib.version.java4all.jaxx>
    
    174 174
         <!--<lib.version.java4all.application-context>1.0.3-SNAPSHOT</lib.version.java4all.application-context>-->
    
    175 175
         <!--<lib.version.java4all.application-template>1.0.2-SNAPSHOT</lib.version.java4all.application-template>-->
    
    176 176
         <!--<lib.version.java4all.i18n>4.0-beta-3-SNAPSHOT</lib.version.java4all.i18n>-->