From 87626f24249a7cb9145c05f3e42a9b0844c4cd99 Mon Sep 17 00:00:00 2001
From: Denis Molony <dmolony@iinet.net.au>
Date: Tue, 9 Aug 2016 19:09:11 +1000
Subject: [PATCH] tidying

---
 src/com/bytezone/diskbrowser/pascal/FileEntry.java  |  3 ++-
 src/com/bytezone/diskbrowser/pascal/PascalDisk.java | 13 ++-----------
 .../diskbrowser/wizardry/Wizardry4BootDisk.java     |  6 ++++++
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/com/bytezone/diskbrowser/pascal/FileEntry.java b/src/com/bytezone/diskbrowser/pascal/FileEntry.java
index fb901a3..da012d2 100644
--- a/src/com/bytezone/diskbrowser/pascal/FileEntry.java
+++ b/src/com/bytezone/diskbrowser/pascal/FileEntry.java
@@ -85,8 +85,8 @@ public class FileEntry extends CatalogEntry
           {
             DefaultMutableTreeNode segmentNode = new DefaultMutableTreeNode (
                 new PascalCodeObject (parent, pascalSegment, firstBlock));
-            node.add (segmentNode);
             segmentNode.setAllowsChildren (false);
+            node.add (segmentNode);
           }
         }
         catch (FileFormatException e)
@@ -95,6 +95,7 @@ public class FileEntry extends CatalogEntry
             file = new AssemblerProgram (name, buffer, 0xD000);
           else
             file = new AssemblerProgram (name, buffer, 0);
+          node.setAllowsChildren (false);
         }
         break;
 
diff --git a/src/com/bytezone/diskbrowser/pascal/PascalDisk.java b/src/com/bytezone/diskbrowser/pascal/PascalDisk.java
index d7fb3b9..72608ed 100755
--- a/src/com/bytezone/diskbrowser/pascal/PascalDisk.java
+++ b/src/com/bytezone/diskbrowser/pascal/PascalDisk.java
@@ -103,19 +103,10 @@ public class PascalDisk extends AbstractFormattedDisk
       DefaultMutableTreeNode node = new DefaultMutableTreeNode (fileEntry);
       fileEntry.setNode (node);
 
-      if (fileEntry.fileType == 2)// && dataSource instanceof PascalCode)
+      if (fileEntry.fileType == 2)
       {
         node.setAllowsChildren (true);
-        // this does not trigger correctly when opening the arrow
-
-        //        PascalCode pascalCode = (PascalCode) dataSource;
-        //        for (PascalSegment pascalSegment : pascalCode)
-        //        {
-        //          DefaultMutableTreeNode segmentNode = new DefaultMutableTreeNode (
-        //              new PascalCodeObject (this, pascalSegment, fileEntry.firstBlock));
-        //          node.add (segmentNode);
-        //          segmentNode.setAllowsChildren (false);
-        //        }
+        fileEntry.getDataSource ();
       }
       else
         node.setAllowsChildren (false);
diff --git a/src/com/bytezone/diskbrowser/wizardry/Wizardry4BootDisk.java b/src/com/bytezone/diskbrowser/wizardry/Wizardry4BootDisk.java
index 6fb14e2..09ce587 100644
--- a/src/com/bytezone/diskbrowser/wizardry/Wizardry4BootDisk.java
+++ b/src/com/bytezone/diskbrowser/wizardry/Wizardry4BootDisk.java
@@ -37,6 +37,12 @@ public class Wizardry4BootDisk extends PascalDisk
       relocator.createNewBuffer (dataDisks);
       fileEntry.setFile (relocator);
     }
+
+    // reset the code segment so that it rebuilds itself from the new data
+    DefaultMutableTreeNode pascalNode = findNode (currentRoot, "SYSTEM.PASCAL");
+    fileEntry = (FileEntry) pascalNode.getUserObject ();
+    fileEntry.setFile (null);
+    fileEntry.getDataSource ();
   }
 
   public static boolean isWizardryIV (Disk disk, boolean debug)