Changeset 1476

Timestamp:

04/01/09 15:10:14 (16 years ago)

Author:

epitzer

Message:

Decomposers for all primitive types except string. (#563)

Location:

trunk/sources/HeuristicLab.Persistence

Files:

• Default/Decomposers/X2StringDecomposer.cs (added)
• Default/ViewOnly/ViewOnlyFormat.cs (modified) (1 diff)
• Default/Xml/Primitive/String2XmlFormatter.cs (added)
• Default/Xml/XmlGenerator.cs (modified) (2 diffs)
• HeuristicLab.Persistence.csproj (modified) (3 diffs)

trunk/sources/HeuristicLab.Persistence/Default/ViewOnly/ViewOnlyFormat.cs

@@ -45 +45 @@
     public override Type Type { get { return typeof(Type); } }
   }
-
-  //public class ToStringDecomposer : IDecomposer {
-  // should not be used by default
-  public class ToStringDecomposer {
-    public bool CanDecompose(Type type) { return true; }
-    public IEnumerable<Tag> DeCompose(object obj) {
-      yield return new Tag(obj.ToString());
-    }
-
-    public object CreateInstance(Type type) {
-      throw new NotImplementedException();
-    }
-
-    public object Populate(object instance, IEnumerable<Tag> tags, Type type) {
-      throw new NotImplementedException();
-    }
-
-  }
-
 
   public class ViewOnlyGenerator : Generator<string> {

trunk/sources/HeuristicLab.Persistence/Default/Xml/XmlGenerator.cs

@@ -6 +6 @@
 using System.IO;
 using ICSharpCode.SharpZipLib.Zip;
+using HeuristicLab.Tracing;
+using log4net;
 
 namespace HeuristicLab.Persistence.Default.Xml {
@@ -145 +147 @@
       zipStream.PutNextEntry(new ZipEntry("data.xml"));      
       StreamWriter writer = new StreamWriter(zipStream);
-      foreach ( ISerializationToken token in serializer )
-        writer.Write(generator.Format(token));
+      ILog logger = Logger.GetDefaultLogger();      
+      foreach (ISerializationToken token in serializer) {
+        string line = generator.Format(token);
+        writer.Write(line);
+        logger.Debug(line);
+      }
       writer.Flush();
       zipStream.PutNextEntry(new ZipEntry("typecache.xml"));
       writer = new StreamWriter(zipStream);
-      foreach ( string line in generator.Format(serializer.TypeCache))
+      foreach (string line in generator.Format(serializer.TypeCache)) {
         writer.WriteLine(line);
+        logger.Debug(line);
+      }
       writer.Flush();            
       zipStream.Close();      

trunk/sources/HeuristicLab.Persistence/HeuristicLab.Persistence.csproj

@@ -80 +80 @@
       <HintPath>..\HeuristicLab.PluginInfrastructure.GUI\ICSharpCode.SharpZipLib.dll</HintPath>
     </Reference>
+    <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\HeuristicLab.Tracing\libs\debug\log4net.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.configuration" />
@@ -99 +103 @@
     <Compile Include="Default\Decomposers\StorableDecomposer.cs" />
     <Compile Include="Default\Decomposers\TypeDecomposer.cs" />
+    <Compile Include="Default\Decomposers\X2StringDecomposer.cs" />
     <Compile Include="Default\ViewOnly\ViewOnlyFormat.cs" />
     <Compile Include="Default\Xml\Compact\IntArray2XmlFormatters.cs" />
@@ -107 +112 @@
     <Compile Include="Core\DataMemberAccessor.cs" />
     <Compile Include="Default\Xml\Compact\IntList2XmlFormatter.cs" />
-    <Compile Include="Default\Xml\Primitive\Sting2XmlFormatter.cs" />
+    <Compile Include="Default\Xml\Primitive\String2XmlFormatter.cs" />
     <Compile Include="Default\Xml\Primitive\Int2XmlFormatter.cs" />
     <Compile Include="Default\Xml\Primitive\Double2XmlFormatter.cs" />