1.1 --- a/java/sql-dk/src/info/globalcode/sql/dk/formatting/XmlFormatter.java	Tue Jan 07 21:53:24 2014 +0100
     1.2 +++ b/java/sql-dk/src/info/globalcode/sql/dk/formatting/XmlFormatter.java	Tue Jan 07 21:54:59 2014 +0100
     1.3 @@ -71,14 +71,14 @@
     1.4  	}
     1.5  
     1.6  	@Override
     1.7 -	public void writeStartResultSet() {
     1.8 -		super.writeStartResultSet();
     1.9 -		printStartElement(qname("resultSet"));
    1.10 +	public void writeStartStatement() {
    1.11 +		super.writeStartStatement();
    1.12 +		printStartElement(qname("statement"));
    1.13  	}
    1.14  
    1.15  	@Override
    1.16 -	public void writeEndResultSet() {
    1.17 -		super.writeEndResultSet();
    1.18 +	public void writeEndStatement() {
    1.19 +		super.writeEndStatement();
    1.20  		printEndElement();
    1.21  	}
    1.22  
    1.23 @@ -106,8 +106,9 @@
    1.24  	}
    1.25  
    1.26  	@Override
    1.27 -	public void writeColumnsHeader(ColumnsHeader header) {
    1.28 -		super.writeColumnsHeader(header);
    1.29 +	public void writeStartResultSet(ColumnsHeader header) {
    1.30 +		super.writeStartResultSet(header);
    1.31 +		printStartElement(qname("resultSet"));
    1.32  
    1.33  		for (ColumnDescriptor cd : header.getColumnDescriptors()) {
    1.34  			Map<QName, String> attributes = new LinkedHashMap<>(4);
    1.35 @@ -120,6 +121,12 @@
    1.36  	}
    1.37  
    1.38  	@Override
    1.39 +	public void writeEndResultSet() {
    1.40 +		super.writeEndResultSet();
    1.41 +		printEndElement();
    1.42 +	}
    1.43 +
    1.44 +	@Override
    1.45  	public void writeStartRow() {
    1.46  		super.writeStartRow();
    1.47  		printStartElement(qname("row"));
    1.48 @@ -145,23 +152,11 @@
    1.49  	}
    1.50  
    1.51  	@Override
    1.52 -	public void writeStartUpdatesResult() {
    1.53 -		super.writeStartUpdatesResult();
    1.54 -		printStartElement(qname("updatesResult"));
    1.55 -	}
    1.56 -
    1.57 -	@Override
    1.58 -	public void writeUpdatedRowsCount(int updatedRowsCount) {
    1.59 -		super.writeUpdatedRowsCount(updatedRowsCount);
    1.60 +	public void writeUpdatesResult(int updatedRowsCount) {
    1.61 +		super.writeUpdatesResult(updatedRowsCount);
    1.62  		printTextElement(qname("updatedRows"), null, String.valueOf(updatedRowsCount));
    1.63  	}
    1.64  
    1.65 -	@Override
    1.66 -	public void writeEndUpdatesResult() {
    1.67 -		super.writeEndUpdatesResult();
    1.68 -		printEndElement();
    1.69 -	}
    1.70 -
    1.71  	protected String toString(Object value) {
    1.72  		return String.valueOf(value);
    1.73  	}