java/sql-dk/src/info/globalcode/sql/dk/configuration/Configuration.java
branchv_0
changeset 224 36db9fd27436
parent 202 01078e09b85b
equal deleted inserted replaced
223:195d969a1fb1 224:36db9fd27436
    17  */
    17  */
    18 package info.globalcode.sql.dk.configuration;
    18 package info.globalcode.sql.dk.configuration;
    19 
    19 
    20 import static info.globalcode.sql.dk.Xmlns.CONFIGURATION;
    20 import static info.globalcode.sql.dk.Xmlns.CONFIGURATION;
    21 import static info.globalcode.sql.dk.Functions.findByName;
    21 import static info.globalcode.sql.dk.Functions.findByName;
    22 import info.globalcode.sql.dk.formatting.DsvFormatter;
    22 import info.globalcode.sql.dk.formatting.BarChartFormatter;
    23 import info.globalcode.sql.dk.formatting.SilentFormatter;
    23 import info.globalcode.sql.dk.formatting.SilentFormatter;
    24 import info.globalcode.sql.dk.formatting.SingleRecordFormatter;
    24 import info.globalcode.sql.dk.formatting.SingleRecordFormatter;
    25 import info.globalcode.sql.dk.formatting.SingleValueFormatter;
    25 import info.globalcode.sql.dk.formatting.SingleValueFormatter;
    26 import info.globalcode.sql.dk.formatting.TabularFormatter;
    26 import info.globalcode.sql.dk.formatting.TabularFormatter;
    27 import info.globalcode.sql.dk.formatting.TabularPrefetchingFormatter;
    27 import info.globalcode.sql.dk.formatting.TabularPrefetchingFormatter;
    71 		l.add(new FormatterDefinition(XhtmlFormatter.NAME, XhtmlFormatter.class.getName()));
    71 		l.add(new FormatterDefinition(XhtmlFormatter.NAME, XhtmlFormatter.class.getName()));
    72 		l.add(new FormatterDefinition(TabularFormatter.NAME, TabularFormatter.class.getName()));
    72 		l.add(new FormatterDefinition(TabularFormatter.NAME, TabularFormatter.class.getName()));
    73 		l.add(new FormatterDefinition(TabularPrefetchingFormatter.NAME, TabularPrefetchingFormatter.class.getName()));
    73 		l.add(new FormatterDefinition(TabularPrefetchingFormatter.NAME, TabularPrefetchingFormatter.class.getName()));
    74 		l.add(new FormatterDefinition(TabularWrappingFormatter.NAME, TabularWrappingFormatter.class.getName()));
    74 		l.add(new FormatterDefinition(TabularWrappingFormatter.NAME, TabularWrappingFormatter.class.getName()));
    75 		l.add(new FormatterDefinition(TeXFormatter.NAME, TeXFormatter.class.getName()));
    75 		l.add(new FormatterDefinition(TeXFormatter.NAME, TeXFormatter.class.getName()));
    76 		l.add(new FormatterDefinition(DsvFormatter.NAME, DsvFormatter.class.getName()));
    76 		//l.add(new FormatterDefinition(DsvFormatter.NAME, DsvFormatter.class.getName()));
       
    77 		//l.add(new FormatterDefinition(SystemCommandExecutor.NAME, SystemCommandExecutor.class.getName()));
       
    78 		l.add(new FormatterDefinition(BarChartFormatter.NAME, BarChartFormatter.class.getName()));
    77 		buildInFormatters = Collections.unmodifiableCollection(l);
    79 		buildInFormatters = Collections.unmodifiableCollection(l);
    78 	}
    80 	}
    79 
    81 
    80 	@XmlElement(name = "database", namespace = CONFIGURATION)
    82 	@XmlElement(name = "database", namespace = CONFIGURATION)
    81 	public List<DatabaseDefinition> getDatabases() {
    83 	public List<DatabaseDefinition> getDatabases() {
    86 		this.databases = databases;
    88 		this.databases = databases;
    87 	}
    89 	}
    88 
    90 
    89 	/**
    91 	/**
    90 	 * @param name
    92 	 * @param name
    91 	 * @return 
    93 	 * @return
    92 	 * @throws ConfigurationException if no database with this name is configured
    94 	 * @throws ConfigurationException if no database with this name is configured
    93 	 */
    95 	 */
    94 	public DatabaseDefinition getDatabase(String name) throws ConfigurationException {
    96 	public DatabaseDefinition getDatabase(String name) throws ConfigurationException {
    95 		DatabaseDefinition dd = findByName(databases, name);
    97 		DatabaseDefinition dd = findByName(databases, name);
    96 		if (dd == null) {
    98 		if (dd == null) {