Changeset 40 for trunk/sources/HeuristicLab.Core

Timestamp:

03/05/08 02:08:02 (17 years ago)

Author:

swagner

Message:

Worked on ticket #41

• added generic ItemList<T>

Location:

trunk/sources/HeuristicLab.Core

Files:

• PersistenceManager.cs (modified) (1 diff)
• StorableBase.cs (modified) (1 diff)
• VariableInfo.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Core/PersistenceManager.cs

@@ -82 +82 @@
       return PersistenceManager.Restore(doc.ChildNodes[1], new Dictionary<Guid, IStorable>());
     }
+
+    public static string BuildTypeString(Type type) {
+      string assembly = type.Assembly.FullName;
+      assembly = assembly.Split(new string[] { ", " }, StringSplitOptions.None)[0];
+
+      StringBuilder builder = new StringBuilder();
+      builder.Append(type.Namespace);
+      builder.Append(".");
+      builder.Append(type.Name);
+      Type[] args = type.GetGenericArguments();
+      if (args.Length > 0) {
+        builder.Append("[[");
+        builder.Append(BuildTypeString(args[0]));
+        builder.Append("]");
+        for (int i = 1; i < args.Length; i++) {
+          builder.Append(",[");
+          builder.Append(BuildTypeString(args[i]));
+          builder.Append("]");
+        }
+        builder.Append("]");
+      }
+      builder.Append(", ");
+      builder.Append(assembly);
+      return builder.ToString();
+    }
   }
 }

trunk/sources/HeuristicLab.Core/StorableBase.cs

@@ -47 +47 @@
     public virtual XmlNode GetXmlNode(string name, XmlDocument document, IDictionary<Guid,IStorable> persistedObjects) {
       XmlNode node = document.CreateNode(XmlNodeType.Element, name, null);
-      Type type = this.GetType();
-      string typeString = type.AssemblyQualifiedName;
-      string[] tokens = typeString.Split(new string[] { ", " }, StringSplitOptions.None);
-      typeString = tokens[0] + ", " + tokens[1];
       XmlAttribute typeAttribute = document.CreateAttribute("Type");
-      typeAttribute.Value = typeString;
+      typeAttribute.Value = PersistenceManager.BuildTypeString(this.GetType());
       node.Attributes.Append(typeAttribute);
       XmlAttribute guidAttribute = document.CreateAttribute("GUID");

trunk/sources/HeuristicLab.Core/VariableInfo.cs

@@ -124 +124 @@
 
       XmlAttribute dataTypeAttribute = document.CreateAttribute("DataType");
-      string typeString = DataType.AssemblyQualifiedName;
-      string[] tokens = typeString.Split(new string[] { ", " }, StringSplitOptions.None);
-      typeString = tokens[0] + ", " + tokens[1];
-      dataTypeAttribute.Value = typeString;
+      dataTypeAttribute.Value = PersistenceManager.BuildTypeString(DataType);
       node.Attributes.Append(dataTypeAttribute);