Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
01/28/19 13:41:42 (6 years ago)
Author:
gkronber
Message:

#2520: merged changes from PersistenceOverhaul branch (r16451:16564) into trunk

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/HeuristicLab.Tests

  • trunk/HeuristicLab.Tests/HeuristicLab.Persistence-3.3/StorableAttributeTests.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2020#endregion
    2121
    22 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     22using HEAL.Attic;
    2323
    2424namespace HeuristicLab.Persistence.Tests {
    2525
    26   [StorableClass]
     26  [StorableType("EF55A82D-7D9B-486E-B811-4DCC389FDB05")]
    2727  class DemoClass {
    2828
     
    3434
    3535    public int y = 0;
     36
     37    [StorableConstructor]
     38    protected DemoClass(StorableConstructorFlag _) {
     39    }
     40    public DemoClass() {
     41    }
    3642  }
    3743
    38   [StorableClass]
     44  [StorableType("31F18F9A-C25D-449D-900A-FEBF95D7CE39")]
    3945  class Base {
    4046    public string baseName;
     
    4450      set { baseName = value; }
    4551    }
     52
     53    [StorableConstructor]
     54    protected Base(StorableConstructorFlag _) {
     55    }
     56    public Base() {
     57    }
    4658  }
    4759
    48   [StorableClass]
     60  [StorableType("DF26C284-08C4-4703-A1A4-AFE834079B85")]
    4961  class Override : Base {
    5062    [Storable]
     
    5365      set { base.Name = value; }
    5466    }
     67
     68    [StorableConstructor]
     69    protected Override(StorableConstructorFlag _) : base(_) {
     70    }
     71    public Override() {
     72    }
    5573  }
    5674
    57   [StorableClass]
     75  [StorableType("6BFB1984-6670-4D5E-AEAC-3E77C627AF98")]
    5876  class Intermediate : Override {
     77    [StorableConstructor]
     78    protected Intermediate(StorableConstructorFlag _) : base(_) {
     79    }
     80    public Intermediate() {
     81    }
    5982  }
    6083
    61   [StorableClass]
     84  [StorableType("856F9BDB-A20C-4B80-981B-5B4F5188FBCD")]
    6285  class New : Intermediate {
    6386    public string newName;
     
    6790      set { newName = value; }
    6891    }
     92
     93    [StorableConstructor]
     94    protected New(StorableConstructorFlag _) : base(_) {
     95    }
     96    public New() {
     97    }
    6998  }
    7099}
Note: See TracChangeset for help on using the changeset viewer.