Changeset 1279

Timestamp:

03/06/09 17:19:08 (16 years ago)

Author:

epitzer

Message:

Better recursive AutoFormat.

File:

• branches/New Persistence Exploration/Persistence/Persistence/Util.cs (modified) (3 diffs)

branches/New Persistence Exploration/Persistence/Persistence/Util.cs

@@ -10 +10 @@
     }
     public static string AutoFormat(object o, bool recursive) {
+      Dictionary<object, int> visitedObjects = new Dictionary<object,int>();
+      return AutoFormat(o, recursive, visitedObjects);
+    }
+    private static string AutoFormat(object o, bool recursive, Dictionary<object, int> visitedObjects) {
       string s = o as string;
       if (s != null)
@@ -15 +19 @@
       if (o == null) {
         return "<null>";
+      }
+      if (visitedObjects.ContainsKey(o)) {
+        return o.ToString();
+      } else {
+        visitedObjects.Add(o, 0);
+      }      
+      if (o.ToString() != o.GetType().ToString()) {
+        return o.ToString();
       }
       StringBuilder sb = new StringBuilder();
@@ -24 +36 @@
         BindingFlags.Instance)) {
         if (mInfo.MemberType == MemberTypes.Field) {
+          FieldInfo fInfo = (FieldInfo)mInfo;          
           sb.Append(mInfo.Name);
-          sb.Append("=");
+          sb.Append("=");          
           if (recursive) {
-            sb.Append(AutoFormat(((FieldInfo)mInfo).GetValue(o)));
+            sb.Append(AutoFormat(((FieldInfo)mInfo).GetValue(o), true, visitedObjects));
           } else {
             sb.Append(((FieldInfo)mInfo).GetValue(o));