This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit d5b6b962cb2eb6d90d5c7edef10b9cf5a615ba01 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Dec 22 12:02:46 2016 +0100 Amélioration menu Navigation --- .../ird/observe/application/swing/ui/ObserveMainUI.jaxx | 8 ++++++-- .../ird/observe/application/swing/ui/ObserveMainUI.jcss | 14 ++++++++++++-- ...entialAction.java => GotoReferentialCommonAction.java} | 13 +++++++------ ...tialAction.java => GotoReferentialLonglineAction.java} | 14 +++++++------- ...rentialAction.java => GotoReferentialSeineAction.java} | 15 ++++++++------- .../swing/ui/tree/navigation/NavigationTree.java | 4 ++-- .../tree/navigation/nodes/NavigationTreeNodeSupport.java | 2 +- .../resources/i18n/application-swing_en_GB.properties | 3 +++ .../resources/i18n/application-swing_es_ES.properties | 3 +++ .../resources/i18n/application-swing_fr_FR.properties | 4 +++- 10 files changed, 52 insertions(+), 28 deletions(-) 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 3c295e2..a11a070 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 @@ -62,7 +62,9 @@ fr.ird.observe.application.swing.ui.actions.menu.navigation.GotoOpenRouteAction fr.ird.observe.application.swing.ui.actions.menu.navigation.GotoOpenActivityAction fr.ird.observe.application.swing.ui.actions.menu.navigation.GotoOpenSetAction - fr.ird.observe.application.swing.ui.actions.menu.navigation.GotoReferentialAction + fr.ird.observe.application.swing.ui.actions.menu.navigation.GotoReferentialCommonAction + fr.ird.observe.application.swing.ui.actions.menu.navigation.GotoReferentialSeineAction + fr.ird.observe.application.swing.ui.actions.menu.navigation.GotoReferentialLonglineAction fr.ird.observe.application.swing.ui.actions.menu.storage.ChangeStorageAction fr.ird.observe.application.swing.ui.actions.menu.storage.CloseStorageAction fr.ird.observe.application.swing.ui.actions.menu.storage.ImportStorageFromFileAction @@ -191,7 +193,9 @@ protected void finalize() throws Throwable { <JMenuItem id='menuNavigationActivity'/> <JMenuItem id='menuNavigationSet'/> <JSeparator/> - <JMenuItem id='menuNavigationReferentiel'/> + <JMenuItem id='menuNavigationReferentielCommon'/> + <JMenuItem id='menuNavigationReferentielLongline'/> + <JMenuItem id='menuNavigationReferentielSeine'/> </JMenu> <JMenu id='menuConfiguration'> <JMenu id='menuLanguage'> 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 3387d95..fa56820 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 @@ -264,8 +264,18 @@ JSplitPane { enabled:{dataContext.isOpenSet()}; } -#menuNavigationReferentiel { - _observeAction:{GotoReferentialAction.ACTION_NAME}; +#menuNavigationReferentielCommon { + _observeAction:{GotoReferentialCommonAction.ACTION_NAME}; + enabled:true; +} + +#menuNavigationReferentielSeine { + _observeAction:{GotoReferentialSeineAction.ACTION_NAME}; + enabled:true; +} + +#menuNavigationReferentielLongline { + _observeAction:{GotoReferentialLonglineAction.ACTION_NAME}; enabled:true; } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/navigation/GotoReferentialAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/navigation/GotoReferentialCommonAction.java similarity index 78% copy from application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/navigation/GotoReferentialAction.java copy to application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/navigation/GotoReferentialCommonAction.java index c7b0a9e..756b696 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/navigation/GotoReferentialAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/navigation/GotoReferentialCommonAction.java @@ -29,6 +29,7 @@ import fr.ird.observe.application.swing.ui.tree.navigation.nodes.NavigationTreeN import java.util.Optional; +import static org.nuiton.i18n.I18n.n; import static org.nuiton.i18n.I18n.t; /** @@ -37,17 +38,17 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 6.0 */ -public class GotoReferentialAction extends GotoActionSupport { +public class GotoReferentialCommonAction extends GotoActionSupport { - public static final String ACTION_NAME = "GotoReferential"; + public static final String ACTION_NAME = GotoReferentialCommonAction.class.getName(); - public GotoReferentialAction(ObserveMainUI mainUI) { + public GotoReferentialCommonAction(ObserveMainUI mainUI) { super(mainUI, ACTION_NAME, null, (int) 'e', - t("observe.action.goto.referentiel.short"), - t("observe.action.goto.referentiel.tip"), + t("observe.type.reference.common"), + t("observe.action.goto.referentiel.common.tip"), "navigation.referentiel"); } @@ -58,7 +59,7 @@ public class GotoReferentialAction extends GotoActionSupport { @Override protected Optional<NavigationTreeNodeSupport> getNodeToSelect(NavigationTree navigation, DataContext dataContext) { - return Optional.of(navigation.getReferentialNode()); + return Optional.of(navigation.getReferentialNode(t("observe.type.reference.common"))); } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/navigation/GotoReferentialAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/navigation/GotoReferentialLonglineAction.java similarity index 78% copy from application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/navigation/GotoReferentialAction.java copy to application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/navigation/GotoReferentialLonglineAction.java index c7b0a9e..37e91d2 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/navigation/GotoReferentialAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/navigation/GotoReferentialLonglineAction.java @@ -37,17 +37,17 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 6.0 */ -public class GotoReferentialAction extends GotoActionSupport { +public class GotoReferentialLonglineAction extends GotoActionSupport { - public static final String ACTION_NAME = "GotoReferential"; + public static final String ACTION_NAME = GotoReferentialLonglineAction.class.getName(); - public GotoReferentialAction(ObserveMainUI mainUI) { + public GotoReferentialLonglineAction(ObserveMainUI mainUI) { super(mainUI, ACTION_NAME, null, - (int) 'e', - t("observe.action.goto.referentiel.short"), - t("observe.action.goto.referentiel.tip"), + (int) 'L', + t("observe.type.reference.longline"), + t("observe.action.goto.referentiel.longline.tip"), "navigation.referentiel"); } @@ -58,7 +58,7 @@ public class GotoReferentialAction extends GotoActionSupport { @Override protected Optional<NavigationTreeNodeSupport> getNodeToSelect(NavigationTree navigation, DataContext dataContext) { - return Optional.of(navigation.getReferentialNode()); + return Optional.of(navigation.getReferentialNode(t("observe.type.reference.longline"))); } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/navigation/GotoReferentialAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/navigation/GotoReferentialSeineAction.java similarity index 77% rename from application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/navigation/GotoReferentialAction.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/navigation/GotoReferentialSeineAction.java index c7b0a9e..588fe03 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/navigation/GotoReferentialAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/navigation/GotoReferentialSeineAction.java @@ -29,6 +29,7 @@ import fr.ird.observe.application.swing.ui.tree.navigation.nodes.NavigationTreeN import java.util.Optional; +import static org.nuiton.i18n.I18n.n; import static org.nuiton.i18n.I18n.t; /** @@ -37,17 +38,17 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 6.0 */ -public class GotoReferentialAction extends GotoActionSupport { +public class GotoReferentialSeineAction extends GotoActionSupport { - public static final String ACTION_NAME = "GotoReferential"; + public static final String ACTION_NAME = GotoReferentialSeineAction.class.getName(); - public GotoReferentialAction(ObserveMainUI mainUI) { + public GotoReferentialSeineAction(ObserveMainUI mainUI) { super(mainUI, ACTION_NAME, null, - (int) 'e', - t("observe.action.goto.referentiel.short"), - t("observe.action.goto.referentiel.tip"), + (int) 'S', + t("observe.type.reference.seine"), + t("observe.action.goto.referentiel.seine.tip"), "navigation.referentiel"); } @@ -58,7 +59,7 @@ public class GotoReferentialAction extends GotoActionSupport { @Override protected Optional<NavigationTreeNodeSupport> getNodeToSelect(NavigationTree navigation, DataContext dataContext) { - return Optional.of(navigation.getReferentialNode()); + return Optional.of(navigation.getReferentialNode(t("observe.type.reference.seine"))); } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTree.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTree.java index a476080..bb10bab 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTree.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTree.java @@ -551,9 +551,9 @@ public class NavigationTree extends JXTree { } - public NavigationTreeNodeSupport getReferentialNode() { + public NavigationTreeNodeSupport getReferentialNode(String name) { RootNavigationTreeNode root = getTreeModel().getRoot(); - return getTreeModel().findNodeByType(root, ReferentialsNavigationTreeNode.class); + return getTreeModel().findNode(root, name); } public NavigationTreeNodeSupport getProgramNode(String programId) { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/NavigationTreeNodeSupport.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/NavigationTreeNodeSupport.java index f4ac6e4..54f1533 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/NavigationTreeNodeSupport.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/NavigationTreeNodeSupport.java @@ -144,7 +144,7 @@ public abstract class NavigationTreeNodeSupport<O> extends ObserveTreeNodeSuppor Enumeration<NavigationTreeNodeSupport> children = children(); while (children.hasMoreElements()) { NavigationTreeNodeSupport node = children.nextElement(); - if (id.equals(node.getId())) { + if (id.equals(node.getId()) || (node.getUserObject() instanceof String && id.equals(node.getUserObject()))) { return node; } } 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 87ef6dd..70985db 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 @@ -79,6 +79,9 @@ observe.action.goto.next.stage=Next step observe.action.goto.next.stage.tip=Go to next step observe.action.goto.previous.stage=Previous step observe.action.goto.previous.stage.tip=go to previous step +observe.action.goto.referentiel.common.tip=Go to common referentials +observe.action.goto.referentiel.longline.tip=Go to longline referentials +observe.action.goto.referentiel.seine.tip=Go to Seine referentials observe.action.goto.referentiel.short=Referentiel observe.action.goto.referentiel.tip=Go to referentiel observe.action.info.storage=Storage details 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 52e47cb..2e77128 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 @@ -79,6 +79,9 @@ observe.action.goto.next.stage=Siguiente observe.action.goto.next.stage.tip=Etapa siguiente observe.action.goto.previous.stage=Anterior observe.action.goto.previous.stage.tip=Acceder a la etapa anterior +observe.action.goto.referentiel.common.tip=Accéder au référentiel Commun \#TODO +observe.action.goto.referentiel.longline.tip=Accéder au référentiel Palangre \#TODO +observe.action.goto.referentiel.seine.tip=Accéder au référentiel Senne \#TODO observe.action.goto.referentiel.short=Referencial observe.action.goto.referentiel.tip=Acceder al referencial observe.action.info.storage=Información sobre la fuente de datos 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 6c62400..c17e06e 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 @@ -79,8 +79,10 @@ observe.action.goto.next.stage=Suivant observe.action.goto.next.stage.tip=Accéder à l'étape suivante observe.action.goto.previous.stage=Précédent observe.action.goto.previous.stage.tip=Accèder à l'étape précédente +observe.action.goto.referentiel.common.tip=Accéder au référentiel Commun +observe.action.goto.referentiel.longline.tip=Accéder au référentiel Palangre +observe.action.goto.referentiel.seine.tip=Accéder au référentiel Senne observe.action.goto.referentiel.short=Référentiel -observe.action.goto.referentiel.tip=Accéder au référentiel observe.action.info.storage=Informations sur la source de données observe.action.info.storage.tip=Voir les informations sur la source de données actuellement utilisée observe.action.load.from.file=Importer une sauvegarde -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.