Apple-2-Tools
/
AppleCommander
mirror of https://github.com/AppleCommander/AppleCommander.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

removal of -raw option

This commit is contained in:
ThomasFok 2023-01-23 17:41:00 +00:00
parent f23aa4b3d3
commit 8b082d4258
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/cli-acx/src/main/java/io/github/applecommander/acx/command/DumpCommand.java
View File

@ -52,11 +52,7 @@ public class DumpCommand extends ReadOnlyDiskImageCommandOptions {
@Override @Override
public int handleCommand() throws Exception { public int handleCommand() throws Exception {
byte[] data = options.coordinate.read(disk); byte[] data = options.coordinate.read(disk);
if (output.raw) { System.out.println(output.format(options, data));
System.out.write(data);
} else {
System.out.println(output.format(options, data));
}
return 0; return 0;
} }
@ -66,7 +62,7 @@ public class DumpCommand extends ReadOnlyDiskImageCommandOptions {
return fn.apply(options, data); return fn.apply(options, data);
} }
@Option(names = "--hex", description = "Hex dump. (Default)") @Option(names = "--hex", description = "Hex dump. (default)")
public void selectHexDump(boolean flag) { public void selectHexDump(boolean flag) {
fn = this::formatHexDump; fn = this::formatHexDump;
} }
@ -75,9 +71,6 @@ public class DumpCommand extends ReadOnlyDiskImageCommandOptions {
public void selectDisassembly(boolean flag) { public void selectDisassembly(boolean flag) {
fn = this::formatDisassembly; fn = this::formatDisassembly;
} }
@Option(names = "--raw", description = "Raw Binary dump.")
public boolean raw = false;
public String formatHexDump(Options options, byte[] data) { public String formatHexDump(Options options, byte[] data) {
return AppleUtil.getHexDump(data); return AppleUtil.getHexDump(data);
@ -141,7 +134,7 @@ public class DumpCommand extends ReadOnlyDiskImageCommandOptions {
return this.instructionSet; return this.instructionSet;
} }
@Option(names = "--6502", description = "MOS 6502. (Default)") @Option(names = "--6502", description = "MOS 6502. (default)")
public void select6502(boolean flag) { public void select6502(boolean flag) {
this.instructionSet = InstructionSet6502.for6502(); this.instructionSet = InstructionSet6502.for6502();
} }