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.DebugEngine/3.3
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/PersistenceReintegration/HeuristicLab.DebugEngine/3.3/DebugEngine.cs

    r14185 r14927  
    2626using HeuristicLab.Common;
    2727using HeuristicLab.Core;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HeuristicLab.Persistence;
    2929
    3030namespace HeuristicLab.DebugEngine {
    3131
    32   [StorableClass]
     32  [StorableType("671a070c-deca-445a-af74-2249f4825739")]
    3333  [Item("Debug Engine", "Engine for debugging algorithms.")]
    3434  public class DebugEngine : Executable, IEngine {
     
    161161        while (skipStackOperations && !(CurrentOperation is IAtomicOperation) && CanContinue)
    162162          ProcessNextOperation(true, cancellationTokenSource.Token);
    163       }
    164       catch (Exception ex) {
     163      } catch (Exception ex) {
    165164        OnExceptionOccurred(ex);
    166165      }
     
    182181        try {
    183182          t.Wait();
    184         }
    185         catch (AggregateException ex) {
     183        } catch (AggregateException ex) {
    186184          try {
    187185            ex.Flatten().Handle(x => x is OperationCanceledException);
    188           }
    189           catch (AggregateException remaining) {
     186          } catch (AggregateException remaining) {
    190187            if (remaining.InnerExceptions.Count == 1) OnExceptionOccurred(remaining.InnerExceptions[0]);
    191188            else OnExceptionOccurred(remaining);
     
    250247          ProcessNextOperation(false, cancellationToken);
    251248        cancellationToken.ThrowIfCancellationRequested();
    252       }
    253       finally {
     249      } finally {
    254250        timer.Stop();
    255251        ExecutionTime += DateTime.UtcNow - lastUpdateTime;
     
    317313          }
    318314          CurrentOperation = null;
    319         }
    320         catch (Exception ex) {
     315        } catch (Exception ex) {
    321316          if (ex is OperationCanceledException) throw ex;
    322317          else throw new OperatorExecutionException(operation.Operator, ex);
  • branches/PersistenceReintegration/HeuristicLab.DebugEngine/3.3/ExecutionStack.cs

    r14185 r14927  
    2525using HeuristicLab.Common;
    2626using HeuristicLab.Core;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HeuristicLab.Persistence;
    2828
    2929namespace HeuristicLab.DebugEngine {
    3030
    31   [StorableClass]
     31  [StorableType("bbc83e7d-49eb-4323-935f-73f674d7aa4f")]
    3232  public class ExecutionStack : ObservableList<IOperation>, IContent, IDeepCloneable {
    3333
  • branches/PersistenceReintegration/HeuristicLab.DebugEngine/3.3/HeuristicLab.DebugEngine-3.3.csproj

    r14926 r14927  
    129129      <Private>False</Private>
    130130    </ProjectReference>
     131    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
     132      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
     133      <Name>HeuristicLab.Persistence-3.3</Name>
     134    </ProjectReference>
    131135    <ProjectReference Include="..\..\HeuristicLab.Persistence\4.0\HeuristicLab.Persistence-4.0.csproj">
    132136      <Project>{b1663091-8156-4deb-9e37-5b19810a4644}</Project>
  • branches/PersistenceReintegration/HeuristicLab.DebugEngine/3.3/OperatorTrace.cs

    r14185 r14927  
    2626using HeuristicLab.Common;
    2727using HeuristicLab.Core;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HeuristicLab.Persistence;
    2929
    3030namespace HeuristicLab.DebugEngine {
    3131
    32   [StorableClass]
     32  [StorableType("049f12b3-6bd2-4c47-bbbd-b05083d34d0a")]
    3333  public class OperatorTrace : ObservableList<IOperator>, IContent, IDeepCloneable {
    3434
Note: See TracChangeset for help on using the changeset viewer.