Author: tchemit Date: 2009-10-21 15:16:51 +0200 (Wed, 21 Oct 2009) New Revision: 1582 Modified: branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeContextHelper.java Log: do not make equals on class, prefer use method isAssignableFrom Modified: branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeContextHelper.java =================================================================== --- branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeContextHelper.java 2009-10-21 12:56:13 UTC (rev 1581) +++ branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeContextHelper.java 2009-10-21 13:16:51 UTC (rev 1582) @@ -89,11 +89,11 @@ } public <T> T getSelectedBean(JAXXContext context, Class<T> type) { - Object r = getSelectedBeanContextEntry().getContextValue(context); - if (type.equals(r.getClass())){ - return (T)getSelectedBeanContextEntry().getContextValue(context); + Object r = getSelectedBean(context); + if (r != null && !type.isAssignableFrom(r.getClass())) { + throw new IllegalStateException("required a object of type '" + type + "' but had '" + r.getClass() + "'"); } - return null; + return (T) r; } public void setTreeModel(JAXXContext context, NavigationTreeModel model) {