diff -r d8faf91519a5 -r 65e3fffae091 java/sql-dk/src/info/globalcode/sql/dk/formatting/AbstractFormatter.java --- a/java/sql-dk/src/info/globalcode/sql/dk/formatting/AbstractFormatter.java Fri Dec 20 22:19:10 2013 +0100 +++ b/java/sql-dk/src/info/globalcode/sql/dk/formatting/AbstractFormatter.java Fri Dec 20 22:58:02 2013 +0100 @@ -18,7 +18,6 @@ package info.globalcode.sql.dk.formatting; import info.globalcode.sql.dk.Parameter; -import java.io.OutputStream; import java.util.EmptyStackException; import java.util.EnumSet; import java.util.List; @@ -31,13 +30,13 @@ public abstract class AbstractFormatter implements Formatter { private Stack state = new Stack<>(); - private OutputStream outputStream; + private FormatterContext formatterContext; private ColumnsHeader currentColumnsHeader; private String currentQuery; private int currentColumnsCount; - public AbstractFormatter(OutputStream outputStream) { - this.outputStream = outputStream; + public AbstractFormatter(FormatterContext formatterContext) { + this.formatterContext = formatterContext; state.push(State.ROOT); } @@ -224,8 +223,8 @@ popState(EnumSet.of(State.UPDATES_RESULT)); } - protected OutputStream getOutputStream() { - return outputStream; + public FormatterContext getFormatterContext() { + return formatterContext; } protected ColumnsHeader getCurrentColumnsHeader() {