diff -r ecd17aad1178 -r da1e38386d84 java/sql-dk/src/info/globalcode/sql/dk/formatting/XmlFormatter.java --- a/java/sql-dk/src/info/globalcode/sql/dk/formatting/XmlFormatter.java Tue Jan 07 21:53:24 2014 +0100 +++ b/java/sql-dk/src/info/globalcode/sql/dk/formatting/XmlFormatter.java Tue Jan 07 21:54:59 2014 +0100 @@ -71,14 +71,14 @@ } @Override - public void writeStartResultSet() { - super.writeStartResultSet(); - printStartElement(qname("resultSet")); + public void writeStartStatement() { + super.writeStartStatement(); + printStartElement(qname("statement")); } @Override - public void writeEndResultSet() { - super.writeEndResultSet(); + public void writeEndStatement() { + super.writeEndStatement(); printEndElement(); } @@ -106,8 +106,9 @@ } @Override - public void writeColumnsHeader(ColumnsHeader header) { - super.writeColumnsHeader(header); + public void writeStartResultSet(ColumnsHeader header) { + super.writeStartResultSet(header); + printStartElement(qname("resultSet")); for (ColumnDescriptor cd : header.getColumnDescriptors()) { Map attributes = new LinkedHashMap<>(4); @@ -120,6 +121,12 @@ } @Override + public void writeEndResultSet() { + super.writeEndResultSet(); + printEndElement(); + } + + @Override public void writeStartRow() { super.writeStartRow(); printStartElement(qname("row")); @@ -145,23 +152,11 @@ } @Override - public void writeStartUpdatesResult() { - super.writeStartUpdatesResult(); - printStartElement(qname("updatesResult")); - } - - @Override - public void writeUpdatedRowsCount(int updatedRowsCount) { - super.writeUpdatedRowsCount(updatedRowsCount); + public void writeUpdatesResult(int updatedRowsCount) { + super.writeUpdatesResult(updatedRowsCount); printTextElement(qname("updatedRows"), null, String.valueOf(updatedRowsCount)); } - @Override - public void writeEndUpdatesResult() { - super.writeEndUpdatesResult(); - printEndElement(); - } - protected String toString(Object value) { return String.valueOf(value); }