Enhance toString() for commit info and data

3 files changed, 24 insertions, 5 deletions

diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitDataImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitDataImpl.java
index 1f45bb0955..b6894042d3 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitDataImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitDataImpl.java
@@ -40,8 +40,14 @@ public class CDOCommitDataImpl extends CDOChangeSetDataImpl implements CDOCommit
   @Override
   public String toString()
   {
+    return toString(this);
+  }
+
+  public static String toString(CDOCommitData commitData)
+  {
     return MessageFormat.format(
         "CommitData[newPackageUnits={0}, newObjects={1}, changedObjects={2}, detachedObjects={3}]", //$NON-NLS-1$
-        newPackageUnits.size(), getNewObjects().size(), getChangedObjects().size(), getDetachedObjects().size());
+        commitData.getNewPackageUnits().size(), commitData.getNewObjects().size(), commitData.getChangedObjects()
+            .size(), commitData.getDetachedObjects().size());
   }
 }
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitInfoImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitInfoImpl.java
index 6a854382f1..5d61c46512 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitInfoImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitInfoImpl.java
@@ -198,16 +198,23 @@ public class CDOCommitInfoImpl extends CDOBranchPointImpl implements CDOCommitIn
   @Override
   public String toString()
   {
+    return toString(this);
+  }
+
+  public static String toString(CDOCommitInfo commitInfo)
+  {
     String data = null;
-    if (commitData != null)
+    if (commitInfo.isCommitDataLoaded())
     {
-      data = commitData.toString();
+      data = CDOCommitDataImpl.toString(commitInfo);
     }
 
-    String timeStamp = CDOCommonUtil.formatTimeStamp(getTimeStamp());
+    long t = commitInfo.getTimeStamp();
+    String timeStamp = CDOCommonUtil.formatTimeStamp(t) + " (" + t + ")";
+
     return MessageFormat
         .format(
-            "CommitInfo[{0}, {1}, {2}, {3}, {4}, {5}]", getPreviousTimeStamp(), getBranch(), timeStamp, getUserID(), getComment(), data); //$NON-NLS-1$
+            "CommitInfo[{0}, {1}, {2}, {3}, {4}]", timeStamp, commitInfo.getBranch(), commitInfo.getUserID(), commitInfo.getComment(), data); //$NON-NLS-1$
   }
 
   public synchronized boolean isCommitDataLoaded()
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/DelegatingCommitInfo.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/DelegatingCommitInfo.java
index ede87a2257..d3aef1c236 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/DelegatingCommitInfo.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/DelegatingCommitInfo.java
@@ -118,4 +118,10 @@ public abstract class DelegatingCommitInfo implements CDOCommitInfo
   {
     getDelegate().merge(changeSetData);
   }
+
+  @Override
+  public String toString()
+  {
+    return getDelegate().toString();
+  }
 }