Changeset 3017 for trunk/sources/HeuristicLab.Persistence/3.3/Default

Timestamp:

03/14/10 01:06:17 (15 years ago)

Author:

epitzer

Message:

Merge StorableClassType.Empty into StorableClassType.MarkedOnly and make it the default if not specified (#548)

Location:

trunk/sources/HeuristicLab.Persistence/3.3/Default

Files:

• CompositeSerializers/ArraySerializer.cs (modified) (1 diff)
• CompositeSerializers/CompactNumberArray2StringSerializer.cs (modified) (1 diff)
• CompositeSerializers/DictionarySerializer.cs (modified) (1 diff)
• CompositeSerializers/EnumSerializer.cs (modified) (1 diff)
• CompositeSerializers/EnumerableSerializer.cs (modified) (1 diff)
• CompositeSerializers/KeyValuePairSerializer.cs (modified) (1 diff)
• CompositeSerializers/Number2StringSerializer.cs (modified) (1 diff)
• CompositeSerializers/NumberEnumerable2StringSerializer.cs (modified) (1 diff)
• CompositeSerializers/StackSerializer.cs (modified) (1 diff)
• CompositeSerializers/Storable/StorableAttribute.cs (modified) (1 diff)
• CompositeSerializers/Storable/StorableClassAttribute.cs (modified) (2 diffs)
• CompositeSerializers/Storable/StorableSerializer.cs (modified) (2 diffs)
• CompositeSerializers/StructSerializer.cs (modified) (1 diff)
• CompositeSerializers/TypeSerializer.cs (modified) (1 diff)
• DebugString/DebugString.cs (modified) (1 diff)
• DebugString/DebugStringFormat.cs (modified) (1 diff)
• Xml/Compact/NumberArray2XmlSerializerBase.cs (modified) (1 diff)
• Xml/Compact/NumberEnumeration2XmlSerializerBase.cs (modified) (1 diff)
• Xml/XmlFormat.cs (modified) (1 diff)
• Xml/XmlString.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/ArraySerializer.cs

@@ -8 +8 @@
 namespace HeuristicLab.Persistence.Default.CompositeSerializers {
 
-  [StorableClass(StorableClassType.Empty)]
+  [StorableClass]
   public class ArraySerializer : ICompositeSerializer {
 

trunk/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/CompactNumberArray2StringSerializer.cs

@@ -10 +10 @@
 namespace HeuristicLab.Persistence.Default.CompositeSerializers {
 
-  [StorableClass(StorableClassType.Empty)]
+  [StorableClass]
   public class CompactNumberArray2StringSerializer : ICompositeSerializer {
 

trunk/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/DictionarySerializer.cs

@@ -9 +9 @@
 namespace HeuristicLab.Persistence.Default.CompositeSerializers {
 
-  [StorableClass(StorableClassType.Empty)]
+  [StorableClass]
   public class DictionarySerializer : ICompositeSerializer {
 

trunk/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/EnumSerializer.cs

@@ -7 +7 @@
 namespace HeuristicLab.Persistence.Default.CompositeSerializers {
 
-  [StorableClass(StorableClassType.Empty)]
+  [StorableClass]
   public class EnumSerializer : ICompositeSerializer {
 

trunk/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/EnumerableSerializer.cs

@@ -10 +10 @@
 namespace HeuristicLab.Persistence.Default.CompositeSerializers {
 
-  [StorableClass(StorableClassType.Empty)]
+  [StorableClass]
   public class EnumerableSerializer : ICompositeSerializer {
 

trunk/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/KeyValuePairSerializer.cs

@@ -9 +9 @@
 namespace HeuristicLab.Persistence.Default.CompositeSerializers {
 
-  [StorableClass(StorableClassType.Empty)]
+  [StorableClass]
   public class KeyValuePairSerializer : ICompositeSerializer {
 

trunk/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Number2StringSerializer.cs

@@ -12 +12 @@
 namespace HeuristicLab.Persistence.Default.CompositeSerializers {
 
-  [StorableClass(StorableClassType.Empty)]
+  [StorableClass]
   public class Number2StringSerializer : ICompositeSerializer {
 

trunk/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/NumberEnumerable2StringSerializer.cs

@@ -11 +11 @@
 namespace HeuristicLab.Persistence.Default.CompositeSerializers {
 
-  [StorableClass(StorableClassType.Empty)]
+  [StorableClass]
   public class NumberEnumerable2StringSerializer : ICompositeSerializer {
 

trunk/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/StackSerializer.cs

@@ -10 +10 @@
 namespace HeuristicLab.Persistence.Default.CompositeSerializers {
 
-  [StorableClass(StorableClassType.Empty)]
+  [StorableClass]
   public class StackSerializer : ICompositeSerializer {
 

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

@@ -10 +10 @@
   /// <summary>
   /// Mark the member of a class to be considered by the <c>StorableSerializer</c>.
-  /// The class must be marked as <c>[StorableClass(StorableClassType.Empty)]</c> and the
+  /// The class must be marked as <c>[StorableClass]</c> and the
   /// <c>StorableClassType</c> should be set to <c>MarkedOnly</c> for
   /// this attribute to kick in.

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

@@ -13 +13 @@
 
     /// <summary>
-    /// Serialize the class completely empty
-    /// (ignore further [Storable] attributes inside the class)
-    /// </summary>
-    Empty,
-
-    /// <summary>
     /// Serialize only fields and properties that have been marked
-    /// with the [Storable] attribute
+    /// with the [Storable] attribute. This is the default value.
     /// </summary>
     MarkedOnly,
@@ -57 +51 @@
     /// Specify how members are selected for serialization.
     /// </summary>
-    public StorableClassType Type { get; set; }    
+    public StorableClassType Type { get; set; }
 
     /// <summary>
-    /// Mark a class to be serialize by the <c>StorableSerizlier</c>    
-    /// </summary>    
+    /// Mark a class to be serialize by the <c>StorableSerizlier</c>
+    /// </summary>
+    /// <param name="type">The storable class type.</param>
     public StorableClassAttribute(StorableClassType type) {
       Type = type;
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="StorableClassAttribute"/> class.
+    /// The default value for <see cref="StorableClassType"/> is
+    /// <see cref="StorableClassType.MarkedOnly"/>.
+    /// </summary>
+    public StorableClassAttribute() {
     }
 

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

@@ -11 +11 @@
   /// <summary>
   /// Intended for serialization of all custom classes. Classes should have the
-  /// <c>[StorableClass(StorableClassType.Empty)]</c> attribute set and a serialization mode set.
+  /// <c>[StorableClass]</c> attribute set and a serialization mode set.
   /// Optionally selected fields and properties can be marked with the
   /// <c>[Storable]</c> attribute.
   /// </summary>
-  [StorableClass(StorableClassType.Empty)]    
+  [StorableClass]    
   public class StorableSerializer : ICompositeSerializer {
 
@@ -33 +33 @@
         StorableConstructorAttribute.GetStorableConstructor(type) == null)
         return "no default constructor and no storable constructor";
-      return "class or one of its base classes is not empty and has no [StorableClass(StorableClassType.Empty)] attribute";
+      return "class or one of its base classes is not empty and has no [StorableClass] attribute";
     }
 

trunk/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/StructSerializer.cs

@@ -10 +10 @@
 namespace HeuristicLab.Persistence.Default.CompositeSerializers {
 
-  [StorableClass(StorableClassType.Empty)]
+  [StorableClass]
   public class StructSerializer : ICompositeSerializer {    
 

trunk/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/TypeSerializer.cs

@@ -8 +8 @@
 namespace HeuristicLab.Persistence.Default.CompositeSerializers {
 
-  [StorableClass(StorableClassType.Empty)]
+  [StorableClass]
   public class TypeSerializer : ICompositeSerializer {
 

trunk/sources/HeuristicLab.Persistence/3.3/Default/DebugString/DebugString.cs

@@ -13 +13 @@
   /// Simple write-only format for debugging purposes.
   /// </summary>
-  [StorableClass(StorableClassType.MarkedOnly)]  
+  [StorableClass]  
   public class DebugString : ISerialData {
 

trunk/sources/HeuristicLab.Persistence/3.3/Default/DebugString/DebugStringFormat.cs

@@ -10 +10 @@
 namespace HeuristicLab.Persistence.Default.DebugString {
 
-  [StorableClass(StorableClassType.Empty)]
+  [StorableClass]
   public class DebugStringFormat : FormatBase<DebugString> {
     public override string Name { get { return "DebugString"; } }

trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Compact/NumberArray2XmlSerializerBase.cs

@@ -8 +8 @@
 namespace HeuristicLab.Persistence.Default.Xml.Compact {
 
-  [StorableClass(StorableClassType.Empty)]
+  [StorableClass]
   public abstract class NumberArray2XmlSerializerBase<T> : CompactXmlSerializerBase<T> where T : class {
 

trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Compact/NumberEnumeration2XmlSerializerBase.cs

@@ -8 +8 @@
 namespace HeuristicLab.Persistence.Default.Xml.Compact {
 
-  [StorableClass(StorableClassType.Empty)]
+  [StorableClass]
   public abstract class NumberEnumeration2XmlSerializerBase<T> : CompactXmlSerializerBase<T> where T : IEnumerable {
 

trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/XmlFormat.cs

@@ -9 +9 @@
   /// or save to a file.
   /// </summary>
-  [StorableClass(StorableClassType.Empty)]
+  [StorableClass]
   public class XmlFormat : FormatBase<XmlString> {
     public override string Name { get { return "XML"; } }

trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/XmlString.cs

@@ -6 +6 @@
 namespace HeuristicLab.Persistence.Default.Xml {
 
-  [StorableClass(StorableClassType.MarkedOnly)]  
+  [StorableClass]  
   public class XmlString : ISerialData {