Changeset 3317 for trunk/sources/HeuristicLab.Core/3.3/Scope.cs

Timestamp:

04/13/10 06:41:56 (14 years ago)

Author:

swagner

Message:

Implemented ReadOnlyView property for items (#969).

File:

• trunk/sources/HeuristicLab.Core/3.3/Scope.cs (modified) (6 diffs)

trunk/sources/HeuristicLab.Core/3.3/Scope.cs

@@ -51 +51 @@
     }
 
+    [Storable]
     private ScopeList subScopes;
-    [Storable]
     public ScopeList SubScopes {
       get { return subScopes; }
-      private set {
-        DeregisterSubScopesEvents();
-        subScopes = value;
-        RegisterSubScopesEvents();
-      }
     }
 
@@ -69 +64 @@
       parent = null;
       variables = new VariableCollection();
-      SubScopes = new ScopeList();
+      subScopes = new ScopeList();
+      Initialize();
     }
     /// <summary>
@@ -79 +75 @@
       parent = null;
       variables = new VariableCollection();
-      SubScopes = new ScopeList();
+      subScopes = new ScopeList();
+      Initialize();
     }
     public Scope(string name, string description)
@@ -85 +82 @@
       parent = null;
       variables = new VariableCollection();
-      SubScopes = new ScopeList();
+      subScopes = new ScopeList();
+      Initialize();
+    }
+    [StorableConstructor]
+    private Scope(bool deserializing) : base(deserializing) { }
+
+    [StorableHook(HookType.AfterDeserialization)]
+    private void Initialize() {
+      RegisterSubScopesEvents();
     }
 
@@ -98 +103 @@
       Scope clone = new Scope();
       cloner.RegisterClonedObject(this, clone);
-      clone.Name = Name;
-      clone.Description = Description;
+      clone.ReadOnlyView = ReadOnlyView;
+      clone.name = name;
+      clone.description = description;
       if (variables.Count > 0) clone.variables = (VariableCollection)cloner.Clone(variables);
       if (subScopes.Count > 0) {
-        clone.SubScopes = (ScopeList)cloner.Clone(subScopes);
+        clone.subScopes = (ScopeList)cloner.Clone(subScopes);
         foreach (IScope child in clone.SubScopes)
           child.Parent = clone;
+        clone.Initialize();
       }
       return clone;
@@ -116 +123 @@
         subScopes.ItemsReplaced += new CollectionItemsChangedEventHandler<IndexedItem<IScope>>(SubScopes_ItemsReplaced);
         subScopes.CollectionReset += new CollectionItemsChangedEventHandler<IndexedItem<IScope>>(SubScopes_CollectionReset);
-      }
-    }
-    private void DeregisterSubScopesEvents() {
-      if (subScopes != null) {
-        subScopes.ItemsAdded -= new CollectionItemsChangedEventHandler<IndexedItem<IScope>>(SubScopes_ItemsAdded);
-        subScopes.ItemsRemoved -= new CollectionItemsChangedEventHandler<IndexedItem<IScope>>(SubScopes_ItemsRemoved);
-        subScopes.ItemsReplaced -= new CollectionItemsChangedEventHandler<IndexedItem<IScope>>(SubScopes_ItemsReplaced);
-        subScopes.CollectionReset -= new CollectionItemsChangedEventHandler<IndexedItem<IScope>>(SubScopes_CollectionReset);
       }
     }