Changeset 14549 for branches/PersistenceOverhaul/HeuristicLab.Persistence/4.0/Core/TypeInfo.cs

Timestamp:

01/05/17 17:36:50 (7 years ago)

Author:

jkarder

Message:

#2520: worked on persistence

File:

• branches/PersistenceOverhaul/HeuristicLab.Persistence/4.0/Core/TypeInfo.cs (modified) (1 diff)

branches/PersistenceOverhaul/HeuristicLab.Persistence/4.0/Core/TypeInfo.cs

@@ -72 +72 @@
         while (types.Count > 0) {
           type = types.Pop();
-          var fieldInfos = type.GetFields(BindingFlags.Instance | BindingFlags.DeclaredOnly | BindingFlags.Public | BindingFlags.NonPublic).
-                           Where(x => StorableAttribute.IsStorable(x));
-          foreach (var field in fieldInfos) {
-            var attrib = StorableAttribute.GetStorableAttribute(field);
-            var name = string.IsNullOrEmpty(attrib.Name) ? field.Name : attrib.Name;
-            fields.Add(new ComponentInfo(name, field, attrib, true, true));
+          if (StorableClassAttribute.Type != StorableClassType.AllProperties) {
+            var fieldInfos = type.GetFields(BindingFlags.Instance | BindingFlags.DeclaredOnly | BindingFlags.Public | BindingFlags.NonPublic)
+                                 .Where(x => !x.Name.StartsWith("<") && !x.Name.EndsWith("k__BackingField")); // exclude backing fields
+            if (StorableClassAttribute.Type == StorableClassType.MarkedOnly)
+              fieldInfos = fieldInfos.Where(x => StorableAttribute.IsStorable(x)).ToArray();
+            foreach (var field in fieldInfos) {
+              var attrib = StorableAttribute.GetStorableAttribute(field);
+              var name = attrib == null || string.IsNullOrEmpty(attrib.Name) ? field.Name : attrib.Name;
+              fields.Add(new ComponentInfo(type.Name + '.' + name, field, attrib, true, true));
+            }
           }
 
-          var propertyInfos = type.GetProperties(BindingFlags.Instance | BindingFlags.DeclaredOnly | BindingFlags.Public | BindingFlags.NonPublic).
-                      Where(x => x.GetIndexParameters().Length == 0).  // exclude indexed properties
-                      Where(x => StorableAttribute.IsStorable(x));
-          foreach (var property in propertyInfos) {
-            var attrib = StorableAttribute.GetStorableAttribute(property);
-            var name = string.IsNullOrEmpty(attrib.Name) ? property.Name : attrib.Name;
-            properties.Add(new ComponentInfo(name, property, attrib, property.CanRead, property.CanWrite));
+          if (StorableClassAttribute.Type != StorableClassType.AllFields) {
+            var propertyInfos = type.GetProperties(BindingFlags.Instance | BindingFlags.DeclaredOnly | BindingFlags.Public | BindingFlags.NonPublic).
+                        Where(x => x.GetIndexParameters().Length == 0);  // exclude indexed properties
+            if (StorableClassAttribute.Type == StorableClassType.MarkedOnly)
+              propertyInfos = propertyInfos.Where(x => StorableAttribute.IsStorable(x)).ToArray();
+            foreach (var property in propertyInfos) {
+              var attrib = StorableAttribute.GetStorableAttribute(property);
+              var name = attrib == null || string.IsNullOrEmpty(attrib.Name) ? property.Name : attrib.Name;
+              properties.Add(new ComponentInfo(type.Name + '.' + name, property, attrib, property.CanRead, property.CanWrite));
+            }
           }