Proper folder icons

Author: rcx

src/main/java/club/bytecode/the/jda/gui/navigation/FileNavigationPane.java

@@ -225,7 +225,7 @@ public FileNode addTreeElement(FileContainer container, FileNode parent) {
         if (parent == null)
             parent = treeRoot;
 
-        FileNode root = new FileNode(container);
+        FileNode root = new FileNode(container, isJava(container));
         parent.add(root);
         JDATreeCellRenderer renderer = new JDATreeCellRenderer();
         tree.setCellRenderer(renderer);
@@ -234,10 +234,10 @@ public FileNode addTreeElement(FileContainer container, FileNode parent) {
             for (final Entry<String, byte[]> entry : container.files.entrySet()) {
                 String name = entry.getKey();
                 final String[] spl = name.split("/");
+                FileNode parentNode = root;
                 if (spl.length <= 1) {
-                    root.add(new FileNode(name));
+                    root.add(new FileNode(name, parentNode.isJava));
                 } else {
-                    FileNode parentNode = root;
                     for (final String s : spl) {
                         FileNode child = null;
                         for (int i = 0; i < parentNode.getChildCount(); i++) {
@@ -247,7 +247,7 @@ public FileNode addTreeElement(FileContainer container, FileNode parent) {
                             }
                         }
                         if (child == null) {
-                            child = new FileNode(s);
+                            child = new FileNode(s, parentNode.isJava);
                             parentNode.add(child);
                         }
                         parentNode = child;
@@ -263,6 +263,10 @@ public FileNode addTreeElement(FileContainer container, FileNode parent) {
         return root;
     }
 
+    private boolean isJava(FileContainer container) {
+        return container.name.endsWith(".java") || container.name.endsWith(".jar") || container.name.endsWith(".class");
+    }
+
     @SuppressWarnings("rawtypes")
     void treeDfs(final TreePath parent, Consumer<TreePath> onPreOrder, Consumer<TreePath> onPostOrder) {
         if (onPreOrder != null)
@@ -314,12 +318,17 @@ public void paint(final Graphics g) {
 
     public class FileNode extends DefaultMutableTreeNode {
 
-        public final boolean isJava = false;
+        public final boolean isJava;
 
         private static final long serialVersionUID = -8817777566176729571L;
 
-        public FileNode(final Object o) {
+        public FileNode(final Object o, boolean isJava) {
             super(o);
+            this.isJava = isJava;
+        }
+
+        public FileNode(final Object o) {
+            this(o, false);
         }
 
         @Override

src/main/java/club/bytecode/the/jda/gui/navigation/JDATreeCellRenderer.java

@@ -54,35 +54,7 @@ public Component getTreeCellRendererComponent(JTree tree, Object value, boolean
                 nodes.add(node);
                 totalNodes.add(node);
 
-                boolean isJava = false;
-                boolean finished = false;
-
-                while (!finished) { //may cause a clusterfuck with huge files
-                    if (nodes.isEmpty())
-                        finished = true;
-                    else {
-                        TreeNode treeNode = nodes.get(0);
-                        nodes.remove(treeNode);
-                        int children = treeNode.getChildCount();
-                        if (children >= 1)
-                            for (int i = 0; i < children; i++) {
-                                TreeNode child = treeNode.getChildAt(i);
-
-                                if (!totalNodes.contains(child)) {
-                                    nodes.add(child);
-                                    totalNodes.add(child);
-                                }
-
-                                if (child.toString().endsWith(".class"))
-                                    isJava = true;
-                            }
-
-                        if (isJava)
-                            nodes.clear();
-                    }
-                }
-
-                if (isJava)
+                if (node.isJava)
                     setIcon(Resources.packagesIcon);
                 else {
                     setIcon(Resources.folderIcon);