Changeset 12275

Timestamp:

04/01/15 15:39:20 (10 years ago)

Author:

mkommend

Message:

#2343: Merged r12088 into stable.

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Scripting.Views/3.3/VariableStoreView.cs (modified) (4 diffs)

stable/HeuristicLab.Scripting.Views/3.3/VariableStoreView.cs

@@ -160 +160 @@
       sortAscendingButton.Enabled = variableListView.Items.Count > 1;
       sortDescendingButton.Enabled = variableListView.Items.Count > 1;
-      var item = variable.Value as IItem;
-      if (item != null) item.ToStringChanged += item_ToStringChanged;
     }
 
@@ -174 +172 @@
       sortAscendingButton.Enabled = variableListView.Items.Count > 1;
       sortDescendingButton.Enabled = variableListView.Items.Count > 1;
-      var item = variable.Value as IItem;
-      if (item != null) item.ToStringChanged -= item_ToStringChanged;
     }
 
@@ -338 +334 @@
     #region Content Events
     protected virtual void Content_ItemsAdded(object sender, CollectionItemsChangedEventArgs<KeyValuePair<string, object>> e) {
-      if (InvokeRequired)
-        Invoke(new CollectionItemsChangedEventHandler<KeyValuePair<string, object>>(Content_ItemsAdded), sender, e);
-      else {
-        foreach (var item in e.Items)
-          AddVariable(item);
-        AdjustListViewColumnSizes();
-      }
+      var variables = e.Items;
+      foreach (var variable in variables) {
+        var item = variable.Value as IItem;
+        if (item != null) item.ToStringChanged += item_ToStringChanged;
+      }
+      InvokeVariableAction(AddVariable, variables);
     }
 
     protected virtual void Content_ItemsReplaced(object sender, CollectionItemsChangedEventArgs<KeyValuePair<string, object>> e) {
-      if (InvokeRequired)
-        Invoke(new CollectionItemsChangedEventHandler<KeyValuePair<string, object>>(Content_ItemsReplaced), sender, e);
-      else {
-        foreach (var item in e.Items)
-          UpdateVariable(item);
-        AdjustListViewColumnSizes();
-      }
+      var oldVariables = e.OldItems;
+      foreach (var variable in oldVariables) {
+        var item = variable.Value as IItem;
+        if (item != null) item.ToStringChanged -= item_ToStringChanged;
+      }
+      var newVariables = e.Items;
+      foreach (var variable in newVariables) {
+        var item = variable.Value as IItem;
+        if (item != null) item.ToStringChanged += item_ToStringChanged;
+      }
+      InvokeVariableAction(UpdateVariable, e.Items);
     }
 
     protected virtual void Content_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<KeyValuePair<string, object>> e) {
-      if (InvokeRequired)
-        Invoke(new CollectionItemsChangedEventHandler<KeyValuePair<string, object>>(Content_ItemsRemoved), sender, e);
-      else {
-        foreach (var item in e.Items)
-          RemoveVariable(item);
-        AdjustListViewColumnSizes();
-      }
-    }
+      var variables = e.Items;
+      foreach (var variable in variables) {
+        var item = variable.Value as IItem;
+        if (item != null) item.ToStringChanged -= item_ToStringChanged;
+      }
+      InvokeVariableAction(RemoveVariable, variables);
+    }
+
     protected virtual void Content_CollectionReset(object sender, CollectionItemsChangedEventArgs<KeyValuePair<string, object>> e) {
       if (InvokeRequired)
@@ -490 +489 @@
       return serializable;
     }
+
+    private void InvokeVariableAction(Action<KeyValuePair<string, object>> action, IEnumerable<KeyValuePair<string, object>> variables) {
+      if (InvokeRequired)
+        Invoke((Action<Action<KeyValuePair<string, object>>, IEnumerable<KeyValuePair<string, object>>>)InvokeVariableAction, action, variables);
+      else {
+        foreach (var variable in variables)
+          action(variable);
+        AdjustListViewColumnSizes();
+      }
+    }
     #endregion
   }