Changeset 6527

Timestamp:

07/07/11 09:00:45 (13 years ago)

Author:

swagner

Message:

Corrected cloning of multiple dropped items (#1564)

Location:

trunk/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Core.Views/3.3/Clipboard.cs (modified) (2 diffs)
• HeuristicLab.Core.Views/3.3/ItemCollectionView.cs (modified) (1 diff)
• HeuristicLab.Core.Views/3.3/ItemListView.cs (modified) (1 diff)
• HeuristicLab.Optimization.Views/3.3/RunCollectionView.cs (modified) (2 diffs)

trunk/sources

@@ -12 +12 @@
 *.psess
 *.vsp
+*.docstates

@@ -12 +12 @@
 *.psess
 *.vsp
+*.docstates

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

@@ -27 +27 @@
 using System.Threading;
 using System.Windows.Forms;
+using HeuristicLab.Common;
 using HeuristicLab.MainForm;
 using HeuristicLab.Persistence.Default.Xml;
@@ -321 +322 @@
           } 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(x => cloner.Clone(x));
+            }
             foreach (T item in items)
-              AddItem(e.Effect.HasFlag(DragDropEffects.Copy) ? (T)item.Clone() : item);
+              AddItem(item);
           }
         }

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

@@ -297 +297 @@
           if (e.Effect.HasFlag(DragDropEffects.Copy)) {
             Cloner cloner = new Cloner();
-            items = items.Select(i => (T)i.Clone(cloner));
+            items = items.Select(x => cloner.Clone(x));
           }
           foreach (T item in items)

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

@@ -337 +337 @@
           if (e.Effect.HasFlag(DragDropEffects.Copy)) {
             Cloner cloner = new Cloner();
-            items = items.Select(i => (T)i.Clone(cloner));
+            items = items.Select(x => cloner.Clone(x));
           }
           foreach (T item in items) {

trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionView.cs

@@ -27 +27 @@
 using System.Windows.Forms;
 using HeuristicLab.Collections;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Core.Views;
@@ -314 +315 @@
         } else if (e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat) is IEnumerable) {
           IEnumerable<IRun> items = ((IEnumerable)e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat)).Cast<IRun>();
+          if (e.Effect.HasFlag(DragDropEffects.Copy)) {
+            Cloner cloner = new Cloner();
+            items = items.Select(x => cloner.Clone(x));
+          }
           foreach (IRun item in items)
-            Content.Add(e.Effect.HasFlag(DragDropEffects.Copy) ? (IRun)item.Clone() : item);
+            Content.Add(item);
         }
       }

@@ -12 +12 @@
 *.psess
 *.vsp
+*.docstates