This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 132e60cb42f2db6b6cb4086a5340fe9f9c48fc83 Author: Kevin Morin <morin@codelutin.com> Date: Fri Feb 5 15:43:20 2016 +0100 expand nodes when children are inserted (refs #7929) --- .../protocol/zones/ZoneEditorUIHandler.java | 52 ++++++++++++++++++---- .../protocol/zones/actions/AddStratasAction.java | 6 --- 2 files changed, 43 insertions(+), 15 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/ZoneEditorUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/ZoneEditorUIHandler.java index aba0d05..aacdb84 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/ZoneEditorUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/ZoneEditorUIHandler.java @@ -25,7 +25,8 @@ import javax.swing.JComponent; import javax.swing.JPopupMenu; import javax.swing.JTree; import javax.swing.SwingUtilities; -import javax.swing.event.TreeSelectionEvent; +import javax.swing.event.TreeModelEvent; +import javax.swing.event.TreeModelListener; import javax.swing.event.TreeSelectionListener; import javax.swing.tree.TreeModel; import javax.swing.tree.TreePath; @@ -210,19 +211,52 @@ public class ZoneEditorUIHandler extends AbstractTuttiUIHandler<EditProtocolUIMo }); - TreeSelectionListener enableAddStrataListener = new TreeSelectionListener() { + TreeSelectionListener enableAddStrataListener = evt -> { - @Override - public void valueChanged(TreeSelectionEvent e) { - boolean addButtonEnabled = zonesTree.getSelectionCount() == 1 - && zonesTree.getSelectionPath().getLastPathComponent() instanceof ZoneNode - && availableStratasTree.getSelectionCount() >= 1; - getUI().getAddButton().setEnabled(addButtonEnabled); - } + boolean addButtonEnabled = zonesTree.getSelectionCount() == 1 + && zonesTree.getSelectionPath().getLastPathComponent() instanceof ZoneNode + && availableStratasTree.getSelectionCount() >= 1; + getUI().getAddButton().setEnabled(addButtonEnabled); + }; zonesTree.addTreeSelectionListener(enableAddStrataListener); availableStratasTree.addTreeSelectionListener(enableAddStrataListener); + // expand nodes when children are added + zonesTreeModel.addTreeModelListener(new TreeModelListener() { + + @Override + public void treeNodesChanged(TreeModelEvent e) { } + + @Override + public void treeNodesInserted(TreeModelEvent e) { + zonesTree.expandPath(e.getTreePath()); + } + + @Override + public void treeNodesRemoved(TreeModelEvent e) { } + + @Override + public void treeStructureChanged(TreeModelEvent e) { } + }); + + availableStratasTreeModel.addTreeModelListener(new TreeModelListener() { + + @Override + public void treeNodesChanged(TreeModelEvent e) { } + + @Override + public void treeNodesInserted(TreeModelEvent e) { + availableStratasTree.expandPath(e.getTreePath()); + } + + @Override + public void treeNodesRemoved(TreeModelEvent e) { } + + @Override + public void treeStructureChanged(TreeModelEvent e) { } + }); + // get data initModel(); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/actions/AddStratasAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/actions/AddStratasAction.java index aa0511f..e6e689b 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/actions/AddStratasAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/actions/AddStratasAction.java @@ -56,16 +56,10 @@ public class AddStratasAction extends SimpleActionSupport<ZoneEditorUI> { if (node instanceof StrataNode) { StrataUIModel strata = ((StrataNode) node).getStrata(); - if (log.isInfoEnabled()) { - log.info("add strata " + strata.getLabel()); - } stratasToAdd.add(strata); } else if (node instanceof SubStrataNode) { SubStrataUIModel subStrata = ((SubStrataNode) node).getSubstrata(); - if (log.isInfoEnabled()) { - log.info("add subtrata " + subStrata.getLabel()); - } subStratasToAdd.add(subStrata); } else { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.