Author: sletellier Date: 2009-10-20 14:58:57 +0200 (Tue, 20 Oct 2009) New Revision: 1578 Modified: branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/ItemNavigationCardPanel.java branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/ItemTreeNavigationAdapter.java Log: Bug categorie item in ItemTreeNavigation fixed Modified: branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/ItemNavigationCardPanel.java =================================================================== --- branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/ItemNavigationCardPanel.java 2009-10-16 14:05:07 UTC (rev 1577) +++ branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/ItemNavigationCardPanel.java 2009-10-20 12:58:57 UTC (rev 1578) @@ -27,11 +27,14 @@ } 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()); + } } } } Modified: branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/ItemTreeNavigationAdapter.java =================================================================== --- branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/ItemTreeNavigationAdapter.java 2009-10-16 14:05:07 UTC (rev 1577) +++ branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/ItemTreeNavigationAdapter.java 2009-10-20 12:58:57 UTC (rev 1578) @@ -39,14 +39,19 @@ // 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);