Changeset 7615 for branches/HeuristicLab.TimeSeries/HeuristicLab.Common/3.3/ObjectExtensions.cs

Timestamp:

03/15/12 09:11:17 (13 years ago)

Author:

gkronber

Message:

#1081 merged r7462:7609 from trunk into time series branch

Location:

branches/HeuristicLab.TimeSeries

Files:

• . (modified) (1 prop)
• HeuristicLab.Common/3.3/ObjectExtensions.cs (modified) (4 diffs)

branches/HeuristicLab.TimeSeries/HeuristicLab.Common/3.3/ObjectExtensions.cs

@@ -31 +31 @@
 namespace HeuristicLab.Common {
   public static class ObjectExtensions {
-    public static IEnumerable<object> GetObjectGraphObjects(this object obj, bool excludeStaticMembers = false) {
+    public static IEnumerable<object> GetObjectGraphObjects(this object obj, HashSet<string> excludedMembers = null, bool excludeStaticMembers = false) {
       if (obj == null) return Enumerable.Empty<object>();
+      if (excludedMembers == null) excludedMembers = new HashSet<string>();
 
       var objects = new HashSet<object>();
@@ -42 +43 @@
         objects.Add(current);
 
-        foreach (object o in GetChildObjects(current, excludeStaticMembers)) {
+        foreach (object o in GetChildObjects(current, excludedMembers, excludeStaticMembers)) {
           if (o != null && !objects.Contains(o) && !ExcludeType(o.GetType()))
             stack.Push(o);
@@ -70 +71 @@
              (type.HasElementType && ExcludeType(type.GetElementType()));
     }
-    private static IEnumerable<object> GetChildObjects(object obj, bool excludeStaticMembers) {
+    private static IEnumerable<object> GetChildObjects(object obj, HashSet<string> excludedMembers, bool excludeStaticMembers) {
       Type type = obj.GetType();
 
@@ -95 +96 @@
       } else {
         foreach (FieldInfo f in type.GetAllFields()) {
+          if (excludedMembers.Contains(f.Name)) continue;
           if (excludeStaticMembers && f.IsStatic) continue;
           object fieldValue;
           try {
             fieldValue = f.GetValue(obj);
-          } catch (SecurityException) {
+          }
+          catch (SecurityException) {
             continue;
           }