This commit is contained in:
Denis Molony 2017-03-27 16:59:30 +11:00
parent d09df374dc
commit fa07a88b1e

View File

@ -48,7 +48,7 @@ public class TreeBuilder
return tree; return tree;
} }
private void addFiles (DefaultMutableTreeNode node, File directory) private void addFiles (DefaultMutableTreeNode parentNode, File directory)
{ {
File[] files = directory.listFiles (); File[] files = directory.listFiles ();
if (files == null || files.length == 0) if (files == null || files.length == 0)
@ -60,24 +60,19 @@ public class TreeBuilder
Arrays.sort (files, fileComparator); Arrays.sort (files, fileComparator);
for (File file : files) for (File file : files)
{
if (file.isDirectory ()) if (file.isDirectory ())
{ parentNode.add (createNode (file, true));
FileNode fileNode = new FileNode (file);
DefaultMutableTreeNode newNode = new DefaultMutableTreeNode (fileNode);
fileNode.setTreeNode (newNode);
newNode.setAllowsChildren (true);
node.add (newNode);
}
else if (Utility.validFileType (file.getName ()) && file.length () > 0) else if (Utility.validFileType (file.getName ()) && file.length () > 0)
parentNode.add (createNode (file, false));
}
private DefaultMutableTreeNode createNode (File file, boolean allowsChildren)
{ {
FileNode fileNode = new FileNode (file); FileNode fileNode = new FileNode (file);
DefaultMutableTreeNode newNode = new DefaultMutableTreeNode (fileNode); DefaultMutableTreeNode newNode = new DefaultMutableTreeNode (fileNode);
fileNode.setTreeNode (newNode); fileNode.setTreeNode (newNode);
newNode.setAllowsChildren (false); newNode.setAllowsChildren (allowsChildren);
node.add (newNode); return newNode;
}
}
} }
private void setDiskIcon (String iconName) private void setDiskIcon (String iconName)