Changeset 1612 for trunk/sources/HeuristicLab.Persistence/3.3/Default

Timestamp:

04/20/09 17:36:22 (16 years ago)

Author:

epitzer

Message:

namespace refactoring (#548)

Location:

trunk/sources/HeuristicLab.Persistence/3.3/Default

Files:

• DebugString/Bool2DebugStringFormatter.cs (deleted)
• DebugString/DateTime2DebugStringFormatter.cs (deleted)
• DebugString/DebugStringGenerator.cs (modified) (1 diff)
• DebugString/Doubld2DebugStringFormatter.cs (deleted)
• DebugString/Float2DebugStringFormatter.cs (deleted)
• DebugString/Formatters (added)
• DebugString/Formatters/Bool2DebugStringFormatter.cs (added)
• DebugString/Formatters/DateTime2DebugStringFormatter.cs (added)
• DebugString/Formatters/Doubld2DebugStringFormatter.cs (added)
• DebugString/Formatters/Float2DebugStringFormatter.cs (added)
• DebugString/Formatters/Int2DebugStringFormatter.cs (added)
• DebugString/Formatters/String2DebugStringFormatter.cs (added)
• DebugString/Formatters/Type2DebugStringFormatter.cs (added)
• DebugString/Formatters/ValueType2DebugStringFormatterBase.cs (added)
• DebugString/Int2DebugStringFormatter.cs (deleted)
• DebugString/String2DebugStringFormatter.cs (deleted)
• DebugString/Type2DebugStringFormatter.cs (deleted)
• DebugString/ValueType2DebugStringFormatterBase.cs (deleted)
• Xml/Compact/DoubleArray2XmlFormatters.cs (modified) (1 diff)
• Xml/Compact/IntArray2XmlFormatters.cs (modified) (1 diff)
• Xml/Compact/NumberArray2XmlFormatterBase.cs (modified) (3 diffs)
• Xml/XmlGenerator.cs (modified) (6 diffs)
• Xml/XmlParser.cs (modified) (2 diffs)
• Xml/XmlStrings.cs (added)

trunk/sources/HeuristicLab.Persistence/3.3/Default/DebugString/DebugStringGenerator.cs

@@ -14 +14 @@
     private readonly bool showRefs;
 
-    public DebugStringGenerator() : this(false) { }
+    public DebugStringGenerator() : this(true) { }
 
     public DebugStringGenerator(bool showRefs) {

trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Compact/DoubleArray2XmlFormatters.cs

@@ -5 +5 @@
 namespace HeuristicLab.Persistence.Default.Xml.Compact {
 
-  public abstract class DoubleArray2XmlFormatterBase<T> : NumberArray2XmlFormatterBase<T> {
+  public abstract class DoubleArray2XmlFormatterBase<T> : NumberArray2XmlFormatterBase<T> where T : class{
 
     protected override string FormatValue(object o) {

trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Compact/IntArray2XmlFormatters.cs

@@ -4 +4 @@
 namespace HeuristicLab.Persistence.Default.Xml.Compact {
 
-  public abstract class IntArray2XmlFormatterBase<T> : NumberArray2XmlFormatterBase<T> {
+  public abstract class IntArray2XmlFormatterBase<T> : NumberArray2XmlFormatterBase<T> where T : class{
 
     protected override string FormatValue(object o) {

trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Compact/NumberArray2XmlFormatterBase.cs

@@ -6 +6 @@
 namespace HeuristicLab.Persistence.Default.Xml.Compact {
 
-  public abstract class NumberArray2XmlFormatterBase<T> : FormatterBase<T, XmlString> {
+  public abstract class NumberArray2XmlFormatterBase<T> : FormatterBase<T, XmlString> where T : class {
 
     protected virtual string Separator { get { return ";"; } }
@@ -12 +12 @@
     protected abstract object ParseValue(string o);
 
-    public override XmlString Format(T t) {
-      object o = (object)t;
-      Array a = (Array)o;
+    public override XmlString Format(T t) {      
+      Array a = (Array)(object)t;
       int[] lengths = new int[a.Rank];
       int[] lowerBounds = new int[a.Rank];
@@ -75 +74 @@
           }
         }
-      }
-      object o = a;
-      return (T)o;
+      }      
+      return (T)(object)a;
     }
   }

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

@@ -10 +10 @@
 using HeuristicLab.Persistence.Core.Tokens;
 
-namespace HeuristicLab.Persistence.Default.Xml {
-
-  struct XmlStrings {
-    public const string PRIMITIVE = "PRIMITVE";
-    public const string COMPOSITE = "COMPOSITE";
-    public const string REFERENCE = "REFERENCE";
-    public const string NULL = "NULL";
-    public const string TYPECACHE = "TYPECACHE";
-    public const string TYPE = "TYPE";
-    public const string METAINFO = "METAINFO";
-  }
+namespace HeuristicLab.Persistence.Default.Xml {  
 
   public class XmlGenerator : GeneratorBase<string> {
@@ -116 +106 @@
     protected override string Format(BeginToken beginToken) {
       return CreateNodeStart(
-        XmlStrings.COMPOSITE,
+        XmlStringConstants.COMPOSITE,
         new Dictionary<string, object> {
           {"name", beginToken.Name},
@@ -124 +114 @@
 
     protected override string Format(EndToken endToken) {
-      return CreateNodeEnd(XmlStrings.COMPOSITE);
+      return CreateNodeEnd(XmlStringConstants.COMPOSITE);
     }
 
     protected override string Format(PrimitiveToken dataToken) {
-      return CreateNode(XmlStrings.PRIMITIVE,
+      return CreateNode(XmlStringConstants.PRIMITIVE,
         new Dictionary<string, object> {
             {"typeId", dataToken.TypeId},
@@ -137 +127 @@
 
     protected override string Format(ReferenceToken refToken) {
-      return CreateNode(XmlStrings.REFERENCE,
+      return CreateNode(XmlStringConstants.REFERENCE,
         new Dictionary<string, object> {
           {"ref", refToken.Id},
@@ -144 +134 @@
 
     protected override string Format(NullReferenceToken nullRefToken) {
-      return CreateNode(XmlStrings.NULL,
+      return CreateNode(XmlStringConstants.NULL,
         new Dictionary<string, object>{
           {"name", nullRefToken.Name}});
@@ -150 +140 @@
 
     protected override string Format(MetaInfoBeginToken metaInfoBeginToken) {
-      return CreateNodeStart(XmlStrings.METAINFO);
+      return CreateNodeStart(XmlStringConstants.METAINFO);
     }
 
     protected override string Format(MetaInfoEndToken metaInfoEndToken) {
-      return CreateNodeEnd(XmlStrings.METAINFO);
+      return CreateNodeEnd(XmlStringConstants.METAINFO);
     }
 
     public IEnumerable<string> Format(List<TypeMapping> typeCache) {
-      yield return CreateNodeStart(XmlStrings.TYPECACHE);
+      yield return CreateNodeStart(XmlStringConstants.TYPECACHE);
       foreach (var mapping in typeCache)
         yield return CreateNode(
-          XmlStrings.TYPE,
+          XmlStringConstants.TYPE,
           mapping.GetDict());
-      yield return CreateNodeEnd(XmlStrings.TYPECACHE);
+      yield return CreateNodeEnd(XmlStringConstants.TYPECACHE);
     }
 

trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/XmlParser.cs

@@ -25 +25 @@
       reader = XmlReader.Create(input, settings);
       handlers = new Dictionary<string, Handler> {
-                     {XmlStrings.PRIMITIVE, ParsePrimitive},
-                     {XmlStrings.COMPOSITE, ParseComposite},
-                     {XmlStrings.REFERENCE, ParseReference},
-                     {XmlStrings.NULL, ParseNull},
-                     {XmlStrings.METAINFO, ParseMetaInfo},
+                     {XmlStringConstants.PRIMITIVE, ParsePrimitive},
+                     {XmlStringConstants.COMPOSITE, ParseComposite},
+                     {XmlStringConstants.REFERENCE, ParseReference},
+                     {XmlStringConstants.NULL, ParseNull},
+                     {XmlStringConstants.METAINFO, ParseMetaInfo},
                    };
     }
@@ -105 +105 @@
       XmlReader xmlReader = XmlReader.Create(reader);
       while (xmlReader.Read()) {
-        if (xmlReader.Name == XmlStrings.TYPE) {
+        if (xmlReader.Name == XmlStringConstants.TYPE) {
           typeCache.Add(new TypeMapping(
             int.Parse(xmlReader.GetAttribute("id")),