Changeset 2994 for trunk/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Storable/StorableSerializer.cs

Timestamp:

03/10/10 18:28:50 (14 years ago)

Author:

epitzer

Message:

Make StorableClass attribute compulsory for StorableSerializer to work, add named property StorableClassType to choose between Empty and MarkedOnly, later other options will be added. (#548)

File:

• trunk/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Storable/StorableSerializer.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Storable/StorableSerializer.cs

@@ -9 +9 @@
 namespace HeuristicLab.Persistence.Default.CompositeSerializers.Storable {
 
-  [EmptyStorableClass]
+  /// <summary>
+  /// Intended for serialization of all custom classes. Classes should have the
+  /// <code>[StorableClass(StorableClassType.Empty)]</code> attribute set and a serialization mode set.
+  /// Optionally selected fields and properties can be marked with the
+  /// <code>[Storable]</code> attribute.
+  /// </summary>
+  [StorableClass(StorableClassType.Empty)]    
   public class StorableSerializer : ICompositeSerializer {
 
@@ -20 +26 @@
         StorableConstructorAttribute.GetStorableConstructor(type) == null)
         return false;
-      while (type != null) {
-        if (StorableAttribute.GetStorableMembers(type, false).Count() == 0 &&
-            !EmptyStorableClassAttribute.IsEmptyStorable(type))
-          return false;
-        type = type.BaseType;
-      }
-      return true;
+      return StorableClassAttribute.IsStorableType(type, true);
     }
 
@@ -33 +33 @@
         StorableConstructorAttribute.GetStorableConstructor(type) == null)
         return "no default constructor and no storable constructor";
-      while (type != null) {
-        if (StorableAttribute.GetStorableMembers(type, false).Count() == 0 &&
-            !EmptyStorableClassAttribute.IsEmptyStorable(type))
-          return string.Format("{0} has no storable members and is not marked [EmtpyStorableClass]",
-            type);
-        type = type.BaseType;
-      }
-      return "no reason";
+      return "class or one of its base classes is not empty and has no [StorableClass(StorableClassType.Empty)] attribute";
     }
 
@@ -59 +52 @@
       try {
         ConstructorInfo constructor = StorableConstructorAttribute.GetStorableConstructor(type);
-        return constructor != null ? constructor.Invoke(defaultArgs) :  Activator.CreateInstance(type, true);        
+        return constructor != null ? constructor.Invoke(defaultArgs) : Activator.CreateInstance(type, true);
       } catch (TargetInvocationException x) {
         throw new PersistenceException(
@@ -72 +65 @@
       while (iter.MoveNext()) {
         memberDict.Add(iter.Current.Name, iter.Current);
-      }
+      }      
       foreach (var accessor in StorableAttribute.GetStorableAccessors(instance)) {
         if (memberDict.ContainsKey(accessor.Name)) {