Changeset 6224 for branches/PersistenceSpeedUp/HeuristicLab.Persistence/3.3/Default/CompositeSerializers

Timestamp:

05/17/11 15:10:19 (14 years ago)

Author:

epitzer

Message:

remove unused and unnecessary StorableClassType enum (#1530)

Location:

branches/PersistenceSpeedUp/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Storable

Files:

• StorableClassAnalyzer.cs (modified) (2 diffs)
• StorableClassAttribute.cs (modified) (2 diffs)
• StorableClassType.cs (deleted)

branches/PersistenceSpeedUp/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Storable/StorableClassAnalyzer.cs

@@ -119 +119 @@
         return;
       var attribute = (StorableAttribute)fieldInfo.GetCustomAttributes(typeof(StorableAttribute), false).SingleOrDefault();
-      if (attribute != null && classAttribute.Type != StorableClassType.AllProperties ||
-        classAttribute.Type == StorableClassType.AllFields ||
-        classAttribute.Type == StorableClassType.AllFieldsAndAllProperties)
+      if (attribute != null)
         typeDescriptor.Fields.Add(new FieldDescriptor(typeDescriptor, fieldInfo, attribute));
     }
@@ -131 +129 @@
       }
       var attribute = (StorableAttribute)propertyInfo.GetCustomAttributes(typeof(StorableAttribute), false).SingleOrDefault();
-      if (attribute != null && classAttribute.Type != StorableClassType.AllFields ||
-        classAttribute.Type == StorableClassType.AllProperties ||
-        classAttribute.Type == StorableClassType.AllFieldsAndAllProperties) {
-        if (!(attribute != null && attribute.AllowOneWay ||
-             propertyInfo.CanRead && propertyInfo.CanWrite))
+      if (attribute != null) {
+        if (!(attribute.AllowOneWay || propertyInfo.CanRead && propertyInfo.CanWrite))
           throw new PersistenceException("Properties have to be read/write or marked as one way storable");
         typeDescriptor.Properties.Add(new PropertyDescriptor(typeDescriptor, propertyInfo, attribute));

branches/PersistenceSpeedUp/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Storable/StorableClassAttribute.cs

@@ -30 +30 @@
   public sealed class StorableClassAttribute : Attribute {
 
-
-    /// <summary>
-    /// Specify how members are selected for serialization.
-    /// </summary>
-    public StorableClassType Type { get; private set; }
-
-    /// <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.
@@ -51 +37 @@
     public StorableClassAttribute() { }
 
-    /// <summary>
-    ///  Checks if the <see cref="StorableClassAttribute"/> is present on a type.
-    /// </summary>
-    /// <param name="type">The type which should be checked for the <see cref="StorableClassAttribute"/></param>
-    /// <returns></returns>
-    public static bool IsStorableClass(Type type) {
-      object[] attribs = type.GetCustomAttributes(typeof(StorableClassAttribute), false);
-      return attribs.Length > 0;
-    }
-
   }
 }