Apple-2-Tools/dmolony-DiskBrowser
1
0
Fork 0
mirror of https://github.com/dmolony/DiskBrowser.git synced 2024-06-25 11:29:32 +00:00
Code Issues Projects Releases Wiki Activity

rewrote terrible sort routine

Browse Source
This commit is contained in:
Denis Molony 2019-10-22 09:50:49 +10:00
parent 0974aa1be7
commit cf5123fb4e
1 changed files with 38 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
src/com/bytezone/diskbrowser/prodos/ProdosDisk.java
View File

@ -4,6 +4,8 @@ import java.awt.Color;
import java.text.DateFormat; import java.text.DateFormat;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List; import java.util.List;
import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultMutableTreeNode;
@ -36,6 +38,7 @@ public class ProdosDisk extends AbstractFormattedDisk
private final List<DirectoryHeader> headerEntries = new ArrayList<DirectoryHeader> (); private final List<DirectoryHeader> headerEntries = new ArrayList<DirectoryHeader> ();
protected VolumeDirectoryHeader vdh; protected VolumeDirectoryHeader vdh;
private final DefaultMutableTreeNode volumeNode; private final DefaultMutableTreeNode volumeNode;
private final NodeComparator nodeComparator = new NodeComparator ();
private static final boolean debug = false; private static final boolean debug = false;
@ -86,86 +89,32 @@ public class ProdosDisk extends AbstractFormattedDisk
if (ProdosDisk.prodosPreferences.sortDirectories) if (ProdosDisk.prodosPreferences.sortDirectories)
{ {
sortLeaves (volumeNode); sortNodes (volumeNode);
sortFolders (volumeNode);
((DefaultTreeModel) catalogTree.getModel ()).reload (); ((DefaultTreeModel) catalogTree.getModel ()).reload ();
} }
} }
public void sortLeaves (DefaultMutableTreeNode node) public void sortNodes (DefaultMutableTreeNode node)
{ {
for (int i = 0; i < node.getChildCount (); i++) int totalNodes = node.getChildCount ();
if (totalNodes == 0)
return;
List<DefaultMutableTreeNode> children = new ArrayList<> (totalNodes);
for (int i = 0; i < totalNodes; i++)
{ {
DefaultMutableTreeNode baseNode = (DefaultMutableTreeNode) node.getChildAt (i); DefaultMutableTreeNode child = (DefaultMutableTreeNode) node.getChildAt (i);
if (!baseNode.isLeaf ()) children.add (child);
{ if (!child.isLeaf ())
sortLeaves (baseNode); sortNodes (child);
continue;
}
String childName = ((FileEntry) baseNode.getUserObject ()).name;
DefaultMutableTreeNode smallestNode = null;
String smallestName = childName;
int smallestPos = -1;
for (int j = i + 1; j < node.getChildCount (); j++)
{
DefaultMutableTreeNode compareNode = (DefaultMutableTreeNode) node.getChildAt (j);
if (!compareNode.isLeaf ())
continue;
String compareName = ((FileEntry) compareNode.getUserObject ()).name;
if (smallestName.compareToIgnoreCase (compareName) > 0)
{
smallestNode = compareNode;
smallestName = compareName;
smallestPos = j;
}
}
if (smallestNode != null)
{
node.insert (baseNode, smallestPos);
node.insert (smallestNode, i);
}
} }
}
public void sortFolders (DefaultMutableTreeNode node) if (totalNodes > 1)
{
for (int i = 0; i < node.getChildCount (); i++)
{ {
DefaultMutableTreeNode baseNode = (DefaultMutableTreeNode) node.getChildAt (i); node.removeAllChildren ();
if (baseNode.isLeaf ()) Collections.sort (children, nodeComparator);
continue; for (DefaultMutableTreeNode child : children)
node.add (child);
sortFolders (baseNode);
String childName = ((FileEntry) baseNode.getUserObject ()).name;
DefaultMutableTreeNode smallestNode = null;
String smallestName = childName;
int smallestPos = -1;
for (int j = i + 1; j < node.getChildCount (); j++)
{
DefaultMutableTreeNode compareNode = (DefaultMutableTreeNode) node.getChildAt (j);
if (compareNode.isLeaf ())
continue;
String compareName = ((FileEntry) compareNode.getUserObject ()).name;
if (smallestName.compareToIgnoreCase (compareName) > 0)
{
smallestNode = compareNode;
smallestName = compareName;
smallestPos = j;
}
}
if (smallestNode != null)
{
node.insert (baseNode, smallestPos);
node.insert (smallestNode, i);
}
} }
} }
@ -369,4 +318,22 @@ public class ProdosDisk extends AbstractFormattedDisk
return text.toString (); return text.toString ();
} }
class NodeComparator implements Comparator<DefaultMutableTreeNode>
{
@Override
public int compare (DefaultMutableTreeNode o1, DefaultMutableTreeNode o2)
{
String name1 = ((FileEntry) o1.getUserObject ()).name;
String name2 = ((FileEntry) o2.getUserObject ()).name;
if (o1.isLeaf () && !o2.isLeaf ())
return -1;
if (!o1.isLeaf () && o2.isLeaf ())
return 1;
return name1.compareTo (name2);
}
}
} }