InfoLister (configuration listings) will use TabularPrefetchingFormatter as default v_0
authorFrantišek Kučera <franta-hg@frantovo.cz>
Sat, 28 Dec 2013 16:45:04 +0100
branchv_0
changeset 89 98d18e9a357b
parent 88 102ba0fcb07f
child 90 ce2b7576ab67
InfoLister (configuration listings) will use TabularPrefetchingFormatter as default
java/sql-dk/src/info/globalcode/sql/dk/InfoLister.java
java/sql-dk/src/info/globalcode/sql/dk/configuration/Configuration.java
java/sql-dk/src/info/globalcode/sql/dk/formatting/TabularFormatter.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);
 	}
--- 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.
--- 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;
 
 /**