Author: sebb
Date: Wed Oct 8 03:32:38 2008
New Revision: 702799
URL: http://svn.apache.org/viewvc?rev=702799&view=rev
Log:
Make explicit null check (would have been caught by canAddTo):
a bit more efficient; easier to see that null is catered for
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/DragNDrop.java
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/DragNDrop.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/DragNDrop.java?rev=702799&r1=702798&r2=702799&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/DragNDrop.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/DragNDrop.java
Wed Oct 8 03:32:38 2008
@@ -54,7 +54,6 @@
if (te instanceof TestPlan || te instanceof WorkBench) {
parentNode = null; // So elements can only be added as children
}
- // System.out.println(action+" "+te.getClass().getName());
if (ActionNames.DRAG_ADD.equals(action) &&
canAddTo(currentNode,draggedNodes)) {
removeNodesFromParents(draggedNodes);
@@ -62,17 +61,19 @@
GuiPackage.getInstance().getTreeModel().insertNodeInto(draggedNodes[i],
currentNode,
currentNode.getChildCount());
}
- } else if (ActionNames.INSERT_BEFORE.equals(action) &&
canAddTo(parentNode,draggedNodes)) {
- removeNodesFromParents(draggedNodes);
- for (int i = 0; i < draggedNodes.length; i++) {
- int index = parentNode.getIndex(currentNode);
-
GuiPackage.getInstance().getTreeModel().insertNodeInto(draggedNodes[i],
parentNode, index);
- }
- } else if (ActionNames.INSERT_AFTER.equals(action) &&
canAddTo(parentNode,draggedNodes)) {
- removeNodesFromParents(draggedNodes);
- for (int i = 0; i < draggedNodes.length; i++) {
- int index = parentNode.getIndex(currentNode) + 1;
-
GuiPackage.getInstance().getTreeModel().insertNodeInto(draggedNodes[i],
parentNode, index);
+ } else if (parentNode != null) {
+ if (ActionNames.INSERT_BEFORE.equals(action) &&
canAddTo(parentNode,draggedNodes)) {
+ removeNodesFromParents(draggedNodes);
+ for (int i = 0; i < draggedNodes.length; i++) {
+ int index = parentNode.getIndex(currentNode);
+
GuiPackage.getInstance().getTreeModel().insertNodeInto(draggedNodes[i],
parentNode, index);
+ }
+ } else if (ActionNames.INSERT_AFTER.equals(action) &&
canAddTo(parentNode,draggedNodes)) {
+ removeNodesFromParents(draggedNodes);
+ for (int i = 0; i < draggedNodes.length; i++) {
+ int index = parentNode.getIndex(currentNode) + 1;
+
GuiPackage.getInstance().getTreeModel().insertNodeInto(draggedNodes[i],
parentNode, index);
+ }
}
}
GuiPackage.getInstance().getMainFrame().repaint();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
