From 42a2f3b294d5139a5cb9b87a7dd870e5a29704b6 Mon Sep 17 00:00:00 2001
From: dgelessus <dgelessus@users.noreply.github.com>
Date: Thu, 16 Jan 2020 10:08:28 +0100
Subject: [PATCH] Replace uses of deprecated Apache Commons CLI classes
---
src/main/java/de/tla2b/TLA2B.java | 29 +++++++++++++----------------
1 file changed, 13 insertions(+), 16 deletions(-)
diff --git a/src/main/java/de/tla2b/TLA2B.java b/src/main/java/de/tla2b/TLA2B.java
index 7848c35..51758a5 100644
--- a/src/main/java/de/tla2b/TLA2B.java
+++ b/src/main/java/de/tla2b/TLA2B.java
@@ -1,19 +1,18 @@
package de.tla2b;
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.HelpFormatter;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.Options;
-import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.PosixParser;
-
import de.tla2b.exceptions.FrontEndException;
import de.tla2b.exceptions.NotImplementedException;
import de.tla2b.exceptions.TLA2BException;
import de.tla2b.global.TranslationGlobals;
import de.tla2bAst.Translator;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.HelpFormatter;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
+
public class TLA2B implements TranslationGlobals {
public final static String VERSION = "version";
@@ -26,7 +25,7 @@ public class TLA2B implements TranslationGlobals {
}
public void handleParameter(String[] args) {
- PosixParser parser = new PosixParser();
+ DefaultParser parser = new DefaultParser();
Options options = getCommandlineOptions();
try {
CommandLine line = parser.parse(options, args);
@@ -80,17 +79,15 @@ public class TLA2B implements TranslationGlobals {
translator.createProbFile();
}
- @SuppressWarnings("static-access")
private static Options getCommandlineOptions() {
Options options = new Options();
options.addOption(VERSION, false, "prints the current version of TLA2B");
- Option config = OptionBuilder
- .withArgName("file")
- .hasArg()
- .withDescription(
- "config file")
- .create("config");
+ Option config = Option.builder("config")
+ .argName("file")
+ .hasArg()
+ .desc("config file")
+ .build();
options.addOption(config);
return options;
}
--
GitLab