This is an automated email from the git hooks/post-receive script. New commit to annotated tag v2.0.0-beta-1 in repository jaxx. See https://gitlab.nuiton.org/nuiton/jaxx.git commit ca721bafbe101b6ffd494ee722f1e787d73e88c7 Author: Sylvain Letellier <???> Date: Tue Oct 20 12:58:57 2009 +0000 Bug categorie item in ItemTreeNavigation fixed --- .../runtime/swing/navigation/ItemNavigationCardPanel.java | 13 ++++++++----- .../runtime/swing/navigation/ItemTreeNavigationAdapter.java | 7 ++++++- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/ItemNavigationCardPanel.java b/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/ItemNavigationCardPanel.java index e5de31d..47cb8b8 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/ItemNavigationCardPanel.java +++ b/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/ItemNavigationCardPanel.java @@ -27,11 +27,14 @@ public class ItemNavigationCardPanel extends JPanel { } public void showItem(Item i) { - if (i != null && i.getValue() != null) { - if (i.getValue() instanceof Class<?>) { - layout.show(this, i.getValue().getClass().getName()); - } else { - layout.show(this, i.getValue().getClass().getName()); + if (i != null) { + Object value = i.getValue(); + if (value != null) { + if (value instanceof Class) { + layout.show(this, ((Class) value).getName()); + } else { + layout.show(this, value.getClass().getName()); + } } } } diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/ItemTreeNavigationAdapter.java b/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/ItemTreeNavigationAdapter.java index e90f8fc..7f14cb3 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/ItemTreeNavigationAdapter.java +++ b/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/ItemTreeNavigationAdapter.java @@ -39,14 +39,19 @@ public abstract class ItemTreeNavigationAdapter implements TreeSelectionListene // Recuperation du path selectionne TreePath path = e.getNewLeadSelectionPath(); + if (path == null){ + path = e.getOldLeadSelectionPath(); + } TreeModel model = tree.getModel(); if (!(model instanceof JAXXTreeModel)){ log.error("Its not an JAXXTreeModel"); return; } + // Find item coresponding - Item itemSelected = ((JAXXTreeModel) model).findItem(path.getLastPathComponent()); + Object lastPathComponent = path.getLastPathComponent(); + Item itemSelected = ((JAXXTreeModel) model).findItem(lastPathComponent); // Show corresponding panel cardPanel.showItem(itemSelected); -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.