52 lines
2.1 KiB
Diff
52 lines
2.1 KiB
Diff
diff -Nur a/morfologik-tools/src/main/java/morfologik/tools/CliTool.java b/morfologik-tools/src/main/java/morfologik/tools/CliTool.java
|
|
--- a/morfologik-tools/src/main/java/morfologik/tools/CliTool.java 2023-08-23 14:39:58.823450555 +0800
|
|
+++ b/morfologik-tools/src/main/java/morfologik/tools/CliTool.java 2023-08-23 14:43:50.962815645 +0800
|
|
@@ -178,13 +178,13 @@
|
|
private static void helpDisplayCommandOptions(PrintStream pw, String command, JCommander jc) {
|
|
StringBuilder sb = new StringBuilder();
|
|
jc = jc.getCommands().get(command);
|
|
- jc.getUsageFormatter().usage(sb, "");
|
|
+ jc.usage(sb, "");
|
|
pw.print(sb);
|
|
}
|
|
|
|
private static void helpDisplayCommandOptions(PrintStream pw, JCommander jc) {
|
|
StringBuilder sb = new StringBuilder();
|
|
- jc.getUsageFormatter().usage(sb, "");
|
|
+ jc.usage(sb, "");
|
|
pw.print(sb);
|
|
}
|
|
}
|
|
diff -Nur a/morfologik-tools/src/main/java/morfologik/tools/CustomParameterConverters.java b/morfologik-tools/src/main/java/morfologik/tools/CustomParameterConverters.java
|
|
--- a/morfologik-tools/src/main/java/morfologik/tools/CustomParameterConverters.java 2023-08-23 14:39:58.823450555 +0800
|
|
+++ b/morfologik-tools/src/main/java/morfologik/tools/CustomParameterConverters.java 2023-08-23 14:52:13.722103640 +0800
|
|
@@ -1,11 +1,11 @@
|
|
package morfologik.tools;
|
|
|
|
-import com.beust.jcommander.IStringConverter;
|
|
-import com.beust.jcommander.IStringConverterFactory;
|
|
-
|
|
import java.nio.file.Path;
|
|
import java.nio.file.Paths;
|
|
|
|
+import com.beust.jcommander.IStringConverter;
|
|
+import com.beust.jcommander.IStringConverterFactory;
|
|
+
|
|
class CustomParameterConverters implements IStringConverterFactory {
|
|
public static class PathConverter implements IStringConverter<Path> {
|
|
@Override
|
|
@@ -14,10 +14,11 @@
|
|
}
|
|
}
|
|
|
|
+ @SuppressWarnings({ "unchecked", "rawtypes" })
|
|
@Override
|
|
- public Class<? extends IStringConverter<?>> getConverter(Class<?> forType) {
|
|
+ public <T> Class<? extends IStringConverter<T>> getConverter(Class<T> forType) {
|
|
if (forType.equals(Path.class)) {
|
|
- return PathConverter.class;
|
|
+ return (Class) PathConverter.class;
|
|
}
|
|
return null;
|
|
}
|