Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
05/04/17 17:19:35 (8 years ago)
Author:
gkronber
Message:

#2520: changed all usages of StorableClass to use StorableType with an auto-generated GUID (did not add StorableType to other type definitions yet)

Location:
branches/PersistenceReintegration/HeuristicLab.Core/3.3
Files:
49 edited

Legend:

Unmodified
Added
Removed

  • branches/PersistenceReintegration/HeuristicLab.Core/3.3/Collections/CheckedItemCollection.cs

    r14185 r14927  
    2525using HeuristicLab.Collections;
    2626using HeuristicLab.Common;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HeuristicLab.Persistence;
    2828
    2929namespace HeuristicLab.Core {
    … …  
    3232  /// </summary>
    3333  /// <typeparam name="T">The element type (base type IItem)</typeparam>
    34   [StorableClass]
     34  [StorableType("c71d18fe-b8c6-4980-b7c5-5d0d257a63d3")]
    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 {

  • branches/PersistenceReintegration/HeuristicLab.Core/3.3/Collections/CheckedItemList.cs

    r14185 r14927  
    2525using HeuristicLab.Collections;
    2626using HeuristicLab.Common;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HeuristicLab.Persistence;
    2828
    2929namespace HeuristicLab.Core {
    … …  
    3232  /// </summary>
    3333  /// <typeparam name="T">The element type (base type is IItem)</typeparam>
    34   [StorableClass]
     34  [StorableType("d675819c-c2af-41e7-bf5c-45c1d7a38667")]
    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 {

  • branches/PersistenceReintegration/HeuristicLab.Core/3.3/Collections/ConstraintCollection.cs

    r14185 r14927  
    2222using System.Collections.Generic;
    2323using HeuristicLab.Common;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HeuristicLab.Persistence;
    2525
    2626namespace HeuristicLab.Core {
    27   [StorableClass]
     27  [StorableType("7b5b031d-d2dc-44ae-ab4c-825dbd7a5345")]
    2828  [Item("ConstraintCollection", "Represents a collection of constraints.")]
    2929  public class ConstraintCollection : ItemCollection<IConstraint> {

  • branches/PersistenceReintegration/HeuristicLab.Core/3.3/Collections/DirectedGraph/Arc.cs

    r13800 r14927  
    2222using System;
    2323using HeuristicLab.Common;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HeuristicLab.Persistence;
    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("448ab484-bfb6-4faf-bc53-30112dc28a3b")]
    2929  public class Arc : Item, IArc {
    3030    [Storable]
    … …  
    8282  }
    8383
    84   [StorableClass]
     84  [StorableType("a538ad5a-5b6a-4e6b-aca1-a75b949325a9")]
    8585  public class Arc<T> : Arc, IArc<T> where T : class, IDeepCloneable {
    8686    [Storable]

  • branches/PersistenceReintegration/HeuristicLab.Core/3.3/Collections/DirectedGraph/DirectedGraph.cs

    r14185 r14927  
    2626using HeuristicLab.Common;
    2727using HeuristicLab.Common.Resources;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HeuristicLab.Persistence;
    2929
    3030namespace HeuristicLab.Core {
    3131  [Item("DirectedGraph", "Generic class representing a directed graph with custom vertices and content")]
    32   [StorableClass]
     32  [StorableType("fe2b6b6c-5842-485c-b1b8-e61127923537")]
    3333  public class DirectedGraph : Item, IDirectedGraph {
    3434    public override Image ItemImage { get { return VSImageLibrary.Graph; } }

  • branches/PersistenceReintegration/HeuristicLab.Core/3.3/Collections/DirectedGraph/Vertex.cs

    r14185 r14927  
    2424using System.Linq;
    2525using HeuristicLab.Common;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HeuristicLab.Persistence;
    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("604093fb-87ca-4d3a-9799-6ef67e92abd9")]
    3131  public class Vertex : Item, IVertex {
    3232    [Storable]
    … …  
    141141  }
    142142
    143   [StorableClass]
    144   public class Vertex<T> : Vertex, IVertex<T> where T : class,IDeepCloneable {
     143  [StorableType("00fed0da-71c5-4448-96d9-7c4db385eb19")]
     144  public class Vertex<T> : Vertex, IVertex<T> where T : class, IDeepCloneable {
    145145    [Storable]
    146146    private T data;

  • branches/PersistenceReintegration/HeuristicLab.Core/3.3/Collections/ItemArray.cs

    r14185 r14927  
    2626using HeuristicLab.Collections;
    2727using HeuristicLab.Common;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HeuristicLab.Persistence;
    2929
    3030namespace HeuristicLab.Core {
    31   [StorableClass]
     31  [StorableType("0a574f49-d76d-4ce6-84bf-ca4b4ee82c45")]
    3232  [Item("ItemArray", "Represents an array of items.")]
    3333  public class ItemArray<T> : ObservableArray<T>, IItemArray<T> where T : class, IItem {

  • branches/PersistenceReintegration/HeuristicLab.Core/3.3/Collections/ItemCollection.cs

    r14185 r14927  
    2626using HeuristicLab.Collections;
    2727using HeuristicLab.Common;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HeuristicLab.Persistence;
    2929
    3030namespace HeuristicLab.Core {
    31   [StorableClass]
     31  [StorableType("1a2186c9-4e36-4d6a-b968-fcc1d4485600")]
    3232  [Item("ItemCollection", "Represents a collection of items.")]
    3333  public class ItemCollection<T> : ObservableCollection<T>, IItemCollection<T> where T : class, IItem {

  • branches/PersistenceReintegration/HeuristicLab.Core/3.3/Collections/ItemDictionary.cs

    r14185 r14927  
    2525using HeuristicLab.Collections;
    2626using HeuristicLab.Common;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HeuristicLab.Persistence;
    2828
    2929namespace HeuristicLab.Core {
    30   [StorableClass]
     30  [StorableType("8b66bc68-4684-47df-a8e6-00a023de38a8")]
    3131  [Item("ItemDictionary", "Represents a dictionary of items.")]
    3232  public class ItemDictionary<TKey, TValue> : ObservableDictionary<TKey, TValue>, IItemDictionary<TKey, TValue>

  • branches/PersistenceReintegration/HeuristicLab.Core/3.3/Collections/ItemList.cs

    r14185 r14927  
    2626using HeuristicLab.Collections;
    2727using HeuristicLab.Common;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HeuristicLab.Persistence;
    2929
    3030namespace HeuristicLab.Core {
    31   [StorableClass]
     31  [StorableType("8c2e6dea-fb5a-4782-a3d2-34294627e364")]
    3232  [Item("ItemList", "Represents a list of items.")]
    3333  public class ItemList<T> : ObservableList<T>, IItemList<T> where T : class, IItem {

  • branches/PersistenceReintegration/HeuristicLab.Core/3.3/Collections/ItemSet.cs

    r14185 r14927  
    2626using HeuristicLab.Collections;
    2727using HeuristicLab.Common;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HeuristicLab.Persistence;
    2929
    3030namespace HeuristicLab.Core {
    31   [StorableClass]
     31  [StorableType("ef1b719e-47b7-47bf-80cf-14b0c5b6d301")]
    3232  [Item("ItemSet", "Represents a set of items.")]
    3333  public class ItemSet<T> : ObservableSet<T>, IItemSet<T> where T : class, IItem {

  • branches/PersistenceReintegration/HeuristicLab.Core/3.3/Collections/KeyedItemCollection.cs

    r14185 r14927  
    2525using HeuristicLab.Collections;
    2626using HeuristicLab.Common;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HeuristicLab.Persistence;
    2828
    2929namespace HeuristicLab.Core {
    3030  [Item("KeyedItemCollection", "Represents a keyed collection of items.")]
    31   [StorableClass]
     31  [StorableType("12d433de-ad9f-4122-89bf-0763061e59c9")]
    3232  public abstract class KeyedItemCollection<TKey, TItem> : ObservableKeyedCollection<TKey, TItem>, IKeyedItemCollection<TKey, TItem> where TItem : class, IItem {
    3333    public virtual string ItemName {

  • branches/PersistenceReintegration/HeuristicLab.Core/3.3/Collections/NamedItemCollection.cs

    r14185 r14927  
    2323using System.Collections.Generic;
    2424using HeuristicLab.Common;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HeuristicLab.Persistence;
    2626
    2727namespace HeuristicLab.Core {
    2828  [Item("NamedItemCollection", "Represents a collection of named items.")]
    29   [StorableClass]
     29  [StorableType("b0e5eea7-b0a4-433a-a2fc-5b4ea14e0e05")]
    3030  public class NamedItemCollection<T> : KeyedItemCollection<string, T> where T : class, INamedItem {
    3131    [StorableConstructor]

  • branches/PersistenceReintegration/HeuristicLab.Core/3.3/Collections/OperationCollection.cs

    r14185 r14927  
    2323using System.Linq;
    2424using HeuristicLab.Common;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HeuristicLab.Persistence;
    2626
    2727namespace HeuristicLab.Core {
    28   [StorableClass]
     28  [StorableType("cf411669-6645-4a19-a40c-259a3f76fd3d")]
    2929  public sealed class OperationCollection : DeepCloneable, IList<IOperation>, IOperation {
    3030    [Storable]

  • branches/PersistenceReintegration/HeuristicLab.Core/3.3/Collections/OperatorCollection.cs

    r14185 r14927  
    2222using System.Collections.Generic;
    2323using HeuristicLab.Common;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HeuristicLab.Persistence;
    2525
    2626namespace HeuristicLab.Core {
    27   [StorableClass]
     27  [StorableType("f703f10f-0e77-4f36-8f3e-733d84548ba2")]
    2828  [Item("Operator Collection", "Represents a collection of operators.")]
    2929  public class OperatorCollection : ItemCollection<IOperator> {

  • branches/PersistenceReintegration/HeuristicLab.Core/3.3/Collections/OperatorList.cs

    r14185 r14927  
    2222using System.Collections.Generic;
    2323using HeuristicLab.Common;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HeuristicLab.Persistence;
    2525
    2626namespace HeuristicLab.Core {
    27   [StorableClass]
     27  [StorableType("59bd31c3-ca0b-4ba1-9d98-7fc957d2d201")]
    2828  [Item("OperatorList", "Represents a list of operators.")]
    2929  public class OperatorList : ItemList<IOperator> {

  • branches/PersistenceReintegration/HeuristicLab.Core/3.3/Collections/OperatorSet.cs

    r14185 r14927  
    2222using System.Collections.Generic;
    2323using HeuristicLab.Common;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HeuristicLab.Persistence;
    2525
    2626namespace HeuristicLab.Core {
    27   [StorableClass]
     27  [StorableType("ce206a6b-691e-4a21-ab86-dcb0f7476300")]
    2828  [Item("OperatorSet", "Represents a set of operators.")]
    2929  public class OperatorSet : ItemSet<IOperator> {

  • branches/PersistenceReintegration/HeuristicLab.Core/3.3/Collections/ParameterCollection.cs

    r14185 r14927  
    2222using System.Collections.Generic;
    2323using HeuristicLab.Common;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HeuristicLab.Persistence;
    2525
    2626namespace HeuristicLab.Core {
    27   [StorableClass]
     27  [StorableType("921f7ab3-0ff1-4e2a-ad41-7774cb0e3fc8")]
    2828  [Item("ParameterCollection", "Represents a collection of parameters.")]
    2929  public class ParameterCollection : NamedItemCollection<IParameter> {

  • branches/PersistenceReintegration/HeuristicLab.Core/3.3/Collections/ReadOnlyCheckedItemCollection.cs

    r14185 r14927  
    2424using HeuristicLab.Collections;
    2525using HeuristicLab.Common;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HeuristicLab.Persistence;
    2727
    2828namespace HeuristicLab.Core {
    29   [StorableClass]
     29  [StorableType("d3dc532a-1a15-43d7-8a49-de499a264543")]
    3030  [Item("ReadOnlyCheckedItemCollection", "Represents a read-only collection of checked items.")]
    3131  public class ReadOnlyCheckedItemCollection<T> : ReadOnlyItemCollection<T>, ICheckedItemCollection<T> where T : class, IItem {

  • branches/PersistenceReintegration/HeuristicLab.Core/3.3/Collections/ReadOnlyCheckedItemList.cs

    r14185 r14927  
    2424using HeuristicLab.Collections;
    2525using HeuristicLab.Common;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HeuristicLab.Persistence;
    2727
    2828namespace HeuristicLab.Core {
    29   [StorableClass]
     29  [StorableType("0f4d2911-e0d3-4ff8-999d-9374780ec1ec")]
    3030  [Item("ReadOnlyCheckedItemList", "Represents a read-only list of checked items.")]
    3131  public class ReadOnlyCheckedItemList<T> : ReadOnlyItemList<T>, ICheckedItemList<T> where T : class, IItem {

  • branches/PersistenceReintegration/HeuristicLab.Core/3.3/Collections/ReadOnlyItemArray.cs

    r14185 r14927  
    2424using HeuristicLab.Collections;
    2525using HeuristicLab.Common;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HeuristicLab.Persistence;
    2727
    2828namespace HeuristicLab.Core {
    29   [StorableClass]
     29  [StorableType("46f77f5c-02db-4389-9140-9ac30f5edd76")]
    3030  [Item("ReadOnlyItemArray", "Represents a read-only array of items.")]
    3131  public class ReadOnlyItemArray<T> : ReadOnlyObservableArray<T>, IItemArray<T> where T : class, IItem {

  • branches/PersistenceReintegration/HeuristicLab.Core/3.3/Collections/ReadOnlyItemCollection.cs

    r14185 r14927  
    2424using HeuristicLab.Collections;
    2525using HeuristicLab.Common;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HeuristicLab.Persistence;
    2727
    2828namespace HeuristicLab.Core {
    29   [StorableClass]
     29  [StorableType("beced559-4078-4ba0-a027-c26dd18a27e1")]
    3030  [Item("ReadOnlyItemCollection", "Represents a read-only collection of items.")]
    3131  public class ReadOnlyItemCollection<T> : ReadOnlyObservableCollection<T>, IItemCollection<T> where T : class, IItem {

  • branches/PersistenceReintegration/HeuristicLab.Core/3.3/Collections/ReadOnlyItemDictionary.cs

    r14185 r14927  
    2424using HeuristicLab.Collections;
    2525using HeuristicLab.Common;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HeuristicLab.Persistence;
    2727
    2828namespace HeuristicLab.Core {
    29   [StorableClass]
     29  [StorableType("6d16ce4e-9076-4226-8323-21a858e4617f")]
    3030  [Item("ReadOnlyItemDictionary", "Represents a read-only dictionary of items.")]
    3131  public class ReadOnlyItemDictionary<TKey, TValue> : ReadOnlyObservableDictionary<TKey, TValue>, IItemDictionary<TKey, TValue>

  • branches/PersistenceReintegration/HeuristicLab.Core/3.3/Collections/ReadOnlyItemList.cs

    r14185 r14927  
    2424using HeuristicLab.Collections;
    2525using HeuristicLab.Common;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HeuristicLab.Persistence;
    2727
    2828namespace HeuristicLab.Core {
    29   [StorableClass]
     29  [StorableType("3c5c521a-8ce8-4f5a-8a83-8ef21bf8bf3b")]
    3030  [Item("ReadOnlyItemList", "Represents a read-only list of items.")]
    3131  public class ReadOnlyItemList<T> : ReadOnlyObservableList<T>, IItemList<T> where T : class, IItem {

  • branches/PersistenceReintegration/HeuristicLab.Core/3.3/Collections/ReadOnlyItemSet.cs

    r14185 r14927  
    2424using HeuristicLab.Collections;
    2525using HeuristicLab.Common;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HeuristicLab.Persistence;
    2727
    2828namespace HeuristicLab.Core {
    29   [StorableClass]
     29  [StorableType("8a5dffb9-a7b5-4042-a0d1-4f4aa3ff08de")]
    3030  [Item("ReadOnlyItemSet", "Represents a read-only set of items.")]
    3131  public class ReadOnlyItemSet<T> : ReadOnlyObservableSet<T>, IItemSet<T> where T : class, IItem {

  • branches/PersistenceReintegration/HeuristicLab.Core/3.3/Collections/ReadOnlyKeyedItemCollection.cs

    r14185 r14927  
    2424using HeuristicLab.Collections;
    2525using HeuristicLab.Common;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HeuristicLab.Persistence;
    2727
    2828namespace HeuristicLab.Core {
    29   [StorableClass]
     29  [StorableType("a0b6c811-6f0a-429c-8e34-dd84d8e72c39")]
    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 {

  • branches/PersistenceReintegration/HeuristicLab.Core/3.3/Collections/ScopeList.cs

    r14185 r14927  
    2222using System.Collections.Generic;
    2323using HeuristicLab.Common;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HeuristicLab.Persistence;
    2525
    2626namespace HeuristicLab.Core {
    27   [StorableClass]
     27  [StorableType("f19c8c22-914a-4110-a86c-9d6a49d7d0a8")]
    2828  [Item("ScopeList", "Represents a list of scopes.")]
    2929  public sealed class ScopeList : ItemList<IScope> {

  • branches/PersistenceReintegration/HeuristicLab.Core/3.3/Collections/ValueParameterCollection.cs

    r14185 r14927  
    2222using System.Collections.Generic;
    2323using HeuristicLab.Common;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HeuristicLab.Persistence;
    2525
    2626namespace HeuristicLab.Core {
    27   [StorableClass]
     27  [StorableType("91c1fb23-1394-4655-ba9b-07fb3d2686a8")]
    2828  [Item("ValueParameterCollection", "Represents a collection of value parameters.")]
    2929  public class ValueParameterCollection : NamedItemCollection<IValueParameter> {

  • branches/PersistenceReintegration/HeuristicLab.Core/3.3/Collections/VariableCollection.cs

    r14185 r14927  
    2222using System.Collections.Generic;
    2323using HeuristicLab.Common;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HeuristicLab.Persistence;
    2525
    2626namespace HeuristicLab.Core {
    27   [StorableClass]
     27  [StorableType("d58e79c9-e34f-4439-b152-a915221c3715")]
    2828  [Item("VariableCollection", "Represents a collection of variables.")]
    2929  public sealed class VariableCollection : NamedItemCollection<IVariable> {

  • branches/PersistenceReintegration/HeuristicLab.Core/3.3/Constraints/ComparisonConstraint.cs

    r14185 r14927  
    2323using System.Collections.Generic;
    2424using HeuristicLab.Common;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HeuristicLab.Persistence;
    2626
    2727namespace HeuristicLab.Core {
    28   [StorableClass]
     28  [StorableType("88a25f2a-5430-45a9-b477-308f37812ad9")]
    2929  [Item("ComparisonConstraint", "A constraint which checks for specified compare operation.")]
    3030  public class ComparisonConstraint : Constraint {

  • branches/PersistenceReintegration/HeuristicLab.Core/3.3/Constraints/Constraint.cs

    r14185 r14927  
    2424using System.Linq;
    2525using HeuristicLab.Common;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HeuristicLab.Persistence;
    2727
    2828namespace HeuristicLab.Core {
    29   [StorableClass]
     29  [StorableType("fce56ba2-5786-4645-8f90-590a7d436c18")]
    3030  public abstract class Constraint : Item, IConstraint {
    3131    [StorableConstructor]

  • branches/PersistenceReintegration/HeuristicLab.Core/3.3/Constraints/ConstraintOperation.cs

    r14185 r14927  
    2020#endregion
    2121
    22 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     22using HeuristicLab.Persistence;
    2323namespace HeuristicLab.Core {
    24   [StorableClass]
     24  [StorableType("da8fba0a-2c33-434d-be0b-c049e1e4af4f")]
    2525  public class ConstraintOperation {
    2626    public static readonly ConstraintOperation Equal = new ConstraintOperation(0, "Equal");

  • branches/PersistenceReintegration/HeuristicLab.Core/3.3/Constraints/EqualityConstraint.cs

    r14185 r14927  
    2323using System.Collections.Generic;
    2424using HeuristicLab.Common;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HeuristicLab.Persistence;
    2626
    2727namespace HeuristicLab.Core {
    28   [StorableClass]
     28  [StorableType("c3b37852-73e8-47ea-9071-39146d9d9dff")]
    2929  [Item("EqualityConstraint", "A constraint which checks for equality.")]
    3030  public class EqualityConstraint : Constraint {

  • branches/PersistenceReintegration/HeuristicLab.Core/3.3/Constraints/TypeCompatibilityConstraint.cs

    r14185 r14927  
    2323using System.Collections.Generic;
    2424using HeuristicLab.Common;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HeuristicLab.Persistence;
    2626
    2727namespace HeuristicLab.Core {
    28   [StorableClass]
     28  [StorableType("bedfe153-9e1e-404a-b60d-cf2fb98c1631")]
    2929  [Item("TypeCompatibilityConstraint", "A constraint that checks for compatible types.")]
    3030  public class TypeCompatibilityConstraint : Constraint {

  • branches/PersistenceReintegration/HeuristicLab.Core/3.3/Engine.cs

    r14185 r14927  
    2525using System.Threading.Tasks;
    2626using HeuristicLab.Common;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HeuristicLab.Persistence;
    2828
    2929namespace HeuristicLab.Core {
    3030  [Item("Engine", "A base class for engines.")]
    31   [StorableClass]
     31  [StorableType("fd2385ca-79e8-496e-bd12-4925d4b3cd1a")]
    3232  public abstract class Engine : Executable, IEngine {
    3333    [Storable]
    … …  
    9090        try {
    9191          t.Wait();
    92         }
    93         catch (AggregateException ex) {
     92        } catch (AggregateException ex) {
    9493          try {
    9594            ex.Flatten().Handle(x => x is OperationCanceledException);
    96           }
    97           catch (AggregateException remaining) {
     95          } catch (AggregateException remaining) {
    9896            if (remaining.InnerExceptions.Count == 1) OnExceptionOccurred(remaining.InnerExceptions[0]);
    9997            else OnExceptionOccurred(remaining);
    … …  
    152150      try {
    153151        Run(cancellationToken);
    154       }
    155       finally {
     152      } finally {
    156153        timer.Elapsed -= new System.Timers.ElapsedEventHandler(timer_Elapsed);
    157154        timer.Stop();

  • branches/PersistenceReintegration/HeuristicLab.Core/3.3/Executable.cs

    r14185 r14927  
    2323using System.Drawing;
    2424using HeuristicLab.Common;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HeuristicLab.Persistence;
    2626
    2727namespace HeuristicLab.Core {
    2828  [Item("Executable", "A base class for executables.")]
    29   [StorableClass]
     29  [StorableType("1da020c4-f08d-4abb-8399-0e1fd9ec670a")]
    3030  public abstract class Executable : Item, IExecutable {
    3131    public static new Image StaticItemImage {

  • branches/PersistenceReintegration/HeuristicLab.Core/3.3/ExecutionContext.cs

    r14185 r14927  
    2222using System;
    2323using HeuristicLab.Common;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HeuristicLab.Persistence;
    2525
    2626namespace HeuristicLab.Core {
    27   [StorableClass]
     27  [StorableType("09b21cdb-7fa9-4870-ab07-efc08fc524de")]
    2828  public sealed class ExecutionContext : DeepCloneable, IExecutionContext, IAtomicOperation {
    2929    [Storable]

  • branches/PersistenceReintegration/HeuristicLab.Core/3.3/HeuristicLab.Core-3.3.csproj

    r14926 r14927  
    234234      <Private>False</Private>
    235235    </ProjectReference>
     236    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
     237      <Project>{102bc7d3-0ef9-439c-8f6d-96ff0fdb8e1b}</Project>
     238      <Name>HeuristicLab.Persistence-3.3</Name>
     239    </ProjectReference>
    236240    <ProjectReference Include="..\..\HeuristicLab.Persistence\4.0\HeuristicLab.Persistence-4.0.csproj">
    237241      <Project>{b1663091-8156-4deb-9e37-5b19810a4644}</Project>

  • branches/PersistenceReintegration/HeuristicLab.Core/3.3/Interfaces/DirectedGraph/IArc.cs

    r14185 r14927  
    3333  }
    3434
    35   public interface IArc<T> : IArc where T : class,IDeepCloneable {
     35  public interface IArc<T> : IArc where T : class, IDeepCloneable {
    3636    T Data { get; set; }
    3737  }

  • branches/PersistenceReintegration/HeuristicLab.Core/3.3/Interfaces/ICheckedMultiOperator.cs

    r14185 r14927  
    2222
    2323namespace HeuristicLab.Core {
    24   public interface ICheckedMultiOperator<T> : IMultiOperator<T> where T : class,IOperator {
     24  public interface ICheckedMultiOperator<T> : IMultiOperator<T> where T : class, IOperator {
    2525    new ICheckedItemList<T> Operators { get; }
    2626  }

  • branches/PersistenceReintegration/HeuristicLab.Core/3.3/Interfaces/IMultiOperator.cs

    r14185 r14927  
    2222
    2323namespace HeuristicLab.Core {
    24   public interface IMultiOperator<T> : IOperator where T : class,IOperator {
     24  public interface IMultiOperator<T> : IOperator where T : class, IOperator {
    2525    IItemList<T> Operators { get; }
    2626  }

  • branches/PersistenceReintegration/HeuristicLab.Core/3.3/Item.cs

    r14185 r14927  
    2323using System.Drawing;
    2424using HeuristicLab.Common;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HeuristicLab.Persistence;
    2626
    2727namespace HeuristicLab.Core {
    … …  
    2929  /// Represents the base class for all basic item types.
    3030  /// </summary>
    31   [StorableClass]
     31  [StorableType("307c797a-d48f-4673-82d1-467eada0c482")]
    3232  [Item("Item", "Base class for all HeuristicLab items.")]
    3333  public abstract class Item : IItem {

  • branches/PersistenceReintegration/HeuristicLab.Core/3.3/Log.cs

    r14185 r14927  
    2424using System.Drawing;
    2525using HeuristicLab.Common;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HeuristicLab.Persistence;
    2727using HeuristicLab.PluginInfrastructure;
    2828
    2929namespace HeuristicLab.Core {
    3030  [Item("Log", "A log for logging string messages.")]
    31   [StorableClass]
     31  [StorableType("655d94e0-8058-42e8-9a44-6b43c83887e0")]
    3232  public sealed class Log : Item, ILog, IStorableContent {
    3333    public string Filename { get; set; }

  • branches/PersistenceReintegration/HeuristicLab.Core/3.3/NamedItem.cs

    r14185 r14927  
    2222using System;
    2323using HeuristicLab.Common;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HeuristicLab.Persistence;
    2525
    2626namespace HeuristicLab.Core {
    2727  [Item("NamedItem", "Base class for items which have a name and an optional description.")]
    28   [StorableClass]
     28  [StorableType("8942465b-b857-4b21-afbb-ca5a6d7edf4f")]
    2929  public abstract class NamedItem : Item, INamedItem {
    3030    [Storable]

  • branches/PersistenceReintegration/HeuristicLab.Core/3.3/OperatorGraph.cs

    r14185 r14927  
    2525using HeuristicLab.Collections;
    2626using HeuristicLab.Common;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HeuristicLab.Persistence;
    2828
    2929namespace HeuristicLab.Core {
    … …  
    3232  /// </summary>
    3333  [Item("Operator Graph", "Represents a graph of operators.")]
    34   [StorableClass]
     34  [StorableType("749477b8-e741-4373-a6ee-d1f98e11e91d")]
    3535  public class OperatorGraph : Item, IStorableContent {
    3636    public string Filename { get; set; }

  • branches/PersistenceReintegration/HeuristicLab.Core/3.3/ParameterizedNamedItem.cs

    r14185 r14927  
    2424using System.Linq;
    2525using HeuristicLab.Common;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HeuristicLab.Persistence;
    2727
    2828namespace HeuristicLab.Core {
    … …  
    3131  /// </summary>
    3232  [Item("ParameterizedNamedItem", "A base class for items which have a name and contain parameters.")]
    33   [StorableClass]
     33  [StorableType("176c4e71-1544-4c7f-af48-42f811d170ab")]
    3434  public abstract class ParameterizedNamedItem : NamedItem, IParameterizedNamedItem {
    3535    [Storable]

  • branches/PersistenceReintegration/HeuristicLab.Core/3.3/Scope.cs

    r14185 r14927  
    2323using HeuristicLab.Collections;
    2424using HeuristicLab.Common;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HeuristicLab.Persistence;
    2626
    2727namespace HeuristicLab.Core {
    … …  
    3030  /// </summary>
    3131  [Item("Scope", "A scope which contains variables and sub-scopes.")]
    32   [StorableClass]
     32  [StorableType("4f032016-f898-47cf-a536-6ed4833dc65d")]
    3333  public sealed class Scope : NamedItem, IScope {
    3434    public static new Image StaticItemImage {

  • branches/PersistenceReintegration/HeuristicLab.Core/3.3/ThreadSafeLog.cs

    r14185 r14927  
    2424using System.Collections.Generic;
    2525using HeuristicLab.Common;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HeuristicLab.Persistence;
    2727
    2828namespace HeuristicLab.Core {
    2929  [Item("ThreadSafeLog", "A thread-safe log for logging string messages.")]
    30   [StorableClass]
     30  [StorableType("0f729d7c-8d01-4297-8793-ed1524d360a1")]
    3131  public sealed class ThreadSafeLog : Item, ILog, IStorableContent {
    3232    public string Filename { get; set; }

  • branches/PersistenceReintegration/HeuristicLab.Core/3.3/Variable.cs

    r14185 r14927  
    2323using System.Drawing;
    2424using HeuristicLab.Common;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HeuristicLab.Persistence;
    2626
    2727namespace HeuristicLab.Core {
    … …  
    3030  /// </summary>
    3131  [Item("Variable", "A variable which has a name and holds an IItem.")]
    32   [StorableClass]
     32  [StorableType("91282682-72d9-43fb-9927-55ad65c71bcb")]
    3333  public sealed class Variable : NamedItem, IVariable {
    3434    public override Image ItemImage {
Note: See TracChangeset for help on using the changeset viewer.