Changeset 14711 for branches/PersistenceOverhaul/HeuristicLab.Core/3.3

Timestamp:

03/03/17 11:41:43 (8 years ago)

Author:

gkronber

Message:

#2520

• renamed StorableClass -> StorableType
• changed persistence to use GUIDs instead of type names

Location:

branches/PersistenceOverhaul/HeuristicLab.Core/3.3

Files:

• Collections/CheckedItemCollection.cs (modified) (1 diff)
• Collections/CheckedItemList.cs (modified) (1 diff)
• Collections/ConstraintCollection.cs (modified) (1 diff)
• Collections/DirectedGraph/Arc.cs (modified) (2 diffs)
• Collections/DirectedGraph/DirectedGraph.cs (modified) (1 diff)
• Collections/DirectedGraph/Vertex.cs (modified) (2 diffs)
• Collections/ItemArray.cs (modified) (1 diff)
• Collections/ItemCollection.cs (modified) (1 diff)
• Collections/ItemDictionary.cs (modified) (1 diff)
• Collections/ItemList.cs (modified) (1 diff)
• Collections/ItemSet.cs (modified) (1 diff)
• Collections/KeyedItemCollection.cs (modified) (1 diff)
• Collections/NamedItemCollection.cs (modified) (1 diff)
• Collections/OperationCollection.cs (modified) (1 diff)
• Collections/OperatorCollection.cs (modified) (1 diff)
• Collections/OperatorList.cs (modified) (1 diff)
• Collections/OperatorSet.cs (modified) (1 diff)
• Collections/ParameterCollection.cs (modified) (1 diff)
• Collections/ReadOnlyCheckedItemCollection.cs (modified) (1 diff)
• Collections/ReadOnlyCheckedItemList.cs (modified) (1 diff)
• Collections/ReadOnlyItemArray.cs (modified) (1 diff)
• Collections/ReadOnlyItemCollection.cs (modified) (1 diff)
• Collections/ReadOnlyItemDictionary.cs (modified) (1 diff)
• Collections/ReadOnlyItemList.cs (modified) (1 diff)
• Collections/ReadOnlyItemSet.cs (modified) (1 diff)
• Collections/ReadOnlyKeyedItemCollection.cs (modified) (1 diff)
• Collections/ScopeList.cs (modified) (1 diff)
• Collections/ValueParameterCollection.cs (modified) (1 diff)
• Collections/VariableCollection.cs (modified) (1 diff)
• Constraints/ComparisonConstraint.cs (modified) (1 diff)
• Constraints/Constraint.cs (modified) (1 diff)
• Constraints/ConstraintOperation.cs (modified) (1 diff)
• Constraints/EqualityConstraint.cs (modified) (1 diff)
• Constraints/TypeCompatibilityConstraint.cs (modified) (1 diff)
• Engine.cs (modified) (1 diff)
• Executable.cs (modified) (1 diff)
• ExecutionContext.cs (modified) (1 diff)
• Item.cs (modified) (1 diff)
• Log.cs (modified) (1 diff)
• NamedItem.cs (modified) (1 diff)
• OperatorGraph.cs (modified) (1 diff)
• ParameterizedNamedItem.cs (modified) (1 diff)
• Scope.cs (modified) (1 diff)
• ThreadSafeLog.cs (modified) (1 diff)
• Variable.cs (modified) (1 diff)

branches/PersistenceOverhaul/HeuristicLab.Core/3.3/Collections/CheckedItemCollection.cs

@@ -32 +32 @@
   /// </summary>
   /// <typeparam name="T">The element type (base type IItem)</typeparam>
-  [StorableClass("7CA48FC0-AA99-46AC-B0D0-AFF37349D896")]
+  [StorableType("7CA48FC0-AA99-46AC-B0D0-AFF37349D896")]
   [Item("CheckedItemCollection", "Represents a collection of items that can be checked or unchecked.")]
   public class CheckedItemCollection<T> : ItemCollection<T>, ICheckedItemCollection<T> where T : class, IItem {

branches/PersistenceOverhaul/HeuristicLab.Core/3.3/Collections/CheckedItemList.cs

@@ -32 +32 @@
   /// </summary>
   /// <typeparam name="T">The element type (base type is IItem)</typeparam>
-  [StorableClass("A7EB1197-74BE-46AC-AACE-D4575A395873")]
+  [StorableType("A7EB1197-74BE-46AC-AACE-D4575A395873")]
   [Item("CheckedItemList", "Represents a list of items that can be checked or unchecked.")]
   public class CheckedItemList<T> : ItemList<T>, ICheckedItemList<T> where T : class, IItem {

branches/PersistenceOverhaul/HeuristicLab.Core/3.3/Collections/ConstraintCollection.cs

@@ -25 +25 @@
 
 namespace HeuristicLab.Core {
-  [StorableClass("C0BE1B31-84C2-40A3-8D5F-2D4EBCCCB70D")]
+  [StorableType("C0BE1B31-84C2-40A3-8D5F-2D4EBCCCB70D")]
   [Item("ConstraintCollection", "Represents a collection of constraints.")]
   public class ConstraintCollection : ItemCollection<IConstraint> {

branches/PersistenceOverhaul/HeuristicLab.Core/3.3/Collections/DirectedGraph/Arc.cs

@@ -26 +26 @@
 namespace HeuristicLab.Core {
   [Item("Arc", "A graph arc connecting two graph vertices, that can have a weight, label, and data object for holding additional info")]
-  [StorableClass("B9E1D948-BCEF-4B07-AADD-2E39A80F15DF")]
+  [StorableType("B9E1D948-BCEF-4B07-AADD-2E39A80F15DF")]
   public class Arc : Item, IArc {
     [Storable]
@@ -82 +82 @@
   }
 
-  [StorableClass("9C41B31C-E208-46A2-87FC-45A9F0A9A928")]
+  [StorableType("9C41B31C-E208-46A2-87FC-45A9F0A9A928")]
   public class Arc<T> : Arc, IArc<T> where T : class,IDeepCloneable {
     [Storable]

branches/PersistenceOverhaul/HeuristicLab.Core/3.3/Collections/DirectedGraph/DirectedGraph.cs

@@ -30 +30 @@
 namespace HeuristicLab.Core {
   [Item("DirectedGraph", "Generic class representing a directed graph with custom vertices and content")]
-  [StorableClass("57BB1C46-28A7-482A-8BAE-437AD14B0158")]
+  [StorableType("57BB1C46-28A7-482A-8BAE-437AD14B0158")]
   public class DirectedGraph : Item, IDirectedGraph {
     public override Image ItemImage { get { return VSImageLibrary.Graph; } }

branches/PersistenceOverhaul/HeuristicLab.Core/3.3/Collections/DirectedGraph/Vertex.cs

@@ -28 +28 @@
 namespace HeuristicLab.Core {
   [Item("Vertex", "An object representing a vertex in the graph. It can have a text label, a weight, and an additional data object.")]
-  [StorableClass("DC0C1D1F-82DF-4150-94CC-A10FD3667F72")]
+  [StorableType("DC0C1D1F-82DF-4150-94CC-A10FD3667F72")]
   public class Vertex : Item, IVertex {
     [Storable]
@@ -141 +141 @@
   }
 
-  [StorableClass("0B8261A0-8829-4BB8-B7EF-940A9A0AB1D9")]
+  [StorableType("0B8261A0-8829-4BB8-B7EF-940A9A0AB1D9")]
   public class Vertex<T> : Vertex, IVertex<T> where T : class,IDeepCloneable {
     [Storable]

branches/PersistenceOverhaul/HeuristicLab.Core/3.3/Collections/ItemArray.cs

@@ -29 +29 @@
 
 namespace HeuristicLab.Core {
-  [StorableClass("4DC5BC72-18EC-457F-96FD-C9408C10B15F")]
+  [StorableType("4DC5BC72-18EC-457F-96FD-C9408C10B15F")]
   [Item("ItemArray", "Represents an array of items.")]
   public class ItemArray<T> : ObservableArray<T>, IItemArray<T> where T : class, IItem {

branches/PersistenceOverhaul/HeuristicLab.Core/3.3/Collections/ItemCollection.cs

@@ -29 +29 @@
 
 namespace HeuristicLab.Core {
-  [StorableClass("A9222563-D714-43F1-8A52-0E3779C4C0F8")]
+  [StorableType("A9222563-D714-43F1-8A52-0E3779C4C0F8")]
   [Item("ItemCollection", "Represents a collection of items.")]
   public class ItemCollection<T> : ObservableCollection<T>, IItemCollection<T> where T : class, IItem {

branches/PersistenceOverhaul/HeuristicLab.Core/3.3/Collections/ItemDictionary.cs

@@ -28 +28 @@
 
 namespace HeuristicLab.Core {
-  [StorableClass("99361DE7-D6B9-4D1B-8797-AD7E3FC7CA30")]
+  [StorableType("99361DE7-D6B9-4D1B-8797-AD7E3FC7CA30")]
   [Item("ItemDictionary", "Represents a dictionary of items.")]
   public class ItemDictionary<TKey, TValue> : ObservableDictionary<TKey, TValue>, IItemDictionary<TKey, TValue>

branches/PersistenceOverhaul/HeuristicLab.Core/3.3/Collections/ItemList.cs

@@ -29 +29 @@
 
 namespace HeuristicLab.Core {
-  [StorableClass("387AADA0-A019-4B09-B8A7-FEBFB17EC6E8")]
+  [StorableType("387AADA0-A019-4B09-B8A7-FEBFB17EC6E8")]
   [Item("ItemList", "Represents a list of items.")]
   public class ItemList<T> : ObservableList<T>, IItemList<T> where T : class, IItem {

branches/PersistenceOverhaul/HeuristicLab.Core/3.3/Collections/ItemSet.cs

@@ -29 +29 @@
 
 namespace HeuristicLab.Core {
-  [StorableClass("9B0FF207-0B25-4ADA-A45D-51D3250CF0E8")]
+  [StorableType("9B0FF207-0B25-4ADA-A45D-51D3250CF0E8")]
   [Item("ItemSet", "Represents a set of items.")]
   public class ItemSet<T> : ObservableSet<T>, IItemSet<T> where T : class, IItem {

branches/PersistenceOverhaul/HeuristicLab.Core/3.3/Collections/KeyedItemCollection.cs

@@ -29 +29 @@
 namespace HeuristicLab.Core {
   [Item("KeyedItemCollection", "Represents a keyed collection of items.")]
-  [StorableClass("E578BDD7-77B2-40D0-8F31-68A190A61DDD")]
+  [StorableType("E578BDD7-77B2-40D0-8F31-68A190A61DDD")]
   public abstract class KeyedItemCollection<TKey, TItem> : ObservableKeyedCollection<TKey, TItem>, IKeyedItemCollection<TKey, TItem> where TItem : class, IItem {
     public virtual string ItemName {

branches/PersistenceOverhaul/HeuristicLab.Core/3.3/Collections/NamedItemCollection.cs

@@ -27 +27 @@
 namespace HeuristicLab.Core {
   [Item("NamedItemCollection", "Represents a collection of named items.")]
-  [StorableClass("D3C81433-819F-4E33-866F-36B29F843E65")]
+  [StorableType("D3C81433-819F-4E33-866F-36B29F843E65")]
   public class NamedItemCollection<T> : KeyedItemCollection<string, T> where T : class, INamedItem {
     [StorableConstructor]

branches/PersistenceOverhaul/HeuristicLab.Core/3.3/Collections/OperationCollection.cs

@@ -26 +26 @@
 
 namespace HeuristicLab.Core {
-  [StorableClass("42ECBE1C-2DCC-4285-9EE5-270C390EF749")]
+  [StorableType("42ECBE1C-2DCC-4285-9EE5-270C390EF749")]
   public sealed class OperationCollection : DeepCloneable, IList<IOperation>, IOperation {
     [Storable]

branches/PersistenceOverhaul/HeuristicLab.Core/3.3/Collections/OperatorCollection.cs

@@ -25 +25 @@
 
 namespace HeuristicLab.Core {
-  [StorableClass("B171A41D-898C-4C25-A78C-91BEFE627499")]
+  [StorableType("B171A41D-898C-4C25-A78C-91BEFE627499")]
   [Item("Operator Collection", "Represents a collection of operators.")]
   public class OperatorCollection : ItemCollection<IOperator> {

branches/PersistenceOverhaul/HeuristicLab.Core/3.3/Collections/OperatorList.cs

@@ -25 +25 @@
 
 namespace HeuristicLab.Core {
-  [StorableClass("975E2255-B5B0-4B10-A864-B575DB095FEE")]
+  [StorableType("975E2255-B5B0-4B10-A864-B575DB095FEE")]
   [Item("OperatorList", "Represents a list of operators.")]
   public class OperatorList : ItemList<IOperator> {

branches/PersistenceOverhaul/HeuristicLab.Core/3.3/Collections/OperatorSet.cs

@@ -25 +25 @@
 
 namespace HeuristicLab.Core {
-  [StorableClass("D1287644-FD5C-4838-BB3F-8E66EA5350CC")]
+  [StorableType("D1287644-FD5C-4838-BB3F-8E66EA5350CC")]
   [Item("OperatorSet", "Represents a set of operators.")]
   public class OperatorSet : ItemSet<IOperator> {

branches/PersistenceOverhaul/HeuristicLab.Core/3.3/Collections/ParameterCollection.cs

@@ -25 +25 @@
 
 namespace HeuristicLab.Core {
-  [StorableClass("A6144D48-4C4D-43CF-950B-B4397C628BFF")]
+  [StorableType("A6144D48-4C4D-43CF-950B-B4397C628BFF")]
   [Item("ParameterCollection", "Represents a collection of parameters.")]
   public class ParameterCollection : NamedItemCollection<IParameter> {

branches/PersistenceOverhaul/HeuristicLab.Core/3.3/Collections/ReadOnlyCheckedItemCollection.cs

@@ -27 +27 @@
 
 namespace HeuristicLab.Core {
-  [StorableClass("4BA73C5B-BC1D-4DCD-8F7B-A70E3C783839")]
+  [StorableType("4BA73C5B-BC1D-4DCD-8F7B-A70E3C783839")]
   [Item("ReadOnlyCheckedItemCollection", "Represents a read-only collection of checked items.")]
   public class ReadOnlyCheckedItemCollection<T> : ReadOnlyItemCollection<T>, ICheckedItemCollection<T> where T : class, IItem {

branches/PersistenceOverhaul/HeuristicLab.Core/3.3/Collections/ReadOnlyCheckedItemList.cs

@@ -27 +27 @@
 
 namespace HeuristicLab.Core {
-  [StorableClass("74AF211B-7F7F-45AC-955A-9F2F915A467E")]
+  [StorableType("74AF211B-7F7F-45AC-955A-9F2F915A467E")]
   [Item("ReadOnlyCheckedItemList", "Represents a read-only list of checked items.")]
   public class ReadOnlyCheckedItemList<T> : ReadOnlyItemList<T>, ICheckedItemList<T> where T : class, IItem {

branches/PersistenceOverhaul/HeuristicLab.Core/3.3/Collections/ReadOnlyItemArray.cs

@@ -27 +27 @@
 
 namespace HeuristicLab.Core {
-  [StorableClass("4E5A29B9-2788-4492-AE20-852BFCE69760")]
+  [StorableType("4E5A29B9-2788-4492-AE20-852BFCE69760")]
   [Item("ReadOnlyItemArray", "Represents a read-only array of items.")]
   public class ReadOnlyItemArray<T> : ReadOnlyObservableArray<T>, IItemArray<T> where T : class, IItem {

branches/PersistenceOverhaul/HeuristicLab.Core/3.3/Collections/ReadOnlyItemCollection.cs

@@ -27 +27 @@
 
 namespace HeuristicLab.Core {
-  [StorableClass("9D904ACB-33DA-4F5D-9B7D-7E0AA2E75093")]
+  [StorableType("9D904ACB-33DA-4F5D-9B7D-7E0AA2E75093")]
   [Item("ReadOnlyItemCollection", "Represents a read-only collection of items.")]
   public class ReadOnlyItemCollection<T> : ReadOnlyObservableCollection<T>, IItemCollection<T> where T : class, IItem {

branches/PersistenceOverhaul/HeuristicLab.Core/3.3/Collections/ReadOnlyItemDictionary.cs

@@ -27 +27 @@
 
 namespace HeuristicLab.Core {
-  [StorableClass("A251EF9D-F357-4EE6-A02D-331D1E34ED5E")]
+  [StorableType("A251EF9D-F357-4EE6-A02D-331D1E34ED5E")]
   [Item("ReadOnlyItemDictionary", "Represents a read-only dictionary of items.")]
   public class ReadOnlyItemDictionary<TKey, TValue> : ReadOnlyObservableDictionary<TKey, TValue>, IItemDictionary<TKey, TValue>

branches/PersistenceOverhaul/HeuristicLab.Core/3.3/Collections/ReadOnlyItemList.cs

@@ -27 +27 @@
 
 namespace HeuristicLab.Core {
-  [StorableClass("08AAB9F2-6072-45FA-B72C-F4EA7037C4DC")]
+  [StorableType("08AAB9F2-6072-45FA-B72C-F4EA7037C4DC")]
   [Item("ReadOnlyItemList", "Represents a read-only list of items.")]
   public class ReadOnlyItemList<T> : ReadOnlyObservableList<T>, IItemList<T> where T : class, IItem {

branches/PersistenceOverhaul/HeuristicLab.Core/3.3/Collections/ReadOnlyItemSet.cs

@@ -27 +27 @@
 
 namespace HeuristicLab.Core {
-  [StorableClass("29A4649C-85DD-45E7-8AD9-C1A1227E2E84")]
+  [StorableType("29A4649C-85DD-45E7-8AD9-C1A1227E2E84")]
   [Item("ReadOnlyItemSet", "Represents a read-only set of items.")]
   public class ReadOnlyItemSet<T> : ReadOnlyObservableSet<T>, IItemSet<T> where T : class, IItem {

branches/PersistenceOverhaul/HeuristicLab.Core/3.3/Collections/ReadOnlyKeyedItemCollection.cs

@@ -27 +27 @@
 
 namespace HeuristicLab.Core {
-  [StorableClass("4ECE4D94-96C0-4A29-8048-FAD3F970D703")]
+  [StorableType("4ECE4D94-96C0-4A29-8048-FAD3F970D703")]
   [Item("ReadOnlyKeyedItemCollection", "Represents a read-only keyed collection of items.")]
   public class ReadOnlyKeyedItemCollection<TKey, TItem> : ReadOnlyObservableKeyedCollection<TKey, TItem>, IKeyedItemCollection<TKey, TItem> where TItem : class, IItem {

branches/PersistenceOverhaul/HeuristicLab.Core/3.3/Collections/ScopeList.cs

@@ -26 +26 @@
 
 namespace HeuristicLab.Core {
-  [StorableClass("34330C70-CFF1-4A58-B590-E4F5BBB3F6AC")]
+  [StorableType("34330C70-CFF1-4A58-B590-E4F5BBB3F6AC")]
   [Item("ScopeList", "Represents a list of scopes.")]
   public sealed class ScopeList : ItemList<IScope> {

branches/PersistenceOverhaul/HeuristicLab.Core/3.3/Collections/ValueParameterCollection.cs

@@ -25 +25 @@
 
 namespace HeuristicLab.Core {
-  [StorableClass("71918B1F-828F-4CBB-B71C-395277F6D804")]
+  [StorableType("71918B1F-828F-4CBB-B71C-395277F6D804")]
   [Item("ValueParameterCollection", "Represents a collection of value parameters.")]
   public class ValueParameterCollection : NamedItemCollection<IValueParameter> {

branches/PersistenceOverhaul/HeuristicLab.Core/3.3/Collections/VariableCollection.cs

@@ -25 +25 @@
 
 namespace HeuristicLab.Core {
-  [StorableClass("3DF17395-7DCE-447C-B10D-4FCF2EF72FCC")]
+  [StorableType("3DF17395-7DCE-447C-B10D-4FCF2EF72FCC")]
   [Item("VariableCollection", "Represents a collection of variables.")]
   public sealed class VariableCollection : NamedItemCollection<IVariable> {

branches/PersistenceOverhaul/HeuristicLab.Core/3.3/Constraints/ComparisonConstraint.cs

@@ -26 +26 @@
 
 namespace HeuristicLab.Core {
-  [StorableClass("47FEAFA7-5AA4-43FC-9FF9-2AAF696A96D1")]
+  [StorableType("47FEAFA7-5AA4-43FC-9FF9-2AAF696A96D1")]
   [Item("ComparisonConstraint", "A constraint which checks for specified compare operation.")]
   public class ComparisonConstraint : Constraint {

branches/PersistenceOverhaul/HeuristicLab.Core/3.3/Constraints/Constraint.cs

@@ -27 +27 @@
 
 namespace HeuristicLab.Core {
-  [StorableClass("7C05E7B6-3CFF-485D-90D5-7DFD0A109840")]
+  [StorableType("7C05E7B6-3CFF-485D-90D5-7DFD0A109840")]
   public abstract class Constraint : Item, IConstraint {
     [StorableConstructor]

branches/PersistenceOverhaul/HeuristicLab.Core/3.3/Constraints/ConstraintOperation.cs

@@ -22 +22 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 namespace HeuristicLab.Core {
-  [StorableClass("9B15D869-4983-4986-B60E-1E8EC67ADD1C")]
+  [StorableType("9B15D869-4983-4986-B60E-1E8EC67ADD1C")]
   public class ConstraintOperation {
     public static readonly ConstraintOperation Equal = new ConstraintOperation(0, "Equal");

branches/PersistenceOverhaul/HeuristicLab.Core/3.3/Constraints/EqualityConstraint.cs

@@ -26 +26 @@
 
 namespace HeuristicLab.Core {
-  [StorableClass("6152AD63-8842-4A70-A878-E96EC9FFD1DD")]
+  [StorableType("6152AD63-8842-4A70-A878-E96EC9FFD1DD")]
   [Item("EqualityConstraint", "A constraint which checks for equality.")]
   public class EqualityConstraint : Constraint {

branches/PersistenceOverhaul/HeuristicLab.Core/3.3/Constraints/TypeCompatibilityConstraint.cs

@@ -26 +26 @@
 
 namespace HeuristicLab.Core {
-  [StorableClass("F5207F5A-F1B5-4979-ACA2-72DEAD032892")]
+  [StorableType("F5207F5A-F1B5-4979-ACA2-72DEAD032892")]
   [Item("TypeCompatibilityConstraint", "A constraint that checks for compatible types.")]
   public class TypeCompatibilityConstraint : Constraint {

branches/PersistenceOverhaul/HeuristicLab.Core/3.3/Engine.cs

@@ -29 +29 @@
 namespace HeuristicLab.Core {
   [Item("Engine", "A base class for engines.")]
-  [StorableClass("1D0181E4-63A0-48D1-A5D9-60CB5EA0EFAA")]
+  [StorableType("1D0181E4-63A0-48D1-A5D9-60CB5EA0EFAA")]
   public abstract class Engine : Executable, IEngine {
     [Storable]

branches/PersistenceOverhaul/HeuristicLab.Core/3.3/Executable.cs

@@ -27 +27 @@
 namespace HeuristicLab.Core {
   [Item("Executable", "A base class for executables.")]
-  [StorableClass("56FAF843-3C4E-4380-890A-DEB832648697")]
+  [StorableType("56FAF843-3C4E-4380-890A-DEB832648697")]
   public abstract class Executable : Item, IExecutable {
     public static new Image StaticItemImage {

branches/PersistenceOverhaul/HeuristicLab.Core/3.3/ExecutionContext.cs

@@ -25 +25 @@
 
 namespace HeuristicLab.Core {
-  [StorableClass("159ADE61-BD88-413E-9189-5096B8AB75AA")]
+  [StorableType("159ADE61-BD88-413E-9189-5096B8AB75AA")]
   public sealed class ExecutionContext : DeepCloneable, IExecutionContext, IAtomicOperation {
     [Storable]

branches/PersistenceOverhaul/HeuristicLab.Core/3.3/Item.cs

@@ -29 +29 @@
   /// Represents the base class for all basic item types.
   /// </summary>
-  [StorableClass("70063A9F-4D62-4EBC-ACCD-B4F4DD7DB712")]
+  [StorableType("70063A9F-4D62-4EBC-ACCD-B4F4DD7DB712")]
   [Item("Item", "Base class for all HeuristicLab items.")]
   public abstract class Item : IItem {

branches/PersistenceOverhaul/HeuristicLab.Core/3.3/Log.cs

@@ -29 +29 @@
 namespace HeuristicLab.Core {
   [Item("Log", "A log for logging string messages.")]
-  [StorableClass("16244B4A-1C3B-4616-8670-4BF388F44D34")]
+  [StorableType("16244B4A-1C3B-4616-8670-4BF388F44D34")]
   public sealed class Log : Item, ILog, IStorableContent {
     public string Filename { get; set; }

branches/PersistenceOverhaul/HeuristicLab.Core/3.3/NamedItem.cs

@@ -26 +26 @@
 namespace HeuristicLab.Core {
   [Item("NamedItem", "Base class for items which have a name and an optional description.")]
-  [StorableClass("B27E51EF-FC2C-407A-9588-91209B6A044C")]
+  [StorableType("B27E51EF-FC2C-407A-9588-91209B6A044C")]
   public abstract class NamedItem : Item, INamedItem {
     [Storable]

branches/PersistenceOverhaul/HeuristicLab.Core/3.3/OperatorGraph.cs

@@ -32 +32 @@
   /// </summary>
   [Item("Operator Graph", "Represents a graph of operators.")]
-  [StorableClass("6C989279-9DD0-4515-AD7C-644AFA0B8FC4")]
+  [StorableType("6C989279-9DD0-4515-AD7C-644AFA0B8FC4")]
   public class OperatorGraph : Item, IStorableContent {
     public string Filename { get; set; }

branches/PersistenceOverhaul/HeuristicLab.Core/3.3/ParameterizedNamedItem.cs

@@ -31 +31 @@
   /// </summary>
   [Item("ParameterizedNamedItem", "A base class for items which have a name and contain parameters.")]
-  [StorableClass("C8E2B277-F320-4423-86BE-442033AAB472")]
+  [StorableType("C8E2B277-F320-4423-86BE-442033AAB472")]
   public abstract class ParameterizedNamedItem : NamedItem, IParameterizedNamedItem {
     [Storable]

branches/PersistenceOverhaul/HeuristicLab.Core/3.3/Scope.cs

@@ -30 +30 @@
   /// </summary>
   [Item("Scope", "A scope which contains variables and sub-scopes.")]
-  [StorableClass("85093877-53A8-44A9-BAFB-CE276BDDC55F")]
+  [StorableType("85093877-53A8-44A9-BAFB-CE276BDDC55F")]
   public sealed class Scope : NamedItem, IScope {
     public static new Image StaticItemImage {

branches/PersistenceOverhaul/HeuristicLab.Core/3.3/ThreadSafeLog.cs

@@ -28 +28 @@
 namespace HeuristicLab.Core {
   [Item("ThreadSafeLog", "A thread-safe log for logging string messages.")]
-  [StorableClass("FFC9ACB8-BEA9-439A-B6D7-E0CBBEBAD297")]
+  [StorableType("FFC9ACB8-BEA9-439A-B6D7-E0CBBEBAD297")]
   public sealed class ThreadSafeLog : Item, ILog, IStorableContent {
     public string Filename { get; set; }

branches/PersistenceOverhaul/HeuristicLab.Core/3.3/Variable.cs

@@ -30 +30 @@
   /// </summary>
   [Item("Variable", "A variable which has a name and holds an IItem.")]
-  [StorableClass("4A6ADEFD-A8DE-4507-B6F9-F17C307EA814")]
+  [StorableType("4A6ADEFD-A8DE-4507-B6F9-F17C307EA814")]
   public sealed class Variable : NamedItem, IVariable {
     public override Image ItemImage {