diff -r ef2fdb55e8ec -r 5e412dbd9362 java/sql-dk/src/info/globalcode/sql/dk/configuration/Configuration.java --- a/java/sql-dk/src/info/globalcode/sql/dk/configuration/Configuration.java Sun Dec 22 20:51:32 2013 +0100 +++ b/java/sql-dk/src/info/globalcode/sql/dk/configuration/Configuration.java Sun Dec 22 21:02:37 2013 +0100 @@ -20,6 +20,7 @@ import static info.globalcode.sql.dk.Xmlns.CONFIGURATION; import static info.globalcode.sql.dk.Functions.findByName; import info.globalcode.sql.dk.formatting.SilentFormatter; +import info.globalcode.sql.dk.formatting.TabularFormatter; import info.globalcode.sql.dk.formatting.XmlFormatter; import java.util.ArrayList; import java.util.Collection; @@ -37,6 +38,10 @@ private List databases = new ArrayList<>(); private List formatters = new ArrayList<>(); + /** + * is used if no formatter is specified on CLI nor in user configuration + */ + public static final String DEFAULT_FORMATTER = TabularFormatter.NAME; private String defaultFormatter; /** * Default list of formatters. Is used if particular name is not found in user configuration. @@ -47,6 +52,7 @@ Collection l = new ArrayList<>(); l.add(new FormatterDefinition(SilentFormatter.NAME, SilentFormatter.class.getName())); l.add(new FormatterDefinition(XmlFormatter.NAME, XmlFormatter.class.getName())); + l.add(new FormatterDefinition(TabularFormatter.NAME, TabularFormatter.class.getName())); buildInFormatters = Collections.unmodifiableCollection(l); } @@ -72,9 +78,23 @@ this.formatters = formatters; } + /** + * @param name name of desired formatter. Looking for this name in user configuration, then in + * buil-in formatters. If null, default from configuration or (if not configured) built-in + * default is used. + * @return formatter definition or null if none for this name is found + */ public FormatterDefinition getFormatter(String name) { - FormatterDefinition fd = findByName(formatters, name); - return fd == null ? findByName(buildInFormatters, name) : fd; + if (name == null) { + if (defaultFormatter == null) { + return getFormatter(DEFAULT_FORMATTER); + } else { + return getFormatter(defaultFormatter); + } + } else { + FormatterDefinition fd = findByName(formatters, name); + return fd == null ? findByName(buildInFormatters, name) : fd; + } } /**