Changeset 6224

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

Files:

• Default/CompositeSerializers/Storable/StorableClassAnalyzer.cs (modified) (2 diffs)
• Default/CompositeSerializers/Storable/StorableClassAttribute.cs (modified) (2 diffs)
• Default/CompositeSerializers/Storable/StorableClassType.cs (deleted)
• HeuristicLab.Persistence-3.3.csproj (modified) (1 diff)
• Tests/UseCases.cs (modified) (1 diff)

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;
-    }
-
   }
 }

branches/PersistenceSpeedUp/HeuristicLab.Persistence/3.3/HeuristicLab.Persistence-3.3.csproj

@@ -154 +154 @@
     <Compile Include="Default\CompositeSerializers\NumberEnumerable2StringSerializer.cs" />
     <Compile Include="Default\CompositeSerializers\StackSerializer.cs" />
-    <Compile Include="Default\CompositeSerializers\Storable\StorableClassType.cs" />
     <Compile Include="Default\CompositeSerializers\Storable\StorableClassAttribute.cs" />
     <Compile Include="Default\CompositeSerializers\Storable\StorableAttribute.cs" />

branches/PersistenceSpeedUp/HeuristicLab.Persistence/3.3/Tests/UseCases.cs

@@ -921 +921 @@
     }
 
-    [StorableClass(StorableClassType.AllFields)]
-    public class AllFieldsStorable {
-      public int Value1 = 1;
-      [Storable]
-      public int Value2 = 2;
-      public int Value3 { get; private set; }
-      public int Value4 { get; private set; }
-      [StorableConstructor]
-      public AllFieldsStorable(bool isDeserializing) {
-        if (!isDeserializing) {
-          Value1 = 12;
-          Value2 = 23;
-          Value3 = 34;
-          Value4 = 56;
-        }
-      }
-    }
-
-    [TestMethod]
-    public void TestStorableClassDiscoveryAllFields() {
-      AllFieldsStorable afs = new AllFieldsStorable(false);
-      XmlGenerator.Serialize(afs, tempFile);
-      AllFieldsStorable newAfs = (AllFieldsStorable)XmlParser.Deserialize(tempFile);
-      Assert.AreEqual(afs.Value1, newAfs.Value1);
-      Assert.AreEqual(afs.Value2, newAfs.Value2);
-      Assert.AreEqual(0, newAfs.Value3);
-      Assert.AreEqual(0, newAfs.Value4);
-    }
-
-    [StorableClass(StorableClassType.AllProperties)]
-    public class AllPropertiesStorable {
-      public int Value1 = 1;
-      [Storable]
-      public int Value2 = 2;
-      public int Value3 { get; private set; }
-      public int Value4 { get; private set; }
-      [StorableConstructor]
-      public AllPropertiesStorable(bool isDeserializing) {
-        if (!isDeserializing) {
-          Value1 = 12;
-          Value2 = 23;
-          Value3 = 34;
-          Value4 = 56;
-        }
-      }
-    }
-
-    [TestMethod]
-    public void TestStorableClassDiscoveryAllProperties() {
-      AllPropertiesStorable afs = new AllPropertiesStorable(false);
-      XmlGenerator.Serialize(afs, tempFile);
-      AllPropertiesStorable newAfs = (AllPropertiesStorable)XmlParser.Deserialize(tempFile);
-      Assert.AreEqual(1, newAfs.Value1);
-      Assert.AreEqual(2, newAfs.Value2);
-      Assert.AreEqual(afs.Value3, newAfs.Value3);
-      Assert.AreEqual(afs.Value4, newAfs.Value4);
-
-    }
-
-    [StorableClass(StorableClassType.AllFieldsAndAllProperties)]
-    public class AllFieldsAndAllPropertiesStorable {
-      public int Value1 = 1;
-      [Storable]
-      public int Value2 = 2;
-      public int Value3 { get; private set; }
-      public int Value4 { get; private set; }
-      [StorableConstructor]
-      public AllFieldsAndAllPropertiesStorable(bool isDeserializing) {
-        if (!isDeserializing) {
-          Value1 = 12;
-          Value2 = 23;
-          Value3 = 34;
-          Value4 = 56;
-        }
-      }
-    }
-
-    [TestMethod]
-    public void TestStorableClassDiscoveryAllFieldsAndAllProperties() {
-      AllFieldsAndAllPropertiesStorable afs = new AllFieldsAndAllPropertiesStorable(false);
-      XmlGenerator.Serialize(afs, tempFile);
-      AllFieldsAndAllPropertiesStorable newAfs = (AllFieldsAndAllPropertiesStorable)XmlParser.Deserialize(tempFile);
-      Assert.AreEqual(afs.Value1, newAfs.Value1);
-      Assert.AreEqual(afs.Value2, newAfs.Value2);
-      Assert.AreEqual(afs.Value3, newAfs.Value3);
-      Assert.AreEqual(afs.Value4, newAfs.Value4);
-    }
-
-    [StorableClass(StorableClassType.MarkedOnly)]
+
+    [StorableClass]
     public class MarkedOnlyStorable {
       public int Value1 = 1;