Changeset 1555

Timestamp:

04/14/09 14:26:45 (16 years ago)

Author:

epitzer

Message:

More renaming and refactoring. (#548)

Location:

trunk/sources

Files:

• HeuristicLab.Persistence.Test/StorableAttributeTests.cs (modified) (1 diff)
• HeuristicLab.Persistence/3.3/Core/EmptyStorableClassAttribute.cs (added)
• HeuristicLab.Persistence/3.3/Core/StorableAttribute.cs (modified) (2 diffs)
• HeuristicLab.Persistence/3.3/Core/TypeExtensions.cs (added)
• HeuristicLab.Persistence/3.3/Core/TypeStringBuilder.cs (modified) (3 diffs)
• HeuristicLab.Persistence/3.3/Default/Decomposers/StorableDecomposer.cs (modified) (3 diffs)
• HeuristicLab.Persistence/3.3/HeuristicLab.Persistence-3.3.csproj (modified) (2 diffs)

trunk/sources/HeuristicLab.Persistence.Test/StorableAttributeTests.cs

@@ -21 +21 @@
     static void Main() {
       TestClass t = new TestClass();
-      Dictionary<string, DataMemberAccessor> accessors = StorableAttribute.GetAutostorableAccessors(t);
+      Dictionary<string, DataMemberAccessor> accessors = StorableAttribute.GetStorableAccessors(t);
       foreach ( KeyValuePair<string, DataMemberAccessor> pair in accessors ) {
         Console.WriteLine(pair.Key + ": " + pair.Value);

trunk/sources/HeuristicLab.Persistence/3.3/Core/StorableAttribute.cs

@@ -4 +4 @@
 
 namespace HeuristicLab.Persistence.Core {
-
-  
-  [AttributeUsage(
-    AttributeTargets.Class,
-    AllowMultiple=false,
-    Inherited=false)]
-  public class EmptyStorableClassAttribute : Attribute {
-    private static readonly Dictionary<Type, bool> emptyTypeInfo = new Dictionary<Type, bool>();
-    public static bool IsEmpyStorable(Type type) {      
-      if (emptyTypeInfo.ContainsKey(type))
-        return emptyTypeInfo[type];
-      foreach (var attribute in type.GetCustomAttributes(false)) {
-        EmptyStorableClassAttribute empty = attribute as EmptyStorableClassAttribute;
-        if (empty != null) {
-          emptyTypeInfo.Add(type, true);
-          return true;
-        }
-      }
-      int nFields = 0;
-      foreach ( MemberInfo memberInfo in type.GetMembers(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic) ) {
-        if (memberInfo.MemberType == MemberTypes.Field ||
-          memberInfo.MemberType == MemberTypes.Property)
-          nFields += 1;
-      }
-      if (nFields == 0) {
-        emptyTypeInfo.Add(type, true);
-        return true;
-      }
-      emptyTypeInfo.Add(type, false);
-      return false;
-    }
-  }
 
   [AttributeUsage(
@@ -72 +40 @@
     }
 
-    public static Dictionary<string, DataMemberAccessor> GetAutostorableAccessors(object obj) {
+    public static Dictionary<string, DataMemberAccessor> GetStorableAccessors(object obj) {
       Dictionary<string, DataMemberAccessor> storableAccessors =
         new Dictionary<string, DataMemberAccessor>();

trunk/sources/HeuristicLab.Persistence/3.3/Core/TypeStringBuilder.cs

@@ -4 +4 @@
 namespace HeuristicLab.Persistence.Core {
 
-  public static class TypeStringBuilder {
+  internal static class TypeStringBuilder {
 
-    private static void BuildDeclaringTypeChain(Type type, StringBuilder sb) {
+    internal static void BuildDeclaringTypeChain(Type type, StringBuilder sb) {
       if ( type.DeclaringType != null ) {
         BuildDeclaringTypeChain(type.DeclaringType, sb);
@@ -13 +13 @@
     }
 
-    private static void BuildVersionInvariantName(Type type, StringBuilder sb) {
+    internal static void BuildVersionInvariantName(Type type, StringBuilder sb) {
       sb.Append(type.Namespace).Append('.');
       BuildDeclaringTypeChain(type, sb);
@@ -32 +32 @@
     }
 
-    public static string VersionInvariantName(this Type type) {
-      StringBuilder sb = new StringBuilder();
-      BuildVersionInvariantName(type, sb);
-      return sb.ToString();
-    }
-  }  
+  }
   
 }

trunk/sources/HeuristicLab.Persistence/3.3/Default/Decomposers/StorableDecomposer.cs

@@ -15 +15 @@
     public bool CanDecompose(Type type) {
       return StorableAttribute.GetStorableMembers(type, false).Count() > 0 ||
-        EmptyStorableClassAttribute.IsEmpyStorable(type);
+        EmptyStorableClassAttribute.IsEmptyStorable(type);
 
     }
@@ -24 +24 @@
 
     public IEnumerable<Tag> Decompose(object obj) {
-      foreach (var mapping in StorableAttribute.GetAutostorableAccessors(obj)) {
+      foreach (var mapping in StorableAttribute.GetStorableAccessors(obj)) {
         yield return new Tag(mapping.Key, mapping.Value.Get());
       }
@@ -39 +39 @@
         memberDict.Add(iter.Current.Name, iter.Current);
       }      
-      foreach (var mapping in StorableAttribute.GetAutostorableAccessors(instance)) {
+      foreach (var mapping in StorableAttribute.GetStorableAccessors(instance)) {
         if (memberDict.ContainsKey(mapping.Key)) {
           mapping.Value.Set(memberDict[mapping.Key].Value);          

trunk/sources/HeuristicLab.Persistence/3.3/HeuristicLab.Persistence-3.3.csproj

@@ -94 +94 @@
   <ItemGroup>
     <Compile Include="Core\Configuration.cs" />
+    <Compile Include="Core\EmptyStorableClassAttribute.cs" />
+    <Compile Include="Core\TypeExtensions.cs" />
     <Compile Include="Core\TypeMapping.cs" />
     <Compile Include="Core\TypeStringBuilder.cs" />
@@ -112 +114 @@
     <Compile Include="Core\DataMemberAccessor.cs" />
     <Compile Include="Default\Xml\Compact\IntList2XmlFormatter.cs" />
-    <Compile Include="Default\Xml\Primitive\Double2XmlFormatterBase.cs" />
-    <Compile Include="Default\Xml\Primitive\Decimal2XmlFormatterBase.cs" />
-    <Compile Include="Default\Xml\Primitive\Float2XmlFormatterBase.cs" />
+    <Compile Include="Default\Xml\Primitive\Double2XmlFormatter.cs" />
+    <Compile Include="Default\Xml\Primitive\Decimal2XmlFormatter.cs" />
+    <Compile Include="Default\Xml\Primitive\Float2XmlFormatter.cs" />
     <Compile Include="Default\Xml\Primitive\UInt2XmlFormatter.cs" />
     <Compile Include="Default\Xml\Primitive\Long2XmlFormatter.cs" />