Changeset 6472

Timestamp:

06/22/11 17:25:52 (13 years ago)

Author:

mkommend

Message:

#1564: Corrected cloning bug in drop method of collection views.

Location:

trunk/sources/HeuristicLab.Core.Views/3.3

Files:

• ItemCollectionView.cs (modified) (2 diffs)
• ItemListView.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Core.Views/3.3/ItemCollectionView.cs

@@ -26 +26 @@
 using System.Windows.Forms;
 using HeuristicLab.Collections;
+using HeuristicLab.Common;
 using HeuristicLab.MainForm;
 using HeuristicLab.MainForm.WindowsForms;
@@ -294 +295 @@
         } else if (e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat) is IEnumerable) {
           IEnumerable<T> items = ((IEnumerable)e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat)).Cast<T>();
+          if (e.Effect.HasFlag(DragDropEffects.Copy)) {
+            Cloner cloner = new Cloner();
+            items = items.Select(i => (T)i.Clone(cloner));
+          }
           foreach (T item in items)
-            Content.Add(e.Effect.HasFlag(DragDropEffects.Copy) ? (T)item.Clone() : item);
+            Content.Add(item);
         }
       }

trunk/sources/HeuristicLab.Core.Views/3.3/ItemListView.cs

@@ -27 +27 @@
 using System.Windows.Forms;
 using HeuristicLab.Collections;
+using HeuristicLab.Common;
 using HeuristicLab.MainForm;
 using HeuristicLab.MainForm.WindowsForms;
@@ -334 +335 @@
         } else if (e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat) is IEnumerable) {
           IEnumerable<T> items = ((IEnumerable)e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat)).Cast<T>();
+          if (e.Effect.HasFlag(DragDropEffects.Copy)) {
+            Cloner cloner = new Cloner();
+            items = items.Select(i => (T)i.Clone(cloner));
+          }
           foreach (T item in items) {
-            if (listViewItem != null) Content.Insert(listViewItem.Index, e.Effect.HasFlag(DragDropEffects.Copy) ? (T)item.Clone() : item);
-            else Content.Add(e.Effect.HasFlag(DragDropEffects.Copy) ? (T)item.Clone() : item);
+            if (listViewItem != null) Content.Insert(listViewItem.Index, item);
+            else Content.Add(item);
           }
         }