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.Core/3.3/Collections
Files:
29 edited

Legend:

Unmodified
Added
Removed

  • branches/2520_PersistenceReintegration/HeuristicLab.Core/3.3/Collections/CheckedItemCollection.cs

    r16453 r16462  
    2525using HeuristicLab.Collections;
    2626using HeuristicLab.Common;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    2828
    2929namespace HeuristicLab.Core {
    … …  
    3232  /// </summary>
    3333  /// <typeparam name="T">The element type (base type IItem)</typeparam>
    34   [StorableClass]
     34  [StorableType("CAD59659-15B5-4CB0-A199-272E28F40832")]
    3535  [Item("CheckedItemCollection", "Represents a collection of items that can be checked or unchecked.")]
    3636  public class CheckedItemCollection<T> : ItemCollection<T>, ICheckedItemCollection<T> where T : class, IItem {
    … …  
    5050    /// <param name="deserializing"></param>
    5151    [StorableConstructor]
    52     protected CheckedItemCollection(bool deserializing) : base(deserializing) { }
     52    protected CheckedItemCollection(StorableConstructorFlag _) : base(_) { }
    5353    protected CheckedItemCollection(CheckedItemCollection<T> original, Cloner cloner)
    5454      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Core/3.3/Collections/CheckedItemList.cs

    r16453 r16462  
    2525using HeuristicLab.Collections;
    2626using HeuristicLab.Common;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    2828
    2929namespace HeuristicLab.Core {
    … …  
    3232  /// </summary>
    3333  /// <typeparam name="T">The element type (base type is IItem)</typeparam>
    34   [StorableClass]
     34  [StorableType("83222907-689C-484B-8431-BA85DF516761")]
    3535  [Item("CheckedItemList", "Represents a list of items that can be checked or unchecked.")]
    3636  public class CheckedItemList<T> : ItemList<T>, ICheckedItemList<T> where T : class, IItem {
    … …  
    5454    /// <param name="deserializing"></param>
    5555    [StorableConstructor]
    56     protected CheckedItemList(bool deserializing) : base(deserializing) { }
     56    protected CheckedItemList(StorableConstructorFlag _) : base(_) { }
    5757    protected CheckedItemList(CheckedItemList<T> original, Cloner cloner)
    5858      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Core/3.3/Collections/ConstraintCollection.cs

    r16453 r16462  
    2222using System.Collections.Generic;
    2323using HeuristicLab.Common;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Fossil;
    2525
    2626namespace HeuristicLab.Core {
    27   [StorableClass]
     27  [StorableType("5E78ED3E-97A4-4632-B729-C9B7DC965609")]
    2828  [Item("ConstraintCollection", "Represents a collection of constraints.")]
    2929  public class ConstraintCollection : ItemCollection<IConstraint> {
    3030    [StorableConstructor]
    31     protected ConstraintCollection(bool deserializing) : base(deserializing) { }
     31    protected ConstraintCollection(StorableConstructorFlag _) : base(_) { }
    3232    protected ConstraintCollection(ConstraintCollection original, Cloner cloner) : base(original, cloner) { }
    3333    public ConstraintCollection() : base() { }

  • branches/2520_PersistenceReintegration/HeuristicLab.Core/3.3/Collections/DirectedGraph/Arc.cs

    r16453 r16462  
    2222using System;
    2323using HeuristicLab.Common;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Fossil;
    2525
    2626namespace HeuristicLab.Core {
    2727  [Item("Arc", "A graph arc connecting two graph vertices, that can have a weight, label, and data object for holding additional info")]
    28   [StorableClass]
     28  [StorableType("E91E40A2-FE77-49F0-866E-5127F3C1AC79")]
    2929  public class Arc : Item, IArc {
    3030    [Storable]
    … …  
    5858
    5959    [StorableConstructor]
    60     protected Arc(bool deserializing) : base(deserializing) { }
     60    protected Arc(StorableConstructorFlag _) : base(_) { }
    6161
    6262    public Arc(IVertex source, IVertex target) {
    … …  
    8282  }
    8383
    84   [StorableClass]
     84  [StorableType("5F06782E-3BD2-4A9D-B030-BE1D6A6B714F")]
    8585  public class Arc<T> : Arc, IArc<T> where T : class, IDeepCloneable {
    8686    [Storable]
    … …  
    105105    }
    106106
    107     public Arc(bool deserializing)
    108       : base(deserializing) {
     107    [StorableConstructor]
     108    public Arc(StorableConstructorFlag _)
     109      : base(_) {
    109110    }
    110111

  • branches/2520_PersistenceReintegration/HeuristicLab.Core/3.3/Collections/DirectedGraph/DirectedGraph.cs

    r16453 r16462  
    2626using HeuristicLab.Common;
    2727using HeuristicLab.Common.Resources;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929
    3030namespace HeuristicLab.Core {
    3131  [Item("DirectedGraph", "Generic class representing a directed graph with custom vertices and content")]
    32   [StorableClass]
     32  [StorableType("C7DF8A65-95AE-4D73-950B-27A8086D7DA2")]
    3333  public class DirectedGraph : Item, IDirectedGraph {
    3434    public override Image ItemImage { get { return VSImageLibrary.Graph; } }
    … …  
    7070
    7171    [StorableConstructor]
    72     protected DirectedGraph(bool serializing)
    73       : base(serializing) {
     72    protected DirectedGraph(StorableConstructorFlag _) : base(_) {
    7473    }
    7574

  • branches/2520_PersistenceReintegration/HeuristicLab.Core/3.3/Collections/DirectedGraph/Vertex.cs

    r16453 r16462  
    2424using System.Linq;
    2525using HeuristicLab.Common;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727
    2828namespace HeuristicLab.Core {
    2929  [Item("Vertex", "An object representing a vertex in the graph. It can have a text label, a weight, and an additional data object.")]
    30   [StorableClass]
     30  [StorableType("3FA3AAFA-05FF-4BE9-BD72-05A822A5E8CC")]
    3131  public class Vertex : Item, IVertex {
    3232    [Storable]
    … …  
    6767
    6868    [StorableConstructor]
    69     public Vertex(bool deserializing) : base(deserializing) { }
     69    public Vertex(StorableConstructorFlag _) : base(_) { }
    7070
    7171    [StorableHook(HookType.AfterDeserialization)]
    … …  
    141141  }
    142142
    143   [StorableClass]
     143  [StorableType("ED2FD106-6F97-415A-A6D0-7F6690426910")]
    144144  public class Vertex<T> : Vertex, IVertex<T> where T : class,IDeepCloneable {
    145145    [Storable]
    … …  
    155155
    156156    [StorableConstructor]
    157     protected Vertex(bool deserializing) : base(deserializing) { }
     157    protected Vertex(StorableConstructorFlag _) : base(_) { }
    158158
    159159    protected Vertex(Vertex<T> original, Cloner cloner)

  • branches/2520_PersistenceReintegration/HeuristicLab.Core/3.3/Collections/ItemArray.cs

    r16453 r16462  
    2626using HeuristicLab.Collections;
    2727using HeuristicLab.Common;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929
    3030namespace HeuristicLab.Core {
    31   [StorableClass]
     31  [StorableType("CB8A238C-B8E6-47A3-A7D8-AB1212DEC672")]
    3232  [Item("ItemArray", "Represents an array of items.")]
    3333  public class ItemArray<T> : ObservableArray<T>, IItemArray<T> where T : class, IItem {
    … …  
    4949
    5050    [StorableConstructor]
    51     protected ItemArray(bool deserializing) : base(deserializing) { }
     51    protected ItemArray(StorableConstructorFlag _) : base(_) { }
    5252    protected ItemArray(ItemArray<T> original, Cloner cloner) {
    5353      cloner.RegisterClonedObject(original, this);

  • branches/2520_PersistenceReintegration/HeuristicLab.Core/3.3/Collections/ItemCollection.cs

    r16453 r16462  
    2626using HeuristicLab.Collections;
    2727using HeuristicLab.Common;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929
    3030namespace HeuristicLab.Core {
    31   [StorableClass]
     31  [StorableType("0BD4F01E-2D52-4E41-AEF8-611F10856D90")]
    3232  [Item("ItemCollection", "Represents a collection of items.")]
    3333  public class ItemCollection<T> : ObservableCollection<T>, IItemCollection<T> where T : class, IItem {
    … …  
    4949
    5050    [StorableConstructor]
    51     protected ItemCollection(bool deserializing) : base(deserializing) { }
     51    protected ItemCollection(StorableConstructorFlag _) : base(_) { }
    5252    protected ItemCollection(ItemCollection<T> original, Cloner cloner) {
    5353      cloner.RegisterClonedObject(original, this);

  • branches/2520_PersistenceReintegration/HeuristicLab.Core/3.3/Collections/ItemDictionary.cs

    r16453 r16462  
    2525using HeuristicLab.Collections;
    2626using HeuristicLab.Common;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    2828
    2929namespace HeuristicLab.Core {
    30   [StorableClass]
     30  [StorableType("C2B03555-3956-400E-94C3-3FB868F30DD2")]
    3131  [Item("ItemDictionary", "Represents a dictionary of items.")]
    3232  public class ItemDictionary<TKey, TValue> : ObservableDictionary<TKey, TValue>, IItemDictionary<TKey, TValue>
    … …  
    5151
    5252    [StorableConstructor]
    53     protected ItemDictionary(bool deserializing) : base(deserializing) { }
     53    protected ItemDictionary(StorableConstructorFlag _) : base(_) { }
    5454    protected ItemDictionary(ItemDictionary<TKey, TValue> original, Cloner cloner) {
    5555      cloner.RegisterClonedObject(original, this);

  • branches/2520_PersistenceReintegration/HeuristicLab.Core/3.3/Collections/ItemList.cs

    r16453 r16462  
    2626using HeuristicLab.Collections;
    2727using HeuristicLab.Common;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929
    3030namespace HeuristicLab.Core {
    31   [StorableClass]
     31  [StorableType("EF6B019D-4ECF-4146-A77D-FF041D0B85F5")]
    3232  [Item("ItemList", "Represents a list of items.")]
    3333  public class ItemList<T> : ObservableList<T>, IItemList<T> where T : class, IItem {
    … …  
    4949
    5050    [StorableConstructor]
    51     protected ItemList(bool deserializing) : base(deserializing) { }
     51    protected ItemList(StorableConstructorFlag _) : base(_) { }
    5252    protected ItemList(ItemList<T> original, Cloner cloner) {
    5353      cloner.RegisterClonedObject(original, this);

  • branches/2520_PersistenceReintegration/HeuristicLab.Core/3.3/Collections/ItemSet.cs

    r16453 r16462  
    2626using HeuristicLab.Collections;
    2727using HeuristicLab.Common;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929
    3030namespace HeuristicLab.Core {
    31   [StorableClass]
     31  [StorableType("C2660C9F-3886-458E-80DF-06EEE9BB3C21")]
    3232  [Item("ItemSet", "Represents a set of items.")]
    3333  public class ItemSet<T> : ObservableSet<T>, IItemSet<T> where T : class, IItem {
    … …  
    4949
    5050    [StorableConstructor]
    51     protected ItemSet(bool deserializing) : base(deserializing) { }
     51    protected ItemSet(StorableConstructorFlag _) : base(_) { }
    5252    protected ItemSet(ItemSet<T> original, Cloner cloner) {
    5353      cloner.RegisterClonedObject(original, this);

  • branches/2520_PersistenceReintegration/HeuristicLab.Core/3.3/Collections/KeyedItemCollection.cs

    r16453 r16462  
    2525using HeuristicLab.Collections;
    2626using HeuristicLab.Common;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    2828
    2929namespace HeuristicLab.Core {
    3030  [Item("KeyedItemCollection", "Represents a keyed collection of items.")]
    31   [StorableClass]
     31  [StorableType("176A9538-58A6-4D3F-9590-26FC37E2BA04")]
    3232  public abstract class KeyedItemCollection<TKey, TItem> : ObservableKeyedCollection<TKey, TItem>, IKeyedItemCollection<TKey, TItem> where TItem : class, IItem {
    3333    public virtual string ItemName {
    … …  
    4848
    4949    [StorableConstructor]
    50     protected KeyedItemCollection(bool deserializing) : base(deserializing) { }
     50    protected KeyedItemCollection(StorableConstructorFlag _) : base(_) { }
    5151    protected KeyedItemCollection(KeyedItemCollection<TKey, TItem> original, Cloner cloner) {
    5252      cloner.RegisterClonedObject(original, this);

  • branches/2520_PersistenceReintegration/HeuristicLab.Core/3.3/Collections/NamedItemCollection.cs

    r16453 r16462  
    2323using System.Collections.Generic;
    2424using HeuristicLab.Common;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    2626
    2727namespace HeuristicLab.Core {
    2828  [Item("NamedItemCollection", "Represents a collection of named items.")]
    29   [StorableClass]
     29  [StorableType("A7DC6650-2486-472C-8515-0D66C93C03F6")]
    3030  public class NamedItemCollection<T> : KeyedItemCollection<string, T> where T : class, INamedItem {
    3131    [StorableConstructor]
    32     protected NamedItemCollection(bool deserializing) : base(deserializing) { }
     32    protected NamedItemCollection(StorableConstructorFlag _) : base(_) { }
    3333    protected NamedItemCollection(NamedItemCollection<T> original, Cloner cloner)
    3434      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Core/3.3/Collections/OperationCollection.cs

    r16453 r16462  
    2323using System.Linq;
    2424using HeuristicLab.Common;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    2626
    2727namespace HeuristicLab.Core {
    28   [StorableClass]
     28  [StorableType("EDE09772-7C20-4B51-90FF-5867B1D91ABE")]
    2929  public sealed class OperationCollection : DeepCloneable, IList<IOperation>, IOperation {
    3030    [Storable]
    … …  
    3939
    4040    [StorableConstructor]
    41     private OperationCollection(bool deserializing) { }
     41    private OperationCollection(StorableConstructorFlag _) { }
    4242    private OperationCollection(OperationCollection original, Cloner cloner)
    4343      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Core/3.3/Collections/OperatorCollection.cs

    r16453 r16462  
    2222using System.Collections.Generic;
    2323using HeuristicLab.Common;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Fossil;
    2525
    2626namespace HeuristicLab.Core {
    27   [StorableClass]
     27  [StorableType("35A02DD1-33F8-4F0D-9DD5-93ED71EE1591")]
    2828  [Item("Operator Collection", "Represents a collection of operators.")]
    2929  public class OperatorCollection : ItemCollection<IOperator> {
    3030    [StorableConstructor]
    31     protected OperatorCollection(bool deserializing) : base(deserializing) { }
     31    protected OperatorCollection(StorableConstructorFlag _) : base(_) { }
    3232    protected OperatorCollection(OperatorCollection original, Cloner cloner) : base(original, cloner) { }
    3333    public OperatorCollection() : base() { }

  • branches/2520_PersistenceReintegration/HeuristicLab.Core/3.3/Collections/OperatorList.cs

    r16453 r16462  
    2222using System.Collections.Generic;
    2323using HeuristicLab.Common;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Fossil;
    2525
    2626namespace HeuristicLab.Core {
    27   [StorableClass]
     27  [StorableType("0477DDAD-41AA-41E7-AE2A-5C0288484119")]
    2828  [Item("OperatorList", "Represents a list of operators.")]
    2929  public class OperatorList : ItemList<IOperator> {
    3030    [StorableConstructor]
    31     protected OperatorList(bool deserializing) : base(deserializing) { }
     31    protected OperatorList(StorableConstructorFlag _) : base(_) { }
    3232    protected OperatorList(OperatorList original, Cloner cloner) : base(original, cloner) { }
    3333    public OperatorList() : base() { }

  • branches/2520_PersistenceReintegration/HeuristicLab.Core/3.3/Collections/OperatorSet.cs

    r16453 r16462  
    2222using System.Collections.Generic;
    2323using HeuristicLab.Common;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Fossil;
    2525
    2626namespace HeuristicLab.Core {
    27   [StorableClass]
     27  [StorableType("FC16764E-EA5C-4D53-953B-3BEE85C7C376")]
    2828  [Item("OperatorSet", "Represents a set of operators.")]
    2929  public class OperatorSet : ItemSet<IOperator> {
    3030    [StorableConstructor]
    31     protected OperatorSet(bool deserializing) : base(deserializing) { }
     31    protected OperatorSet(StorableConstructorFlag _) : base(_) { }
    3232    protected OperatorSet(OperatorSet original, Cloner cloner) : base(original, cloner) { }
    3333    public OperatorSet() : base() { }

  • branches/2520_PersistenceReintegration/HeuristicLab.Core/3.3/Collections/ParameterCollection.cs

    r16453 r16462  
    2222using System.Collections.Generic;
    2323using HeuristicLab.Common;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Fossil;
    2525
    2626namespace HeuristicLab.Core {
    27   [StorableClass]
     27  [StorableType("D1F7CEF4-42C6-46E1-B2B9-AB49C1420D55")]
    2828  [Item("ParameterCollection", "Represents a collection of parameters.")]
    2929  public class ParameterCollection : NamedItemCollection<IParameter> {
    3030    [StorableConstructor]
    31     protected ParameterCollection(bool deserializing) : base(deserializing) { }
     31    protected ParameterCollection(StorableConstructorFlag _) : base(_) { }
    3232    protected ParameterCollection(ParameterCollection original, Cloner cloner) : base(original, cloner) { }
    3333    public ParameterCollection() : base() { }

  • branches/2520_PersistenceReintegration/HeuristicLab.Core/3.3/Collections/ReadOnlyCheckedItemCollection.cs

    r16453 r16462  
    2424using HeuristicLab.Collections;
    2525using HeuristicLab.Common;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727
    2828namespace HeuristicLab.Core {
    29   [StorableClass]
     29  [StorableType("81B63F7B-0AD4-4BAD-8F39-BAB1F6B006C8")]
    3030  [Item("ReadOnlyCheckedItemCollection", "Represents a read-only collection of checked items.")]
    3131  public class ReadOnlyCheckedItemCollection<T> : ReadOnlyItemCollection<T>, ICheckedItemCollection<T> where T : class, IItem {
    … …  
    3535
    3636    [StorableConstructor]
    37     protected ReadOnlyCheckedItemCollection(bool deserializing) : base(deserializing) { }
     37    protected ReadOnlyCheckedItemCollection(StorableConstructorFlag _) : base(_) { }
    3838    protected ReadOnlyCheckedItemCollection(ReadOnlyCheckedItemCollection<T> original, Cloner cloner)
    3939      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Core/3.3/Collections/ReadOnlyCheckedItemList.cs

    r16453 r16462  
    2424using HeuristicLab.Collections;
    2525using HeuristicLab.Common;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727
    2828namespace HeuristicLab.Core {
    29   [StorableClass]
     29  [StorableType("BE738F46-3864-42BB-BD29-F3E933B0AC06")]
    3030  [Item("ReadOnlyCheckedItemList", "Represents a read-only list of checked items.")]
    3131  public class ReadOnlyCheckedItemList<T> : ReadOnlyItemList<T>, ICheckedItemList<T> where T : class, IItem {
    … …  
    3535
    3636    [StorableConstructor]
    37     protected ReadOnlyCheckedItemList(bool deserializing) : base(deserializing) { }
     37    protected ReadOnlyCheckedItemList(StorableConstructorFlag _) : base(_) { }
    3838    protected ReadOnlyCheckedItemList(ReadOnlyCheckedItemList<T> original, Cloner cloner)
    3939      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Core/3.3/Collections/ReadOnlyItemArray.cs

    r16453 r16462  
    2424using HeuristicLab.Collections;
    2525using HeuristicLab.Common;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727
    2828namespace HeuristicLab.Core {
    29   [StorableClass]
     29  [StorableType("29C0CA71-5C3C-48A7-93B3-289E532F396E")]
    3030  [Item("ReadOnlyItemArray", "Represents a read-only array of items.")]
    3131  public class ReadOnlyItemArray<T> : ReadOnlyObservableArray<T>, IItemArray<T> where T : class, IItem {
    … …  
    4747
    4848    [StorableConstructor]
    49     protected ReadOnlyItemArray(bool deserializing) : base(deserializing) { }
     49    protected ReadOnlyItemArray(StorableConstructorFlag _) : base(_) { }
    5050    protected ReadOnlyItemArray(ReadOnlyItemArray<T> original, Cloner cloner) {
    5151      cloner.RegisterClonedObject(original, this);

  • branches/2520_PersistenceReintegration/HeuristicLab.Core/3.3/Collections/ReadOnlyItemCollection.cs

    r16453 r16462  
    2424using HeuristicLab.Collections;
    2525using HeuristicLab.Common;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727
    2828namespace HeuristicLab.Core {
    29   [StorableClass]
     29  [StorableType("B8D4A97C-4277-4B42-86E2-8D64B254BCFD")]
    3030  [Item("ReadOnlyItemCollection", "Represents a read-only collection of items.")]
    3131  public class ReadOnlyItemCollection<T> : ReadOnlyObservableCollection<T>, IItemCollection<T> where T : class, IItem {
    … …  
    4747
    4848    [StorableConstructor]
    49     protected ReadOnlyItemCollection(bool deserializing) : base(deserializing) { }
     49    protected ReadOnlyItemCollection(StorableConstructorFlag _) : base(_) { }
    5050    protected ReadOnlyItemCollection(ReadOnlyItemCollection<T> original, Cloner cloner) {
    5151      cloner.RegisterClonedObject(original, this);

  • branches/2520_PersistenceReintegration/HeuristicLab.Core/3.3/Collections/ReadOnlyItemDictionary.cs

    r16453 r16462  
    2424using HeuristicLab.Collections;
    2525using HeuristicLab.Common;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727
    2828namespace HeuristicLab.Core {
    29   [StorableClass]
     29  [StorableType("DCF34C1E-1F68-4AAB-9761-4036D58E7E75")]
    3030  [Item("ReadOnlyItemDictionary", "Represents a read-only dictionary of items.")]
    3131  public class ReadOnlyItemDictionary<TKey, TValue> : ReadOnlyObservableDictionary<TKey, TValue>, IItemDictionary<TKey, TValue>
    … …  
    5050
    5151    [StorableConstructor]
    52     protected ReadOnlyItemDictionary(bool deserializing) : base(deserializing) { }
     52    protected ReadOnlyItemDictionary(StorableConstructorFlag _) : base(_) { }
    5353    protected ReadOnlyItemDictionary(ReadOnlyItemDictionary<TKey, TValue> original, Cloner cloner) {
    5454      cloner.RegisterClonedObject(original, this);

  • branches/2520_PersistenceReintegration/HeuristicLab.Core/3.3/Collections/ReadOnlyItemList.cs

    r16453 r16462  
    2424using HeuristicLab.Collections;
    2525using HeuristicLab.Common;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727
    2828namespace HeuristicLab.Core {
    29   [StorableClass]
     29  [StorableType("8FC81B05-B27D-4FD7-A8F9-7EE29839B056")]
    3030  [Item("ReadOnlyItemList", "Represents a read-only list of items.")]
    3131  public class ReadOnlyItemList<T> : ReadOnlyObservableList<T>, IItemList<T> where T : class, IItem {
    … …  
    4747
    4848    [StorableConstructor]
    49     protected ReadOnlyItemList(bool deserializing) : base(deserializing) { }
     49    protected ReadOnlyItemList(StorableConstructorFlag _) : base(_) { }
    5050    protected ReadOnlyItemList(ReadOnlyItemList<T> original, Cloner cloner)
    5151      : base(cloner.Clone((IItemList<T>)original.list)) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Core/3.3/Collections/ReadOnlyItemSet.cs

    r16453 r16462  
    2424using HeuristicLab.Collections;
    2525using HeuristicLab.Common;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727
    2828namespace HeuristicLab.Core {
    29   [StorableClass]
     29  [StorableType("65208683-0ECE-4647-B8BA-FD80A9CA00F4")]
    3030  [Item("ReadOnlyItemSet", "Represents a read-only set of items.")]
    3131  public class ReadOnlyItemSet<T> : ReadOnlyObservableSet<T>, IItemSet<T> where T : class, IItem {
    … …  
    4747
    4848    [StorableConstructor]
    49     protected ReadOnlyItemSet(bool deserializing) : base(deserializing) { }
     49    protected ReadOnlyItemSet(StorableConstructorFlag _) : base(_) { }
    5050    protected ReadOnlyItemSet(ReadOnlyItemSet<T> original, Cloner cloner) {
    5151      cloner.RegisterClonedObject(original, this);

  • branches/2520_PersistenceReintegration/HeuristicLab.Core/3.3/Collections/ReadOnlyKeyedItemCollection.cs

    r16453 r16462  
    2424using HeuristicLab.Collections;
    2525using HeuristicLab.Common;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727
    2828namespace HeuristicLab.Core {
    29   [StorableClass]
     29  [StorableType("BEAA9943-228E-4B99-9C07-CE77BA724C41")]
    3030  [Item("ReadOnlyKeyedItemCollection", "Represents a read-only keyed collection of items.")]
    3131  public class ReadOnlyKeyedItemCollection<TKey, TItem> : ReadOnlyObservableKeyedCollection<TKey, TItem>, IKeyedItemCollection<TKey, TItem> where TItem : class, IItem {
    … …  
    4747
    4848    [StorableConstructor]
    49     protected ReadOnlyKeyedItemCollection(bool deserializing) : base(deserializing) { }
     49    protected ReadOnlyKeyedItemCollection(StorableConstructorFlag _) : base(_) { }
    5050    protected ReadOnlyKeyedItemCollection(ReadOnlyKeyedItemCollection<TKey, TItem> original, Cloner cloner) {
    5151      cloner.RegisterClonedObject(original, this);

  • branches/2520_PersistenceReintegration/HeuristicLab.Core/3.3/Collections/ScopeList.cs

    r16453 r16462  
    2222using System.Collections.Generic;
    2323using HeuristicLab.Common;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Fossil;
    2525
    2626namespace HeuristicLab.Core {
    27   [StorableClass]
     27  [StorableType("D8670057-029C-449C-914C-0342A0DCB2C5")]
    2828  [Item("ScopeList", "Represents a list of scopes.")]
    2929  public sealed class ScopeList : ItemList<IScope> {
    3030    [StorableConstructor]
    31     private ScopeList(bool deserializing) : base(deserializing) { }
     31    private ScopeList(StorableConstructorFlag _) : base(_) { }
    3232    private ScopeList(ScopeList original, Cloner cloner) : base(original, cloner) { }
    3333    public ScopeList() : base() { }

  • branches/2520_PersistenceReintegration/HeuristicLab.Core/3.3/Collections/ValueParameterCollection.cs

    r16453 r16462  
    2222using System.Collections.Generic;
    2323using HeuristicLab.Common;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Fossil;
    2525
    2626namespace HeuristicLab.Core {
    27   [StorableClass]
     27  [StorableType("758F5674-7D98-4F44-800E-9E6B0B646938")]
    2828  [Item("ValueParameterCollection", "Represents a collection of value parameters.")]
    2929  public class ValueParameterCollection : NamedItemCollection<IValueParameter> {
    3030    [StorableConstructor]
    31     protected ValueParameterCollection(bool deserializing) : base(deserializing) { }
     31    protected ValueParameterCollection(StorableConstructorFlag _) : base(_) { }
    3232    protected ValueParameterCollection(ValueParameterCollection original, Cloner cloner) : base(original, cloner) { }
    3333    public ValueParameterCollection() : base() { }

  • branches/2520_PersistenceReintegration/HeuristicLab.Core/3.3/Collections/VariableCollection.cs

    r16453 r16462  
    2222using System.Collections.Generic;
    2323using HeuristicLab.Common;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Fossil;
    2525
    2626namespace HeuristicLab.Core {
    27   [StorableClass]
     27  [StorableType("72180610-BA37-4A51-9EFD-D9ADD1061824")]
    2828  [Item("VariableCollection", "Represents a collection of variables.")]
    2929  public sealed class VariableCollection : NamedItemCollection<IVariable> {
    3030    [StorableConstructor]
    31     private VariableCollection(bool deserializing) : base(deserializing) { }
     31    private VariableCollection(StorableConstructorFlag _) : base(_) { }
    3232    private VariableCollection(VariableCollection original, Cloner cloner) : base(original, cloner) { }
    3333    public VariableCollection() : base() { }
Note: See TracChangeset for help on using the changeset viewer.