From 4cc97ada875c26ac1b31d3ddc698ef6eaaec2015 Mon Sep 17 00:00:00 2001 From: jochen Date: Tue, 29 Jun 1999 10:44:44 +0000 Subject: [PATCH] isLeaf fixed (root was sometimes not a leaf, if classpath was empty) git-svn-id: https://svn.code.sf.net/p/jode/code/trunk@962 379699f6-c40d-0410-875b-85095c16579e --- jode/jode/swingui/PackagesTreeModel.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/jode/jode/swingui/PackagesTreeModel.java b/jode/jode/swingui/PackagesTreeModel.java index 280679f..8c9a203 100644 --- a/jode/jode/swingui/PackagesTreeModel.java +++ b/jode/jode/swingui/PackagesTreeModel.java @@ -41,10 +41,10 @@ public class PackagesTreeModel implements TreeModel { String name; boolean leaf; - public TreeElement(String prefix, String name) { + public TreeElement(String prefix, String name, boolean isLeaf) { this.fullName = prefix+name; this.name = name; - this.leaf = !ClassInfo.isPackage(fullName); + this.leaf = isLeaf; } public String getFullName() { @@ -81,7 +81,7 @@ public class PackagesTreeModel implements TreeModel { } } - TreeElement root = new TreeElement("",""); + TreeElement root = new TreeElement("", "", false); Vector listeners = new Vector(); public void rebuild() { @@ -107,10 +107,13 @@ public class PackagesTreeModel implements TreeModel { while (enum.hasMoreElements()) { //insert sorted and remove double elements; String name = (String)enum.nextElement(); - if (Decompiler.skipClass(ClassInfo.forName(prefix+name))) + String fqn = prefix+name; + boolean isClass = !ClassInfo.isPackage(fqn); + + if (isClass && Decompiler.skipClass(ClassInfo.forName(fqn))) continue; - TreeElement newElem = new TreeElement(prefix, name); + TreeElement newElem = new TreeElement(prefix, name, isClass); for (int i=0; ; i++) { if (i == v.size()) { v.addElement(newElem);