From 2dd931a0a080db38ca4ea2976f4aa7a5ea19d0b8 Mon Sep 17 00:00:00 2001 From: "John B. Matthews" Date: Sun, 18 May 2008 20:00:16 +0000 Subject: [PATCH] Start 1.3.4.2; accept hex start address ($) in -p command. --- .../webcodepro/applecommander/ui/AppleCommander.java | 2 +- src/com/webcodepro/applecommander/ui/ac.java | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/com/webcodepro/applecommander/ui/AppleCommander.java b/src/com/webcodepro/applecommander/ui/AppleCommander.java index d26b37f..cd22c69 100644 --- a/src/com/webcodepro/applecommander/ui/AppleCommander.java +++ b/src/com/webcodepro/applecommander/ui/AppleCommander.java @@ -40,7 +40,7 @@ import com.webcodepro.applecommander.util.TextBundle; * @author Rob Greene */ public class AppleCommander { - public static final String VERSION = "1.3.4.1"; //$NON-NLS-1$ + public static final String VERSION = "1.3.4.2"; //$NON-NLS-1$ private static TextBundle textBundle = UiBundle.getInstance(); /** * Launch AppleCommander. diff --git a/src/com/webcodepro/applecommander/ui/ac.java b/src/com/webcodepro/applecommander/ui/ac.java index 55760b0..8936a45 100644 --- a/src/com/webcodepro/applecommander/ui/ac.java +++ b/src/com/webcodepro/applecommander/ui/ac.java @@ -303,9 +303,14 @@ public class ac { static int stringToInt(String s) { int i = 0; try { - i = Integer.parseInt(s.trim()); - } catch (NumberFormatException ignored) { - // ignored + s = s.trim(); + if (s.startsWith("$")) { + i = Integer.parseInt(s.substring(1), 0x10); + } else { + i = Integer.parseInt(s); + } + } catch (NumberFormatException nfe) { + i = 0x2000; } return i; }