jotoho/waituntil
1
0
Fork 0
Code Issues 3 Pull requests Releases 3 Activity

Rewrite AppOptions to instead use non-static attributes

Browse source
This commit is contained in:
Jonas Tobias Hopusch 2022-03-12 14:20:18 +01:00
parent a7882ab201
commit 653e5295de
Failed to generate hash of commit
2 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/main/java/de/jotoho/waituntil/AppOptions.java
View file

@ -22,14 +22,7 @@ import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options; import org.apache.commons.cli.Options;
final class AppOptions { final class AppOptions {
public final static Option help = Option.builder().argName("h").longOpt("help").desc("Shows this help " + "message and exits").build(); public final Option help = Option.builder().argName("h").longOpt("help").desc("Shows this help " + "message and exits").build();
public final static Option version = Option.builder().argName("v").longOpt("version").desc("Shows version information and exits").build(); public final Option version = Option.builder().argName("v").longOpt("version").desc("Shows version information and exits").build();
private final static Options options = new Options().addOption(help).addOption(version); public final Options options = new Options().addOption(help).addOption(version);
// Disable Instance Creation
private AppOptions() {}
public static Options getOptions() {
return options;
}
} }

7
src/main/java/de/jotoho/waituntil/Main.java
View file

@ -55,14 +55,15 @@ public final class Main {
} }
public static void main(final String[] args) { public static void main(final String[] args) {
final var appOptions = new AppOptions();
try { try {
final var parsedArguments = DefaultParser.builder().setStripLeadingAndTrailingQuotes(true).build().parse(AppOptions.getOptions(), args); final var parsedArguments = DefaultParser.builder().setStripLeadingAndTrailingQuotes(true).build().parse(appOptions.options, args);
final var userData = parsedArguments.getArgs(); final var userData = parsedArguments.getArgs();
if (parsedArguments.hasOption(AppOptions.help)) { if (parsedArguments.hasOption(appOptions.help)) {
printHelpInformation(); printHelpInformation();
} else if (parsedArguments.hasOption(AppOptions.version)) { } else if (parsedArguments.hasOption(appOptions.version)) {
printVersionInformation(); printVersionInformation();
} else if (userData.length == 0) { } else if (userData.length == 0) {
switch (applicationOutputLanguage) { switch (applicationOutputLanguage) {