Changeset 9056 for trunk

Timestamp:

12/14/12 12:25:37 (12 years ago)

Author:

bburlacu

Message:

#1763: Disabled paste option when attempting to cut/paste a subtree into itself.

File:

• trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicExpressionTreeChart.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicExpressionTreeChart.cs

@@ -73 +73 @@
         cutToolStripMenuItem.Visible = true;
         removeToolStripMenuItem.Visible = true;
+
         pasteToolStripMenuItem.Visible = true;
-        pasteToolStripMenuItem.Enabled = tempNode != null && insertNodeToolStripMenuItem.Enabled;
+        pasteToolStripMenuItem.Enabled = tempNode != null && insertNodeToolStripMenuItem.Enabled
+                                                          && !(lastOp == EditOp.CutSubtree
+                                                               && tempNode.IterateNodesBreadth().Contains(currSelected.SymbolicExpressionTreeNode));
       }
     }
@@ -214 +217 @@
         case EditOp.CutSubtree: {
             if (tempNode.IterateNodesBreadth().Contains(node))
-              goto case EditOp.CopySubtree; // a subtree cannot be cut/pasted onto itself
-            ModifyTree(Tree, tempNode.Parent, tempNode, null); //remove node from its original parent
-            ModifyTree(Tree, node, null, tempNode); //insert it as a child to the new parent
-            lastOp = EditOp.CopySubtree; //do this so the next paste will actually perform a copy   
+              throw new ArgumentException();
             break;
           }