1.1 --- a/java/sql-dk/src/info/globalcode/sql/dk/CLIOptions.java	Thu Dec 26 11:58:14 2013 +0100
     1.2 +++ b/java/sql-dk/src/info/globalcode/sql/dk/CLIOptions.java	Thu Dec 26 21:18:54 2013 +0100
     1.3 @@ -20,6 +20,7 @@
     1.4  import static info.globalcode.sql.dk.Functions.isNotEmpty;
     1.5  import static info.globalcode.sql.dk.Functions.isEmpty;
     1.6  import static info.globalcode.sql.dk.Functions.equalz;
     1.7 +import info.globalcode.sql.dk.InfoLister.InfoType;
     1.8  import java.io.OutputStream;
     1.9  import java.util.ArrayList;
    1.10  import java.util.Collection;
    1.11 @@ -51,20 +52,9 @@
    1.12  		EXECUTE_BATCH,
    1.13  		JUST_SHOW_INFO
    1.14  	}
    1.15 -
    1.16 -	public enum INFO_TYPE {
    1.17 -
    1.18 -		HELP,
    1.19 -		VERSION,
    1.20 -		LICENSE,
    1.21 -		FORMATTERS,
    1.22 -		TYPES,
    1.23 -		DATABASES,
    1.24 -		CONNECTION
    1.25 -	}
    1.26  	private final List<NamedParameter> namedParameters = new ArrayList<>();
    1.27  	private final List<Parameter> numberedParameters = new ArrayList<>();
    1.28 -	private final EnumSet<INFO_TYPE> showInfo = EnumSet.noneOf(INFO_TYPE.class);
    1.29 +	private final EnumSet<InfoType> showInfo = EnumSet.noneOf(InfoType.class);
    1.30  
    1.31  	public void validate() throws InvalidOptionsException {
    1.32  		InvalidOptionsException e = new InvalidOptionsException();
    1.33 @@ -97,7 +87,7 @@
    1.34  			if (!equalz(nameSuffix, DEFAULT_NAME_SUFFIX)) {
    1.35  				e.addProblem(new InvalidOptionsException.OptionProblem("Do not specify name suffix if just showing info."));
    1.36  			}
    1.37 -			if (showInfo.contains(INFO_TYPE.CONNECTION) && isEmpty(databaseNameToTest, false)) {
    1.38 +			if (showInfo.contains(InfoType.CONNECTION) && isEmpty(databaseNameToTest, false)) {
    1.39  				e.addProblem(new InvalidOptionsException.OptionProblem("Please specify which database should be tested."));
    1.40  			}
    1.41  		}
    1.42 @@ -215,11 +205,11 @@
    1.43  		this.formatterName = formatterName;
    1.44  	}
    1.45  
    1.46 -	public void addShowInfo(INFO_TYPE info) {
    1.47 +	public void addShowInfo(InfoType info) {
    1.48  		showInfo.add(info);
    1.49  	}
    1.50  
    1.51 -	public EnumSet<INFO_TYPE> getShowInfo() {
    1.52 +	public EnumSet<InfoType> getShowInfo() {
    1.53  		return showInfo;
    1.54  	}
    1.55