Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
12/28/18 16:10:48 (6 years ago)
Author:
jkarder
Message:

#2520: worked on reintegration of new persistence

  • added nuget references to HEAL.Fossil
  • added StorableType attributes to many classes
  • changed signature of StorableConstructors
  • removed some classes in old persistence
  • removed some unnecessary usings
Location:
branches/2520_PersistenceReintegration/HeuristicLab.Persistence/3.3
Files:
1 added
6 deleted
44 edited

Legend:

Unmodified
Added
Removed

  • branches/2520_PersistenceReintegration/HeuristicLab.Persistence/3.3/Auxiliary/TypeLoader.cs

    r16453 r16462  
    2323using System.Collections.Generic;
    2424using System.Reflection;
    25 using HeuristicLab.Persistence.Core;
     25using HEAL.Fossil;
    2626using HeuristicLab.Tracing;
    2727

  • branches/2520_PersistenceReintegration/HeuristicLab.Persistence/3.3/Auxiliary/TypeName.cs

    r16453 r16462  
    2424using System.Linq;
    2525using System.Text;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727
    2828namespace HeuristicLab.Persistence.Auxiliary {
    … …  
    104104
    105105    [StorableConstructor]
    106     protected TypeName(bool deserializing) { }
     106    protected TypeName(StorableConstructorFlag _) { }
    107107    /// <summary>
    108108    /// Initializes a new instance of the <see cref="TypeName"/> class.

  • branches/2520_PersistenceReintegration/HeuristicLab.Persistence/3.3/Core/Configuration.cs

    r16453 r16462  
    2222using System;
    2323using System.Collections.Generic;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Fossil;
    2525using HeuristicLab.Persistence.Interfaces;
    2626
    … …  
    5050
    5151    [StorableConstructor]
    52     protected Configuration(bool isDeserializing) {
     52    protected Configuration(StorableConstructorFlag _) {
    5353      compositeSerializerCache = new Dictionary<Type, ICompositeSerializer>();
    54       if (isDeserializing)
    55         return;
     54    }
     55
     56    public Configuration() {
     57      compositeSerializerCache = new Dictionary<Type, ICompositeSerializer>();
    5658      primitiveSerializers = new Dictionary<Type, IPrimitiveSerializer>();
    5759      compositeSerializers = new List<ICompositeSerializer>();
    5860    }
     61
    5962
    6063    /// <summary>
    … …  
    6770        IEnumerable<IPrimitiveSerializer> primitiveSerializers,
    6871        IEnumerable<ICompositeSerializer> compositeSerializers)
    69       : this(false) {
     72      : this() {
    7073      this.Format = format;
    7174      this.compositeSerializers.AddRange(compositeSerializers);
    … …  
    131134    /// <returns>A new <see cref="Configuration"/></returns>
    132135    public Configuration Copy() {
    133       var config = new Configuration(false);
     136      var config = new Configuration();
    134137      config.Format = Format;
    135138      foreach (var ps in primitiveSerializers)

  • branches/2520_PersistenceReintegration/HeuristicLab.Persistence/3.3/Core/ConfigurationService.cs

    r16453 r16462  
    2626using System.Reflection;
    2727using System.Text;
     28using HEAL.Fossil;
    2829using HeuristicLab.Persistence.Default.Xml;
    2930using HeuristicLab.Persistence.Interfaces;

  • branches/2520_PersistenceReintegration/HeuristicLab.Persistence/3.3/Core/DataMemberAccessor.cs

    r16453 r16462  
    2323using System.Reflection;
    2424using System.Reflection.Emit;
     25using HEAL.Fossil;
    2526
    2627namespace HeuristicLab.Persistence.Core {

  • branches/2520_PersistenceReintegration/HeuristicLab.Persistence/3.3/Core/Deserializer.cs

    r16453 r16462  
    2222using System;
    2323using System.Collections.Generic;
     24using HEAL.Fossil;
    2425using HeuristicLab.Persistence.Auxiliary;
    2526using HeuristicLab.Persistence.Core.Tokens;

  • branches/2520_PersistenceReintegration/HeuristicLab.Persistence/3.3/Core/FormatBase.cs

    r16453 r16462  
    2121
    2222using System;
    23 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     23using HEAL.Fossil;
    2424
    2525namespace HeuristicLab.Persistence.Interfaces {
    … …  
    4444
    4545    [StorableConstructor]
    46     protected FormatBase(bool deserializing) { }
     46    protected FormatBase(StorableConstructorFlag _) { }
    4747    protected FormatBase() { }
    4848

  • branches/2520_PersistenceReintegration/HeuristicLab.Persistence/3.3/Core/PrimitiveSerializerBase.cs

    r16453 r16462  
    2222using System;
    2323using System.Text;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Fossil;
    2525
    2626namespace HeuristicLab.Persistence.Interfaces {

  • branches/2520_PersistenceReintegration/HeuristicLab.Persistence/3.3/Core/Serializer.cs

    r16453 r16462  
    2525using System.Reflection;
    2626using System.Text;
     27using HEAL.Fossil;
    2728using HeuristicLab.Persistence.Auxiliary;
    2829using HeuristicLab.Persistence.Core.Tokens;

  • branches/2520_PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/ArraySerializer.cs

    r16453 r16462  
    2323using System.Collections.Generic;
    2424using HeuristicLab.Persistence.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    2626using HeuristicLab.Persistence.Interfaces;
    2727
    … …  
    3232
    3333    [StorableConstructor]
    34     private ArraySerializer(bool deserializing) { }
     34    private ArraySerializer(StorableConstructorFlag _) { }
    3535    public ArraySerializer() { }
    3636

  • branches/2520_PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/CompactNumberArray2StringSerializer.cs

    r16453 r16462  
    2626using HeuristicLab.Persistence.Auxiliary;
    2727using HeuristicLab.Persistence.Core;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929using HeuristicLab.Persistence.Interfaces;
    3030
    … …  
    8282
    8383    [StorableConstructor]
    84     private CompactNumberArray2StringSerializer(bool deserializing) { }
     84    private CompactNumberArray2StringSerializer(StorableConstructorFlag _) { }
    8585    public CompactNumberArray2StringSerializer() { }
    8686

  • branches/2520_PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/ConcreteDictionarySerializer.cs

    r16453 r16462  
    2525using System.Linq;
    2626using HeuristicLab.Persistence.Core;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    2828using HeuristicLab.Persistence.Interfaces;
    2929
    … …  
    3434
    3535    [StorableConstructor]
    36     private ConcreteDictionarySerializer(bool deserializing) { }
     36    private ConcreteDictionarySerializer(StorableConstructorFlag _) { }
    3737    public ConcreteDictionarySerializer() { }
    3838

  • branches/2520_PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/DictionarySerializer.cs

    r16453 r16462  
    2525using HeuristicLab.Persistence.Auxiliary;
    2626using HeuristicLab.Persistence.Core;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    2828using HeuristicLab.Persistence.Interfaces;
    2929
    … …  
    3434
    3535    [StorableConstructor]
    36     private DictionarySerializer(bool deserializing) { }
     36    private DictionarySerializer(StorableConstructorFlag _) { }
    3737    public DictionarySerializer() { }
    3838

  • branches/2520_PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/EnumSerializer.cs

    r16453 r16462  
    2323using System.Collections.Generic;
    2424using HeuristicLab.Persistence.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    2626using HeuristicLab.Persistence.Interfaces;
    2727
    … …  
    3232
    3333    [StorableConstructor]
    34     private EnumSerializer(bool deserializing) { }
     34    private EnumSerializer(StorableConstructorFlag _) { }
    3535    public EnumSerializer() { }
    3636

  • branches/2520_PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/EnumerableSerializer.cs

    r16453 r16462  
    2626using HeuristicLab.Persistence.Auxiliary;
    2727using HeuristicLab.Persistence.Core;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929using HeuristicLab.Persistence.Interfaces;
    3030
    … …  
    3535
    3636    [StorableConstructor]
    37     private EnumerableSerializer(bool deserializing) { }
     37    private EnumerableSerializer(StorableConstructorFlag _) { }
    3838    public EnumerableSerializer() { }
    3939

  • branches/2520_PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/HashSetSerializer.cs

    r16453 r16462  
    2626using System.Reflection;
    2727using HeuristicLab.Persistence.Core;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929using HeuristicLab.Persistence.Interfaces;
    3030
    … …  
    3535
    3636    [StorableConstructor]
    37     private HashSetSerializer(bool deserializing) { }
     37    private HashSetSerializer(StorableConstructorFlag _) { }
    3838    public HashSetSerializer() { }
    3939

  • branches/2520_PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/KeyValuePairSerializer.cs

    r16453 r16462  
    2525using System.Reflection;
    2626using HeuristicLab.Persistence.Core;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    2828using HeuristicLab.Persistence.Interfaces;
    2929
    … …  
    3434
    3535    [StorableConstructor]
    36     private KeyValuePairSerializer(bool deserializing) { }
     36    private KeyValuePairSerializer(StorableConstructorFlag _) { }
    3737    public KeyValuePairSerializer() { }
    3838

  • branches/2520_PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Number2StringSerializer.cs

    r16453 r16462  
    2525using HeuristicLab.Persistence.Auxiliary;
    2626using HeuristicLab.Persistence.Core;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    2828using HeuristicLab.Persistence.Default.Xml;
    2929using HeuristicLab.Persistence.Default.Xml.Primitive;
    … …  
    4444
    4545    [StorableConstructor]
    46     private Number2StringSerializer(bool deserializing) { }
     46    private Number2StringSerializer(StorableConstructorFlag _) { }
    4747    public Number2StringSerializer() { }
    4848

  • branches/2520_PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/NumberEnumerable2StringSerializer.cs

    r16453 r16462  
    2626using HeuristicLab.Persistence.Auxiliary;
    2727using HeuristicLab.Persistence.Core;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929using HeuristicLab.Persistence.Interfaces;
    3030
    … …  
    3535
    3636    [StorableConstructor]
    37     private NumberEnumerable2StringSerializer(bool deserializing) { }
     37    private NumberEnumerable2StringSerializer(StorableConstructorFlag _) { }
    3838    public NumberEnumerable2StringSerializer() { }
    3939

  • branches/2520_PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/QueueSerializer.cs

    r16453 r16462  
    2525using System.Reflection;
    2626using HeuristicLab.Persistence.Core;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    2828using HeuristicLab.Persistence.Interfaces;
    2929
    … …  
    3434
    3535    [StorableConstructor]
    36     private QueueSerializer(bool deserializing) { }
     36    private QueueSerializer(StorableConstructorFlag _) { }
    3737    public QueueSerializer() { }
    3838

  • branches/2520_PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/StackSerializer.cs

    r16453 r16462  
    2525using System.Reflection;
    2626using HeuristicLab.Persistence.Core;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    2828using HeuristicLab.Persistence.Interfaces;
    2929
    … …  
    3434
    3535    [StorableConstructor]
    36     private StackSerializer(bool deserializing) { }
     36    private StackSerializer(StorableConstructorFlag _) { }
    3737    public StackSerializer() { }
    3838

  • branches/2520_PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Storable/StorableMemberInfo.cs

    r16453 r16462  
    2323using System.Reflection;
    2424using System.Text;
    25 using HeuristicLab.Persistence.Core;
     25using HEAL.Fossil;
    2626
    2727namespace HeuristicLab.Persistence.Default.CompositeSerializers.Storable {

  • branches/2520_PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Storable/StorableReflection.cs

    r16453 r16462  
    2424using System.Linq;
    2525using System.Reflection;
    26 using HeuristicLab.Persistence.Core;
     26using HEAL.Fossil;
    2727
    2828namespace HeuristicLab.Persistence.Default.CompositeSerializers.Storable {
    … …  
    4343        storableMembers.AddRange(GenerateStorableMembers(type.BaseType));
    4444
    45       var storableClassAttribute = GetStorableClassAttribute(type);
    46       if (storableClassAttribute != null) {
    47         switch (storableClassAttribute.Type) {
    48           case StorableClassType.MarkedOnly:
     45      var storableTypeAttribute = GetStorableTypeAttribute(type);
     46      if (storableTypeAttribute != null) {
     47        switch (storableTypeAttribute.MemberSelection) {
     48          case StorableMemberSelection.MarkedOnly:
    4949            AddMarkedMembers(type, storableMembers); break;
    50           case StorableClassType.AllFields:
     50          case StorableMemberSelection.AllFields:
    5151            AddAll(type, MemberTypes.Field, storableMembers); break;
    52           case StorableClassType.AllProperties:
     52          case StorableMemberSelection.AllProperties:
    5353            AddAll(type, MemberTypes.Property, storableMembers); break;
    54           case StorableClassType.AllFieldsAndAllProperties:
     54          case StorableMemberSelection.AllFieldsAndAllProperties:
    5555            AddAll(type, MemberTypes.Field | MemberTypes.Property, storableMembers); break;
    5656          default:
    57             throw new PersistenceException("unsupported [StorableClassType]: " + storableClassAttribute.Type);
     57            throw new PersistenceException("unsupported [StorableMemberSelection]: " + storableTypeAttribute.MemberSelection);
    5858        }
    5959      }
    … …  
    6262
    6363    public static bool IsEmptyOrStorableType(Type type, bool recursive) {
    64       if (!HasStorableClassAttribute(type) && !IsEmptyType(type, false)) return false;
     64      if (!HasStorableTypeAttribute(type) && !IsEmptyType(type, false)) return false;
    6565      return !recursive || type.BaseType == null || IsEmptyOrStorableType(type.BaseType, true);
    6666    }
    … …  
    7272        foreach (var hook in CollectHooks(hookType, type.BaseType))
    7373          yield return hook;
    74       if (HasStorableClassAttribute(type)) {
     74      if (HasStorableTypeAttribute(type)) {
    7575        foreach (MethodInfo methodInfo in type.GetMethods(DECLARED_INSTANCE_MEMBERS)) {
    7676          if (methodInfo.ReturnType == typeof(void) && methodInfo.GetParameters().Length == 0) {
    … …  
    174174    #region [StorableClass] helpers
    175175
    176     private static StorableClassAttribute GetStorableClassAttribute(Type type) {
    177       lock (storableClassCache) {
    178         if (storableClassCache.ContainsKey(type))
    179           return storableClassCache[type];
    180         StorableClassAttribute attribute = type
    181           .GetCustomAttributes(typeof(StorableClassAttribute), false)
    182           .SingleOrDefault() as StorableClassAttribute;
    183         storableClassCache.Add(type, attribute);
     176    private static StorableTypeAttribute GetStorableTypeAttribute(Type type) {
     177      lock (storableTypeCache) {
     178        if (storableTypeCache.ContainsKey(type))
     179          return storableTypeCache[type];
     180        StorableTypeAttribute attribute = type
     181          .GetCustomAttributes(typeof(StorableTypeAttribute), false)
     182          .SingleOrDefault() as StorableTypeAttribute;
     183        storableTypeCache.Add(type, attribute);
    184184        return attribute;
    185185      }
    186186    }
    187187
    188     public static bool HasStorableClassAttribute(Type type) {
    189       return GetStorableClassAttribute(type) != null;
    190     }
    191 
    192     private static Dictionary<Type, StorableClassAttribute> storableClassCache =
    193       new Dictionary<Type, StorableClassAttribute>();
     188    public static bool HasStorableTypeAttribute(Type type) {
     189      return GetStorableTypeAttribute(type) != null;
     190    }
     191
     192    private static Dictionary<Type, StorableTypeAttribute> storableTypeCache =
     193      new Dictionary<Type, StorableTypeAttribute>();
    194194
    195195    #endregion

  • branches/2520_PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Storable/StorableSerializer.cs

    r16453 r16462  
    2626using System.Reflection.Emit;
    2727using System.Text;
     28using HEAL.Fossil;
    2829using HeuristicLab.Persistence.Core;
    2930using HeuristicLab.Persistence.Interfaces;
    … …  
    4950
    5051    [StorableConstructor]
    51     private StorableSerializer(bool deserializing) : this() { }
     52    private StorableSerializer(StorableConstructorFlag _) { }
    5253
    5354    #region ICompositeSerializer implementation
    … …  
    6970    /// </returns>
    7071    public bool CanSerialize(Type type) {
    71       var markedStorable = StorableReflection.HasStorableClassAttribute(type);
     72      var markedStorable = StorableReflection.HasStorableTypeAttribute(type);
    7273      if (GetConstructor(type) == null)
    7374        if (markedStorable)
    … …  
    240241        .Where(ci => ci.GetCustomAttributes(typeof(StorableConstructorAttribute), false).Length > 0)) {
    241242        if (ci.GetParameters().Length != 1 ||
    242             ci.GetParameters()[0].ParameterType != typeof(bool))
    243           throw new PersistenceException("StorableConstructor must have exactly one argument of type bool");
     243            ci.GetParameters()[0].ParameterType != typeof(StorableConstructorFlag))
     244          throw new PersistenceException("StorableConstructor must have exactly one argument of type StorableConstructorFlag");
    244245        var dm = new DynamicMethod("", typeof(object), null, type, true);
    245246        var ilgen = dm.GetILGenerator();
    246         ilgen.Emit(OpCodes.Ldc_I4_1); // load true
     247        var defaultFlagFieldInfo = typeof(StorableConstructorFlag).GetField("Default", BindingFlags.Static | BindingFlags.Public);
     248        ilgen.Emit(OpCodes.Ldsfld, defaultFlagFieldInfo); // load the object
    247249        ilgen.Emit(OpCodes.Newobj, ci);
    248250        ilgen.Emit(OpCodes.Ret);

  • branches/2520_PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/StructSerializer.cs

    r16453 r16462  
    2424using System.Reflection;
    2525using HeuristicLab.Persistence.Core;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727using HeuristicLab.Persistence.Interfaces;
    2828
    … …  
    3333
    3434    [StorableConstructor]
    35     private StructSerializer(bool deserializing) { }
     35    private StructSerializer(StorableConstructorFlag _) { }
    3636    public StructSerializer() { }
    3737

  • branches/2520_PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/TupleSerializer.cs

    r16453 r16462  
    2525using System.Reflection;
    2626using HeuristicLab.Persistence.Core;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    2828using HeuristicLab.Persistence.Interfaces;
    2929
    … …  
    3434
    3535    [StorableConstructor]
    36     private TupleSerializer(bool deserializing) { }
     36    private TupleSerializer(StorableConstructorFlag _) { }
    3737    public TupleSerializer() { }
    3838

  • branches/2520_PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/TypeSerializer.cs

    r16453 r16462  
    2424using HeuristicLab.Persistence.Auxiliary;
    2525using HeuristicLab.Persistence.Core;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727using HeuristicLab.Persistence.Interfaces;
    2828
    … …  
    3333
    3434    [StorableConstructor]
    35     private TypeSerializer(bool deserializing) { }
     35    private TypeSerializer(StorableConstructorFlag _) { }
    3636    public TypeSerializer() { }
    3737

  • branches/2520_PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/DebugString/DebugString.cs

    r16453 r16462  
    2020#endregion
    2121
    22 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     22using HEAL.Fossil;
    2323using HeuristicLab.Persistence.Interfaces;
    2424
    … …  
    3939
    4040    [StorableConstructor]
    41     protected DebugString(bool deserializing) { }
     41    protected DebugString(StorableConstructorFlag _) { }
    4242    private DebugString() { }
    4343

  • branches/2520_PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/DebugString/DebugStringFormat.cs

    r16453 r16462  
    2020#endregion
    2121
    22 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     22using HEAL.Fossil;
    2323using HeuristicLab.Persistence.Interfaces;
    2424
    … …  
    3737
    3838    [StorableConstructor]
    39     protected DebugStringFormat(bool deserializing) : base(deserializing) { }
     39    protected DebugStringFormat(StorableConstructorFlag _) : base(_) { }
    4040    public DebugStringFormat() { }
    4141  }

  • branches/2520_PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/Xml/Compact/DoubleList2XmlSerializer.cs

    r16453 r16462  
    2323using System.Collections.Generic;
    2424using System.Text;
     25using HEAL.Fossil;
    2526using HeuristicLab.Persistence.Auxiliary;
    26 using HeuristicLab.Persistence.Core;
    2727using HeuristicLab.Persistence.Default.Xml.Primitive;
    2828

  • branches/2520_PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/Xml/Compact/NumberArray2XmlSerializerBase.cs

    r16453 r16462  
    2121
    2222using System;
    23 using System.Collections;
    2423using System.Collections.Generic;
    2524using System.Linq;
    2625using System.Text;
     26using HEAL.Fossil;
    2727using HeuristicLab.Persistence.Auxiliary;
    28 using HeuristicLab.Persistence.Core;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3028
    3129namespace HeuristicLab.Persistence.Default.Xml.Compact {

  • branches/2520_PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/Xml/Compact/NumberEnumeration2XmlSerializerBase.cs

    r16453 r16462  
    2323using System.Collections;
    2424using System.Text;
     25using HEAL.Fossil;
    2526using HeuristicLab.Persistence.Auxiliary;
    26 using HeuristicLab.Persistence.Core;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2827
    2928namespace HeuristicLab.Persistence.Default.Xml.Compact {

  • branches/2520_PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/Xml/EasyXmlGenerator.cs

    r16453 r16462  
    2323using System.Collections.Generic;
    2424using System.IO;
     25using HEAL.Fossil;
    2526using HeuristicLab.Persistence.Auxiliary;
    2627using HeuristicLab.Persistence.Core;
    … …  
    181182      try {
    182183        using (StreamWriter writer = new StreamWriter(stream)) {
    183           Serializer serializer = new Serializer(obj, config);
     184          Core.Serializer serializer = new Core.Serializer(obj, config);
    184185          serializer.InterleaveTypeInformation = true;
    185186          ReadableXmlGenerator generator = new ReadableXmlGenerator();

  • branches/2520_PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/Xml/Primitive/Char2XmlFormatter.cs

    r16453 r16462  
    2323using System.Text;
    2424using System.Text.RegularExpressions;
    25 using HeuristicLab.Persistence.Core;
     25using HEAL.Fossil;
    2626using HeuristicLab.Persistence.Interfaces;
    2727

  • branches/2520_PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/Xml/Primitive/DateTime2XmlSerializer.cs

    r16453 r16462  
    2121
    2222using System;
    23 using HeuristicLab.Persistence.Core;
     23using HEAL.Fossil;
    2424
    2525namespace HeuristicLab.Persistence.Default.Xml.Primitive {

  • branches/2520_PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/Xml/Primitive/Guid2XmlSerializer.cs

    r16453 r16462  
    2222using System;
    2323using System.Globalization;
    24 using HeuristicLab.Persistence.Core;
     24using HEAL.Fossil;
    2525
    2626

  • branches/2520_PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/Xml/Primitive/SimpleNumber2XmlSerializerBase.cs

    r16453 r16462  
    2222using System;
    2323using System.Reflection;
    24 using HeuristicLab.Persistence.Core;
     24using HEAL.Fossil;
    2525
    2626namespace HeuristicLab.Persistence.Default.Xml.Primitive {

  • branches/2520_PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/Xml/Primitive/String2XmlSerializer.cs

    r16453 r16462  
    2323using System.Text;
    2424using System.Text.RegularExpressions;
    25 using HeuristicLab.Persistence.Core;
     25using HEAL.Fossil;
    2626
    2727namespace HeuristicLab.Persistence.Default.Xml.Primitive {

  • branches/2520_PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/Xml/Primitive/TimeSpan2XmlSerializer.cs

    r16453 r16462  
    2121
    2222using System;
    23 using HeuristicLab.Persistence.Core;
     23using HEAL.Fossil;
    2424
    2525

  • branches/2520_PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/Xml/XmlFormat.cs

    r16453 r16462  
    2020#endregion
    2121
    22 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     22using HEAL.Fossil;
    2323using HeuristicLab.Persistence.Interfaces;
    2424
    … …  
    3838
    3939    [StorableConstructor]
    40     protected XmlFormat(bool deserializing) : base(deserializing) { }
     40    protected XmlFormat(StorableConstructorFlag _) : base(_) { }
    4141    public XmlFormat() { }
    4242  }

  • branches/2520_PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/Xml/XmlGenerator.cs

    r16453 r16462  
    2727using System.Text;
    2828using System.Threading;
     29using HEAL.Fossil;
    2930using HeuristicLab.Persistence.Core;
    3031using HeuristicLab.Persistence.Core.Tokens;
    … …  
    312313
    313314    private static void Serialize(object obj, Stream stream, Configuration config, bool includeAssemblies, CompressionLevel compression, CancellationToken cancellationToken = default(CancellationToken)) {
    314       Serializer serializer = new Serializer(obj, config);
     315      Core.Serializer serializer = new Core.Serializer(obj, config);
    315316      Serialize(stream, includeAssemblies, compression, serializer, cancellationToken);
    316317    }
    317318
    318     private static void Serialize(Stream stream, bool includeAssemblies, CompressionLevel compression, Serializer serializer, CancellationToken cancellationToken = default(CancellationToken)) {
     319    private static void Serialize(Stream stream, bool includeAssemblies, CompressionLevel compression, Core.Serializer serializer, CancellationToken cancellationToken = default(CancellationToken)) {
    319320      try {
    320321        cancellationToken.ThrowIfCancellationRequested();
    … …  
    429430    public static void Serialize(object obj, Stream stream, Configuration config, bool includeAssemblies, CompressionType compressionType = CompressionType.GZip, CancellationToken cancellationToken = default(CancellationToken)) {
    430431      try {
    431         Serializer serializer = new Serializer(obj, config);
     432        Core.Serializer serializer = new Core.Serializer(obj, config);
    432433        if (compressionType == CompressionType.Zip) {
    433434          Serialize(obj, stream, config, includeAssemblies, CompressionLevel.Optimal, cancellationToken);
    … …  
    454455                                 CompressionType compressionType = CompressionType.GZip, CancellationToken cancellationToken = default(CancellationToken)) {
    455456      try {
    456         Serializer serializer = new Serializer(obj, config);
     457        Core.Serializer serializer = new Core.Serializer(obj, config);
    457458        if (compressionType == CompressionType.Zip) {
    458459          Serialize(stream, includeAssemblies, CompressionLevel.Optimal, serializer, cancellationToken);
    … …  
    468469    }
    469470
    470     private static void Serialize(Stream stream, Serializer serializer, CancellationToken cancellationToken = default(CancellationToken)) {
     471    private static void Serialize(Stream stream, Core.Serializer serializer, CancellationToken cancellationToken = default(CancellationToken)) {
    471472      cancellationToken.ThrowIfCancellationRequested();
    472473      using (StreamWriter writer = new StreamWriter(new GZipStream(stream, CompressionMode.Compress))) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/Xml/XmlParser.cs

    r16453 r16462  
    2626using System.IO.Compression;
    2727using System.Xml;
     28using HEAL.Fossil;
    2829using HeuristicLab.Persistence.Core;
    2930using HeuristicLab.Persistence.Core.Tokens;

  • branches/2520_PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/Xml/XmlString.cs

    r16453 r16462  
    2121
    2222using System.Text;
    23 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     23using HEAL.Fossil;
    2424using HeuristicLab.Persistence.Interfaces;
    2525
    … …  
    4141
    4242    [StorableConstructor]
    43     protected XmlString(bool deserializing) { }
     43    protected XmlString(StorableConstructorFlag _) { }
    4444    private XmlString() { }
    4545

  • branches/2520_PersistenceReintegration/HeuristicLab.Persistence/3.3/HeuristicLab.Persistence-3.3.csproj

    r16452 r16462  
    108108  </PropertyGroup>
    109109  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    110   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
    111        Other similar extension points exist, see Microsoft.Common.targets.
    112   <Target Name="BeforeBuild">
     110  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
     111  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     112    <PropertyGroup>
     113      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     114    </PropertyGroup>
     115    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
    113116  </Target>
    114   <Target Name="AfterBuild">
    115   </Target>
    116   -->
    117   <ItemGroup>
     117  <ItemGroup>
     118    <Reference Include="Google.Protobuf, Version=3.6.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
     119      <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
     120    </Reference>
     121    <Reference Include="HEAL.Fossil, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     122      <HintPath>..\..\packages\HEAL.Fossil.1.0.0\lib\netstandard2.0\HEAL.Fossil.dll</HintPath>
     123    </Reference>
    118124    <Reference Include="System" />
    119125    <Reference Include="System.configuration" />
    … …  
    132138    <Compile Include="Auxiliary\TypeNameParser.cs" />
    133139    <Compile Include="Auxiliary\ReflectionTools.cs" />
     140    <None Include="packages.config" />
    134141    <None Include="Plugin.cs.frame" />
    135142    <Compile Include="Core\Configuration.cs" />
    136     <Compile Include="Core\PersistenceException.cs" />
    137143    <Compile Include="Core\PrimitiveSerializerBase.cs" />
    138144    <Compile Include="Core\FormatBase.cs" />
    … …  
    157163    <Compile Include="Default\CompositeSerializers\Storable\StorableReflection.cs" />
    158164    <Compile Include="Default\CompositeSerializers\Storable\StorableMemberInfo.cs" />
    159     <Compile Include="Default\CompositeSerializers\Storable\StorableClassType.cs" />
    160165    <Compile Include="Core\DataMemberAccessor.cs" />
    161     <Compile Include="Default\CompositeSerializers\Storable\StorableClassAttribute.cs" />
    162     <Compile Include="Default\CompositeSerializers\Storable\StorableAttribute.cs" />
    163     <Compile Include="Default\CompositeSerializers\Storable\StorableConstructorAttribute.cs" />
    164     <Compile Include="Default\CompositeSerializers\Storable\StorableHookAttribute.cs" />
    165166    <Compile Include="Default\CompositeSerializers\Storable\StorableSerializer.cs" />
    166167    <Compile Include="Default\CompositeSerializers\StructSerializer.cs" />
Note: See TracChangeset for help on using the changeset viewer.