Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 4eb6a93b by Tony CHEMIT at 2018-04-06T07:04:58Z Fix some navigation issues (scrollpane does not work, on select node is not expand) + review navigation ui design - - - - - 22 changed files: - client/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/ObserveMainUIInitializer.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/CloseAndCreateUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/CloseOpenUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/GoDownUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/GoUpUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveActivityLonglinesUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveActivitySeinesUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveMultipleDataUIActionSupport.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveRoutesUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveSingleDataUIActionSupport.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveTripUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveTripsUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/ReOpenUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/ResetEditUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/SelectNodeUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/main/global/ChangeFocusGlobalUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/GotoActionSupport.java - client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/storage/ReloadStorageAction.java - client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/ref/ReferenceHomeUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationTree.java Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jaxx @@ -78,9 +78,6 @@ fr.ird.observe.client.ui.content.ContentUIManager fr.ird.observe.client.ui.content.ObserveActionMap fr.ird.observe.client.ui.tree.navigation.NavigationUI - fr.ird.observe.client.ui.tree.navigation.NavigationTree - fr.ird.observe.client.ui.tree.navigation.NavigationTreeModel - fr.ird.observe.client.ui.tree.navigation.NavigationTreeModel fr.ird.observe.client.ui.util.UIHelper fr.ird.observe.client.ui.util.ObserveBlockingLayerUI @@ -255,7 +252,6 @@ protected void finalize() throws Throwable { <JXTitledPanel id='navigationView'> <NavigationUI id="navigationUI" initializer="new NavigationUI((JAXXContext)this)"/> - <NavigationTree id="navigation" initializer="navigationUI.getTree()"/> </JXTitledPanel> <!-- right : (content + messages) --> ===================================== client/src/main/java/fr/ird/observe/client/ui/ObserveMainUIInitializer.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/ObserveMainUIInitializer.java +++ b/client/src/main/java/fr/ird/observe/client/ui/ObserveMainUIInitializer.java @@ -153,7 +153,7 @@ public class ObserveMainUIInitializer { // set fullscreen propery on main ui ui.getGraphicsConfiguration().getDevice().setFullScreenWindow(config.isFullScreen() ? ui : null); - new ObserveNavigationTreeShowPopupAction(ui.getNavigation(), ui.getNavigationUI(), ui.getNavigationPopup()); + new ObserveNavigationTreeShowPopupAction(ui.getNavigationUI().getTree(), ui.getNavigationUI(), ui.getNavigationPopup()); return ui; } @@ -180,7 +180,7 @@ public class ObserveMainUIInitializer { log.debug("No open Data source."); return; } - if (ui.getNavigation().isSelectionEmpty()) { + if (ui.getNavigationUI().getTree().isSelectionEmpty()) { log.debug("No selection, show empty panel..."); boolean foundEmptySelection = false; @@ -260,12 +260,12 @@ public class ObserveMainUIInitializer { JComponent focusOwner; if (ui.getFocusOwner() == ui) { focusOnNavigation = true; - focusOwner = ui.getNavigation(); + focusOwner = ui.getNavigationUI().getTree(); } else { focusOwner = (JComponent) ui.getFocusOwner(); if (focusOwner != null) { - if (ui.getNavigation().equals(focusOwner)) { + if (ui.getNavigationUI().getTree().equals(focusOwner)) { focusOnNavigation = true; } if (ui.getNavigationUI().equals(focusOwner)) { @@ -277,7 +277,7 @@ public class ObserveMainUIInitializer { if (!focusOnNavigation) { Container focusOwnerParent = focusOwner.getParent(); while (focusOwnerParent != null) { - if (ui.getNavigation().equals(focusOwnerParent)) { + if (ui.getNavigationUI().getTree().equals(focusOwnerParent)) { focusOnNavigation = true; break; } @@ -337,7 +337,7 @@ public class ObserveMainUIInitializer { oldMode = ui.getModel().getMode(); - ids = ui.getNavigation().getSelectedIds(); + ids = ui.getNavigationUI().getTree().getSelectedIds(); ErrorDialogUI.init(null); @@ -368,7 +368,7 @@ public class ObserveMainUIInitializer { if (oldMode == ObserveUIMode.DB) { // on met à jour le modèle de navigation - NavigationTreeModel treeModel = ui.getNavigation().getTreeModel(); + NavigationTreeModel treeModel = ui.getNavigationUI().getTree().getTreeModel(); treeModel.load(config); treeModel.populate(); @@ -378,7 +378,7 @@ public class ObserveMainUIInitializer { // selection du noeud d'ouverture (le noeud precedemment selectionne, // ou le noeud le plus ouvert // ou le premier program si aucune donnée ouverte) - ui.getNavigation().selectInitialNode(); + ui.getNavigationUI().getTree().selectInitialNode(); } // show ui @@ -405,7 +405,7 @@ public class ObserveMainUIInitializer { // ajout d'un ecouteur sur la navigation pour toujours mettre la scrollbar // tout à droite a chaque selection - ui.getNavigation().addTreeSelectionListener(this::changeNavigationNode); + ui.getNavigationUI().getTree().addTreeSelectionListener(this::changeNavigationNode); SwingValidatorUtil.installUI(ui.getErrorTable(), new ObserveValidatorMessageTableRenderer()); @@ -433,12 +433,12 @@ public class ObserveMainUIInitializer { } }; ui.getNavigationView().addMouseListener(mouseAdapter); - ui.getNavigation().addMouseListener(mouseAdapter); + ui.getNavigationUI().getTree().addMouseListener(mouseAdapter); ui.getNavigationUI().addMouseListener(mouseAdapter); init(ui.getSplitpane()); init(ui.getSplitpane2()); - init(ui.getNavigation()); + init(ui.getNavigationUI().getTree()); ui.getNavigationView().setRightDecoration(ui.getNavigationUI().getToolbar()); // ui.getNavigationView().addComponentListener(new ComponentAdapter() { @@ -555,7 +555,7 @@ public class ObserveMainUIInitializer { ui.getContextValue(SwingValidatorMessageTableModel.class).clear(); // clean tree model - NavigationTree tree = ui.getNavigation(); + NavigationTree tree = ui.getNavigationUI().getTree(); tree.clearModel(); progressModel.incrementsCurrentStep(); @@ -574,7 +574,7 @@ public class ObserveMainUIInitializer { */ public void loadNavigationUI(ProgressModel progressModel) { - NavigationTree tree = ui.getNavigation(); + NavigationTree tree = ui.getNavigationUI().getTree(); NavigationTreeModel treeModel = tree.getTreeModel(); treeModel.populate(); ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/content/CloseAndCreateUIAction.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/actions/content/CloseAndCreateUIAction.java +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/content/CloseAndCreateUIAction.java @@ -78,7 +78,7 @@ public class CloseAndCreateUIAction extends AbstractContentUIAction { return; } - NavigationTree tree = getMainUI().getNavigation(); + NavigationTree tree = getMainUI().getNavigationUI().getTree(); boolean wasCollapsed = isOpenActivityNodeCollapsed(tree, dataContext); @@ -120,7 +120,7 @@ public class CloseAndCreateUIAction extends AbstractContentUIAction { return; } - NavigationTree tree = getMainUI().getNavigation(); + NavigationTree tree = getMainUI().getNavigationUI().getTree(); boolean wasCollapsed = isOpenActivityNodeCollapsed(tree, dataContext); ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/content/CloseOpenUIAction.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/actions/content/CloseOpenUIAction.java +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/content/CloseOpenUIAction.java @@ -102,7 +102,7 @@ public class CloseOpenUIAction extends AbstractContentUIAction { private void closeData(ObserveSwingApplicationContext applicationContext, ContentUI<?, ?> ui, String id) { - NavigationTree tree = getMainUI().getNavigation(); + NavigationTree tree = getMainUI().getNavigationUI().getTree(); NavigationTreeNodeSupport selectedNode = tree.getSelectedNode(); NavigationTreeNodeSupport node = tree.getChild(selectedNode, id); ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/content/GoDownUIAction.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/actions/content/GoDownUIAction.java +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/content/GoDownUIAction.java @@ -71,7 +71,7 @@ public class GoDownUIAction extends AbstractContentUIAction { public void updateAction(JAXXObject ui, AbstractButton editor) { ObserveMainUI mainUI = getMainUI(); - NavigationTree tree = getMainUI().getNavigation(); + NavigationTree tree = getMainUI().getNavigationUI().getTree(); JPopupMenu scopePopup = mainUI.getScopeDownPopup(); SelectNodeUIAction action = (SelectNodeUIAction) mainUI.getObserveActionMap().get(SelectNodeUIAction.ACTION_NAME); ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/content/GoUpUIAction.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/actions/content/GoUpUIAction.java +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/content/GoUpUIAction.java @@ -73,7 +73,7 @@ public class GoUpUIAction extends AbstractContentUIAction { @Override public void updateAction(JAXXObject ui, AbstractButton editor) { - NavigationTree treeHelper = getMainUI().getNavigation(); + NavigationTree treeHelper = getMainUI().getNavigationUI().getTree(); NavigationTreeNodeSupport<?> node; ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveActivityLonglinesUIAction.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveActivityLonglinesUIAction.java +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveActivityLonglinesUIAction.java @@ -73,7 +73,7 @@ public class MoveActivityLonglinesUIAction extends MoveMultipleDataUIActionSuppo ObserveSwingApplicationContext applicationContext = ObserveSwingApplicationContext.get(); ObserveOpenDataManager openDataManager = applicationContext.getOpenDataManager(); - NavigationTree treeHelper = getMainUI().getNavigation(); + NavigationTree treeHelper = getMainUI().getNavigationUI().getTree(); NavigationTreeNodeSupport oldTripLonglineNode = oldActivitiesNode.getParent(); NavigationTreeNodeSupport programNode = oldTripLonglineNode.getParent(); ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveActivitySeinesUIAction.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveActivitySeinesUIAction.java +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveActivitySeinesUIAction.java @@ -73,7 +73,7 @@ public class MoveActivitySeinesUIAction extends MoveMultipleDataUIActionSupport< ObserveSwingApplicationContext applicationContext = ObserveSwingApplicationContext.get(); ObserveOpenDataManager openDataManager = applicationContext.getOpenDataManager(); - NavigationTree treeHelper = getMainUI().getNavigation(); + NavigationTree treeHelper = getMainUI().getNavigationUI().getTree(); NavigationTreeNodeSupport oldRouteNode = oldParentNode.getParent(); NavigationTreeNodeSupport routesNode = oldRouteNode.getParent(); ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveMultipleDataUIActionSupport.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveMultipleDataUIActionSupport.java +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveMultipleDataUIActionSupport.java @@ -71,7 +71,7 @@ public abstract class MoveMultipleDataUIActionSupport<U extends ContentListUI<?, @SuppressWarnings("unchecked") U ui = (U) ui1; - NavigationTree treeHelper = getMainUI().getNavigation(); + NavigationTree treeHelper = getMainUI().getNavigationUI().getTree(); NavigationTreeNodeSupport node = treeHelper.getSelectedNode(); NavigationTreeNodeSupport oldParentNode = node.getParent().isRoot() ? node : node.getParent(); ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveRoutesUIAction.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveRoutesUIAction.java +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveRoutesUIAction.java @@ -72,7 +72,7 @@ public class MoveRoutesUIAction extends MoveMultipleDataUIActionSupport<RoutesUI void updateUI(RoutesUI ui, NavigationTreeNodeSupport oldRoutesNode, String tripSeineId, ImmutableSet<String> routeIds, List<Integer> positions) { ObserveOpenDataManager openDataManager = getOpenDataManager(); - NavigationTree treeHelper = getMainUI().getNavigation(); + NavigationTree treeHelper = getMainUI().getNavigationUI().getTree(); NavigationTreeNodeSupport oldTripSeineNode = oldRoutesNode.getParent(); NavigationTreeNodeSupport programNode = oldTripSeineNode.getParent(); ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveSingleDataUIActionSupport.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveSingleDataUIActionSupport.java +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveSingleDataUIActionSupport.java @@ -50,7 +50,7 @@ public abstract class MoveSingleDataUIActionSupport extends UIActionSupport { @Override public final void actionPerformed(ActionEvent e) { - NavigationTree treeHelper = getMainUI().getNavigation(); + NavigationTree treeHelper = getMainUI().getNavigationUI().getTree(); NavigationTreeNodeSupport node = treeHelper.getSelectedNode(); NavigationTreeNodeSupport oldParentNode = node.getParent().getParent().equals(node.getRoot()) ? node.getParent() : node.getParent().getParent(); Optional<String> optionalNewParentId = getNewParentId(getMainUI(), oldParentNode); @@ -62,7 +62,7 @@ public abstract class MoveSingleDataUIActionSupport extends UIActionSupport { private void apply(NavigationTreeNodeSupport oldParentNode, String dataId, String newParentId) { - NavigationTree treeHelper = getMainUI().getNavigation(); + NavigationTree treeHelper = getMainUI().getNavigationUI().getTree(); NavigationTreeNodeSupport node = treeHelper.getSelectedNode(); NavigationTreeNodeSupport grandParentNode = oldParentNode.getParent(); ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveTripUIAction.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveTripUIAction.java +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveTripUIAction.java @@ -94,7 +94,7 @@ public abstract class MoveTripUIAction extends MoveSingleDataUIActionSupport { static Optional<String> chooseNewProgram(ObserveMainUI mainUI, GearType gearType, String oldProgramId) { - NavigationTree treeHelper = mainUI.getNavigation(); + NavigationTree treeHelper = mainUI.getNavigationUI().getTree(); // racine NavigationTreeNodeSupport rootNode = treeHelper.getRootNode(); ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveTripsUIAction.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveTripsUIAction.java +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveTripsUIAction.java @@ -77,7 +77,7 @@ public abstract class MoveTripsUIAction<U extends ContentListUI<?, ?, ?, ?>> ext ObserveSwingApplicationContext applicationContext = ObserveSwingApplicationContext.get(); ObserveOpenDataManager openDataManager = applicationContext.getOpenDataManager(); - NavigationTree treeHelper = getMainUI().getNavigation(); + NavigationTree treeHelper = getMainUI().getNavigationUI().getTree(); NavigationTreeNodeSupport rootNode = treeHelper.getRootNode(); NavigationTreeNodeSupport newProgramNode = treeHelper.getChild(rootNode, newParentId); ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/content/ReOpenUIAction.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/actions/content/ReOpenUIAction.java +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/content/ReOpenUIAction.java @@ -70,7 +70,7 @@ public class ReOpenUIAction extends AbstractContentUIAction { String id = selectedData.getId(); - NavigationTree tree = getMainUI().getNavigation(); + NavigationTree tree = getMainUI().getNavigationUI().getTree(); NavigationTreeNodeSupport selectedNode = tree.getSelectedNode(); NavigationTreeNodeSupport node = tree.getChild(selectedNode, id); ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/content/ResetEditUIAction.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/actions/content/ResetEditUIAction.java +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/content/ResetEditUIAction.java @@ -57,7 +57,7 @@ public class ResetEditUIAction extends AbstractContentUIAction { if (ui.getModel().isCreatingMode()) { ui.stopEdit(); - NavigationTree tree = getMainUI().getNavigation(); + NavigationTree tree = getMainUI().getNavigationUI().getTree(); NavigationTreeNodeSupport parentNode = tree.getSelectedNode().getParent(); tree.removeNode(tree.getSelectedNode()); tree.selectNode(parentNode); ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/content/SelectNodeUIAction.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/actions/content/SelectNodeUIAction.java +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/content/SelectNodeUIAction.java @@ -92,6 +92,6 @@ public class SelectNodeUIAction extends AbstractContentUIAction { NavigationTreeNodeSupport node = (NavigationTreeNodeSupport) source.getClientProperty(NODE); Objects.requireNonNull(node); - SwingUtilities.invokeLater(() -> getMainUI().getNavigation().selectNode(node)); + SwingUtilities.invokeLater(() -> getMainUI().getNavigationUI().getTree().selectNode(node)); } } ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/main/global/ChangeFocusGlobalUIAction.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/actions/main/global/ChangeFocusGlobalUIAction.java +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/main/global/ChangeFocusGlobalUIAction.java @@ -76,7 +76,7 @@ public class ChangeFocusGlobalUIAction extends UIActionSupport { log.info("Focus to navigation"); } getMainUI().getModel().setFocusOnNavigation(true); - focusComponent = getMainUI().getNavigation(); + focusComponent = getMainUI().getNavigationUI().getTree(); } SwingUtilities.invokeLater(focusComponent::requestFocusInWindow); ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/GotoActionSupport.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/GotoActionSupport.java +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/GotoActionSupport.java @@ -89,7 +89,7 @@ public abstract class GotoActionSupport extends MenuActionSupport { return; } - NavigationTree navigation = getMainUI().getNavigation(); + NavigationTree navigation = getMainUI().getNavigationUI().getTree(); getNodeToSelect(navigation, dataContext).ifPresent(navigation::selectNode); ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/storage/ReloadStorageAction.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/storage/ReloadStorageAction.java +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/storage/ReloadStorageAction.java @@ -82,7 +82,7 @@ public class ReloadStorageAction extends MenuActionSupport { ui.getModel().setBusy(false); - Object[] ids = ui.getNavigation().getSelectedIds(); + Object[] ids = ui.getNavigationUI().getTree().getSelectedIds(); try { ===================================== client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java @@ -222,7 +222,7 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U } public static NavigationTree getNavigationTree() { - return ObserveSwingApplicationContext.get().getMainUI().getNavigation(); + return ObserveSwingApplicationContext.get().getMainUI().getNavigationUI().getTree(); } /** @@ -444,10 +444,10 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U if (focusOnNavigation) { SwingUtilities.invokeLater(() -> { Component focusOwner = mainUI.getFocusOwner(); - if (!mainUI.getNavigation().equals(focusOwner)) { + if (!mainUI.getNavigationUI().getTree().equals(focusOwner)) { SwingUtilities.invokeLater(() -> { - mainUI.getNavigation().requestFocusInWindow(); + mainUI.getNavigationUI().getTree().requestFocusInWindow(); log.debug("Focus old owner: " + focusOwner); log.debug("Focus new owner: " + mainUI.getFocusOwner()); ===================================== client/src/main/java/fr/ird/observe/client/ui/content/ref/ReferenceHomeUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/ref/ReferenceHomeUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/ref/ReferenceHomeUIHandler.java @@ -68,7 +68,7 @@ public class ReferenceHomeUIHandler extends ContentUIHandler<ProgramDto, Referen JPanel panel = ui.getBody(); String nodeName = ui.getModel().getNodeName(); - NavigationTree navigation = ObserveSwingApplicationContext.get().getMainUI().getNavigation(); + NavigationTree navigation = ObserveSwingApplicationContext.get().getMainUI().getNavigationUI().getTree(); NavigationTreeNodeSupport<?> referentialNode = navigation.getReferentialNode(nodeName); for (Class<? extends ReferentialDto> type : ui.getModel().getTypes()) { ===================================== client/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationTree.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationTree.java +++ b/client/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationTree.java @@ -153,7 +153,14 @@ public class NavigationTree extends JXTree { return; } TreePath path = e.getPath(); - getTreeModel().open((NavigationTreeNodeSupport) path.getLastPathComponent()); + NavigationTreeNodeSupport selectedNode = (NavigationTreeNodeSupport) path.getLastPathComponent(); + try { + getTreeModel().open((NavigationTreeNodeSupport) path.getLastPathComponent()); + } finally { + if (!selectedNode.isLeaf()) { + SwingUtilities.invokeLater(() -> expandPath(path)); + } + } }); NavigationTreeCellRenderer renderer = new NavigationTreeCellRenderer(); @@ -202,7 +209,7 @@ public class NavigationTree extends JXTree { /** * Sélectionne le noeud dans l'arbre de navigation. - * <p> + * * <b>Note:</b> cette méthode doit être appelée après un rechargement du * modèle de navigation. */ View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/4eb6a93b689a88eb9c87c2583afb... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/4eb6a93b689a88eb9c87c2583afb... You're receiving this email because of your account on gitlab.com.