# HG changeset patch # User František Kučera # Date 1388245504 -3600 # Node ID 98d18e9a357bb602192e3d0daecdc632afe0b11c # Parent 102ba0fcb07f0607184240a474a6fc03ae1b9ec5 InfoLister (configuration listings) will use TabularPrefetchingFormatter as default diff -r 102ba0fcb07f -r 98d18e9a357b java/sql-dk/src/info/globalcode/sql/dk/InfoLister.java --- a/java/sql-dk/src/info/globalcode/sql/dk/InfoLister.java Sat Dec 28 12:19:39 2013 +0100 +++ b/java/sql-dk/src/info/globalcode/sql/dk/InfoLister.java Sat Dec 28 16:45:04 2013 +0100 @@ -202,7 +202,9 @@ } private Formatter getFormatter() throws ConfigurationException, FormatterException { - FormatterDefinition fd = configurationProvider.getConfiguration().getFormatter(options.getFormatterName()); + String formatterName = options.getFormatterName(); + formatterName = formatterName == null ? Configuration.DEFAULT_FORMATTER_PREFETCHING : formatterName; + FormatterDefinition fd = configurationProvider.getConfiguration().getFormatter(formatterName); FormatterContext context = new FormatterContext(out); return fd.getInstance(context); } diff -r 102ba0fcb07f -r 98d18e9a357b java/sql-dk/src/info/globalcode/sql/dk/configuration/Configuration.java --- a/java/sql-dk/src/info/globalcode/sql/dk/configuration/Configuration.java Sat Dec 28 12:19:39 2013 +0100 +++ b/java/sql-dk/src/info/globalcode/sql/dk/configuration/Configuration.java Sat Dec 28 16:45:04 2013 +0100 @@ -45,6 +45,11 @@ * is used if no formatter is specified on CLI nor in user configuration */ public static final String DEFAULT_FORMATTER = TabularFormatter.NAME; + /** + * Can be used as default if prefetching is ok – for configuration listings (config is alread in + * memory, so this does not matter) + */ + public static final String DEFAULT_FORMATTER_PREFETCHING = TabularPrefetchingFormatter.NAME; private String defaultFormatter; /** * Default list of formatters. Is used if particular name is not found in user configuration. diff -r 102ba0fcb07f -r 98d18e9a357b java/sql-dk/src/info/globalcode/sql/dk/formatting/TabularFormatter.java --- a/java/sql-dk/src/info/globalcode/sql/dk/formatting/TabularFormatter.java Sat Dec 28 12:19:39 2013 +0100 +++ b/java/sql-dk/src/info/globalcode/sql/dk/formatting/TabularFormatter.java Sat Dec 28 16:45:04 2013 +0100 @@ -22,7 +22,6 @@ import static info.globalcode.sql.dk.Functions.lpad; import static info.globalcode.sql.dk.Functions.rpad; import static info.globalcode.sql.dk.Functions.repeat; -import java.util.Arrays; import java.util.List; /**