Changeset 14927 for branches/PersistenceReintegration/HeuristicLab.DebugEngine

Timestamp:

05/04/17 17:19:35 (7 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.DebugEngine/3.3

Files:

• DebugEngine.cs (modified) (5 diffs)
• ExecutionStack.cs (modified) (1 diff)
• HeuristicLab.DebugEngine-3.3.csproj (modified) (1 diff)
• OperatorTrace.cs (modified) (1 diff)

branches/PersistenceReintegration/HeuristicLab.DebugEngine/3.3/DebugEngine.cs

@@ -26 +26 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Persistence;
 
 namespace HeuristicLab.DebugEngine {
 
-  [StorableClass]
+  [StorableType("671a070c-deca-445a-af74-2249f4825739")]
   [Item("Debug Engine", "Engine for debugging algorithms.")]
   public class DebugEngine : Executable, IEngine {
@@ -161 +161 @@
         while (skipStackOperations && !(CurrentOperation is IAtomicOperation) && CanContinue)
           ProcessNextOperation(true, cancellationTokenSource.Token);
-      }
-      catch (Exception ex) {
+      } catch (Exception ex) {
         OnExceptionOccurred(ex);
       }
@@ -182 +181 @@
         try {
           t.Wait();
-        }
-        catch (AggregateException ex) {
+        } catch (AggregateException ex) {
           try {
             ex.Flatten().Handle(x => x is OperationCanceledException);
-          }
-          catch (AggregateException remaining) {
+          } catch (AggregateException remaining) {
             if (remaining.InnerExceptions.Count == 1) OnExceptionOccurred(remaining.InnerExceptions[0]);
             else OnExceptionOccurred(remaining);
@@ -250 +247 @@
           ProcessNextOperation(false, cancellationToken);
         cancellationToken.ThrowIfCancellationRequested();
-      }
-      finally {
+      } finally {
         timer.Stop();
         ExecutionTime += DateTime.UtcNow - lastUpdateTime;
@@ -317 +313 @@
           }
           CurrentOperation = null;
-        }
-        catch (Exception ex) {
+        } catch (Exception ex) {
           if (ex is OperationCanceledException) throw ex;
           else throw new OperatorExecutionException(operation.Operator, ex);

branches/PersistenceReintegration/HeuristicLab.DebugEngine/3.3/ExecutionStack.cs

@@ -25 +25 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Persistence;
 
 namespace HeuristicLab.DebugEngine {
 
-  [StorableClass]
+  [StorableType("bbc83e7d-49eb-4323-935f-73f674d7aa4f")]
   public class ExecutionStack : ObservableList<IOperation>, IContent, IDeepCloneable {
 

branches/PersistenceReintegration/HeuristicLab.DebugEngine/3.3/HeuristicLab.DebugEngine-3.3.csproj

@@ -129 +129 @@
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
+      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
+      <Name>HeuristicLab.Persistence-3.3</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Persistence\4.0\HeuristicLab.Persistence-4.0.csproj">
       <Project>{b1663091-8156-4deb-9e37-5b19810a4644}</Project>

branches/PersistenceReintegration/HeuristicLab.DebugEngine/3.3/OperatorTrace.cs

@@ -26 +26 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Persistence;
 
 namespace HeuristicLab.DebugEngine {
 
-  [StorableClass]
+  [StorableType("049f12b3-6bd2-4c47-bbbd-b05083d34d0a")]
   public class OperatorTrace : ObservableList<IOperator>, IContent, IDeepCloneable {