Value formatting: Object → String conversion is job for particular formatter v_0
authorFrantišek Kučera <franta-hg@frantovo.cz>
Sun, 29 Dec 2013 15:53:58 +0100
branchv_0
changeset 98 4d420f8b3320
parent 97 0dcaa48809f2
child 99 b969176512dd
Value formatting: Object → String conversion is job for particular formatter
java/sql-dk/src/info/globalcode/sql/dk/formatting/AbstractFormatter.java
java/sql-dk/src/info/globalcode/sql/dk/formatting/TabularFormatter.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));
--- 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 ? "✔" : "✗";