Changeset 17566 for branches/2521_ProblemRefactoring/HeuristicLab.Parameters

Timestamp:

05/28/20 14:33:28 (4 years ago)

Author:

mkommend

Message:

#2521: Decoupled readonly state of ReferenceParameter from the referenced parameter and corrected cloning.

File:

• branches/2521_ProblemRefactoring/HeuristicLab.Parameters/3.3/ReferenceParameter.cs (modified) (3 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Parameters/3.3/ReferenceParameter.cs

@@ -45 +45 @@
     public IValueParameter ReferencedParameter { get; }
 
+    [Storable(DefaultValue = true)]
+    private bool readOnly;
     public bool ReadOnly {
-      get => ReferencedParameter.ReadOnly;
-      set => ReferencedParameter.ReadOnly = value;
-    }
+      get { return readOnly; }
+      set {
+        if (value != readOnly) {
+          readOnly = value;
+          OnReadOnlyChanged();
+        }
+      }
+    }
+
 
     [Storable(DefaultValue = true)]
@@ -80 +88 @@
     protected ReferenceParameter(ReferenceParameter original, Cloner cloner) : base(original, cloner) {
       ReferencedParameter = cloner.Clone(original.ReferencedParameter);
+      ReadOnly = original.ReadOnly;
+      GetsCollected = original.GetsCollected;
+
       RegisterEvents();
     }
@@ -119 +130 @@
     }
 
-    private EventHandler readOnlyChanged;
-    public event EventHandler ReadOnlyChanged {
-      add { // only subscribe when we have a subscriber ourselves
-        bool firstSubscription = readOnlyChanged == null;
-        readOnlyChanged += value;
-        if (firstSubscription && readOnlyChanged != null) //only subscribe once
-          ReferencedParameter.ReadOnlyChanged += OnReferencedParameterReadOnlyChanged;
-      }
-      remove { // unsubscribe if we have no more subscribers
-        readOnlyChanged -= value;
-        if (readOnlyChanged == null) ReferencedParameter.ReadOnlyChanged -= OnReferencedParameterReadOnlyChanged;
-      }
-    }
-    private void OnReferencedParameterReadOnlyChanged(object sender, EventArgs args) {
-      readOnlyChanged?.Invoke(this, args); // note "this", not "sender" as sender would be the referenced parameter
+    public event EventHandler ReadOnlyChanged;
+    private void OnReadOnlyChanged() {
+      ReadOnlyChanged?.Invoke(this, EventArgs.Empty);
     }