# HG changeset patch # User František Kučera # Date 1388328838 -3600 # Node ID 4d420f8b33204455246d2aa59cf56dc9400b2ffe # Parent 0dcaa48809f21cd38bdab25a156e5d52dd23f293 Value formatting: Object → String conversion is job for particular formatter diff -r 0dcaa48809f2 -r 4d420f8b3320 java/sql-dk/src/info/globalcode/sql/dk/formatting/AbstractFormatter.java --- a/java/sql-dk/src/info/globalcode/sql/dk/formatting/AbstractFormatter.java Sun Dec 29 15:49:25 2013 +0100 +++ b/java/sql-dk/src/info/globalcode/sql/dk/formatting/AbstractFormatter.java Sun Dec 29 15:53:58 2013 +0100 @@ -211,17 +211,6 @@ } } - /** - * @param value from ResultSet - * @return String representation of given value - */ - protected String toString(Object value) { - /** - * TODO: basic formatting: boolean, null, date, numbers… - */ - return String.valueOf(value); - } - @Override public void writeStartUpdatesResult() { pushState(State.UPDATES_RESULT, EnumSet.of(State.DATABASE)); diff -r 0dcaa48809f2 -r 4d420f8b3320 java/sql-dk/src/info/globalcode/sql/dk/formatting/TabularFormatter.java --- a/java/sql-dk/src/info/globalcode/sql/dk/formatting/TabularFormatter.java Sun Dec 29 15:49:25 2013 +0100 +++ b/java/sql-dk/src/info/globalcode/sql/dk/formatting/TabularFormatter.java Sun Dec 29 15:53:58 2013 +0100 @@ -163,14 +163,13 @@ } - @Override protected String toString(Object value) { final int width = getColumnWidth(getCurrentColumnsCount()); String result; if (value instanceof Number || value instanceof Boolean) { - result = lpad(super.toString(value), width); + result = lpad(String.valueOf(value), width); } else { - result = rpad(super.toString(value), width); + result = rpad(String.valueOf(value), width); } // ? value = (boolean) value ? "✔" : "✗";