Changeset 1659

Timestamp:

04/24/09 15:18:45 (16 years ago)

Author:

epitzer

Message:

Add missing attributes and create type hierarchy for formatters. (#548)

Location:

trunk/sources/HeuristicLab.Persistence/3.3

Files:

• Core/PersistenceException.cs (modified) (1 diff)
• Default/DebugString/DebugString.cs (modified) (1 diff)
• Default/DebugString/DebugStringFormat.cs (modified) (1 diff)
• Default/DebugString/Formatters/Bool2DebugStringFormatter.cs (modified) (1 diff)
• Default/DebugString/Formatters/Byte2DebugStringFormatter.cs (modified) (1 diff)
• Default/DebugString/Formatters/Char2DebugStringFormatter.cs (modified) (1 diff)
• Default/DebugString/Formatters/DateTime2DebugStringFormatter.cs (modified) (1 diff)
• Default/DebugString/Formatters/Doubld2DebugStringFormatter.cs (modified) (1 diff)
• Default/DebugString/Formatters/Float2DebugStringFormatter.cs (modified) (1 diff)
• Default/DebugString/Formatters/Int2DebugStringFormatter.cs (modified) (1 diff)
• Default/DebugString/Formatters/Long2DebugStringFormatter.cs (modified) (1 diff)
• Default/DebugString/Formatters/SByte2DebugStringFormatter.cs (modified) (1 diff)
• Default/DebugString/Formatters/Short2DebugStringFormatter.cs (modified) (1 diff)
• Default/DebugString/Formatters/String2DebugStringFormatter.cs (modified) (1 diff)
• Default/DebugString/Formatters/Type2DebugStringFormatter.cs (modified) (1 diff)
• Default/DebugString/Formatters/UInt2DebugStringFormatter.cs (modified) (1 diff)
• Default/DebugString/Formatters/ULong2DebugStringFormatter.cs (modified) (1 diff)
• Default/DebugString/Formatters/UShort2DebugStringFormatter.cs (modified) (1 diff)
• Default/DebugString/Formatters/ValueType2DebugStringFormatterBase.cs (modified) (1 diff)
• Default/Xml/Compact/CompactXmlFormatterBase.cs (added)
• Default/Xml/Compact/NumberArray2XmlFormatterBase.cs (modified) (1 diff)
• Default/Xml/Compact/NumberEnumeration2XmlFormatterBase.cs (modified) (1 diff)
• Default/Xml/Primitive/DateTime2XmlFormatter.cs (modified) (1 diff)
• Default/Xml/Primitive/DecimalNumber2XmlFormatterBase.cs (modified) (1 diff)
• Default/Xml/Primitive/PrimitiveXmlFormatterBase.cs (added)
• Default/Xml/Primitive/SByte2XmlFormatter.cs (modified) (1 diff)
• Default/Xml/Primitive/SimpleNumber2XmlFormatterBase.cs (modified) (1 diff)
• Default/Xml/Primitive/String2XmlFormatter.cs (modified) (1 diff)
• Default/Xml/XmlFormatterBase.cs (added)
• HeuristicLab.Persistence-3.3.csproj (modified) (1 diff)

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

@@ -3 +3 @@
 using HeuristicLab.Persistence.Interfaces;
 using HeuristicLab.Persistence.Core.Tokens;
+using HeuristicLab.Persistence.Default.Decomposers.Storable;
 
 namespace HeuristicLab.Persistence.Core {
 
+  [Serializable]  
   public class PersistenceException : Exception {
     public PersistenceException() : base() { }

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

@@ -6 +6 @@
 using HeuristicLab.Persistence.Core;
 using HeuristicLab.Persistence.Core.Tokens;
+using HeuristicLab.Persistence.Default.Decomposers.Storable;
 
 namespace HeuristicLab.Persistence.Default.DebugString {
+  
+  public class DebugString : ISerialData {
 
-  public class DebugString : ISerialData {
+    [Storable]
     public string Data { get; set; }
+
     public DebugString(string s) {
       Data = s;
     }
+
   }
 

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

@@ -6 +6 @@
 using HeuristicLab.Persistence.Core;
 using HeuristicLab.Persistence.Core.Tokens;
+using HeuristicLab.Persistence.Default.Decomposers.Storable;
 
 namespace HeuristicLab.Persistence.Default.DebugString {
 
+  [EmptyStorableClass]
   public class DebugStringFormat : FormatBase<DebugString> {
-    public override string Name { get { return "ViewOnly"; } }
+    public override string Name { get { return "DebugString"; } }
   }
 

trunk/sources/HeuristicLab.Persistence/3.3/Default/DebugString/Formatters/Bool2DebugStringFormatter.cs

@@ -11 +11 @@
 
   [EmptyStorableClass]
-  public class Bool2DebugStringFormatter : ValueType2DebugStringFormatterBase<bool> { }
+  public class Bool2DebugStringFormatter : DebugStringFormatterBase<bool> { }
 
 }

trunk/sources/HeuristicLab.Persistence/3.3/Default/DebugString/Formatters/Byte2DebugStringFormatter.cs

@@ -11 +11 @@
 
   [EmptyStorableClass]
-  public class Byte2DebugStringFormatter : ValueType2DebugStringFormatterBase<byte> { }
+  public class Byte2DebugStringFormatter : DebugStringFormatterBase<byte> { }
 
 }

trunk/sources/HeuristicLab.Persistence/3.3/Default/DebugString/Formatters/Char2DebugStringFormatter.cs

@@ -11 +11 @@
 
   [EmptyStorableClass]
-  public class Char2DebugStringFormatter : ValueType2DebugStringFormatterBase<char> { }
+  public class Char2DebugStringFormatter : DebugStringFormatterBase<char> { }
 
 }

trunk/sources/HeuristicLab.Persistence/3.3/Default/DebugString/Formatters/DateTime2DebugStringFormatter.cs

@@ -11 +11 @@
 
   [EmptyStorableClass]
-  public class DateTime2DebugStringFormatter : ValueType2DebugStringFormatterBase<DateTime> { }
+  public class DateTime2DebugStringFormatter : DebugStringFormatterBase<DateTime> { }
 
 }

trunk/sources/HeuristicLab.Persistence/3.3/Default/DebugString/Formatters/Doubld2DebugStringFormatter.cs

@@ -11 +11 @@
 
   [EmptyStorableClass]
-  public class Double2DebugStringFormatter : ValueType2DebugStringFormatterBase<double> { }
+  public class Double2DebugStringFormatter : DebugStringFormatterBase<double> { }
 
 }

trunk/sources/HeuristicLab.Persistence/3.3/Default/DebugString/Formatters/Float2DebugStringFormatter.cs

@@ -11 +11 @@
 
   [EmptyStorableClass]
-  public class Float2DebugStringFormatter : ValueType2DebugStringFormatterBase<float> { }
+  public class Float2DebugStringFormatter : DebugStringFormatterBase<float> { }
 
 }

trunk/sources/HeuristicLab.Persistence/3.3/Default/DebugString/Formatters/Int2DebugStringFormatter.cs

@@ -11 +11 @@
 
   [EmptyStorableClass]
-  public class Int2DebugStringFormatter : ValueType2DebugStringFormatterBase<int> { }
+  public class Int2DebugStringFormatter : DebugStringFormatterBase<int> { }
 
 }

trunk/sources/HeuristicLab.Persistence/3.3/Default/DebugString/Formatters/Long2DebugStringFormatter.cs

@@ -11 +11 @@
 
   [EmptyStorableClass]
-  public class Long2DebugStringFormatter : ValueType2DebugStringFormatterBase<long> { }
+  public class Long2DebugStringFormatter : DebugStringFormatterBase<long> { }
 
 }

trunk/sources/HeuristicLab.Persistence/3.3/Default/DebugString/Formatters/SByte2DebugStringFormatter.cs

@@ -11 +11 @@
 
   [EmptyStorableClass]
-  public class SByte2DebugStringFormatter : ValueType2DebugStringFormatterBase<sbyte> { }
+  public class SByte2DebugStringFormatter : DebugStringFormatterBase<sbyte> { }
 
 }

trunk/sources/HeuristicLab.Persistence/3.3/Default/DebugString/Formatters/Short2DebugStringFormatter.cs

@@ -11 +11 @@
 
   [EmptyStorableClass]
-  public class Short2DebugStringFormatter : ValueType2DebugStringFormatterBase<short> { }
+  public class Short2DebugStringFormatter : DebugStringFormatterBase<short> { }
 
 }

trunk/sources/HeuristicLab.Persistence/3.3/Default/DebugString/Formatters/String2DebugStringFormatter.cs

@@ -11 +11 @@
 
   [EmptyStorableClass]
-  public class String2DebugStringFormatter : ValueType2DebugStringFormatterBase<string> { }
+  public class String2DebugStringFormatter : DebugStringFormatterBase<string> { }
 
 }

trunk/sources/HeuristicLab.Persistence/3.3/Default/DebugString/Formatters/Type2DebugStringFormatter.cs

@@ -11 +11 @@
 
   [EmptyStorableClass]
-  public class Type2DebugStringFormatter : ValueType2DebugStringFormatterBase<Type> { }
+  public class Type2DebugStringFormatter : DebugStringFormatterBase<Type> { }
 
 }

trunk/sources/HeuristicLab.Persistence/3.3/Default/DebugString/Formatters/UInt2DebugStringFormatter.cs

@@ -11 +11 @@
 
   [EmptyStorableClass]
-  public class UInt2DebugStringFormatter : ValueType2DebugStringFormatterBase<uint> { }
+  public class UInt2DebugStringFormatter : DebugStringFormatterBase<uint> { }
 
 }

trunk/sources/HeuristicLab.Persistence/3.3/Default/DebugString/Formatters/ULong2DebugStringFormatter.cs

@@ -11 +11 @@
 
   [EmptyStorableClass]
-  public class ULong2DebugStringFormatter : ValueType2DebugStringFormatterBase<ulong> { }
+  public class ULong2DebugStringFormatter : DebugStringFormatterBase<ulong> { }
 
 }

trunk/sources/HeuristicLab.Persistence/3.3/Default/DebugString/Formatters/UShort2DebugStringFormatter.cs

@@ -11 +11 @@
 
   [EmptyStorableClass]
-  public class UShort2DebugStringFormatter : ValueType2DebugStringFormatterBase<ushort> { }
+  public class UShort2DebugStringFormatter : DebugStringFormatterBase<ushort> { }
 
 }

trunk/sources/HeuristicLab.Persistence/3.3/Default/DebugString/Formatters/ValueType2DebugStringFormatterBase.cs

@@ -9 +9 @@
 namespace HeuristicLab.Persistence.Default.DebugString.Formatters {
 
-  public abstract class ValueType2DebugStringFormatterBase<T> : FormatterBase<T, DebugString> {
+  public abstract class DebugStringFormatterBase<T> : FormatterBase<T, DebugString> {
     public override DebugString Format(T o) { return new DebugString(o.ToString()); }
     public override T Parse(DebugString s) {

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

@@ -7 +7 @@
 namespace HeuristicLab.Persistence.Default.Xml.Compact {
 
-  public abstract class NumberArray2XmlFormatterBase<T> : FormatterBase<T, XmlString> where T : class {
+  public abstract class NumberArray2XmlFormatterBase<T> : CompactXmlFormatterBase<T> where T : class {
 
     protected virtual string Separator { get { return ";"; } }

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

@@ -7 +7 @@
 namespace HeuristicLab.Persistence.Default.Xml.Compact {
 
-  public abstract class NumberEnumeration2XmlFormatterBase<T> : FormatterBase<T, XmlString> where T : IEnumerable {
+  public abstract class NumberEnumeration2XmlFormatterBase<T> : CompactXmlFormatterBase<T> where T : IEnumerable {
 
     protected virtual string Separator { get { return ";"; } }

trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Primitive/DateTime2XmlFormatter.cs

@@ -7 +7 @@
 
   [EmptyStorableClass]
-  public class DateTime2XmlFormatter : FormatterBase<DateTime, XmlString> {
+  public class DateTime2XmlFormatter : PrimitiveXmlFormatterBase<DateTime> {
 
     public override XmlString Format(DateTime dt) {

trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Primitive/DecimalNumber2XmlFormatterBase.cs

@@ -7 +7 @@
 namespace HeuristicLab.Persistence.Default.Xml.Primitive {
 
-  public abstract class DecimalNumber2XmlFormatterBase<T> : FormatterBase<T, XmlString> {
+  public abstract class DecimalNumber2XmlFormatterBase<T> : PrimitiveXmlFormatterBase<T> {
 
     private static MethodInfo ToStringMethod = typeof(T)

trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Primitive/SByte2XmlFormatter.cs

@@ -9 +9 @@
 
   [EmptyStorableClass]
-  public class Sbyte2XmlFormatter : SimpleNumber2XmlFormatterBase<sbyte> { }
+  public class SByte2XmlFormatter : SimpleNumber2XmlFormatterBase<sbyte> { }
 
 }

trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Primitive/SimpleNumber2XmlFormatterBase.cs

@@ -7 +7 @@
 namespace HeuristicLab.Persistence.Default.Xml.Primitive {
 
-  public abstract class SimpleNumber2XmlFormatterBase<T> : FormatterBase<T, XmlString> {
+  public abstract class SimpleNumber2XmlFormatterBase<T> : PrimitiveXmlFormatterBase<T> {
 
     private static MethodInfo ParseMethod = typeof(T)

trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Primitive/String2XmlFormatter.cs

@@ -10 +10 @@
 
   [EmptyStorableClass]
-  public class String2XmlFormatter : FormatterBase<string, XmlString> {
+  public class String2XmlFormatter : PrimitiveXmlFormatterBase<string> {
 
     public override XmlString Format(string s) {

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

@@ -138 +138 @@
     <Compile Include="Default\Decomposers\Storable\DataMemberAccessor.cs" />
     <Compile Include="Default\Xml\Compact\IntList2XmlFormatter.cs" />
+    <Compile Include="Default\Xml\XmlFormatterBase.cs" />
+    <Compile Include="Default\Xml\Primitive\PrimitiveXmlFormatterBase.cs" />
+    <Compile Include="Default\Xml\Compact\CompactXmlFormatterBase.cs" />
     <Compile Include="Default\Xml\Primitive\Char2XmlFormatter.cs" />
     <Compile Include="Default\Xml\XmlStringConstants.cs" />