1.1 --- a/java/sql-dk/src/info/globalcode/sql/dk/formatting/AbstractFormatter.java	Sun Dec 22 22:02:44 2013 +0100
     1.2 +++ b/java/sql-dk/src/info/globalcode/sql/dk/formatting/AbstractFormatter.java	Sun Dec 22 23:31:55 2013 +0100
     1.3 @@ -110,7 +110,8 @@
     1.4  	 */
     1.5  	private State popState(EnumSet expected) {
     1.6  		try {
     1.7 -			State superior = state.pop();
     1.8 +			state.pop();
     1.9 +			State superior = state.peek();
    1.10  			if (expected.contains(superior)) {
    1.11  				return superior;
    1.12  			} else {
    1.13 @@ -155,7 +156,7 @@
    1.14  	}
    1.15  
    1.16  	@Override
    1.17 -	public void writeParameters(List<Parameter> parameters) {
    1.18 +	public void writeParameters(List<? extends Parameter> parameters) {
    1.19  		peekState(EnumSet.of(State.RESULT_SET, State.UPDATES_RESULT));
    1.20  
    1.21  		if (currentColumnsHeader != null) {
    1.22 @@ -242,6 +243,14 @@
    1.23  		return currentColumnsCount;
    1.24  	}
    1.25  
    1.26 +	protected boolean isCurrentColumnFirst() {
    1.27 +		return currentColumnsCount == 1;
    1.28 +	}
    1.29 +
    1.30 +	protected boolean isCurrentColumnLast() {
    1.31 +		return currentColumnsCount == currentColumnsHeader.getColumnCount();
    1.32 +	}
    1.33 +
    1.34  	/**
    1.35  	 * @return row number, 1 = first
    1.36  	 */