This is an automated email from the git hooks/post-receive script. New commit to branch feature/8429 in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 628c272fed4e830f1b1a0fe910662871a2b6f844 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Nov 22 10:15:26 2016 +0100 refs #8429 continue les adaptations sur les arbres --- .../swing/ObserveSwingApplicationDataSourcesManager.java | 2 -- .../application/swing/db/ObserveSwingDataSource.java | 5 +++++ .../fr/ird/observe/application/swing/ui/ObserveMainUI.jaxx | 4 ++-- .../fr/ird/observe/application/swing/ui/ObserveMainUI.jcss | 5 ----- .../observe/application/swing/ui/ObserveMainUIHandler.java | 6 +++++- .../swing/ui/actions/content/CancelCreateUIAction.java | 3 ++- .../swing/ui/actions/content/CloseAndCreateUIAction.java | 2 +- .../swing/ui/actions/content/MoveTripsUIAction.java | 4 ++-- .../swing/ui/actions/content/ResetEditUIAction.java | 3 ++- .../application/swing/ui/actions/shared/GoDownUIAction.java | 3 --- .../application/swing/ui/actions/shared/GoUpUIAction.java | 3 --- .../application/swing/ui/content/ContentUIHandler.java | 13 ++++++------- .../application/swing/ui/content/ObserveActionMap.java | 4 ++-- .../ui/content/impl/longline/SetLonglineUIHandler.java | 3 ++- .../ui/content/impl/seine/FloatingObjectUIHandler.java | 3 ++- .../swing/ui/content/impl/seine/SetSeineUIHandler.java | 3 ++- .../swing/ui/content/list/ContentListUIHandler.java | 6 +----- .../main/resources/i18n/application-swing_en_GB.properties | 1 + .../main/resources/i18n/application-swing_es_ES.properties | 1 + .../main/resources/i18n/application-swing_fr_FR.properties | 1 + 20 files changed, 37 insertions(+), 38 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationDataSourcesManager.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationDataSourcesManager.java index ff923d3..b11d0fa 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationDataSourcesManager.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationDataSourcesManager.java @@ -446,8 +446,6 @@ public class ObserveSwingApplicationDataSourcesManager implements Closeable { dataContext.populateOpens(openIds); mainUI.getHandler().loadNavigationUI(mainUI); - mainUI.getNavigation().getNavigationTreeModel().openRoot(); - mainUI.setMode(ObserveUIMode.DB); mainUI.getStatus().setStatus(t("observe.message.db.loaded", source.getLabel())); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/db/ObserveSwingDataSource.java b/application-swing/src/main/java/fr/ird/observe/application/swing/db/ObserveSwingDataSource.java index 482abbb..442d0fd 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/db/ObserveSwingDataSource.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/db/ObserveSwingDataSource.java @@ -569,6 +569,11 @@ public class ObserveSwingDataSource extends AbstractSerializableBean implements } @Override + public NavigationService newNavigationService() { + return newService(NavigationService.class); + } + + @Override public ReferentialService newReferentialService() { return newService(ReferentialService.class); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jaxx index 72d31e4..faff734 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jaxx @@ -45,7 +45,7 @@ fr.ird.observe.application.swing.ui.actions.ShowStorageInfoAction fr.ird.observe.application.swing.ui.content.ContentUIManager fr.ird.observe.application.swing.ui.tree.navigation.NavigationTree - fr.ird.observe.application.swing.ui.util.tree.BeanTreeHeader + fr.ird.observe.application.swing.ui.tree.navigation.NavigationTreeHeader jaxx.runtime.swing.CardLayout2 jaxx.runtime.swing.CardLayout2Ext @@ -252,7 +252,7 @@ void $afterCompleteSetup() { <JXTitledPanel id='navigationView'> <JScrollPane id='navigationScrollPane' columnHeaderView='{navigationTreeHeader}'> <NavigationTree id="navigation"/> - <BeanTreeHeader id='navigationTreeHeader' tree='{navigation}'/> + <NavigationTreeHeader id='navigationTreeHeader' tree='{navigation}'/> </JScrollPane> </JXTitledPanel> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jcss index e13f2fa..ef1ee0e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jcss @@ -380,14 +380,9 @@ JSplitPane { } #navigation { - minimumSize: {UIHelper.newMinDimension()}; font-size:11; } -#navigationTreeHeader { - showSelectActions: false; -} - #messageView { title: "observe.view.message"; } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIHandler.java index 5f8c6d6..545ab02 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIHandler.java @@ -33,6 +33,7 @@ import fr.ird.observe.application.swing.ui.content.ContentUIManager; import fr.ird.observe.application.swing.ui.content.ContentUIModel; import fr.ird.observe.application.swing.ui.tree.ObserveNavigationTreeShowPopupAction; import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTree; +import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTreeModel; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.NavigationTreeNodeSupport; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.ReferenceNavigationTreeNodeSupport; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.StringNavigationTreeNodeSupport; @@ -551,11 +552,14 @@ public class ObserveMainUIHandler { NavigationTree tree = mainUI.getNavigation(); - tree.createModel(); + NavigationTreeModel treeModel = tree.getTreeModel(); + treeModel.populate(); // select initial node tree.selectInitialNode(); tree.setVisible(true); + + SwingUtilities.invokeLater(tree::revalidate); } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CancelCreateUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CancelCreateUIAction.java index 330b1e9..8147b0b 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CancelCreateUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CancelCreateUIAction.java @@ -55,7 +55,8 @@ public class CancelCreateUIAction extends AbstractContentUIAction { protected void actionPerformed(ContentUI<?, ?> ui) { ui.stopEdit(); NavigationTree tree = getMainUI().getNavigation(); - NavigationTreeNodeSupport parentNode = tree.removeNode(tree.getSelectedNode()); + NavigationTreeNodeSupport parentNode = tree.getSelectedNode().getParent(); + tree.removeNode(tree.getSelectedNode()); tree.selectNode(parentNode); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CloseAndCreateUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CloseAndCreateUIAction.java index 8d544aa..da724ca 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CloseAndCreateUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CloseAndCreateUIAction.java @@ -144,7 +144,7 @@ public class CloseAndCreateUIAction extends AbstractContentUIAction { String id = dataContext.getOpenActivityId(); - NavigationTreeNodeSupport node1 = node.findNodeById(tree.getNavigationTreeModel(), id); + NavigationTreeNodeSupport node1 = node.findNodeById(tree.getTreeModel(), id); TreePath activityPath = path.pathByAddingChild(node1); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveTripsUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveTripsUIAction.java index 2a3ee12..3b8d7df 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveTripsUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveTripsUIAction.java @@ -105,7 +105,7 @@ public abstract class MoveTripsUIAction<T extends DataDto> extends AbstractConte GearType geartype = getGearType(ui); // racine - RootNavigationTreeNode rootNode = tree.getNavigationTreeModel().getRoot(); + RootNavigationTreeNode rootNode = tree.getTreeModel().getRoot(); //on crée un tableau avec un programme en moins car on ne propose pas le programme actuel List<DecoratedNodeEntity> decoratedProgramList = new ArrayList<>(); @@ -137,7 +137,7 @@ public abstract class MoveTripsUIAction<T extends DataDto> extends AbstractConte ObserveOpenDataManager openDataManager = applicationContext.getOpenDataManager(); NavigationTree tree = getMainUI().getNavigation(); - RootNavigationTreeNode rootNode = tree.getNavigationTreeModel().getRoot(); + RootNavigationTreeNode rootNode = tree.getTreeModel().getRoot(); NavigationTreeNodeSupport newProgramNode = tree.getChild(rootNode, programId); for (int i = 0, s = positions.size(); i < s; i++) { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/ResetEditUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/ResetEditUIAction.java index 4ba3b74..6edda51 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/ResetEditUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/ResetEditUIAction.java @@ -57,7 +57,8 @@ public class ResetEditUIAction extends AbstractContentUIAction { if (ui.getModel().isCreatingMode()) { ui.stopEdit(); NavigationTree tree = getMainUI().getNavigation(); - NavigationTreeNodeSupport parentNode = tree.removeNode(tree.getSelectedNode()); + NavigationTreeNodeSupport parentNode = tree.getSelectedNode().getParent(); + tree.removeNode(tree.getSelectedNode()); tree.selectNode(parentNode); } else { ui.resetEdit(); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/GoDownUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/GoDownUIAction.java index b15959f..a17ce17 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/GoDownUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/GoDownUIAction.java @@ -24,7 +24,6 @@ package fr.ird.observe.application.swing.ui.actions.shared; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.content.ContentUI; import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTree; -import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTreeCellRenderer; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.NavigationTreeNodeSupport; import javax.swing.AbstractButton; @@ -85,8 +84,6 @@ public class GoDownUIAction extends AbstractUIAction { NavigationTree tree = getMainUI().getNavigation(); - NavigationTreeCellRenderer render = tree.getNavigationCellRenderer(); - NavigationTreeNodeSupport node; super.updateAction(ui, editor); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/GoUpUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/GoUpUIAction.java index f23baed..d4b414a 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/GoUpUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/GoUpUIAction.java @@ -24,7 +24,6 @@ package fr.ird.observe.application.swing.ui.actions.shared; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.content.ContentUI; import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTree; -import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTreeCellRenderer; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.NavigationTreeNodeSupport; import javax.swing.AbstractButton; @@ -86,8 +85,6 @@ public class GoUpUIAction extends AbstractUIAction { NavigationTree treeHelper = getMainUI().getNavigation(); - NavigationTreeCellRenderer render = treeHelper.getNavigationCellRenderer(); - NavigationTreeNodeSupport node; JPopupMenu scopePopup = getMainUI().getScopeUpPopup(); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java index 06eb161..10eae41 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java @@ -38,7 +38,6 @@ import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.actions.shared.AbstractUIAction; import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTree; -import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTreeCellRenderer; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.NavigationTreeNodeSupport; import fr.ird.observe.application.swing.ui.util.SpringUtilities; import fr.ird.observe.application.swing.validation.ValidationContext; @@ -250,10 +249,10 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U model.addMessages(ui, fieldName, scope, message); } - public static <E extends IdDto, U extends ContentUI<E, U>> void removeAllMessages(U ui, NuitonValidatorScope scope, String fieldName) { - SwingValidatorMessageTableModel model = ui.getErrorTableModel(); - model.removeMessages(ui, fieldName, scope); - } +// public static <E extends IdDto, U extends ContentUI<E, U>> void removeAllMessages(U ui, NuitonValidatorScope scope, String fieldName) { +// SwingValidatorMessageTableModel model = ui.getErrorTableModel(); +// model.removeMessages(ui, fieldName, scope); +// } protected static <E extends IdDto, U extends ContentUI<E, U>> void removeAllMessages(U ui) { SwingValidatorMessageTableModel model = ui.getErrorTableModel(); @@ -381,7 +380,6 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U // suppression des messages de validation removeAllMessages(ui); NavigationTree tree = getTreeHelper(ui); - NavigationTreeCellRenderer render = tree.getNavigationCellRenderer(); NavigationTreeNodeSupport node = tree.getSelectedNode(); if (ContentReferenceUIHandler.class.isAssignableFrom(getClass())) { @@ -747,7 +745,8 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U NavigationTree treeHelper = getTreeHelper(ui); NavigationTreeNodeSupport node = treeHelper.getSelectedNode(); - NavigationTreeNodeSupport parentNode = treeHelper.removeNode(node); + NavigationTreeNodeSupport parentNode = node.getParent(); + treeHelper.removeNode(node); treeHelper.selectNode(parentNode); } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ObserveActionMap.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ObserveActionMap.java index 71556dd..aefcdff 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ObserveActionMap.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ObserveActionMap.java @@ -107,8 +107,8 @@ public class ObserveActionMap extends ActionMap { private <A extends AbstractUIAction> A newAction(String key, Class<A> actionType) { try { - if (log.isInfoEnabled()) { - log.info("Create action: " + key + ", type: " + actionType.getName()); + if (log.isDebugEnabled()) { + log.debug("Create action: " + key + ", type: " + actionType.getName()); } return ConstructorUtils.invokeConstructor(actionType, ui); } catch (NoSuchMethodException | IllegalAccessException | InstantiationException | InvocationTargetException e) { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUIHandler.java index 3ecf77c..07dc8b4 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUIHandler.java @@ -363,7 +363,8 @@ public class SetLonglineUIHandler extends ContentUIHandler<SetLonglineDto, SetLo getModel().setMode(ContentMode.UPDATE); // remove old node and recreate new node - NavigationTreeNodeSupport parentNode = treeHelper.removeNode(node); + NavigationTreeNodeSupport parentNode = node.getParent(); + treeHelper.removeNode(node); DataReference<SetLonglineDto> beanRef = ObserveSwingApplicationContext.get().getReferenceBinderEngine().transformDataDtoToReference(getDecoratorService().getReferentialLocale(), bean); node = treeHelper.addSetLongline(parentNode, beanRef); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java index 5aea97e..f21b658 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java @@ -182,7 +182,8 @@ public class FloatingObjectUIHandler extends ContentUIHandler<FloatingObjectDto, getModel().setMode(ContentMode.UPDATE); // remove old node and recreate new node - NavigationTreeNodeSupport parentNode = treeHelper.removeNode(node); + NavigationTreeNodeSupport parentNode = node.getParent(); + treeHelper.removeNode(node); DataReference<FloatingObjectDto> beanRef = ObserveSwingApplicationContext.get().getReferenceBinderEngine().transformDataDtoToReference(getDecoratorService().getReferentialLocale(), bean); node = treeHelper.addFloatingObject(parentNode, beanRef); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIHandler.java index 8f9de9b..8eef9ba 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIHandler.java @@ -262,7 +262,8 @@ public class SetSeineUIHandler extends ContentUIHandler<SetSeineDto, SetSeineUI> getModel().setMode(ContentMode.UPDATE); // remove old node and recreate new node - NavigationTreeNodeSupport parentNode = treeHelper.removeNode(node); + NavigationTreeNodeSupport parentNode = node.getParent(); + treeHelper.removeNode(node); DataReference<SetSeineDto> beanRef = ObserveSwingApplicationContext.get().getReferenceBinderEngine().transformDataDtoToReference(getDecoratorService().getReferentialLocale(), bean); node = treeHelper.addSetSeine(parentNode, beanRef); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIHandler.java index 31a28c8..1a8af7a 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIHandler.java @@ -27,7 +27,6 @@ import fr.ird.observe.application.swing.ui.actions.shared.SelectNodeUIAction; import fr.ird.observe.application.swing.ui.content.ContentMode; import fr.ird.observe.application.swing.ui.content.ContentUIHandler; import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTree; -import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTreeCellRenderer; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.NavigationTreeNodeSupport; import fr.ird.observe.services.dto.AbstractReference; import fr.ird.observe.services.dto.DataDto; @@ -233,14 +232,11 @@ public abstract class ContentListUIHandler<E extends IdDto, C extends DataDto, U private final transient NavigationTree treeHelper; - private final NavigationTreeCellRenderer treeRenderer; - private final ThreadLocal<NavigationTreeNodeSupport> containerNode = new ThreadLocal<>(); EntityListCellRenderer(ListCellRenderer delegate, NavigationTree treeHelper) { this.delegate = delegate; this.treeHelper = treeHelper; - this.treeRenderer = treeHelper.getNavigationCellRenderer(); } public void init() { @@ -248,7 +244,7 @@ public abstract class ContentListUIHandler<E extends IdDto, C extends DataDto, U } @Override - public Component getListCellRendererComponent(JList list, + public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, diff --git a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties index 60f9b8c..37d2acb 100644 --- a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties +++ b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties @@ -1419,6 +1419,7 @@ observe.enum.fr.ird.observe.application.swing.validation.ValidationModelMode.REF observe.enum.fr.ird.observe.application.swing.validation.ValidationModelMode.REFERENTIEL.description=Only referentials observe.enum.fr.ird.observe.services.dto.ObserveModelType.LL=Longline observe.enum.fr.ird.observe.services.dto.ObserveModelType.PS=Seine +observe.enum.fr.ird.observe.services.dto.ObserveModelType.REF=Referential observe.enum.fr.ird.observe.services.dto.constants.GearType.longline=Longline gear type observe.enum.fr.ird.observe.services.dto.constants.GearType.seine=Senne gear type observe.enum.fr.ird.observe.services.dto.constants.ReferenceStatus.disabled=Disabled diff --git a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties index 4f0439b..8cc8705 100644 --- a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties +++ b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties @@ -1419,6 +1419,7 @@ observe.enum.fr.ird.observe.application.swing.validation.ValidationModelMode.REF observe.enum.fr.ird.observe.application.swing.validation.ValidationModelMode.REFERENTIEL.description=Todos los referenciales observe.enum.fr.ird.observe.services.dto.ObserveModelType.LL=Palangre observe.enum.fr.ird.observe.services.dto.ObserveModelType.PS=Senne +observe.enum.fr.ird.observe.services.dto.ObserveModelType.REF=Referencial observe.enum.fr.ird.observe.services.dto.constants.GearType.longline=Palangre observe.enum.fr.ird.observe.services.dto.constants.GearType.seine=Senne observe.enum.fr.ird.observe.services.dto.constants.ReferenceStatus.disabled=Desactivado diff --git a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties index 83536fa..2768968 100644 --- a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties +++ b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties @@ -1419,6 +1419,7 @@ observe.enum.fr.ird.observe.application.swing.validation.ValidationModelMode.REF observe.enum.fr.ird.observe.application.swing.validation.ValidationModelMode.REFERENTIEL.description=Tous les référentiels observe.enum.fr.ird.observe.services.dto.ObserveModelType.LL=Palangre observe.enum.fr.ird.observe.services.dto.ObserveModelType.PS=Senne +observe.enum.fr.ird.observe.services.dto.ObserveModelType.REF=Référentiel observe.enum.fr.ird.observe.services.dto.constants.GearType.longline=Longline observe.enum.fr.ird.observe.services.dto.constants.GearType.seine=Senne observe.enum.fr.ird.observe.services.dto.constants.ReferenceStatus.disabled=Désactivé -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.