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

Timestamp:

03/03/17 11:41:43 (7 years ago)

Author:

gkronber

Message:

#2520

• renamed StorableClass -> StorableType
• changed persistence to use GUIDs instead of type names

File:

• branches/PersistenceOverhaul/HeuristicLab.Persistence/4.0/Core/TypeInfo.cs (modified) (4 diffs)

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

@@ -33 +33 @@
     public Type Type { get; private set; }
     public ITransformer Transformer { get; private set; }
-    public StorableClassAttribute StorableClassAttribute { get; private set; }
+    public StorableTypeAttribute StorableTypeAttribute { get; private set; }
     public IEnumerable<ComponentInfo> Fields { get; private set; }
     public IEnumerable<ComponentInfo> Properties { get; private set; }
@@ -57 +57 @@
     private void Reflect() {
       var type = Type;
-      StorableClassAttribute = StorableClassAttribute.GetStorableClassAttribute(type);
-      if (StorableClassAttribute != null) {
+      StorableTypeAttribute = StorableTypeAttribute.GetStorableTypeAttribute(type);
+      if (StorableTypeAttribute != null) {
         // traverse type hierarchy from base type to sub types
         Stack<Type> types = new Stack<Type>();
@@ -72 +72 @@
         while (types.Count > 0) {
           type = types.Pop();
-          if (StorableClassAttribute.Type != StorableClassType.AllProperties) {
+          if (StorableTypeAttribute.MemberSelection != StorableMemberSelection.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)
+            if (StorableTypeAttribute.MemberSelection == StorableMemberSelection.MarkedOnly)
               fieldInfos = fieldInfos.Where(x => StorableAttribute.IsStorable(x)).ToArray();
             foreach (var field in fieldInfos) {
@@ -84 +84 @@
           }
 
-          if (StorableClassAttribute.Type != StorableClassType.AllFields) {
+          if (StorableTypeAttribute.MemberSelection != StorableMemberSelection.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)
+            if (StorableTypeAttribute.MemberSelection == StorableMemberSelection.MarkedOnly)
               propertyInfos = propertyInfos.Where(x => StorableAttribute.IsStorable(x)).ToArray();
             foreach (var property in propertyInfos) {