Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 518406b4 by tchemit at 2020-04-06T13:52:08+02:00 Mise à jour jaxx avec des améliorations sur les JTabbedPane - - - - - 512a6572 by tchemit at 2020-04-06T13:52:10+02:00 Lors d'un 'Rechargement de la source' ou d'un appel aux filtres d'affichage de l'arbre, afficher une barre de progression - Closes #1386 - - - - - b6185ba5 by tchemit at 2020-04-06T13:52:10+02:00 Fix NPE when reload ui callback - - - - - 27 changed files: - client-configuration/src/main/config/Client.ini - client-configuration/src/main/i18n/getters/config.getter - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client-core/src/main/java/fr/ird/observe/client/main/ObserveMainUI.jaxx - client-core/src/main/java/fr/ird/observe/client/main/ObserveMainUI.jcss - client-core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java - client-core/src/main/java/fr/ird/observe/client/main/callback/ReloadUiCallback.java - client-core/src/main/resources/fr/ird/observe/client/ui/ObserveCommon.jcss - client-core/src/main/resources/observe-ui.properties - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminTabUI.jcss - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUI.jaxx - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUI.jcss - client-datasource-editor-api/src/main/i18n/getters/java.getter - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentUI.jaxx - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentUI.jcss - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/ContentTableUI.jaxx - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/ContentTableUI.jcss - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ContentReferenceUI.jaxx - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ContentReferenceUI.jcss - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/actions/NavigationConfigUIToggleShowActionSupport.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/StorageUI.jaxx - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/StorageUI.jcss - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/common/TripUIHandler.java - observe-i18n/src/main/i18n/translations/observe_en_GB.properties - observe-i18n/src/main/i18n/translations/observe_es_ES.properties - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties - pom.xml Changes: ===================================== client-configuration/src/main/config/Client.ini ===================================== @@ -627,6 +627,18 @@ key = ui.temperature.format type = org.nuiton.jaxx.widgets.temperature.TemperatureFormat defaultValue = "C" +[option busyStateColor] +description = observe.config.ui.busyStateColor +key = ui.busyState.color +type = java.awt.Color +defaultValue = "java.awt.Color[r=50,g=50,b=50]" + +[option blockStateColor] +description = observe.config.ui.blockStateColor +key = ui.blockState.color +type = java.awt.Color +defaultValue = "java.awt.Color[r=50,g=50,b=50]" + [option focusBorderColor] description = observe.config.ui.focusBorderColor key = ui.focusBorder.color ===================================== client-configuration/src/main/i18n/getters/config.getter ===================================== @@ -92,6 +92,8 @@ observe.config.speciesList.seine.observation.targetCatch observe.config.swingSessionFile.description observe.config.temperature.format observe.config.ui.autoPopupNumberEditor +observe.config.ui.blockStateColor +observe.config.ui.busyStateColor observe.config.ui.changeSynchroSrc observe.config.ui.dcp.error.color 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; import org.nuiton.version.Version; import org.nuiton.version.Versions; +import javax.swing.UIManager; import java.io.File; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -681,6 +682,8 @@ public class ClientConfig extends GeneratedClientConfig implements TemplateGener loadUIConfigFile(ObserveClientResourceManager.Resource.ui_navigation_common, dir); loadUIConfigFile(ObserveClientResourceManager.Resource.ui_navigation_ps, dir); loadUIConfigFile(ObserveClientResourceManager.Resource.ui_navigation_ll, dir); + UIManager.getDefaults().put("BlockingLayerUI.busyColor", getBusyStateColor()); + UIManager.getDefaults().put("BlockingLayerUI.blockColor", getBlockStateColor()); } private void loadUIConfigFile(ObserveClientResourceManager.Resource resource, File resourceDirectory) { ===================================== client-core/src/main/java/fr/ird/observe/client/main/ObserveMainUI.jaxx ===================================== @@ -47,7 +47,7 @@ <ClientConfig id='config' initializer='getContextValue(ClientConfig.class)'/> <MainUIBodyContentManager id="mainUIBodyContentManager" initializer='getContextValue(MainUIBodyContentManager.class)'/> - <ObserveBlockingLayerUI id='busyBlockLayerUI'/> + <ObserveBlockingLayerUI id='busyBlockLayerUI' styleClass="busyBlockLayerUI"/> <script><![CDATA[ ===================================== client-core/src/main/java/fr/ird/observe/client/main/ObserveMainUI.jcss ===================================== @@ -72,10 +72,7 @@ } #busyBlockLayerUI { - useIcon: false; - blockingColor: {UIManager.getColor("BlockingLayerUI.blockingColor")}; block: {model.isBusy()}; - acceptedComponentNames: {UIHelper.ACCEPTABLE_COMPONENTS}; } #serverMode { ===================================== client-core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java ===================================== @@ -170,6 +170,8 @@ public class ClientConfigUI extends JXTitledPanel { helper.addOption(ClientConfigOption.SHOW_MNEMONIC); helper.addOption(ClientConfigOption.COORDINATE_FORMAT); + helper.addOption(ClientConfigOption.BUSY_STATE_COLOR); + helper.addOption(ClientConfigOption.BLOCK_STATE_COLOR); helper.addOption(ClientConfigOption.FOCUS_BORDER_COLOR); helper.addOption(ClientConfigOption.NO_FOCUS_BORDER_COLOR); helper.addOption(ClientConfigOption.FLOATING_OBJECT_MATERIAL_ERROR_COLOR); ===================================== client-core/src/main/java/fr/ird/observe/client/main/callback/ReloadUiCallback.java ===================================== @@ -27,6 +27,7 @@ import fr.ird.observe.client.ClientUIContext; import fr.ird.observe.client.configuration.ClientConfig; import fr.ird.observe.client.configuration.WithClientConfig; import fr.ird.observe.client.main.ObserveMainUI; +import fr.ird.observe.client.main.body.ClientConfigUI; import fr.ird.observe.client.main.body.NoBodyContentComponent; import io.ultreia.java4all.application.context.ApplicationContext; import org.nuiton.jaxx.runtime.swing.SwingUtil; @@ -71,44 +72,24 @@ public class ReloadUiCallback implements ObserveUICallback, WithClientConfig { // scan main ui -// ObserveSwingDataSource mainStorage = getObserveDataSourcesManager().getMainDataSource(); - //FIXME:BodyContent, cela doit être délégué au body content concerné Class<? extends JComponent> bodyContent = NoBodyContentComponent.class; if (ui != null) { + // Keep a reference on ui instance since it will be reset in close method + // FIXME Should use a closing state in application to improve this + ObserveMainUI ui = this.ui; bodyContent = ui.getMainUIBodyContentManager().getCurrentBodyType(); + if (ClientConfigUI.class.equals(bodyContent)) { + bodyContent = NoBodyContentComponent.class; + } ui.dispose(); - ui.setVisible(false); System.runFinalization(); } -// focusBorder = null; -// noFocusBorder = null; ui = clientUIContext.initUI(rootContext, config); - //FIXME:BodyContent : We must improve this, but for the moment, we could just open main ui empty... -// if (bodyContent == null) { -// if (mainStorage == null) { -// bodyContent = NoBodyContent.NoBodyContentComponent.class; -// } else { -// throw new IllegalStateException("Can't have a loaded database, but not loaded in gui..."); -// } -// } - ui.changeBodyContent(bodyContent); - //FIXME:BodyContent this will be done in data source editor body content -// if (oldMode == ObserveUIMode.DB) { -// -// // on met à jour le modèle de navigation -// NavigationTreeModel treeModel = ui.getNavigationUI().getTree().getModel(); -// treeModel.load(config); -// treeModel.populate(mainStorage); -// -// // selection du noeud d'ouverture -// ui.getNavigationUI().getTree().selectInitialNode(); -// } - // show ui clientUIContext.setMainUIVisible(ui, true); } ===================================== client-core/src/main/resources/fr/ird/observe/client/ui/ObserveCommon.jcss ===================================== @@ -172,3 +172,14 @@ BlockingLayerUI { acceptedComponentTypes: {javax.swing.JScrollBar.class}; } +.busyBlockLayerUI { + useIcon: false; + blockingColor: {javax.swing.UIManager.getColor("BlockingLayerUI.busyColor")}; + acceptedComponentNames: {fr.ird.observe.client.util.UIHelper.ACCEPTABLE_COMPONENTS}; +} + +.blockBlockLayerUI { + useIcon: false; + blockingColor: {javax.swing.UIManager.getColor("BlockingLayerUI.blockingColor")}; + acceptedComponentNames: {fr.ird.observe.client.util.UIHelper.ACCEPTABLE_COMPONENTS}; +} ===================================== client-core/src/main/resources/observe-ui.properties ===================================== @@ -189,3 +189,4 @@ color.Table.lastRowColor=255,255,0 color.Table.emptyRowColor=255,255,0 color.Table.unvalidCellColor=255,0,0 color.BlockingLayerUI.blockingColor=50,50,50 +color.BlockingLayerUI.busyColor=50,50,50 ===================================== client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminTabUI.jcss ===================================== @@ -92,7 +92,3 @@ columnHeaderView:{UIHelper.newLabel(t("observe.common.step.description") ,"information", 10)}; } -#busyBlockLayerUI{ - useIcon:false; - blockingColor:{UIManager.getColor("BlockingLayerUI.blockingColor")}; -} ===================================== client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUI.jaxx ===================================== @@ -37,13 +37,13 @@ <AdminUIModel id='model' initializer='getContextValue(AdminUIModel.class)'/> <!-- le bloqueur d'ui utilisé par l'assistant --> - <ObserveBlockingLayerUI id='tabBusyBlockLayerUI'/> + <ObserveBlockingLayerUI id='tabBusyBlockLayerUI' styleClass="busyBlockLayerUI"/> <!-- le bloqueur d'ui lorsqu'une action est en cours ou annulée --> - <ObserveBlockingLayerUI id='busyBlockLayerUI'/> + <ObserveBlockingLayerUI id='busyBlockLayerUI' styleClass="busyBlockLayerUI"/> <!-- le bloqueur de changement de configuration --> - <ObserveBlockingLayerUI id='configBlockLayerUI'/> + <ObserveBlockingLayerUI id='configBlockLayerUI' styleClass="blockBlockLayerUI"/> <script><![CDATA[ ===================================== client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUI.jcss ===================================== @@ -24,24 +24,12 @@ layout:{new BorderLayout()}; } -#tabBusyBlockLayerUI { - useIcon:false; - blockingColor:{UIManager.getColor("BlockingLayerUI.blockingColor")}; - acceptedComponentNames:{UIHelper.ACCEPTABLE_COMPONENTS}; -} - #busyBlockLayerUI{ - useIcon:false; block:{WizardExtUtil.acceptStates(model.getModelState(), WizardState.CANCELED, WizardState.SUCCESSED, WizardState.FAILED)}; - blockingColor:{UIManager.getColor("BlockingLayerUI.blockingColor")}; - acceptedComponentNames:{UIHelper.ACCEPTABLE_COMPONENTS}; } #configBlockLayerUI { - useIcon:false; - blockingColor:{UIManager.getColor("BlockingLayerUI.blockingColor")}; block:{model.isWasStarted() || WizardExtUtil.acceptStates(model.getModelState(), WizardState.CANCELED)}; - acceptedComponentNames:{UIHelper.ACCEPTABLE_COMPONENTS}; } #tabs { ===================================== client-datasource-editor-api/src/main/i18n/getters/java.getter ===================================== @@ -239,6 +239,7 @@ observe.tree.action.configure.tip observe.tree.action.expandAll.tip observe.tree.action.selectAll.tip observe.tree.action.unselectAll.tip +observe.ui.tree.navigation.loaded observe.ui.tree.referential.common observe.ui.tree.referential.ll.common 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 @@ <String id='contentTitle' javaBean='null'/> - <ContentUIBlockingLayerUI id='blockLayerUI' constructorParams="this"/> + <ContentUIBlockingLayerUI id='blockLayerUI' constructorParams="this" styleClass="blockBlockLayerUI"/> <script><![CDATA[ public abstract ContentUIHandler getHandler(); ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentUI.jcss ===================================== @@ -21,8 +21,6 @@ */ #blockLayerUI { - useIcon:false; - blockingColor:{UIManager.getColor("BlockingLayerUI.blockingColor")}; block:{body.isVisible() && !model.isEnabled()}; } ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/ContentTableUI.jaxx ===================================== @@ -64,7 +64,7 @@ <ListSelectionModel id='selectionModel' initializer='getModel().getSelectionModel()' onValueChanged='getHandler().updateEditor(event)'/> <!-- le bloqueur de l'editeur d'une entrée du tableau --> - <ContentTableEditorLayerUI id='editorBlockLayerUI' constructorParams="this"/> + <ContentTableEditorLayerUI id='editorBlockLayerUI' constructorParams="this" styleClass="blockBlockLayerUI"/> <DataDto id='bean' initializer='getModel().getBean()'/> <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 @@ } #editorBlockLayerUI { - useIcon:false; - blockingColor:{UIManager.getColor("BlockingLayerUI.blockingColor")}; block:{!tableModel.isEditable()}; } ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ContentReferenceUI.jaxx ===================================== @@ -60,7 +60,7 @@ <java.lang.String id='pluralTypeI18nKey' initializer='t(ObserveI18nDecoratorHelper.getTypeI18nKey(bean.getClass()))'/> <java.lang.String id='typeI18nKey' initializer='t(ObserveI18nDecoratorHelper.getTypeI18nKey(bean.getClass()))'/> - <ObserveBlockingLayerUI id='editKeyTableLayerUI'/> + <ObserveBlockingLayerUI id='editKeyTableLayerUI' styleClass="blockBlockLayerUI"/> <CardLayout2Ext id='viewLayout' constructorParams='this, "body"'/> ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ContentReferenceUI.jcss ===================================== @@ -27,8 +27,6 @@ } #editKeyTableLayerUI { - useIcon:false; - blockingColor:{UIManager.getColor("BlockingLayerUI.blockingColor")}; block:{model.isUpdatingMode()}; } ===================================== 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; * #L% */ +import fr.ird.observe.client.ClientUIContext; +import fr.ird.observe.client.WithClientUIContext; import fr.ird.observe.client.configuration.NavigationTreeConfig; import fr.ird.observe.client.datasource.api.WithObserveDataSourcesManager; import fr.ird.observe.client.datasource.editor.tree.navigation.NavigationTree; @@ -29,19 +31,23 @@ import fr.ird.observe.client.datasource.editor.tree.navigation.NavigationTreeMod import fr.ird.observe.client.datasource.editor.tree.navigation.NavigationUI; import fr.ird.observe.client.datasource.editor.tree.navigation.nodes.NavigationTreeNodeSupport; import fr.ird.observe.services.ObserveServicesProvider; +import io.ultreia.java4all.lang.Strings; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import javax.swing.Icon; import javax.swing.KeyStroke; +import javax.swing.SwingUtilities; import java.awt.event.ActionEvent; +import static io.ultreia.java4all.i18n.I18n.t; + /** * Created by tchemit on 03/10/2018. * * @author Tony Chemit - dev@tchemit.fr */ -public abstract class NavigationConfigUIToggleShowActionSupport extends NavigationConfigUIActionSupport implements WithObserveDataSourcesManager { +public abstract class NavigationConfigUIToggleShowActionSupport extends NavigationConfigUIActionSupport implements WithObserveDataSourcesManager, WithClientUIContext { private static final Logger log = LogManager.getLogger(NavigationConfigUIToggleShowActionSupport.class); @@ -51,7 +57,17 @@ public abstract class NavigationConfigUIToggleShowActionSupport extends Navigati @Override protected void doActionPerformed(ActionEvent e, NavigationUI ui) { - tryToUpdateNavigationTree(ui); + ClientUIContext clientUIContext = getClientUIContext(); + clientUIContext.setBusy(true); + SwingUtilities.invokeLater(()->{ + try { + long t0 = System.nanoTime(); + tryToUpdateNavigationTree(ui); + clientUIContext.setUiStatus(t("observe.ui.tree.navigation.loaded", Strings.convertTime(System.nanoTime()-t0))); + } finally { + clientUIContext.setBusy(false); + } + }); } 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 @@ <StorageUIModel id='model' javaBean='getContextValue(StorageUIModel.class)'/> - <ObserveBlockingLayerUI id='busyBlockLayerUI'/> + <ObserveBlockingLayerUI id='busyBlockLayerUI' styleClass="busyBlockLayerUI"/> <JPanel visible="false"> <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 { layout:{new BorderLayout()}; } -#busyBlockLayerUI { - useIcon:false; - blockingColor:{UIManager.getColor("BlockingLayerUI.blockingColor")}; -} - #tabs { border:{BorderFactory.createEmptyBorder(6,6,6,6)}; } ===================================== 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 @Override public void afterInit(TripUI ui) { - //FIXME in jaxx (tabInfo is modified before registred in JTabbedPane...) - ui.getMainTabbedPane().setTitleAt(1, ui.getSpeciesTab().getTitle()); super.afterInit(ui); 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 observe.config.swingSessionFile.description=Swing session file. observe.config.temperature.format=Default temperature format observe.config.ui.autoPopupNumberEditor=Flag sets to true when number editor show automaticly popup +observe.config.ui.blockStateColor=Color of block state +observe.config.ui.busyStateColor=Color of busy state observe.config.ui.changeSynchroSrc=Flag sets to true if you can change local source in admin tasks observe.config.ui.dcp.error.color=Color to notify errors while validating floating object materials. 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 observe.ui.tree.data.ps.schoolEstimate=School estimates observe.ui.tree.data.ps.set.unsaved=New set observe.ui.tree.data.ps.trip.unsaved=New trip +observe.ui.tree.navigation.loaded=Navigation tree reloaded (in %s) observe.ui.tree.referential.common=Common Referential observe.ui.tree.referential.ll.common=Longline Referential - Common 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 observe.config.swingSessionFile.description=Copia de seguridad del estado del UI. observe.config.temperature.format=Unidad de temperatura observe.config.ui.autoPopupNumberEditor=Para mostrar automáticamente el editor numérico durante la edición de un número +observe.config.ui.blockStateColor=Color of block state \#TODO +observe.config.ui.busyStateColor=Color of busy state \#TODO observe.config.ui.changeSynchroSrc=Para autorizar la seleción de la base fuente durante las operaciones sobre la base observe.config.ui.dcp.error.color=Color para notificar los errores sobre la composición de dcps 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 observe.ui.tree.data.ps.schoolEstimate=Estimaciones banco observe.ui.tree.data.ps.set.unsaved=Nuevo lance observe.ui.tree.data.ps.trip.unsaved=Nueva marea +observe.ui.tree.navigation.loaded=Navigation tree reloaded (in %s) \#TODO observe.ui.tree.referential.common=Referencial commun observe.ui.tree.referential.ll.common=Referencial Palangre - Common \#TODO 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 observe.config.swingSessionFile.description=Fichier de sauvegarde des états des UI. observe.config.temperature.format=Unité de température observe.config.ui.autoPopupNumberEditor=Pour afficher automatiquement l'éditeur numérique lors de l'édition d'un nombre +observe.config.ui.blockStateColor=Couleur lorsque l'on bloque une partie de l'application +observe.config.ui.busyStateColor=Couleur lorsque l'application est occupée observe.config.ui.changeSynchroSrc=Pour autoriser la sélection de la base source dans les opérations sur base observe.config.ui.dcp.error.color=Couleur pour notifier les erreurs sur la composition des dcps 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 observe.ui.tree.data.ps.schoolEstimate=Estimation banc observe.ui.tree.data.ps.set.unsaved=Nouvelle calée observe.ui.tree.data.ps.trip.unsaved=Nouvelle marée +observe.ui.tree.navigation.loaded=Arbre de navigation rechargé (en %s) observe.ui.tree.referential.common=Référentiel commun observe.ui.tree.referential.ll.common=Référentiel Palangre - Commun observe.ui.tree.referential.ll.landing=Référentiel Palangre - Débarquement ===================================== pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2020.14</version> + <version>2020.15</version> </parent> <groupId>fr.ird.observe</groupId> @@ -170,7 +170,7 @@ <!-- <lib.version.java4all.topia>1.17</lib.version.java4all.topia>--> <!--<lib.version.java4all.eugene>3.0<-alpha-22</lib.version.java4all.eugene>--> - <!-- <lib.version.java4all.jaxx>3.0-alpha-64-SNAPSHOT</lib.version.java4all.jaxx>--> +<!-- <lib.version.java4all.jaxx>3.0-alpha-66-SNAPSHOT</lib.version.java4all.jaxx>--> <!--<lib.version.java4all.application-context>1.0.3-SNAPSHOT</lib.version.java4all.application-context>--> <!--<lib.version.java4all.application-template>1.0.2-SNAPSHOT</lib.version.java4all.application-template>--> <!--<lib.version.java4all.i18n>4.0-beta-3-SNAPSHOT</lib.version.java4all.i18n>--> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/4ad63b3274dea5ea4034d12dd... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/4ad63b3274dea5ea4034d12dd... You're receiving this email because of your account on gitlab.com.