Changeset 1555 for trunk/sources/HeuristicLab.Persistence/3.3/Core

Timestamp:

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

Author:

epitzer

Message:

More renaming and refactoring. (#548)

Location:

trunk/sources/HeuristicLab.Persistence/3.3/Core

Files:

• EmptyStorableClassAttribute.cs (added)
• StorableAttribute.cs (modified) (2 diffs)
• TypeExtensions.cs (added)
• TypeStringBuilder.cs (modified) (3 diffs)

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();
-    }
-  }  
+  }
   
 }