From d5acd57acfdc7c3652e2a581b80c876078187eae Mon Sep 17 00:00:00 2001 From: Alexander Lobas Date: Fri, 24 May 2013 17:26:17 +0400 Subject: [PATCH] Autolayout --- .../componentTree/TreeEditOperation.java | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/plugins/ui-designer-core/src/com/intellij/designer/componentTree/TreeEditOperation.java b/plugins/ui-designer-core/src/com/intellij/designer/componentTree/TreeEditOperation.java index 75150ca7d39d..6f017ddce288 100644 --- a/plugins/ui-designer-core/src/com/intellij/designer/componentTree/TreeEditOperation.java +++ b/plugins/ui-designer-core/src/com/intellij/designer/componentTree/TreeEditOperation.java @@ -23,7 +23,6 @@ import com.intellij.util.ArrayUtil; import org.jetbrains.annotations.Nullable; import java.awt.*; -import java.util.List; /** * @author Alexander Lobas @@ -86,10 +85,10 @@ public abstract class TreeEditOperation extends AbstractEditOperation { return false; } - List children = myContainer.getChildren(); - int index = children.indexOf(myTarget) + (myInsertBefore ? -1 : 1); - if (0 <= index && index < children.size()) { - return !myComponents.contains(children.get(index)); + Object[] children = myContainer.getTreeChildren(); + int index = ArrayUtil.indexOf(children, myTarget) + (myInsertBefore ? -1 : 1); + if (0 <= index && index < children.length) { + return !myComponents.contains(children[index]); } } return true; @@ -104,10 +103,10 @@ public abstract class TreeEditOperation extends AbstractEditOperation { execute(myTarget); } else { - List children = myContainer.getChildren(); - int index = children.indexOf(myTarget) + 1; - if (index < children.size()) { - execute(children.get(index)); + Object[] children = myContainer.getTreeChildren(); + int index = ArrayUtil.indexOf(children, myTarget) + 1; + if (index < children.length) { + execute((RadComponent)children[index]); } else { execute(null);