--- a/java/sql-dk/src/info/globalcode/sql/dk/CLIOptions.java Thu Dec 26 11:58:14 2013 +0100
+++ b/java/sql-dk/src/info/globalcode/sql/dk/CLIOptions.java Thu Dec 26 21:18:54 2013 +0100
@@ -20,6 +20,7 @@
import static info.globalcode.sql.dk.Functions.isNotEmpty;
import static info.globalcode.sql.dk.Functions.isEmpty;
import static info.globalcode.sql.dk.Functions.equalz;
+import info.globalcode.sql.dk.InfoLister.InfoType;
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.Collection;
@@ -51,20 +52,9 @@
EXECUTE_BATCH,
JUST_SHOW_INFO
}
-
- public enum INFO_TYPE {
-
- HELP,
- VERSION,
- LICENSE,
- FORMATTERS,
- TYPES,
- DATABASES,
- CONNECTION
- }
private final List<NamedParameter> namedParameters = new ArrayList<>();
private final List<Parameter> numberedParameters = new ArrayList<>();
- private final EnumSet<INFO_TYPE> showInfo = EnumSet.noneOf(INFO_TYPE.class);
+ private final EnumSet<InfoType> showInfo = EnumSet.noneOf(InfoType.class);
public void validate() throws InvalidOptionsException {
InvalidOptionsException e = new InvalidOptionsException();
@@ -97,7 +87,7 @@
if (!equalz(nameSuffix, DEFAULT_NAME_SUFFIX)) {
e.addProblem(new InvalidOptionsException.OptionProblem("Do not specify name suffix if just showing info."));
}
- if (showInfo.contains(INFO_TYPE.CONNECTION) && isEmpty(databaseNameToTest, false)) {
+ if (showInfo.contains(InfoType.CONNECTION) && isEmpty(databaseNameToTest, false)) {
e.addProblem(new InvalidOptionsException.OptionProblem("Please specify which database should be tested."));
}
}
@@ -215,11 +205,11 @@
this.formatterName = formatterName;
}
- public void addShowInfo(INFO_TYPE info) {
+ public void addShowInfo(InfoType info) {
showInfo.add(info);
}
- public EnumSet<INFO_TYPE> getShowInfo() {
+ public EnumSet<InfoType> getShowInfo() {
return showInfo;
}