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.Scripting/3.3
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • branches/2520_PersistenceReintegration/HeuristicLab.Scripting/3.3/ExecutableScript.cs

    r16453 r16462  
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Core;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727
    2828namespace HeuristicLab.Scripting {
    2929  [Item("Executable Script", "An executable script.")]
    30   [StorableClass]
     30  [StorableType("206BFDFE-A829-424E-BFAD-BB7993830325")]
    3131  public abstract class ExecutableScript : Script {
    3232    private Thread scriptThread;
    … …  
    4747    #region Construction & Cloning
    4848    [StorableConstructor]
    49     protected ExecutableScript(bool deserializing) : base(deserializing) { }
     49    protected ExecutableScript(StorableConstructorFlag _) : base(_) { }
    5050    protected ExecutableScript(ExecutableScript original, Cloner cloner)
    5151      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Scripting/3.3/HeuristicLab.Scripting-3.3.csproj

    r16454 r16462  
    8484      <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
    8585    </Reference>
    86     <Reference Include="HEAL.Fossil, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
     86    <Reference Include="HEAL.Fossil, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    8787      <HintPath>..\..\packages\HEAL.Fossil.1.0.0\lib\netstandard2.0\HEAL.Fossil.dll</HintPath>
    8888    </Reference>

  • branches/2520_PersistenceReintegration/HeuristicLab.Scripting/3.3/Script.cs

    r16453 r16462  
    3232using HeuristicLab.Common.Resources;
    3333using HeuristicLab.Core;
    34 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     34using HEAL.Fossil;
    3535using Microsoft.CSharp;
    3636
    3737namespace HeuristicLab.Scripting {
    38   [StorableClass]
     38  [StorableType("0FA4F218-E1F5-4C09-9C2F-12B32D4EC373")]
    3939  public abstract class Script : NamedItem, IProgrammableItem {
    4040    #region Fields & Properties
    … …  
    6666    #region Construction & Initialization
    6767    [StorableConstructor]
    68     protected Script(bool deserializing) : base(deserializing) { }
     68    protected Script(StorableConstructorFlag _) : base(_) { }
    6969    protected Script(Script original, Cloner cloner)
    7070      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Scripting/3.3/Scripts/CSharp/CSharpScript.cs

    r16453 r16462  
    2525using HeuristicLab.Common;
    2626using HeuristicLab.Core;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    2828
    2929namespace HeuristicLab.Scripting {
    3030  [Item("C# Script", "An empty C# script.")]
    3131  [Creatable(CreatableAttribute.Categories.Scripts, Priority = 100)]
    32   [StorableClass]
     32  [StorableType("1630933C-AB5B-44EC-A967-C299CC57E4E3")]
    3333  public class CSharpScript : ExecutableScript, IStorableContent {
    3434    #region Fields & Properties
    … …  
    4949    #region Construction & Cloning
    5050    [StorableConstructor]
    51     protected CSharpScript(bool deserializing) : base(deserializing) { }
     51    protected CSharpScript(StorableConstructorFlag _) : base(_) { }
    5252    protected CSharpScript(CSharpScript original, Cloner cloner)
    5353      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Scripting/3.3/Scripts/Templates/CSharpScriptTemplate.cs

    r11825 r16462  
    66// use 'variables' to work with IEnumerable<T> extension methods on the script's variable store
    77
    8 using System;
    9 using System.Linq;
    10 using System.Collections.Generic;
    118
    12 using HeuristicLab.Core;
    13 using HeuristicLab.Common;
    149//using HeuristicLab.Collections;
    1510//using HeuristicLab.Data;

  • branches/2520_PersistenceReintegration/HeuristicLab.Scripting/3.3/VariableStore.cs

    r16453 r16462  
    2727using HeuristicLab.Common.Resources;
    2828using HeuristicLab.Core;
    29 using HeuristicLab.Persistence.Core;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Fossil;
    3130using HeuristicLab.Persistence.Default.Xml;
    3231
    3332namespace HeuristicLab.Scripting {
    3433  [Item("VariableStore", "Represents a variable store.")]
    35   [StorableClass]
     34  [StorableType("DDE415E7-99FD-4C10-9B5E-63334876FFDE")]
    3635  public class VariableStore : ObservableDictionary<string, object>, IItem {
    3736    #region Properties
    … …  
    5554    #region Constructors & Cloning
    5655    [StorableConstructor]
    57     protected VariableStore(bool deserializing) : base(deserializing) { }
     56    protected VariableStore(StorableConstructorFlag _) : base(_) { }
    5857    protected VariableStore(VariableStore original, Cloner cloner) {
    5958      cloner.RegisterClonedObject(original, this);
Note: See TracChangeset for help on using the changeset viewer.