1.1 --- a/java/sql-dk/src/info/globalcode/sql/dk/configuration/Configuration.java Fri Dec 27 16:54:10 2013 +0100
1.2 +++ b/java/sql-dk/src/info/globalcode/sql/dk/configuration/Configuration.java Fri Dec 27 17:40:27 2013 +0100
1.3 @@ -80,6 +80,11 @@
1.4 }
1.5 }
1.6
1.7 + /**
1.8 + * @return only configured formatters
1.9 + * @see #getBuildInFormatters()
1.10 + * @see #getAllFormatters()
1.11 + */
1.12 @XmlElement(name = "formatter", namespace = CONFIGURATION)
1.13 public List<FormatterDefinition> getFormatters() {
1.14 return formatters;
1.15 @@ -110,12 +115,29 @@
1.16 }
1.17 }
1.18
1.19 + /**
1.20 + * @return only built-in formatters
1.21 + * @see #getAllFormatters()
1.22 + * @see #getFormatters()
1.23 + */
1.24 @XmlTransient
1.25 public Collection<FormatterDefinition> getBuildInFormatters() {
1.26 return buildInFormatters;
1.27 }
1.28
1.29 /**
1.30 + * @return built-in + configured formatters
1.31 + * @see #getFormatters()
1.32 + */
1.33 + @XmlTransient
1.34 + public Collection<FormatterDefinition> getAllFormatters() {
1.35 + Collection<FormatterDefinition> allFormatters = new ArrayList<>();
1.36 + allFormatters.addAll(buildInFormatters);
1.37 + allFormatters.addAll(formatters);
1.38 + return allFormatters;
1.39 + }
1.40 +
1.41 + /**
1.42 * @return name of default formatter, is used if name is not specified on CLI
1.43 */
1.44 @XmlElement(name = "defaultFormatter", namespace = CONFIGURATION)