Apple-2-Tools/dmolony-DiskBrowser
1
0
Fork 0
mirror of https://github.com/dmolony/DiskBrowser.git synced 2024-11-28 20:50:13 +00:00
Code Issues Projects Releases Wiki Activity

tidying

Browse Source
This commit is contained in:
Denis Molony 2021-01-06 19:15:58 +10:00
parent d9a43577f7
commit 21f7da6fc5
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/bytezone/diskbrowser/applefile/ApplesoftBasicProgram.java
View File

@ -39,6 +39,7 @@ public class ApplesoftBasicProgram extends BasicProgram
String formatLeft; String formatLeft;
String formatLineNumber; String formatLineNumber;
String formatRight; String formatRight;
int maxDigits;
// ---------------------------------------------------------------------------------// // ---------------------------------------------------------------------------------//
public ApplesoftBasicProgram (String name, byte[] buffer) public ApplesoftBasicProgram (String name, byte[] buffer)
@ -86,7 +87,9 @@ public class ApplesoftBasicProgram extends BasicProgram
: "%-7.7s "; : "%-7.7s ";
formatRight = longestVarName > 7 ? "%" + longestVarName + "." + longestVarName + "s " formatRight = longestVarName > 7 ? "%" + longestVarName + "." + longestVarName + "s "
: "%7.7s "; : "%7.7s ";
formatLineNumber = "%" + getMaxDigits () + "d ";
maxDigits = getMaxDigits ();
formatLineNumber = "%" + maxDigits + "d ";
} }
// ---------------------------------------------------------------------------------// // ---------------------------------------------------------------------------------//
@ -397,6 +400,10 @@ public class ApplesoftBasicProgram extends BasicProgram
if (fullText.charAt (fullText.length () - 2) != '\n') if (fullText.charAt (fullText.length () - 2) != '\n')
fullText.append ("\n"); fullText.append ("\n");
fullText.append (String.format (format, underline));
fullText.append (underline);
fullText.append ("\n");
fullText.append (String.format (format, heading[0])); fullText.append (String.format (format, heading[0]));
if (heading.length == 1) if (heading.length == 1)
fullText.append ("Line numbers"); fullText.append ("Line numbers");
@ -425,6 +432,7 @@ public class ApplesoftBasicProgram extends BasicProgram
headingShown = true; headingShown = true;
heading (fullText, formatLeft, heading, "Duplicate Names"); heading (fullText, formatLeft, heading, "Duplicate Names");
} }
String line = usage.toString (); String line = usage.toString ();
line = line.substring (1, line.length () - 1); line = line.substring (1, line.length () - 1);
fullText.append (String.format ("%-6s %s%n", key, line)); fullText.append (String.format ("%-6s %s%n", key, line));
@ -445,7 +453,7 @@ public class ApplesoftBasicProgram extends BasicProgram
text.append (String.format (formatLeft, symbol)); text.append (String.format (formatLeft, symbol));
for (int lineNo : map.get (symbol)) for (int lineNo : map.get (symbol))
{ {
if (text.length () > 95) if (text.length () > underline.length () - maxDigits + longestVarName)
{ {
fullText.append (text); fullText.append (text);
fullText.append ("\n"); fullText.append ("\n");
@ -473,7 +481,7 @@ public class ApplesoftBasicProgram extends BasicProgram
text.append (String.format (formatRight, symbol)); text.append (String.format (formatRight, symbol));
for (int lineNo : map.get (symbol)) for (int lineNo : map.get (symbol))
{ {
if (text.length () > 95) if (text.length () > underline.length () - maxDigits + longestVarName)
{ {
fullText.append (text); fullText.append (text);
fullText.append ("\n"); fullText.append ("\n");