Free cookie consent management tool by TermsFeed Policy Generator

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

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

Location:
trunk
Files:
35 edited
1 copied

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/HeuristicLab.Collections/3.3/BidirectionalDictionary.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.
    … …  
    2121
    2222using System;
    23 using System.Linq;
    2423using System.Collections;
    2524using System.Collections.Generic;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2726
    2827namespace HeuristicLab.Collections {
    29   [StorableClass]
     28  [StorableType("6D8354FC-521A-4D6B-A544-2C9892D0A36C")]
    3029  [Serializable]
    3130  public class BidirectionalDictionary<TFirst, TSecond> : IEnumerable<KeyValuePair<TFirst, TSecond>> {
    … …  
    3635
    3736    [StorableConstructor]
    38     protected BidirectionalDictionary(bool deserializing) : base() { }
     37    protected BidirectionalDictionary(StorableConstructorFlag _) : base() { }
    3938    public BidirectionalDictionary() {
    4039      firstToSecond = new Dictionary<TFirst, TSecond>();

  • trunk/HeuristicLab.Collections/3.3/BidirectionalLookup.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.
    … …  
    2323using System.Collections.Generic;
    2424using System.Linq;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Collections {
    28   [StorableClass]
     28  [StorableType("30981E2A-09AD-49F4-964B-4C20B210116C")]
    2929  [Serializable]
    3030  public class BidirectionalLookup<TFirst, TSecond> {
    … …  
    3535
    3636    [StorableConstructor]
    37     protected BidirectionalLookup(bool deserializing) : base() { }
     37    protected BidirectionalLookup(StorableConstructorFlag _) : base() { }
    3838    public BidirectionalLookup() {
    3939      firstToSecond = new Dictionary<TFirst, HashSet<TSecond>>();
    … …  
    189189    #endregion
    190190
    191     [StorableClass]
     191    [StorableType("AF0C6143-9031-43CF-8952-49FE8089ACD2")]
    192192    private class StorableGrouping<TKey, TValue> : IGrouping<TKey, TValue> {
    193193
    … …  
    197197      private readonly HashSet<TValue> values;
    198198
     199      [StorableConstructor]
     200      protected StorableGrouping(StorableConstructorFlag _) : base() { }
     201
    199202      public StorableGrouping(TKey key, IEnumerable<TValue> values, IEqualityComparer<TValue> comparer) {
    200203        this.key = key;

  • trunk/HeuristicLab.Collections/3.3/CollectionItemsChangedEventArgs.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.

  • trunk/HeuristicLab.Collections/3.3/CollectionItemsChangedEventHandler.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.

  • trunk/HeuristicLab.Collections/3.3/HeuristicLab.Collections-3.3.csproj

    r11623 r16565  
    1111    <RootNamespace>HeuristicLab.Collections</RootNamespace>
    1212    <AssemblyName>HeuristicLab.Collections-3.3</AssemblyName>
    13     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     13    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    1414    <TargetFrameworkProfile>
    1515    </TargetFrameworkProfile>
    … …  
    105105  </PropertyGroup>
    106106  <ItemGroup>
     107    <Reference Include="Google.Protobuf, Version=3.6.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
     108      <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
     109    </Reference>
     110    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     111      <HintPath>..\..\packages\HEAL.Attic.1.0.0-pre01\lib\netstandard2.0\HEAL.Attic.dll</HintPath>
     112    </Reference>
    107113    <Reference Include="System" />
    108114    <Reference Include="System.Core">
    109115      <RequiredTargetFramework>3.5</RequiredTargetFramework>
    110116    </Reference>
     117    <Reference Include="System.Drawing" />
     118    <Reference Include="System.Drawing.Common, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
     119      <HintPath>..\..\packages\System.Drawing.Common.4.5.1\lib\net461\System.Drawing.Common.dll</HintPath>
     120    </Reference>
    111121    <Reference Include="System.Xml.Linq">
    112122      <RequiredTargetFramework>3.5</RequiredTargetFramework>
    … …  
    119129  </ItemGroup>
    120130  <ItemGroup>
     131    <None Include="packages.config" />
    121132    <None Include="Plugin.cs.frame" />
    122133    <Compile Include="BidirectionalDictionary.cs" />

  • trunk/HeuristicLab.Collections/3.3/INotifyObservableArrayItemsChanged.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.

  • trunk/HeuristicLab.Collections/3.3/INotifyObservableCollectionItemsChanged.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.

  • trunk/HeuristicLab.Collections/3.3/INotifyObservableDictionaryItemsChanged.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.

  • trunk/HeuristicLab.Collections/3.3/INotifyObservableKeyedCollectionItemsChanged.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.

  • trunk/HeuristicLab.Collections/3.3/INotifyObservableListItemsChanged.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.

  • trunk/HeuristicLab.Collections/3.3/IObservableArray.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.
    … …  
    2222using System.Collections.Generic;
    2323using System.ComponentModel;
     24using HEAL.Attic;
    2425
    2526namespace HeuristicLab.Collections {
     27  [StorableType("ebdc610c-2f22-42c7-a72e-8a4ec682712f")]
    2628  public interface IObservableArray<T> : IList<T>, INotifyObservableArrayItemsChanged<T>, INotifyPropertyChanged {
    2729    int Length { get; }

  • trunk/HeuristicLab.Collections/3.3/IObservableCollection.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.
    … …  
    2222using System.Collections.Generic;
    2323using System.ComponentModel;
     24using HEAL.Attic;
    2425
    2526namespace HeuristicLab.Collections {
     27  [StorableType("289d81e9-a167-416c-aaa8-c40aa1ea96f9")]
    2628  public interface IObservableCollection<T> : ICollection<T>, INotifyObservableCollectionItemsChanged<T>, INotifyPropertyChanged { }
    2729}

  • trunk/HeuristicLab.Collections/3.3/IObservableDictionary.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.
    … …  
    2121
    2222using System.Collections.Generic;
     23using HEAL.Attic;
    2324
    2425namespace HeuristicLab.Collections {
     26  [StorableType("70d9ec0d-7a88-424a-9f59-6cc659f57369")]
    2527  public interface IObservableDictionary<TKey, TValue> : IDictionary<TKey, TValue>, IObservableCollection<KeyValuePair<TKey, TValue>>, INotifyObservableDictionaryItemsChanged<TKey, TValue> { }
    2628}

  • trunk/HeuristicLab.Collections/3.3/IObservableKeyedCollection.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
     22using HEAL.Attic;
    2223namespace HeuristicLab.Collections {
     24  [StorableType("5be307b0-41d7-4d8d-a289-fba09fce33f4")]
    2325  public interface IObservableKeyedCollection<TKey, TItem> : IObservableCollection<TItem>, INotifyObservableKeyedCollectionItemsChanged<TKey, TItem> {
    2426    TItem this[TKey key] { get; }

  • trunk/HeuristicLab.Collections/3.3/IObservableKeyedList.cs

    r15583 r16565  
    22
    33/* HeuristicLab
    4  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    55 *
    66 * This file is part of HeuristicLab.
    … …  
    2222#endregion
    2323
     24using HEAL.Attic;
     25
    2426namespace HeuristicLab.Collections {
     27  [StorableType("b26c93c5-eb74-41a9-982d-985df4a1eb77")]
    2528  public interface IObservableKeyedList<TKey, TItem> : IObservableKeyedCollection<TKey, TItem>, IObservableList<TItem> {
    2629  }

  • trunk/HeuristicLab.Collections/3.3/IObservableList.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.
    … …  
    2121
    2222using System.Collections.Generic;
     23using HEAL.Attic;
    2324
    2425namespace HeuristicLab.Collections {
     26  [StorableType("00be7255-b5c6-4b5d-82d3-6ed258d6a0c9")]
    2527  public interface IObservableList<T> : IList<T>, IObservableCollection<T>, INotifyObservableListItemsChanged<T> {
    2628    void Reverse();

  • trunk/HeuristicLab.Collections/3.3/IObservableSet.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.
    … …  
    2121
    2222using System.Collections.Generic;
     23using HEAL.Attic;
    2324
    2425namespace HeuristicLab.Collections {
     26  [StorableType("2c42f57a-3bdb-45b9-a548-d4cb9cc71250")]
    2527  public interface IObservableSet<T> : IObservableCollection<T> {
    2628    bool IsProperSubsetOf(IEnumerable<T> other);

  • trunk/HeuristicLab.Collections/3.3/IndexedItem.cs

    r15583 r16565  
    1 #region License Information
     1using HEAL.Attic;
     2#region License Information
    23/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    45 *
    56 * This file is part of HeuristicLab.
    … …  
    2122
    2223namespace HeuristicLab.Collections {
     24  [StorableType(StorableMemberSelection.AllFields, "0a9d0728-5fdc-4e16-b02b-545dbdf0b0fa")]
    2325  public struct IndexedItem<T> {
    2426    private readonly int index;

  • trunk/HeuristicLab.Collections/3.3/ObservableArray.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.
    … …  
    2525using System.ComponentModel;
    2626using System.Linq;
     27using HEAL.Attic;
    2728using HeuristicLab.Common;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2929
    3030namespace HeuristicLab.Collections {
    31   [StorableClass]
     31  [StorableType("8F8986E7-943C-4CD7-9710-F13F13B48097")]
    3232  [Serializable]
    3333  public class ObservableArray<T> : IObservableArray<T> {
    … …  
    7575    }
    7676    [StorableConstructor]
    77     protected ObservableArray(bool deserializing) { }
     77    protected ObservableArray(StorableConstructorFlag _) { }
    7878    #endregion
    7979

  • trunk/HeuristicLab.Collections/3.3/ObservableCollection.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;
    2323using System;
    2424using System.Collections;
    … …  
    2828
    2929namespace HeuristicLab.Collections {
    30   [StorableClass]
     30  [StorableType("98A1FFF8-88D8-4A1A-BDAA-BDC3F4663C1F")]
    3131  [Serializable]
    3232  public class ObservableCollection<T> : IObservableCollection<T> {
    … …  
    6363    }
    6464    [StorableConstructor]
    65     protected ObservableCollection(bool deserializing) { }
     65    protected ObservableCollection(StorableConstructorFlag _) { }
    6666    #endregion
    6767

  • trunk/HeuristicLab.Collections/3.3/ObservableDictionary.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.
    … …  
    2525using System.ComponentModel;
    2626using System.Linq;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Collections {
    30   [StorableClass]
     30  [StorableType("EFAF5129-39F0-4477-834E-E22B85D63BCF")]
    3131  [Serializable]
    3232  public class ObservableDictionary<TKey, TValue> : IObservableDictionary<TKey, TValue> {
    … …  
    8888    }
    8989    [StorableConstructor]
    90     protected ObservableDictionary(bool deserializing) { }
     90    protected ObservableDictionary(StorableConstructorFlag _) { }
    9191    #endregion
    9292

  • trunk/HeuristicLab.Collections/3.3/ObservableKeyedCollection.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.
    … …  
    2525using System.ComponentModel;
    2626using System.Linq;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Collections {
    30   [StorableClass]
     30  [StorableType("4FF5E444-9E4A-4590-AF60-2377BC91D389")]
    3131  [Serializable]
    3232  public abstract class ObservableKeyedCollection<TKey, TItem> : IObservableKeyedCollection<TKey, TItem> {
    … …  
    7878    }
    7979    [StorableConstructor]
    80     protected ObservableKeyedCollection(bool deserializing) { }
     80    protected ObservableKeyedCollection(StorableConstructorFlag _) { }
    8181    #endregion
    8282

  • trunk/HeuristicLab.Collections/3.3/ObservableKeyedList.cs

    r15583 r16565  
    22
    33/* HeuristicLab
    4  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    55 *
    66 * This file is part of HeuristicLab.
    … …  
    2525using System.Collections.Generic;
    2626using System.Linq;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Collections {
    3030  [Serializable]
    31   [StorableClass]
     31  [StorableType("47F1D1D1-DF32-4C23-8D4F-0B36A6E42AF7")]
    3232  public abstract class ObservableKeyedList<TKey, TItem> : ObservableList<TItem>, IObservableKeyedList<TKey, TItem> {
    3333
    … …  
    6464    }
    6565    [StorableConstructor]
    66     protected ObservableKeyedList(bool deserializing) : base(deserializing) { }
     66    protected ObservableKeyedList(StorableConstructorFlag _) : base(_) { }
    6767    #endregion
    6868

  • trunk/HeuristicLab.Collections/3.3/ObservableList.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
     22using HEAL.Attic;
    2223using HeuristicLab.Common;
    23 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2424using System;
    2525using System.Collections;
    … …  
    2929
    3030namespace HeuristicLab.Collections {
    31   [StorableClass]
     31  [StorableType("EBD47A4A-848B-487C-B996-2CA2A509A488")]
    3232  [Serializable]
    3333  public class ObservableList<T> : IObservableList<T> {
    … …  
    7878    }
    7979    [StorableConstructor]
    80     protected ObservableList(bool deserializing) { }
     80    protected ObservableList(StorableConstructorFlag _) { }
    8181    #endregion
    8282

  • trunk/HeuristicLab.Collections/3.3/ObservableSet.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.
    … …  
    2525using System.ComponentModel;
    2626using System.Linq;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Collections {
    30   [StorableClass]
     30  [StorableType("44FF4DAE-F308-4B3B-8475-0B0327619657")]
    3131  [Serializable]
    3232  public class ObservableSet<T> : IObservableSet<T> {
    … …  
    6060    }
    6161    [StorableConstructor]
    62     protected ObservableSet(bool deserializing) { }
     62    protected ObservableSet(StorableConstructorFlag _) { }
    6363    #endregion
    6464

  • trunk/HeuristicLab.Collections/3.3/Plugin.cs.frame

    r15589 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.

  • trunk/HeuristicLab.Collections/3.3/Properties/AssemblyInfo.cs.frame

    r15589 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.

  • trunk/HeuristicLab.Collections/3.3/ReadOnlyObservableArray.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.
    … …  
    2424using System.Collections.Generic;
    2525using System.ComponentModel;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Collections {
    29   [StorableClass]
     29  [StorableType("DBE0FFE7-BCAD-49C2-9A55-5360EBE0FD86")]
    3030  [Serializable]
    3131  public class ReadOnlyObservableArray<T> : IObservableArray<T> {
    … …  
    6161    }
    6262    [StorableConstructor]
    63     protected ReadOnlyObservableArray(bool deserializing) { }
     63    protected ReadOnlyObservableArray(StorableConstructorFlag _) { }
    6464
    6565    [StorableHook(HookType.AfterDeserialization)]

  • trunk/HeuristicLab.Collections/3.3/ReadOnlyObservableCollection.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.
    … …  
    2424using System.Collections.Generic;
    2525using System.ComponentModel;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Collections {
    29   [StorableClass]
     29  [StorableType("ADC26E6D-9F2A-40AA-A959-224DA6A90638")]
    3030  [Serializable]
    3131  public class ReadOnlyObservableCollection<T> : IObservableCollection<T> {
    … …  
    5050    }
    5151    [StorableConstructor]
    52     protected ReadOnlyObservableCollection(bool deserializing) { }
     52    protected ReadOnlyObservableCollection(StorableConstructorFlag _) { }
    5353
    5454    [StorableHook(HookType.AfterDeserialization)]

  • trunk/HeuristicLab.Collections/3.3/ReadOnlyObservableDictionary.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.
    … …  
    2424using System.Collections.Generic;
    2525using System.ComponentModel;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Collections {
    29   [StorableClass]
     29  [StorableType("BEF4B633-F0AE-4843-B9CD-1F80986A596F")]
    3030  [Serializable]
    3131  public class ReadOnlyObservableDictionary<TKey, TValue> : IObservableDictionary<TKey, TValue> {
    … …  
    6464    }
    6565    [StorableConstructor]
    66     protected ReadOnlyObservableDictionary(bool deserializing) { }
     66    protected ReadOnlyObservableDictionary(StorableConstructorFlag _) { }
    6767
    6868    [StorableHook(HookType.AfterDeserialization)]

  • trunk/HeuristicLab.Collections/3.3/ReadOnlyObservableKeyedCollection.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.
    … …  
    2424using System.Collections.Generic;
    2525using System.ComponentModel;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Collections {
    29   [StorableClass]
     29  [StorableType("A52968F9-DA56-4DCB-AE1A-4EF22E9415B9")]
    3030  [Serializable]
    3131  public class ReadOnlyObservableKeyedCollection<TKey, TItem> : IObservableKeyedCollection<TKey, TItem> {
    … …  
    5656    }
    5757    [StorableConstructor]
    58     protected ReadOnlyObservableKeyedCollection(bool deserializing) { }
     58    protected ReadOnlyObservableKeyedCollection(StorableConstructorFlag _) { }
    5959
    6060    [StorableHook(HookType.AfterDeserialization)]

  • trunk/HeuristicLab.Collections/3.3/ReadOnlyObservableKeyedList.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.
    … …  
    2222using System;
    2323using System.Collections.Generic;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2525
    2626namespace HeuristicLab.Collections {
    27   [StorableClass]
     27  [StorableType("58D6326E-BD52-4B5D-8915-89948CEB50AA")]
    2828  [Serializable]
    2929  public class ReadOnlyObservableKeyedList<TKey, TItem> : ReadOnlyObservableList<TItem>, IObservableKeyedList<TKey, TItem> {
    … …  
    4747    }
    4848    [StorableConstructor]
    49     protected ReadOnlyObservableKeyedList(bool deserializing) { }
     49    protected ReadOnlyObservableKeyedList(StorableConstructorFlag _) : base(_) { }
    5050    [StorableHook(HookType.AfterDeserialization)]
    5151    private void AfterDeserialization() {

  • trunk/HeuristicLab.Collections/3.3/ReadOnlyObservableList.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.
    … …  
    2424using System.Collections.Generic;
    2525using System.ComponentModel;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Collections {
    29   [StorableClass]
     29  [StorableType("110A111A-66A3-4200-B7C8-AD237343D1AF")]
    3030  [Serializable]
    3131  public class ReadOnlyObservableList<T> : IObservableList<T> {
    … …  
    5858    }
    5959    [StorableConstructor]
    60     protected ReadOnlyObservableList(bool deserializing) { }
     60    protected ReadOnlyObservableList(StorableConstructorFlag _) { }
    6161
    6262    [StorableHook(HookType.AfterDeserialization)]

  • trunk/HeuristicLab.Collections/3.3/ReadOnlyObservableSet.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.
    … …  
    2424using System.Collections.Generic;
    2525using System.ComponentModel;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Collections {
    29   [StorableClass]
     29  [StorableType("CB2FD087-C3B7-499D-9188-AF5B0D4FFEDB")]
    3030  [Serializable]
    3131  public class ReadOnlyObservableSet<T> : IObservableSet<T> {
    … …  
    5050    }
    5151    [StorableConstructor]
    52     protected ReadOnlyObservableSet(bool deserializing) { }
     52    protected ReadOnlyObservableSet(StorableConstructorFlag _) { }
    5353
    5454    [StorableHook(HookType.AfterDeserialization)]
Note: See TracChangeset for help on using the changeset viewer.