Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
04/30/10 02:48:19 (14 years ago)
Author:
swagner
Message:

Fixed persistence exceptions by restoring the reference on HeuristicLab.Persistence in HeuristicLab.Collections (#977)

Location:
trunk/sources/HeuristicLab.Core/3.3/Collections
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab.Core/3.3/Collections/CheckedItemCollection.cs

    r3558 r3560  
    5858    }
    5959    [StorableConstructor]
    60     protected CheckedItemCollection(bool deserializing) { }
     60    protected CheckedItemCollection(bool deserializing) : base(deserializing) { }
    6161
    6262    public bool IsItemChecked(T item) {

  • trunk/sources/HeuristicLab.Core/3.3/Collections/ItemArray.cs

    r3550 r3560  
    5858    }
    5959
    60     [Storable]
    61     private T[] Items {
    62       get { return array; }
    63       set { array = value; }
    64     }
    65 
    6660    public ItemArray() : base() { }
    6761    public ItemArray(int length) : base(length) { }
    … …  
    6963    public ItemArray(IEnumerable<T> collection) : base(collection) { }
    7064    [StorableConstructor]
    71     protected ItemArray(bool deserializing) { }
     65    protected ItemArray(bool deserializing) : base(deserializing) { }
    7266
    7367    public object Clone() {

  • trunk/sources/HeuristicLab.Core/3.3/Collections/ItemCollection.cs

    r3550 r3560  
    5555    }
    5656
    57     [Storable]
    58     private List<T> Items {
    59       get { return list; }
    60       set { list = value; }
    61     }
    62 
    6357    public ItemCollection() : base() { }
    6458    public ItemCollection(int capacity) : base(capacity) { }
    6559    public ItemCollection(IEnumerable<T> collection) : base(collection) { }
    6660    [StorableConstructor]
    67     protected ItemCollection(bool deserializing) { }
     61    protected ItemCollection(bool deserializing) : base(deserializing) { }
    6862
    6963    public object Clone() {

  • trunk/sources/HeuristicLab.Core/3.3/Collections/ItemDictionary.cs

    r3550 r3560  
    5555    }
    5656
    57     [Storable]
    58     private Dictionary<TKey, TValue> Items {
    59       get { return dict; }
    60       set { dict = value; }
    61     }
    62 
    6357    public ItemDictionary() : base() { }
    6458    public ItemDictionary(int capacity) : base(capacity) { }
    6559    public ItemDictionary(IDictionary<TKey, TValue> dictionary) : base(dictionary) { }
    6660    [StorableConstructor]
    67     protected ItemDictionary(bool deserializing) { }
     61    protected ItemDictionary(bool deserializing) : base(deserializing) { }
    6862
    6963    public object Clone() {

  • trunk/sources/HeuristicLab.Core/3.3/Collections/ItemList.cs

    r3550 r3560  
    5858    }
    5959
    60     [Storable]
    61     private List<T> Items {
    62       get { return list; }
    63       set { list = value; }
    64     }
    65 
    6660    public ItemList() : base() { }
    6761    public ItemList(int capacity) : base(capacity) { }
    6862    public ItemList(IEnumerable<T> collection) : base(collection) { }
    6963    [StorableConstructor]
    70     protected ItemList(bool deserializing) { }
     64    protected ItemList(bool deserializing) : base(deserializing) { }
    7165
    7266    public object Clone() {

  • trunk/sources/HeuristicLab.Core/3.3/Collections/ItemSet.cs

    r3550 r3560  
    5858    }
    5959
    60     [Storable]
    61     private HashSet<T> Items {
    62       get { return set; }
    63       set { set = value; }
    64     }
    65 
    6660    public ItemSet() : base() { }
    6761    public ItemSet(IEnumerable<T> collection) : base(collection) { }
    6862    [StorableConstructor]
    69     protected ItemSet(bool deserializing) { }
     63    protected ItemSet(bool deserializing) : base(deserializing) { }
    7064
    7165    public object Clone() {

  • trunk/sources/HeuristicLab.Core/3.3/Collections/KeyedItemCollection.cs

    r3550 r3560  
    5454    }
    5555
    56     [Storable]
    57     private Dictionary<TKey, TItem> Items {
    58       get { return dict; }
    59       set { dict = value; }
    60     }
    61 
    6256    protected KeyedItemCollection() : base() { }
    6357    protected KeyedItemCollection(int capacity) : base(capacity) { }
    6458    protected KeyedItemCollection(IEnumerable<TItem> collection) : base(collection) { }
    6559    [StorableConstructor]
    66     protected KeyedItemCollection(bool deserializing) { }
     60    protected KeyedItemCollection(bool deserializing) : base(deserializing) { }
    6761
    6862    public object Clone() {

  • trunk/sources/HeuristicLab.Core/3.3/Collections/NamedItemCollection.cs

    r3390 r3560  
    3838    }
    3939    [StorableConstructor]
    40     protected NamedItemCollection(bool deserializing) { }
     40    protected NamedItemCollection(bool deserializing) : base(deserializing) { }
    4141
    4242    [StorableHook(HookType.AfterDeserialization)]

  • trunk/sources/HeuristicLab.Core/3.3/Collections/ReadOnlyItemArray.cs

    r3550 r3560  
    5555    }
    5656
    57     [Storable]
    58     private IObservableArray<T> Items {
    59       get { return array; }
    60       set { array = value; }
    61     }
    62 
    6357    public ReadOnlyItemArray() : base(new ItemArray<T>()) { }
    6458    public ReadOnlyItemArray(IItemArray<T> array) : base(array) { }
    6559    [StorableConstructor]
    66     protected ReadOnlyItemArray(bool deserializing) { }
    67 
    68     [StorableHook(HookType.AfterDeserialization)]
    69     private void Initialize() {
    70       RegisterEvents();
    71     }
     60    protected ReadOnlyItemArray(bool deserializing) : base(deserializing) { }
    7261
    7362    public object Clone() {
    … …  
    7867      cloner.RegisterClonedObject(this, clone);
    7968      clone.array = (IItemArray<T>)((IItemArray<T>)array).Clone(cloner);
    80       clone.Initialize();
     69      clone.RegisterEvents();
    8170      return clone;
    8271    }

  • trunk/sources/HeuristicLab.Core/3.3/Collections/ReadOnlyItemCollection.cs

    r3550 r3560  
    5555    }
    5656
    57     [Storable]
    58     private IObservableCollection<T> Items {
    59       get { return collection; }
    60       set { collection = value; }
    61     }
    62 
    6357    public ReadOnlyItemCollection() : base(new ItemCollection<T>()) { }
    6458    public ReadOnlyItemCollection(IItemCollection<T> collection) : base(collection) { }
    6559    [StorableConstructor]
    66     protected ReadOnlyItemCollection(bool deserializing) { }
    67 
    68     [StorableHook(HookType.AfterDeserialization)]
    69     private void Initialize() {
    70       RegisterEvents();
    71     }
     60    protected ReadOnlyItemCollection(bool deserializing) : base(deserializing) { }
    7261
    7362    public object Clone() {
    … …  
    7867      cloner.RegisterClonedObject(this, clone);
    7968      clone.collection = (IItemCollection<T>)((IItemCollection<T>)collection).Clone(cloner);
    80       clone.Initialize();
     69      clone.RegisterEvents();
    8170      return clone;
    8271    }

  • trunk/sources/HeuristicLab.Core/3.3/Collections/ReadOnlyItemDictionary.cs

    r3550 r3560  
    5555    }
    5656
    57     [Storable]
    58     private IObservableDictionary<TKey, TValue> Items {
    59       get { return dict; }
    60       set { dict = value; }
    61     }
    62 
    6357    public ReadOnlyItemDictionary() : base(new ItemDictionary<TKey, TValue>()) { }
    6458    public ReadOnlyItemDictionary(IItemDictionary<TKey, TValue> dictionary) : base(dictionary) { }
    6559    [StorableConstructor]
    66     protected ReadOnlyItemDictionary(bool deserializing) { }
    67 
    68     [StorableHook(HookType.AfterDeserialization)]
    69     private void Initialize() {
    70       RegisterEvents();
    71     }
     60    protected ReadOnlyItemDictionary(bool deserializing) : base(deserializing) { }
    7261
    7362    public object Clone() {
    … …  
    7867      cloner.RegisterClonedObject(this, clone);
    7968      clone.dict = (IItemDictionary<TKey, TValue>)((IItemDictionary<TKey, TValue>)dict).Clone(cloner);
    80       clone.Initialize();
     69      clone.RegisterEvents();
    8170      return clone;
    8271    }

  • trunk/sources/HeuristicLab.Core/3.3/Collections/ReadOnlyItemList.cs

    r3550 r3560  
    5555    }
    5656
    57     [Storable]
    58     private IObservableList<T> Items {
    59       get { return list; }
    60       set { list = value; }
    61     }
    62 
    6357    public ReadOnlyItemList() : base(new ItemList<T>()) { }
    6458    public ReadOnlyItemList(IItemList<T> list) : base(list) { }
    6559    [StorableConstructor]
    66     protected ReadOnlyItemList(bool deserializing) { }
    67 
    68     [StorableHook(HookType.AfterDeserialization)]
    69     private void Initialize() {
    70       RegisterEvents();
    71     }
     60    protected ReadOnlyItemList(bool deserializing) : base(deserializing) { }
    7261
    7362    public object Clone() {
    … …  
    7867      cloner.RegisterClonedObject(this, clone);
    7968      clone.list = (IItemList<T>)((IItemList<T>)list).Clone(cloner);
    80       clone.Initialize();
     69      clone.RegisterEvents();
    8170      return clone;
    8271    }

  • trunk/sources/HeuristicLab.Core/3.3/Collections/ReadOnlyItemSet.cs

    r3550 r3560  
    5555    }
    5656
    57     [Storable]
    58     private IObservableSet<T> Items {
    59       get { return set; }
    60       set { set = value; }
    61     }
    62 
    6357    public ReadOnlyItemSet() : base(new ItemSet<T>()) { }
    6458    public ReadOnlyItemSet(IItemSet<T> set) : base(set) { }
    6559    [StorableConstructor]
    66     protected ReadOnlyItemSet(bool deserializing) { }
    67 
    68     [StorableHook(HookType.AfterDeserialization)]
    69     private void Initialize() {
    70       RegisterEvents();
    71     }
     60    protected ReadOnlyItemSet(bool deserializing) : base(deserializing) { }
    7261
    7362    public object Clone() {
    … …  
    7867      cloner.RegisterClonedObject(this, clone);
    7968      clone.set = (IItemSet<T>)((IItemSet<T>)set).Clone(cloner);
    80       clone.Initialize();
     69      clone.RegisterEvents();
    8170      return clone;
    8271    }

  • trunk/sources/HeuristicLab.Core/3.3/Collections/ReadOnlyKeyedItemCollection.cs

    r3550 r3560  
    5555    }
    5656
    57     [Storable]
    58     private IObservableKeyedCollection<TKey, TItem> Items {
    59       get { return collection; }
    60       set { collection = value; }
    61     }
    62 
    6357    protected ReadOnlyKeyedItemCollection() : base() { }
    6458    public ReadOnlyKeyedItemCollection(IKeyedItemCollection<TKey, TItem> collection) : base(collection) { }
    6559    [StorableConstructor]
    66     protected ReadOnlyKeyedItemCollection(bool deserializing) { }
    67 
    68     [StorableHook(HookType.AfterDeserialization)]
    69     private void Initialize() {
    70       RegisterEvents();
    71     }
     60    protected ReadOnlyKeyedItemCollection(bool deserializing) : base(deserializing) { }
    7261
    7362    public object Clone() {
    … …  
    7867      cloner.RegisterClonedObject(this, clone);
    7968      clone.collection = (IKeyedItemCollection<TKey, TItem>)((IKeyedItemCollection<TKey, TItem>)collection).Clone(cloner);
    80       clone.Initialize();
     69      clone.RegisterEvents();
    8170      return clone;
    8271    }
Note: See TracChangeset for help on using the changeset viewer.