Changeset 11734

Timestamp:

01/07/15 10:29:08 (10 years ago)

Author:

jkarder

Message:

#2262:

• only IDeepCloneables can be dropped on the VariableStoreView
• renamed CSharpScript.Execute to CSharpScript.ExecuteAsync

Location:

trunk/sources

Files:

• HeuristicLab.Scripting.Views/3.3/CSharpScriptView.cs (modified) (2 diffs)
• HeuristicLab.Scripting.Views/3.3/VariableStoreView.cs (modified) (2 diffs)
• HeuristicLab.Scripting/3.3/CSharpScript.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Scripting.Views/3.3/CSharpScriptView.cs

@@ -111 +111 @@
         if (Compile()) {
           outputTextBox.Clear();
-          Content.Execute();
+          Content.ExecuteAsync();
           Running = true;
         }
@@ -123 +123 @@
             if (Compile()) {
               outputTextBox.Clear();
-              Content.Execute();
+              Content.ExecuteAsync();
               Running = true;
             }

trunk/sources/HeuristicLab.Scripting.Views/3.3/VariableStoreView.cs

@@ -241 +241 @@
     }
     protected virtual void variableListView_DragEnter(object sender, DragEventArgs e) {
-      validDragOperation = !Locked && !ReadOnly && e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat) != null;
+      validDragOperation = !Locked && !ReadOnly;
+
+      object item = e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat);
+      if (item is KeyValuePair<string, object>) {
+        var variable = (KeyValuePair<string, object>)item;
+        validDragOperation &= variable.Value is IDeepCloneable;
+      } else {
+        validDragOperation &= item is IDeepCloneable;
+      }
     }
     protected virtual void variableListView_DragOver(object sender, DragEventArgs e) {
       e.Effect = DragDropEffects.None;
       if (validDragOperation) {
-        if (e.AllowedEffect.HasFlag(DragDropEffects.Copy)) e.Effect = DragDropEffects.Copy;
+        if (e.AllowedEffect.HasFlag(DragDropEffects.Copy))
+          e.Effect = DragDropEffects.Copy;
       }
     }
@@ -269 +278 @@
 
       var cloneable = item as IDeepCloneable;
-      if (cloneable != null) item = cloneable.Clone();
-
-      Content.Add(variableName, item);
+      if (cloneable == null) return;
+
+      var clonedItem = cloneable.Clone();
+      Content.Add(variableName, clonedItem);
 
       var listViewItem = variableListView.FindItemWithText(variableName);

trunk/sources/HeuristicLab.Scripting/3.3/CSharpScript.cs

@@ -95 +95 @@
 
     private Thread scriptThread;
-    public virtual void Execute() {
+    public virtual void ExecuteAsync() {
       if (compiledScript == null) return;
       scriptThread = new Thread(() => {