From a5c6b50ad0172150620a4d81aef323f725632e3f Mon Sep 17 00:00:00 2001 From: Matthias Jaros Date: Sat, 1 Aug 2026 20:01:01 +0200 Subject: Change flow when -h is given. Now instead of using System.exit throw an exception --- src/main/java/com/it_jaros/jscanner/App.java | 1 - src/main/java/com/it_jaros/jscanner/CliParser.java | 3 +-- src/main/java/com/it_jaros/jscanner/PortRange.java | 4 ++-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/it_jaros/jscanner/App.java b/src/main/java/com/it_jaros/jscanner/App.java index d3652ee..bf8a078 100644 --- a/src/main/java/com/it_jaros/jscanner/App.java +++ b/src/main/java/com/it_jaros/jscanner/App.java @@ -43,7 +43,6 @@ public class App { try { return cliParser.parseArgs(args); } catch (IllegalArgumentException e) { - System.out.printf("Error while parsing arguments: %s%n", e.getMessage()); cliParser.printUsageHelp(); exitCode = 1; throw e; diff --git a/src/main/java/com/it_jaros/jscanner/CliParser.java b/src/main/java/com/it_jaros/jscanner/CliParser.java index a63b47f..4259bec 100644 --- a/src/main/java/com/it_jaros/jscanner/CliParser.java +++ b/src/main/java/com/it_jaros/jscanner/CliParser.java @@ -42,8 +42,7 @@ public class CliParser { break; case "--help", "-h": printUsageHelp(); - System.exit(0); - break; + throw new RuntimeException(""); case "--input", "-i": hostsFile = getArgument(args, ++i, currentArg); break; diff --git a/src/main/java/com/it_jaros/jscanner/PortRange.java b/src/main/java/com/it_jaros/jscanner/PortRange.java index 3a735c5..8841162 100644 --- a/src/main/java/com/it_jaros/jscanner/PortRange.java +++ b/src/main/java/com/it_jaros/jscanner/PortRange.java @@ -63,12 +63,12 @@ public class PortRange { private void checkValue(int port) { if (port < MIN_PORT) { throw new IllegalArgumentException( - String.format("Start value smaller than allowed range %s < %s", port, MIN_PORT)); + String.format("Port value is too low: %s < %s", port, MIN_PORT)); } if (port > MAX_PORT) { throw new IllegalArgumentException( - String.format("End value bigger than allowed range %s > %s", port, MAX_PORT)); + String.format("Port value is too high: %s > %s", port, MAX_PORT)); } } -- cgit v1.3.1