a little more revamp tostring output

git-svn-id: https://svn.code.sf.net/p/jackcess/code/jackcess/trunk@795 f203690c-595d-4dc9-a70b-905162fa7fd2

diff --git a/src/main/java/com/healthmarketscience/jackcess/impl/CustomToStringStyle.java b/src/main/java/com/healthmarketscience/jackcess/impl/CustomToStringStyle.java
index d909f96c1e20308cbfd6fb8cb5df90ba9dbb4e68..437f176889f16847b3444646f13d78f4caddf17a 100644 (file)
--- a/src/main/java/com/healthmarketscience/jackcess/impl/CustomToStringStyle.java
+++ b/src/main/java/com/healthmarketscience/jackcess/impl/CustomToStringStyle.java
@@ -37,7 +37,7 @@ public class CustomToStringStyle extends StandardToStringStyle
 {
   private static final long serialVersionUID = 0L;
 
-  private static final String FIELD_SEP = SystemUtils.LINE_SEPARATOR + "  ";
+  private static final String ML_FIELD_SEP = SystemUtils.LINE_SEPARATOR + "  ";
   private static final String IMPL_SUFFIX = "Impl";
   private static final int MAX_BYTE_DETAIL_LEN = 20;
   
@@ -45,9 +45,10 @@ public class CustomToStringStyle extends StandardToStringStyle
     private static final long serialVersionUID = 0L;
     {
       setContentStart("[");
-      setFieldSeparator(FIELD_SEP);
+      setFieldSeparator(ML_FIELD_SEP);
       setFieldSeparatorAtStart(true);
       setFieldNameValueSeparator(": ");
+      setArraySeparator("," + ML_FIELD_SEP);
       setContentEnd(SystemUtils.LINE_SEPARATOR + "]");
       setUseShortClassName(true);
     }
@@ -121,8 +122,7 @@ public class CustomToStringStyle extends StandardToStringStyle
       appendInternal(sb, fieldName, iter.next(), true);
     }
     while(iter.hasNext()) {
-      sb.append(",");
-      appendFieldSeparator(sb);
+      sb.append(getArraySeparator());
       appendInternal(sb, fieldName, iter.next(), true);
     }
 
@@ -154,19 +154,18 @@ public class CustomToStringStyle extends StandardToStringStyle
       appendInternal(sb, fieldName, e.getValue(), true);
     }
     while(iter.hasNext()) {
-      sb.append(",");
-      appendFieldSeparator(sb);
+      sb.append(getArraySeparator());
       Map.Entry<?,?> e = iter.next();
       sb.append(e.getKey()).append("=");
       appendInternal(sb, fieldName, e.getValue(), true);
     }
-    if(isFieldSeparatorAtStart()) {
-      appendFieldSeparator(sb);
-    }
 
     // indent entire map contents another level
     buffer.append(indent(sb));
 
+    if(isFieldSeparatorAtStart()) {
+      appendFieldSeparator(buffer);
+    }
     buffer.append("}");
   }
 
@@ -179,16 +178,15 @@ public class CustomToStringStyle extends StandardToStringStyle
   private static void appendDetail(StringBuffer buffer, ByteBuffer bb) {
     int len = bb.remaining();
     buffer.append("(").append(len).append(") ");
+    buffer.append(ByteUtil.toHexString(bb, bb.position(), 
+                                       Math.min(len, MAX_BYTE_DETAIL_LEN)));
     if(len > MAX_BYTE_DETAIL_LEN) {
-      buffer.append(ByteUtil.toHexString(bb, len, MAX_BYTE_DETAIL_LEN))
-        .append(" ...");
-    } else {
-      buffer.append(ByteUtil.toHexString(bb, len));
+      buffer.append(" ...");
     }      
   }
 
   private static String indent(Object obj) {
     return ((obj != null) ? obj.toString().replaceAll(
-                SystemUtils.LINE_SEPARATOR, FIELD_SEP) : null);
+                SystemUtils.LINE_SEPARATOR, ML_FIELD_SEP) : null);
   }
 }

diff --git a/src/main/java/com/healthmarketscience/jackcess/impl/RowImpl.java b/src/main/java/com/healthmarketscience/jackcess/impl/RowImpl.java
index 898508ae21b032b500b656841677e8431b30a616..31f2c43c38e06ff9fc0952cfc5598f843d22b584 100644 (file)
--- a/src/main/java/com/healthmarketscience/jackcess/impl/RowImpl.java
+++ b/src/main/java/com/healthmarketscience/jackcess/impl/RowImpl.java
@@ -60,6 +60,8 @@ public class RowImpl extends LinkedHashMap<String,Object> implements Row
 
   @Override
   public String toString() {
-    return "Row[" + _id + "] " + super.toString();
+    return CustomToStringStyle.valueBuilder("Row[" + _id + "]")
+      .append(null, this)
+      .toString();
   }
 }