mirror of
https://github.com/dmolony/DiskBrowser.git
synced 2024-06-07 12:29:30 +00:00
tidying
This commit is contained in:
parent
df955b4885
commit
5e133715cd
|
@ -60,7 +60,7 @@ public class ApplesoftBasicProgram extends BasicProgram implements ApplesoftCons
|
||||||
return text.toString ();
|
return text.toString ();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (basicPreferences.formatApplesoft)
|
if (basicPreferences.userFormat)
|
||||||
userBasicFormatter.format (text);
|
userBasicFormatter.format (text);
|
||||||
else
|
else
|
||||||
appleBasicFormatter.format (text);
|
appleBasicFormatter.format (text);
|
||||||
|
|
|
@ -134,7 +134,7 @@ public class XrefFormatter extends BasicFormatter
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (basicPreferences.showXref)
|
if (basicPreferences.showGosubGoto)
|
||||||
{
|
{
|
||||||
if (!gosubLines.isEmpty ())
|
if (!gosubLines.isEmpty ())
|
||||||
showSymbolsRight (fullText, gosubLines, "GOSUB");
|
showSymbolsRight (fullText, gosubLines, "GOSUB");
|
||||||
|
|
|
@ -5,23 +5,26 @@ public class BasicPreferences
|
||||||
// -----------------------------------------------------------------------------------//
|
// -----------------------------------------------------------------------------------//
|
||||||
{
|
{
|
||||||
public boolean showHeader = true;
|
public boolean showHeader = true;
|
||||||
public boolean formatApplesoft = true;
|
public boolean userFormat = true;
|
||||||
public boolean showAllXref = true;
|
public boolean showAllXref = true;
|
||||||
|
|
||||||
public boolean appleLineWrap = false;
|
public boolean appleLineWrap = false;
|
||||||
|
|
||||||
public boolean splitRem = false;
|
public boolean splitRem = false;
|
||||||
|
public boolean splitDim = false;
|
||||||
public boolean alignAssign = true;
|
public boolean alignAssign = true;
|
||||||
public boolean showCaret = false;
|
public boolean showCaret = false;
|
||||||
public boolean showThen = true;
|
public boolean showThen = true;
|
||||||
public boolean blankAfterReturn = false;
|
public boolean blankAfterReturn = false;
|
||||||
public boolean formatRem = false;
|
public boolean formatRem = false;
|
||||||
public boolean deleteExtraDataSpace = false;
|
public boolean deleteExtraDataSpace = false;
|
||||||
public boolean showXref = false;
|
|
||||||
|
public boolean showGosubGoto = false;
|
||||||
public boolean showCalls = false;
|
public boolean showCalls = false;
|
||||||
public boolean showSymbols = false;
|
public boolean showSymbols = false;
|
||||||
public boolean showConstants = false;
|
|
||||||
public boolean showFunctions = false;
|
public boolean showFunctions = false;
|
||||||
|
public boolean showConstants = false;
|
||||||
public boolean showDuplicateSymbols = false;
|
public boolean showDuplicateSymbols = false;
|
||||||
public boolean splitDim = false;
|
|
||||||
|
|
||||||
public int wrapPrintAt = 0;
|
public int wrapPrintAt = 0;
|
||||||
public int wrapRemAt = 80;
|
public int wrapRemAt = 80;
|
||||||
|
@ -37,12 +40,12 @@ public class BasicPreferences
|
||||||
text.append (String.format ("Split REM ................ %s%n", splitRem));
|
text.append (String.format ("Split REM ................ %s%n", splitRem));
|
||||||
text.append (String.format ("Align assign ............. %s%n", alignAssign));
|
text.append (String.format ("Align assign ............. %s%n", alignAssign));
|
||||||
text.append (String.format ("Show header .............. %s%n", showHeader));
|
text.append (String.format ("Show header .............. %s%n", showHeader));
|
||||||
text.append (String.format ("Format applesoft ......... %s%n", formatApplesoft));
|
text.append (String.format ("User format .............. %s%n", userFormat));
|
||||||
text.append (String.format ("Show All Xref ............ %s%n", showAllXref));
|
text.append (String.format ("Show All Xref ............ %s%n", showAllXref));
|
||||||
text.append (String.format ("Apple line wrap .......... %s%n", appleLineWrap));
|
text.append (String.format ("Apple line wrap .......... %s%n", appleLineWrap));
|
||||||
text.append (String.format ("Show caret ............... %s%n", showCaret));
|
text.append (String.format ("Show caret ............... %s%n", showCaret));
|
||||||
text.append (String.format ("Show THEN ................ %s%n", showThen));
|
text.append (String.format ("Show THEN ................ %s%n", showThen));
|
||||||
text.append (String.format ("Show GOTO/GOSUB .......... %s%n", showXref));
|
text.append (String.format ("Show GOTO/GOSUB .......... %s%n", showGosubGoto));
|
||||||
text.append (String.format ("Show CALL ................ %s%n", showCalls));
|
text.append (String.format ("Show CALL ................ %s%n", showCalls));
|
||||||
text.append (String.format ("Show symbols ............. %s%n", showSymbols));
|
text.append (String.format ("Show symbols ............. %s%n", showSymbols));
|
||||||
text.append (String.format ("Show constants ........... %s%n", showConstants));
|
text.append (String.format ("Show constants ........... %s%n", showConstants));
|
||||||
|
|
|
@ -53,22 +53,19 @@ class MenuHandler implements DiskSelectionListener, FileSelectionListener, QuitL
|
||||||
private static final String PREFS_SPLIT_REMARKS = "splitRemarks";
|
private static final String PREFS_SPLIT_REMARKS = "splitRemarks";
|
||||||
private static final String PREFS_SPLIT_DIM = "splitDim";
|
private static final String PREFS_SPLIT_DIM = "splitDim";
|
||||||
private static final String PREFS_ALIGN_ASSIGN = "alignAssign";
|
private static final String PREFS_ALIGN_ASSIGN = "alignAssign";
|
||||||
// private static final String PREFS_SHOW_TARGETS = "showTargets";
|
|
||||||
// private static final String PREFS_ONLY_SHOW_TARGETS = "onlyShowTargets";
|
|
||||||
private static final String PREFS_SHOW_CARET = "showCaret";
|
private static final String PREFS_SHOW_CARET = "showCaret";
|
||||||
private static final String PREFS_SHOW_THEN = "showThen";
|
private static final String PREFS_SHOW_THEN = "showThen";
|
||||||
private static final String PREFS_SHOW_XREF = "showXref";
|
|
||||||
private static final String PREFS_SHOW_CALLS = "showCalls";
|
|
||||||
private static final String PREFS_SHOW_SYMBOLS = "showSymbols";
|
|
||||||
private static final String PREFS_SHOW_CONSTANTS = "showConstants";
|
|
||||||
private static final String PREFS_SHOW_FUNCTIONS = "showFunctions";
|
|
||||||
private static final String PREFS_SHOW_DUPLICATE_SYMBOLS = "showDuplicateSymbols";
|
|
||||||
// private static final String PREFS_LIST_STRINGS = "listStrings";
|
|
||||||
private static final String PREFS_BLANK_AFTER_RETURN = "blankAfterReturn";
|
private static final String PREFS_BLANK_AFTER_RETURN = "blankAfterReturn";
|
||||||
private static final String PREFS_FORMAT_REM = "formatRem";
|
private static final String PREFS_FORMAT_REM = "formatRem";
|
||||||
// private static final String PREFS_DELETE_EXTRA_REM_SPACE = "deleteExtraRemSpace";
|
|
||||||
private static final String PREFS_DELETE_EXTRA_DATA_SPACE = "deleteExtraDataSpace";
|
private static final String PREFS_DELETE_EXTRA_DATA_SPACE = "deleteExtraDataSpace";
|
||||||
|
|
||||||
|
private static final String PREFS_SHOW_GOSUB_GOTO = "showXref";
|
||||||
|
private static final String PREFS_SHOW_CALLS = "showCalls";
|
||||||
|
private static final String PREFS_SHOW_SYMBOLS = "showSymbols";
|
||||||
|
private static final String PREFS_SHOW_FUNCTIONS = "showFunctions";
|
||||||
|
private static final String PREFS_SHOW_CONSTANTS = "showConstants";
|
||||||
|
private static final String PREFS_SHOW_DUPLICATE_SYMBOLS = "showDuplicateSymbols";
|
||||||
|
|
||||||
private static final String PREFS_SHOW_ASSEMBLER_TARGETS = "showAssemblerTargets";
|
private static final String PREFS_SHOW_ASSEMBLER_TARGETS = "showAssemblerTargets";
|
||||||
private static final String PREFS_SHOW_ASSEMBLER_STRINGS = "showAssemblerStrings";
|
private static final String PREFS_SHOW_ASSEMBLER_STRINGS = "showAssemblerStrings";
|
||||||
private static final String PREFS_SHOW_ASSEMBLER_HEADER = "showAssemblerHeader";
|
private static final String PREFS_SHOW_ASSEMBLER_HEADER = "showAssemblerHeader";
|
||||||
|
@ -400,7 +397,7 @@ class MenuHandler implements DiskSelectionListener, FileSelectionListener, QuitL
|
||||||
// ---------------------------------------------------------------------------------//
|
// ---------------------------------------------------------------------------------//
|
||||||
{
|
{
|
||||||
basicPreferences.showHeader = showHeaderItem.isSelected ();
|
basicPreferences.showHeader = showHeaderItem.isSelected ();
|
||||||
basicPreferences.formatApplesoft = showAllFormatItem.isSelected ();
|
basicPreferences.userFormat = showAllFormatItem.isSelected ();
|
||||||
basicPreferences.showAllXref = showAllXrefItem.isSelected ();
|
basicPreferences.showAllXref = showAllXrefItem.isSelected ();
|
||||||
|
|
||||||
basicPreferences.appleLineWrap = appleLineWrapItem.isSelected ();
|
basicPreferences.appleLineWrap = appleLineWrapItem.isSelected ();
|
||||||
|
@ -408,29 +405,25 @@ class MenuHandler implements DiskSelectionListener, FileSelectionListener, QuitL
|
||||||
basicPreferences.splitRem = splitRemarkItem.isSelected ();
|
basicPreferences.splitRem = splitRemarkItem.isSelected ();
|
||||||
basicPreferences.splitDim = splitDimItem.isSelected ();
|
basicPreferences.splitDim = splitDimItem.isSelected ();
|
||||||
basicPreferences.alignAssign = alignAssignItem.isSelected ();
|
basicPreferences.alignAssign = alignAssignItem.isSelected ();
|
||||||
// basicPreferences.showTargets = showBasicTargetsItem.isSelected ();
|
|
||||||
// basicPreferences.onlyShowTargetLineNumbers = onlyShowTargetLinesItem.isSelected ();
|
|
||||||
basicPreferences.showCaret = showCaretItem.isSelected ();
|
basicPreferences.showCaret = showCaretItem.isSelected ();
|
||||||
basicPreferences.showThen = showThenItem.isSelected ();
|
basicPreferences.showThen = showThenItem.isSelected ();
|
||||||
basicPreferences.blankAfterReturn = blankAfterReturnItem.isSelected ();
|
basicPreferences.blankAfterReturn = blankAfterReturnItem.isSelected ();
|
||||||
basicPreferences.formatRem = formatRemItem.isSelected ();
|
basicPreferences.formatRem = formatRemItem.isSelected ();
|
||||||
// basicPreferences.deleteExtraRemSpace = deleteExtraRemSpace.isSelected ();
|
|
||||||
basicPreferences.deleteExtraDataSpace = deleteExtraDataSpace.isSelected ();
|
basicPreferences.deleteExtraDataSpace = deleteExtraDataSpace.isSelected ();
|
||||||
|
|
||||||
basicPreferences.showXref = showXrefItem.isSelected ();
|
basicPreferences.showGosubGoto = showXrefItem.isSelected ();
|
||||||
basicPreferences.showCalls = showCallsItem.isSelected ();
|
basicPreferences.showCalls = showCallsItem.isSelected ();
|
||||||
basicPreferences.showSymbols = showSymbolsItem.isSelected ();
|
basicPreferences.showSymbols = showSymbolsItem.isSelected ();
|
||||||
basicPreferences.showFunctions = showFunctionsItem.isSelected ();
|
basicPreferences.showFunctions = showFunctionsItem.isSelected ();
|
||||||
basicPreferences.showConstants = showConstantsItem.isSelected ();
|
basicPreferences.showConstants = showConstantsItem.isSelected ();
|
||||||
// basicPreferences.listStrings = listStringsItem.isSelected ();
|
|
||||||
basicPreferences.showDuplicateSymbols = showDuplicateSymbolsItem.isSelected ();
|
basicPreferences.showDuplicateSymbols = showDuplicateSymbolsItem.isSelected ();
|
||||||
|
|
||||||
BasicProgram.setBasicPreferences (basicPreferences);
|
BasicProgram.setBasicPreferences (basicPreferences);
|
||||||
|
|
||||||
for (JMenuItem item : applesoftFormatItems)
|
for (JMenuItem item : applesoftFormatItems)
|
||||||
item.setEnabled (basicPreferences.formatApplesoft);
|
item.setEnabled (basicPreferences.userFormat);
|
||||||
|
|
||||||
appleLineWrapItem.setEnabled (!basicPreferences.formatApplesoft);
|
appleLineWrapItem.setEnabled (!basicPreferences.userFormat);
|
||||||
|
|
||||||
for (JMenuItem item : applesoftXrefItems)
|
for (JMenuItem item : applesoftXrefItems)
|
||||||
item.setEnabled (basicPreferences.showAllXref);
|
item.setEnabled (basicPreferences.showAllXref);
|
||||||
|
@ -590,20 +583,17 @@ class MenuHandler implements DiskSelectionListener, FileSelectionListener, QuitL
|
||||||
prefs.putBoolean (PREFS_ALIGN_ASSIGN, alignAssignItem.isSelected ());
|
prefs.putBoolean (PREFS_ALIGN_ASSIGN, alignAssignItem.isSelected ());
|
||||||
prefs.putBoolean (PREFS_SHOW_CARET, showCaretItem.isSelected ());
|
prefs.putBoolean (PREFS_SHOW_CARET, showCaretItem.isSelected ());
|
||||||
prefs.putBoolean (PREFS_SHOW_THEN, showThenItem.isSelected ());
|
prefs.putBoolean (PREFS_SHOW_THEN, showThenItem.isSelected ());
|
||||||
prefs.putBoolean (PREFS_SHOW_XREF, showXrefItem.isSelected ());
|
prefs.putBoolean (PREFS_BLANK_AFTER_RETURN, blankAfterReturnItem.isSelected ());
|
||||||
|
prefs.putBoolean (PREFS_FORMAT_REM, formatRemItem.isSelected ());
|
||||||
|
prefs.putBoolean (PREFS_DELETE_EXTRA_DATA_SPACE, deleteExtraDataSpace.isSelected ());
|
||||||
|
|
||||||
|
prefs.putBoolean (PREFS_SHOW_GOSUB_GOTO, showXrefItem.isSelected ());
|
||||||
prefs.putBoolean (PREFS_SHOW_CALLS, showCallsItem.isSelected ());
|
prefs.putBoolean (PREFS_SHOW_CALLS, showCallsItem.isSelected ());
|
||||||
prefs.putBoolean (PREFS_SHOW_SYMBOLS, showSymbolsItem.isSelected ());
|
prefs.putBoolean (PREFS_SHOW_SYMBOLS, showSymbolsItem.isSelected ());
|
||||||
prefs.putBoolean (PREFS_SHOW_FUNCTIONS, showFunctionsItem.isSelected ());
|
prefs.putBoolean (PREFS_SHOW_FUNCTIONS, showFunctionsItem.isSelected ());
|
||||||
prefs.putBoolean (PREFS_SHOW_CONSTANTS, showConstantsItem.isSelected ());
|
prefs.putBoolean (PREFS_SHOW_CONSTANTS, showConstantsItem.isSelected ());
|
||||||
prefs.putBoolean (PREFS_SHOW_DUPLICATE_SYMBOLS,
|
prefs.putBoolean (PREFS_SHOW_DUPLICATE_SYMBOLS,
|
||||||
showDuplicateSymbolsItem.isSelected ());
|
showDuplicateSymbolsItem.isSelected ());
|
||||||
// prefs.putBoolean (PREFS_LIST_STRINGS, listStringsItem.isSelected ());
|
|
||||||
// prefs.putBoolean (PREFS_SHOW_TARGETS, showBasicTargetsItem.isSelected ());
|
|
||||||
// prefs.putBoolean (PREFS_ONLY_SHOW_TARGETS, onlyShowTargetLinesItem.isSelected ());
|
|
||||||
prefs.putBoolean (PREFS_BLANK_AFTER_RETURN, blankAfterReturnItem.isSelected ());
|
|
||||||
prefs.putBoolean (PREFS_FORMAT_REM, formatRemItem.isSelected ());
|
|
||||||
// prefs.putBoolean (PREFS_DELETE_EXTRA_REM_SPACE, deleteExtraRemSpace.isSelected ());
|
|
||||||
prefs.putBoolean (PREFS_DELETE_EXTRA_DATA_SPACE, deleteExtraDataSpace.isSelected ());
|
|
||||||
|
|
||||||
prefs.putBoolean (PREFS_SHOW_ASSEMBLER_TARGETS,
|
prefs.putBoolean (PREFS_SHOW_ASSEMBLER_TARGETS,
|
||||||
showAssemblerTargetsItem.isSelected ());
|
showAssemblerTargetsItem.isSelected ());
|
||||||
|
@ -654,23 +644,18 @@ class MenuHandler implements DiskSelectionListener, FileSelectionListener, QuitL
|
||||||
alignAssignItem.setSelected (prefs.getBoolean (PREFS_ALIGN_ASSIGN, true));
|
alignAssignItem.setSelected (prefs.getBoolean (PREFS_ALIGN_ASSIGN, true));
|
||||||
showCaretItem.setSelected (prefs.getBoolean (PREFS_SHOW_CARET, false));
|
showCaretItem.setSelected (prefs.getBoolean (PREFS_SHOW_CARET, false));
|
||||||
showThenItem.setSelected (prefs.getBoolean (PREFS_SHOW_THEN, true));
|
showThenItem.setSelected (prefs.getBoolean (PREFS_SHOW_THEN, true));
|
||||||
showXrefItem.setSelected (prefs.getBoolean (PREFS_SHOW_XREF, false));
|
blankAfterReturnItem.setSelected (prefs.getBoolean (PREFS_BLANK_AFTER_RETURN, false));
|
||||||
|
formatRemItem.setSelected (prefs.getBoolean (PREFS_FORMAT_REM, false));
|
||||||
|
deleteExtraDataSpace
|
||||||
|
.setSelected (prefs.getBoolean (PREFS_DELETE_EXTRA_DATA_SPACE, false));
|
||||||
|
|
||||||
|
showXrefItem.setSelected (prefs.getBoolean (PREFS_SHOW_GOSUB_GOTO, false));
|
||||||
showCallsItem.setSelected (prefs.getBoolean (PREFS_SHOW_CALLS, false));
|
showCallsItem.setSelected (prefs.getBoolean (PREFS_SHOW_CALLS, false));
|
||||||
showSymbolsItem.setSelected (prefs.getBoolean (PREFS_SHOW_SYMBOLS, false));
|
showSymbolsItem.setSelected (prefs.getBoolean (PREFS_SHOW_SYMBOLS, false));
|
||||||
showFunctionsItem.setSelected (prefs.getBoolean (PREFS_SHOW_FUNCTIONS, false));
|
showFunctionsItem.setSelected (prefs.getBoolean (PREFS_SHOW_FUNCTIONS, false));
|
||||||
showConstantsItem.setSelected (prefs.getBoolean (PREFS_SHOW_CONSTANTS, false));
|
showConstantsItem.setSelected (prefs.getBoolean (PREFS_SHOW_CONSTANTS, false));
|
||||||
showDuplicateSymbolsItem
|
showDuplicateSymbolsItem
|
||||||
.setSelected (prefs.getBoolean (PREFS_SHOW_DUPLICATE_SYMBOLS, false));
|
.setSelected (prefs.getBoolean (PREFS_SHOW_DUPLICATE_SYMBOLS, false));
|
||||||
// listStringsItem.setSelected (prefs.getBoolean (PREFS_LIST_STRINGS, false));
|
|
||||||
// showBasicTargetsItem.setSelected (prefs.getBoolean (PREFS_SHOW_TARGETS, false));
|
|
||||||
// onlyShowTargetLinesItem
|
|
||||||
// .setSelected (prefs.getBoolean (PREFS_ONLY_SHOW_TARGETS, false));
|
|
||||||
blankAfterReturnItem.setSelected (prefs.getBoolean (PREFS_BLANK_AFTER_RETURN, false));
|
|
||||||
formatRemItem.setSelected (prefs.getBoolean (PREFS_FORMAT_REM, false));
|
|
||||||
// deleteExtraRemSpace
|
|
||||||
// .setSelected (prefs.getBoolean (PREFS_DELETE_EXTRA_REM_SPACE, false));
|
|
||||||
deleteExtraDataSpace
|
|
||||||
.setSelected (prefs.getBoolean (PREFS_DELETE_EXTRA_DATA_SPACE, false));
|
|
||||||
|
|
||||||
showAssemblerTargetsItem
|
showAssemblerTargetsItem
|
||||||
.setSelected (prefs.getBoolean (PREFS_SHOW_ASSEMBLER_TARGETS, true));
|
.setSelected (prefs.getBoolean (PREFS_SHOW_ASSEMBLER_TARGETS, true));
|
||||||
|
|
Loading…
Reference in New Issue
Block a user