Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
05/15/09 12:29:13 (15 years ago)
Author:
epitzer
Message:

Namespace refactoring: rename formatters & decomposers -> primitive and composite serializers. (#603)

Location:
trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml
Files:
5 edited
27 moved

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Compact/CompactXmlSerializerBase.cs

    r1805 r1823  
    11using HeuristicLab.Persistence.Interfaces;
    22using HeuristicLab.Persistence.Core;
    3 using HeuristicLab.Persistence.Default.Decomposers.Storable;
     3using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    44
    55namespace HeuristicLab.Persistence.Default.Xml.Compact {
    66
    7   public abstract class CompactXmlFormatterBase<T> : XmlFormatterBase<T> { }
     7  public abstract class CompactXmlSerializerBase<T> : XmlSerializerBase<T> { }
    88
    99}

  • trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Compact/DoubleArray2XmlSerializer.cs

    r1805 r1823  
    22using HeuristicLab.Persistence.Core;
    33using System.Globalization;
    4 using HeuristicLab.Persistence.Default.Decomposers.Storable;
     4using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    55
    66namespace HeuristicLab.Persistence.Default.Xml.Compact {
    77
    8   public abstract class DoubleArray2XmlFormatterBase<T> : NumberArray2XmlFormatterBase<T> where T : class{
     8  public abstract class DoubleArray2XmlSerializerBase<T> : NumberArray2XmlSerializerBase<T> where T : class{
    99
    1010    protected override string FormatValue(object o) {
    … …  
    1818
    1919  [EmptyStorableClass]
    20   public class Double1DArray2XmlFormatter : DoubleArray2XmlFormatterBase<double[]> { }
     20  public class Double1DArray2XmlSerializer : DoubleArray2XmlSerializerBase<double[]> { }
    2121
    2222
    2323  [EmptyStorableClass]
    24   public class Double2DArray2XmlFormatter : DoubleArray2XmlFormatterBase<double[,]> { }
     24  public class Double2DArray2XmlSerializer : DoubleArray2XmlSerializerBase<double[,]> { }
    2525
    2626  [EmptyStorableClass]
    27   public class Double3DArray2XmlFormatter : DoubleArray2XmlFormatterBase<double[, ,]> { }
     27  public class Double3DArray2XmlSerializer : DoubleArray2XmlSerializerBase<double[, ,]> { }
    2828
    2929}

  • trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Compact/DoubleList2XmlSerializer.cs

    r1805 r1823  
    44using HeuristicLab.Persistence.Core;
    55using System.Globalization;
    6 using HeuristicLab.Persistence.Default.Decomposers.Storable;
     6using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    77
    88namespace HeuristicLab.Persistence.Default.Xml.Compact {
    99
    1010  [EmptyStorableClass]
    11   public class DoubleList2XmlFormatter : NumberEnumeration2XmlFormatterBase<List<double>> {
     11  public class DoubleList2XmlSerializer : NumberEnumeration2XmlSerializerBase<List<double>> {
    1212
    1313    protected override void Add(IEnumerable enumeration, object o) {

  • trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Compact/IntArray2XmlSerializer.cs

    r1805 r1823  
    11using System;
    22using HeuristicLab.Persistence.Core;
    3 using HeuristicLab.Persistence.Default.Decomposers.Storable;
     3using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    44
    55namespace HeuristicLab.Persistence.Default.Xml.Compact {
    66
    7   public abstract class IntArray2XmlFormatterBase<T> : NumberArray2XmlFormatterBase<T> where T : class{
     7  public abstract class IntArray2XmlSerializerBase<T> : NumberArray2XmlSerializerBase<T> where T : class{
    88
    99    protected override string FormatValue(object o) {
    … …  
    1717
    1818  [EmptyStorableClass]
    19   public class Int1DArray2XmlFormatter : IntArray2XmlFormatterBase<int[]> { }
     19  public class Int1DArray2XmlSerializer : IntArray2XmlSerializerBase<int[]> { }
    2020
    2121  [EmptyStorableClass]
    22   public class Int2DArray2XmlFormatter : IntArray2XmlFormatterBase<int[,]> { }
     22  public class Int2DArray2XmlSerializer : IntArray2XmlSerializerBase<int[,]> { }
    2323
    2424  [EmptyStorableClass]
    25   public class Int3DArray2XmlFormatter : IntArray2XmlFormatterBase<int[, ,]> { }
     25  public class Int3DArray2XmlSerializer : IntArray2XmlSerializerBase<int[, ,]> { }
    2626
    2727}

  • trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Compact/IntList2XmlSerializer.cs

    r1805 r1823  
    33using System;
    44using HeuristicLab.Persistence.Core;
    5 using HeuristicLab.Persistence.Default.Decomposers.Storable;
     5using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    66
    77namespace HeuristicLab.Persistence.Default.Xml.Compact {
    88
    99  [EmptyStorableClass]
    10   public class IntList2XmlFormatter : NumberEnumeration2XmlFormatterBase<List<int>> {
     10  public class IntList2XmlSerializer : NumberEnumeration2XmlSerializerBase<List<int>> {
    1111
    1212    protected override void Add(IEnumerable enumeration, object o) {

  • trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Compact/NumberArray2XmlSerializerBase.cs

    r1805 r1823  
    77namespace HeuristicLab.Persistence.Default.Xml.Compact {
    88
    9   public abstract class NumberArray2XmlFormatterBase<T> : CompactXmlFormatterBase<T> where T : class {
     9  public abstract class NumberArray2XmlSerializerBase<T> : CompactXmlSerializerBase<T> where T : class {
    1010
    1111    protected virtual string Separator { get { return ";"; } }

  • trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Compact/NumberEnumeration2XmlSerializerBase.cs

    r1805 r1823  
    77namespace HeuristicLab.Persistence.Default.Xml.Compact {
    88
    9   public abstract class NumberEnumeration2XmlFormatterBase<T> : CompactXmlFormatterBase<T> where T : IEnumerable {
     9  public abstract class NumberEnumeration2XmlSerializerBase<T> : CompactXmlSerializerBase<T> where T : IEnumerable {
    1010
    1111    protected virtual string Separator { get { return ";"; } }

  • trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Primitive/Bool2XmlSerializer.cs

    r1805 r1823  
    44using System.Reflection;
    55using System.Globalization;
    6 using HeuristicLab.Persistence.Default.Decomposers.Storable;
     6using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    77
    88namespace HeuristicLab.Persistence.Default.Xml.Primitive {
    99
    1010  [EmptyStorableClass]
    11   public class Bool2XmlFormatter : SimpleNumber2XmlFormatterBase<bool> { }
     11  public class Bool2XmlSerializer : SimpleNumber2XmlSerializerBase<bool> { }
    1212
    1313}

  • trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Primitive/Byte2XmlSerializer.cs

    r1805 r1823  
    44using System.Reflection;
    55using System.Globalization;
    6 using HeuristicLab.Persistence.Default.Decomposers.Storable;
     6using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    77
    88namespace HeuristicLab.Persistence.Default.Xml.Primitive {
    99
    1010  [EmptyStorableClass]
    11   public class Byte2XmlFormatter : SimpleNumber2XmlFormatterBase<byte> { }
     11  public class Byte2XmlSerializer : SimpleNumber2XmlSerializerBase<byte> { }
    1212
    1313}

  • trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Primitive/Char2XmlFormatter.cs

    r1652 r1823  
    44using System.Reflection;
    55using System.Globalization;
    6 using HeuristicLab.Persistence.Default.Decomposers.Storable;
     6using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    77
    88namespace HeuristicLab.Persistence.Default.Xml.Primitive {
    99
    1010  [EmptyStorableClass]
    11   public class Char2XmlFormatter : FormatterBase<char, XmlString> { 
     11  public class Char2XmlSerializer : PrimitiveSerializerBase<char, XmlString> { 
    1212   
    1313    public override XmlString Format(char c) {

  • trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Primitive/DateTime2XmlSerializer.cs

    r1805 r1823  
    22using HeuristicLab.Persistence.Core;
    33using HeuristicLab.Persistence.Interfaces;
    4 using HeuristicLab.Persistence.Default.Decomposers.Storable;
     4using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    55
    66namespace HeuristicLab.Persistence.Default.Xml.Primitive {
    77
    88  [EmptyStorableClass]
    9   public class DateTime2XmlFormatter : PrimitiveXmlFormatterBase<DateTime> {
     9  public class DateTime2XmlSerializer : PrimitiveXmlSerializerBase<DateTime> {
    1010
    1111    public override XmlString Format(DateTime dt) {

  • trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Primitive/Decimal2XmlSerializer.cs

    r1805 r1823  
    44using System.Reflection;
    55using System.Globalization;
    6 using HeuristicLab.Persistence.Default.Decomposers.Storable;
     6using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    77
    88namespace HeuristicLab.Persistence.Default.Xml.Primitive {
    99
    1010  [EmptyStorableClass]
    11   public class Decimal2XmlFormatter : DecimalNumber2XmlFormatterBase<decimal> { }
     11  public class Decimal2XmlSerializer : DecimalNumber2XmlSerializerBase<decimal> { }
    1212
    1313}

  • trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Primitive/DecimalNumber2XmlSerializerBase.cs

    r1805 r1823  
    77namespace HeuristicLab.Persistence.Default.Xml.Primitive {
    88
    9   public abstract class DecimalNumber2XmlFormatterBase<T> : PrimitiveXmlFormatterBase<T> {
     9  public abstract class DecimalNumber2XmlSerializerBase<T> : PrimitiveXmlSerializerBase<T> {
    1010
    1111    private static MethodInfo ToStringMethod = typeof(T)

  • trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Primitive/Double2XmlSerializer.cs

    r1805 r1823  
    44using System.Reflection;
    55using System.Globalization;
    6 using HeuristicLab.Persistence.Default.Decomposers.Storable;
     6using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    77
    88namespace HeuristicLab.Persistence.Default.Xml.Primitive {
    99
    1010  [EmptyStorableClass]
    11   public class Double2XmlFormatter : DecimalNumber2XmlFormatterBase<double> { }
     11  public class Double2XmlSerializer : DecimalNumber2XmlSerializerBase<double> { }
    1212
    1313}

  • trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Primitive/Float2XmlSerializer.cs

    r1805 r1823  
    44using System.Reflection;
    55using System.Globalization;
    6 using HeuristicLab.Persistence.Default.Decomposers.Storable;
     6using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    77
    88namespace HeuristicLab.Persistence.Default.Xml.Primitive {
    99
    1010  [EmptyStorableClass]
    11   public class Float2XmlFormatter : DecimalNumber2XmlFormatterBase<float> { }
     11  public class Float2XmlSerializer : DecimalNumber2XmlSerializerBase<float> { }
    1212
    1313}

  • trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Primitive/Guid2XmlSerializer.cs

    r1805 r1823  
    44using System.Text;
    55using System.Text.RegularExpressions;
    6 using HeuristicLab.Persistence.Default.Decomposers.Storable;
     6using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    77using System.Globalization;
    88
    … …  
    1111 
    1212  [EmptyStorableClass]
    13   public class Guid2XmlFormatter : PrimitiveXmlFormatterBase<Guid> {
     13  public class Guid2XmlSerializer : PrimitiveXmlSerializerBase<Guid> {
    1414
    1515    public override XmlString Format(Guid o) {

  • trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Primitive/Int2XmlSerializer.cs

    r1805 r1823  
    44using System.Reflection;
    55using System.Globalization;
    6 using HeuristicLab.Persistence.Default.Decomposers.Storable;
     6using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    77
    88namespace HeuristicLab.Persistence.Default.Xml.Primitive {
    99
    1010  [EmptyStorableClass]
    11   public class Int2XmlFormatter : SimpleNumber2XmlFormatterBase<int> { }
     11  public class Int2XmlSerializer : SimpleNumber2XmlSerializerBase<int> { }
    1212
    1313}

  • trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Primitive/Long2XmlSerializer.cs

    r1805 r1823  
    44using System.Reflection;
    55using System.Globalization;
    6 using HeuristicLab.Persistence.Default.Decomposers.Storable;
     6using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    77
    88namespace HeuristicLab.Persistence.Default.Xml.Primitive {
    99
    1010  [EmptyStorableClass]
    11   public class Long2XmlFormatter : SimpleNumber2XmlFormatterBase<long> { }
     11  public class Long2XmlSerializer : SimpleNumber2XmlSerializerBase<long> { }
    1212
    1313}

  • trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Primitive/PrimitiveXmlSerializerBase.cs

    r1805 r1823  
    11using HeuristicLab.Persistence.Interfaces;
    22using HeuristicLab.Persistence.Core;
    3 using HeuristicLab.Persistence.Default.Decomposers.Storable;
     3using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    44
    55namespace HeuristicLab.Persistence.Default.Xml.Primitive {
    66
    7   public abstract class PrimitiveXmlFormatterBase<T> : XmlFormatterBase<T> { }
     7  public abstract class PrimitiveXmlSerializerBase<T> : XmlSerializerBase<T> { }
    88
    99}

  • trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Primitive/SByte2XmlSerializer.cs

    r1805 r1823  
    44using System.Reflection;
    55using System.Globalization;
    6 using HeuristicLab.Persistence.Default.Decomposers.Storable;
     6using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    77
    88namespace HeuristicLab.Persistence.Default.Xml.Primitive {
    99
    1010  [EmptyStorableClass]
    11   public class SByte2XmlFormatter : SimpleNumber2XmlFormatterBase<sbyte> { }
     11  public class SByte2XmlSerializer : SimpleNumber2XmlSerializerBase<sbyte> { }
    1212
    1313}

  • trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Primitive/Short2XmlSerializer.cs

    r1805 r1823  
    44using System.Reflection;
    55using System.Globalization;
    6 using HeuristicLab.Persistence.Default.Decomposers.Storable;
     6using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    77
    88namespace HeuristicLab.Persistence.Default.Xml.Primitive {
    99
    1010  [EmptyStorableClass]
    11   public class Short2XmlFormatter : SimpleNumber2XmlFormatterBase<short> { }
     11  public class Short2XmlSerializer : SimpleNumber2XmlSerializerBase<short> { }
    1212
    1313}

  • trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Primitive/SimpleNumber2XmlSerializerBase.cs

    r1805 r1823  
    77namespace HeuristicLab.Persistence.Default.Xml.Primitive {
    88
    9   public abstract class SimpleNumber2XmlFormatterBase<T> : PrimitiveXmlFormatterBase<T> {
     9  public abstract class SimpleNumber2XmlSerializerBase<T> : PrimitiveXmlSerializerBase<T> {
    1010
    1111    private static MethodInfo ParseMethod = typeof(T)

  • trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Primitive/String2XmlSerializer.cs

    r1805 r1823  
    44using System.Text;
    55using System.Text.RegularExpressions;
    6 using HeuristicLab.Persistence.Default.Decomposers.Storable;
     6using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    77using System.Globalization;
    88
    … …  
    1111
    1212  [EmptyStorableClass]
    13   public class String2XmlFormatter : PrimitiveXmlFormatterBase<string> {
     13  public class String2XmlSerializer : PrimitiveXmlSerializerBase<string> {
    1414
    1515    public override XmlString Format(string s) {

  • trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Primitive/TimeSpan2XmlSerializer.cs

    r1805 r1823  
    44using System.Text;
    55using System.Text.RegularExpressions;
    6 using HeuristicLab.Persistence.Default.Decomposers.Storable;
     6using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    77using System.Globalization;
    88
    … …  
    1111
    1212  [EmptyStorableClass]
    13   public class TimeSpan2XmlFormatter : PrimitiveXmlFormatterBase<TimeSpan> {
     13  public class TimeSpan2XmlSerializer : PrimitiveXmlSerializerBase<TimeSpan> {
    1414
    1515    public override XmlString Format(TimeSpan o) {

  • trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Primitive/UInt2XmlSerializer.cs

    r1805 r1823  
    44using System.Reflection;
    55using System.Globalization;
    6 using HeuristicLab.Persistence.Default.Decomposers.Storable;
     6using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    77
    88namespace HeuristicLab.Persistence.Default.Xml.Primitive {
    99
    1010  [EmptyStorableClass]
    11   public class UInt2XmlFormatter : SimpleNumber2XmlFormatterBase<uint> { }
     11  public class UInt2XmlSerializer : SimpleNumber2XmlSerializerBase<uint> { }
    1212
    1313}

  • trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Primitive/ULong2XmlSerializer.cs

    r1805 r1823  
    44using System.Reflection;
    55using System.Globalization;
    6 using HeuristicLab.Persistence.Default.Decomposers.Storable;
     6using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    77
    88namespace HeuristicLab.Persistence.Default.Xml.Primitive {
    99
    1010  [EmptyStorableClass]
    11   public class ULong2XmlFormatter : SimpleNumber2XmlFormatterBase<ulong> { }
     11  public class ULong2XmlSerializer : SimpleNumber2XmlSerializerBase<ulong> { }
    1212
    1313}

  • trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Primitive/UShort2XmlSerializer.cs

    r1805 r1823  
    44using System.Reflection;
    55using System.Globalization;
    6 using HeuristicLab.Persistence.Default.Decomposers.Storable;
     6using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    77
    88namespace HeuristicLab.Persistence.Default.Xml.Primitive {
    99
    1010  [EmptyStorableClass]
    11   public class UShort2XmlFormatter : SimpleNumber2XmlFormatterBase<ushort> { }
     11  public class UShort2XmlSerializer : SimpleNumber2XmlSerializerBase<ushort> { }
    1212
    1313}

  • trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/XmlFormat.cs

    r1623 r1823  
    11using HeuristicLab.Persistence.Interfaces;
    22using HeuristicLab.Persistence.Core;
    3 using HeuristicLab.Persistence.Default.Decomposers.Storable;
     3using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    44
    55namespace HeuristicLab.Persistence.Default.Xml {

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

    r1797 r1823  
    170170        File.Copy(tempfile, filename, true);
    171171        File.Delete(tempfile);
    172       } catch (Exception x) {
     172      } catch (Exception) {
    173173        Logger.Warn("Exception caught, no data has been written.");
    174174        throw;
    … …  
    222222          }
    223223        }
    224       } catch (PersistenceException e) {
     224      } catch (PersistenceException) {
    225225        throw;
    226226      } catch (Exception e) {

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

    r1779 r1823  
    115115        }
    116116        return typeCache;
    117       } catch (PersistenceException e) {
     117      } catch (PersistenceException) {
    118118        throw;
    119119      } catch (Exception e) {

  • trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/XmlSerializerBase.cs

    r1805 r1823  
    11using HeuristicLab.Persistence.Interfaces;
    22using HeuristicLab.Persistence.Core;
    3 using HeuristicLab.Persistence.Default.Decomposers.Storable;
     3using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    44
    55namespace HeuristicLab.Persistence.Default.Xml {
    66 
    7   public abstract class XmlFormatterBase<T> : FormatterBase<T, XmlString> { }
     7  public abstract class XmlSerializerBase<T> : PrimitiveSerializerBase<T, XmlString> { }
    88
    99}

  • trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/XmlString.cs

    r1623 r1823  
    22using HeuristicLab.Persistence.Core;
    33using System.Text;
    4 using HeuristicLab.Persistence.Default.Decomposers.Storable;
     4using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    55
    66namespace HeuristicLab.Persistence.Default.Xml {
Note: See TracChangeset for help on using the changeset viewer.