From 12b67a4cf409abda3eee4e847c0ac829078a26b3 Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Thu, 15 Oct 2026 16:08:29 -0400 Subject: [PATCH 1/4] detect 0x prefix and parse hex to long --- .../src/main/java/org/jlab/utils/options/OptionValue.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/common-tools/clas-utils/src/main/java/org/jlab/utils/options/OptionValue.java b/common-tools/clas-utils/src/main/java/org/jlab/utils/options/OptionValue.java index 419394c95e..de33a6db09 100644 --- a/common-tools/clas-utils/src/main/java/org/jlab/utils/options/OptionValue.java +++ b/common-tools/clas-utils/src/main/java/org/jlab/utils/options/OptionValue.java @@ -1,5 +1,6 @@ package org.jlab.utils.options; +import java.util.HexFormat; import java.util.List; /** @@ -28,9 +29,13 @@ public OptionValue() { } public String getDefault() { return this.optionDefault;} public int intValue() { return Integer.parseInt(this.optionValue);} - public long longValue() { return Long.parseLong(this.optionValue);} public double doubleValue() { return Double.parseDouble(this.optionValue);} public String stringValue() { return this.optionValue;} + public long longValue() { + if (this.optionValue.startsWith("0x")) + return HexFormat.fromHexDigitsToLong(this.optionValue.substring(2)); + return Long.parseLong(this.optionValue); + } private int getOptionIndex(List options){ for(int i = 0; i < options.size(); i++){ From be180e08b26bb245c77a14a3eb27bccc3b5712a0 Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Wed, 21 Oct 2026 17:47:19 -0400 Subject: [PATCH 2/4] switch to decode, int too --- .../main/java/org/jlab/utils/options/OptionValue.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/common-tools/clas-utils/src/main/java/org/jlab/utils/options/OptionValue.java b/common-tools/clas-utils/src/main/java/org/jlab/utils/options/OptionValue.java index de33a6db09..9c90eeb640 100644 --- a/common-tools/clas-utils/src/main/java/org/jlab/utils/options/OptionValue.java +++ b/common-tools/clas-utils/src/main/java/org/jlab/utils/options/OptionValue.java @@ -28,15 +28,11 @@ public OptionValue() { } public String getDescription() { return this.optionDescription;} public String getDefault() { return this.optionDefault;} - public int intValue() { return Integer.parseInt(this.optionValue);} + public int intValue() { return Integer.decode(this.optionValue);} public double doubleValue() { return Double.parseDouble(this.optionValue);} public String stringValue() { return this.optionValue;} - public long longValue() { - if (this.optionValue.startsWith("0x")) - return HexFormat.fromHexDigitsToLong(this.optionValue.substring(2)); - return Long.parseLong(this.optionValue); - } - + public long longValue() { return Long.decode(this.optionValue); } + private int getOptionIndex(List options){ for(int i = 0; i < options.size(); i++){ if(options.get(i).equals(optionString)==true) From 012cffdb1b774c0004a1349afd95315f8d158ad4 Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Wed, 21 Oct 2026 17:49:49 -0400 Subject: [PATCH 3/4] put it back where it was --- .../src/main/java/org/jlab/utils/options/OptionValue.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common-tools/clas-utils/src/main/java/org/jlab/utils/options/OptionValue.java b/common-tools/clas-utils/src/main/java/org/jlab/utils/options/OptionValue.java index 9c90eeb640..b76ef404ef 100644 --- a/common-tools/clas-utils/src/main/java/org/jlab/utils/options/OptionValue.java +++ b/common-tools/clas-utils/src/main/java/org/jlab/utils/options/OptionValue.java @@ -29,9 +29,9 @@ public OptionValue() { } public String getDefault() { return this.optionDefault;} public int intValue() { return Integer.decode(this.optionValue);} + public long longValue() { return Long.decode(this.optionValue);} public double doubleValue() { return Double.parseDouble(this.optionValue);} public String stringValue() { return this.optionValue;} - public long longValue() { return Long.decode(this.optionValue); } private int getOptionIndex(List options){ for(int i = 0; i < options.size(); i++){ From 8a52ac570fa493c46cd41d283ced4439ffd043eb Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Wed, 21 Oct 2026 17:50:35 -0400 Subject: [PATCH 4/4] remove unused import --- .../src/main/java/org/jlab/utils/options/OptionValue.java | 1 - 1 file changed, 1 deletion(-) diff --git a/common-tools/clas-utils/src/main/java/org/jlab/utils/options/OptionValue.java b/common-tools/clas-utils/src/main/java/org/jlab/utils/options/OptionValue.java index b76ef404ef..b4d216e392 100644 --- a/common-tools/clas-utils/src/main/java/org/jlab/utils/options/OptionValue.java +++ b/common-tools/clas-utils/src/main/java/org/jlab/utils/options/OptionValue.java @@ -1,6 +1,5 @@ package org.jlab.utils.options; -import java.util.HexFormat; import java.util.List; /**