Apple-2-Tools/dmolony-DiskBrowser
1
0
Fork 0
mirror of https://github.com/dmolony/DiskBrowser.git synced 2025-02-06 19:30:01 +00:00
Code Issues Projects Releases Wiki Activity

minor changes

Browse Source
This commit is contained in:
Denis Molony 2017-11-26 07:12:59 +11:00
parent 5e43f0aa8a
commit 99805f41d7
7 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored Normal file
View File

@ -0,0 +1,4 @@
resources/buildNumber
resources/buildNumber

7
src/com/bytezone/diskbrowser/disk/AbstractFormattedDisk.java
View File

@ -14,6 +14,7 @@ import java.util.List;
import javax.swing.JTree;
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.DefaultTreeModel;
import javax.swing.tree.TreeNode;
import javax.swing.tree.TreePath;
import com.bytezone.diskbrowser.applefile.AbstractFile;
@ -247,17 +248,17 @@ public abstract class AbstractFormattedDisk implements FormattedDisk
protected DefaultMutableTreeNode findNode (DefaultMutableTreeNode node, String name)
{
Enumeration<DefaultMutableTreeNode> children = node.breadthFirstEnumeration ();
Enumeration<TreeNode> children = node.breadthFirstEnumeration ();
if (children != null)
{
while (children.hasMoreElements ())
{
DefaultMutableTreeNode childNode = children.nextElement ();
DefaultMutableTreeNode childNode =
(DefaultMutableTreeNode) children.nextElement ();
if (childNode.getUserObject ().toString ().indexOf (name) > 0)
return childNode;
}
}
// System.out.println ("Node not found : " + name);
return null;
}

8
src/com/bytezone/diskbrowser/gui/AbstractTab.java
View File

@ -104,22 +104,22 @@ abstract class AbstractTab extends JPanel implements Tab
protected DefaultMutableTreeNode findNode (int nodeNo)
{
DefaultMutableTreeNode rootNode = getRootNode ();
Enumeration<DefaultMutableTreeNode> children = rootNode.breadthFirstEnumeration ();
Enumeration<TreeNode> children = rootNode.breadthFirstEnumeration ();
int count = 0;
DefaultMutableTreeNode selectNode = null;
while (children.hasMoreElements () && ++count <= nodeNo)
selectNode = children.nextElement ();
selectNode = (DefaultMutableTreeNode) children.nextElement ();
return selectNode;
}
protected DefaultMutableTreeNode findFirstLeafNode ()
{
DefaultMutableTreeNode rootNode = getRootNode ();
Enumeration<DefaultMutableTreeNode> children = rootNode.depthFirstEnumeration ();
Enumeration<TreeNode> children = rootNode.depthFirstEnumeration ();
DefaultMutableTreeNode selectNode = null;
while (children.hasMoreElements ())
{
selectNode = children.nextElement ();
selectNode = (DefaultMutableTreeNode) children.nextElement ();
if (selectNode.isLeaf ())
{
FileNode node = (FileNode) selectNode.getUserObject ();

5
src/com/bytezone/diskbrowser/gui/AppleDiskTab.java
View File

@ -13,6 +13,7 @@ import javax.swing.JTree;
import javax.swing.event.TreeSelectionEvent;
import javax.swing.event.TreeSelectionListener;
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.TreeNode;
import com.bytezone.diskbrowser.applefile.AppleFileSource;
import com.bytezone.diskbrowser.disk.DiskFactory;
@ -120,10 +121,10 @@ class AppleDiskTab extends AbstractTab
private DefaultMutableTreeNode findNode (String nodeName)
{
DefaultMutableTreeNode rootNode = getRootNode ();
Enumeration<DefaultMutableTreeNode> children = rootNode.breadthFirstEnumeration ();
Enumeration<TreeNode> children = rootNode.breadthFirstEnumeration ();
while (children.hasMoreElements ())
{
DefaultMutableTreeNode node = children.nextElement ();
DefaultMutableTreeNode node = (DefaultMutableTreeNode) children.nextElement ();
Object o = node.getUserObject ();
if (o instanceof AppleFileSource)
{

6
src/com/bytezone/diskbrowser/gui/DataPanel.java
View File

@ -392,7 +392,11 @@ class DataPanel extends JTabbedPane
return;
if (sectors.size () == 1)
setDataSource (event.getFormattedDisk ().getFormattedSector (sectors.get (0)));
{
DiskAddress da = sectors.get (0);
// if (da != null)
setDataSource (event.getFormattedDisk ().getFormattedSector (da));
}
else
setDataSource (new SectorList (event.getFormattedDisk (), sectors));
}

1
src/com/bytezone/diskbrowser/gui/DiskLayoutImage.java
View File

@ -88,6 +88,7 @@ class DiskLayoutImage extends JPanel implements Scrollable, RedoListener
if (sectors != null && sectors.size () > 0)
{
DiskAddress da = sectors.size () == 1 ? sectors.get (0) : sectors.get (1);
// if (da != null)
scrollRectToVisible (layoutDetails.getLocation (da));
}
repaint ();

5
src/com/bytezone/diskbrowser/gui/FileSystemTab.java
View File

@ -18,6 +18,7 @@ import javax.swing.event.TreeSelectionListener;
import javax.swing.event.TreeWillExpandListener;
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.ExpandVetoException;
import javax.swing.tree.TreeNode;
import javax.swing.tree.TreePath;
import com.bytezone.diskbrowser.disk.DiskFactory;
@ -161,10 +162,10 @@ class FileSystemTab extends AbstractTab
// find the old disk and replace it
DefaultMutableTreeNode rootNode = getRootNode ();
Enumeration<DefaultMutableTreeNode> children = rootNode.breadthFirstEnumeration ();
Enumeration<TreeNode> children = rootNode.breadthFirstEnumeration ();
while (children.hasMoreElements ())
{
DefaultMutableTreeNode node = children.nextElement ();
DefaultMutableTreeNode node = (DefaultMutableTreeNode) children.nextElement ();
fn = (FileNode) node.getUserObject ();
if (fn.replaceDisk (disk))
break;