Changeset 6618 for branches/GP.Grammar.Editor/HeuristicLab.Core.Views

Timestamp:

08/01/11 17:48:53 (13 years ago)

Author:

mkommend

Message:

#1479: Integrated trunk changes.

Location:

branches/GP.Grammar.Editor/HeuristicLab.Core.Views/3.3

Files:

• Clipboard.cs (modified) (2 diffs)
• HeuristicLabCoreViewsPlugin.cs.frame (modified) (1 diff)
• ItemCollectionView.cs (modified) (2 diffs)
• ItemListView.cs (modified) (2 diffs)
• Properties/AssemblyInfo.frame (modified) (1 diff)

branches/GP.Grammar.Editor/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);
           }
         }

branches/GP.Grammar.Editor/HeuristicLab.Core.Views/3.3/HeuristicLabCoreViewsPlugin.cs.frame

@@ -26 +26 @@
   /// Plugin class for HeuristicLab.Core.Views plugin.
   /// </summary>
-  [Plugin("HeuristicLab.Core.Views", "3.3.4.$WCREV$")]
+  [Plugin("HeuristicLab.Core.Views", "3.3.5.$WCREV$")]
   [PluginFile("HeuristicLab.Core.Views-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Collections", "3.3")]

branches/GP.Grammar.Editor/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(x => cloner.Clone(x));
+          }
           foreach (T item in items)
-            Content.Add(e.Effect.HasFlag(DragDropEffects.Copy) ? (T)item.Clone() : item);
+            Content.Add(item);
         }
       }

branches/GP.Grammar.Editor/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(x => cloner.Clone(x));
+          }
           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);
           }
         }

branches/GP.Grammar.Editor/HeuristicLab.Core.Views/3.3/Properties/AssemblyInfo.frame

@@ -54 +54 @@
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.4.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.5.$WCREV$")]