MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

project view builder attempts to select virtual file on unsuccessful select of an element - due to many clients trying to select elements that are not in the tree structure

Browse Source
This commit is contained in:
Kirill Kalishev
2010-07-27 16:13:04 +04:00
parent e98c87b8e9
commit 345b88eaf8
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/projectView/BaseProjectTreeBuilder.java
+16 -6
View File
@@ -81,7 +81,7 @@ public abstract class BaseProjectTreeBuilder extends AbstractTreeBuilder {
batch(new Progressive() {
public void run(@NotNull ProgressIndicator indicator) {
final Ref<Object> target = new Ref<Object>();
_select(value, finalVFile, false, Conditions.<AbstractTreeNode>alwaysTrue(), cb, indicator, target, focusRequestor);
_select(value, finalVFile, false, Conditions.<AbstractTreeNode>alwaysTrue(), cb, indicator, target, focusRequestor, false);
cb.doWhenDone(new Runnable() {
public void run() {
result.setDone(target.get());
@@ -178,7 +178,7 @@ public abstract class BaseProjectTreeBuilder extends AbstractTreeBuilder {
public void run() {
batch(new Progressive() {
public void run(@NotNull ProgressIndicator indicator) {
_select(element, file, requestFocus, nonStopCondition, result, indicator, null, requestor);
_select(element, file, requestFocus, nonStopCondition, result, indicator, null, requestor, false);
}
});
}
@@ -190,13 +190,14 @@ public abstract class BaseProjectTreeBuilder extends AbstractTreeBuilder {
}
private void _select(Object element,
VirtualFile file,
final VirtualFile file,
final boolean requestFocus,
final Condition<AbstractTreeNode> nonStopCondition,
final ActionCallback result,
ProgressIndicator indicator,
final ProgressIndicator indicator,
@Nullable final Ref<Object> virtualSelectTarget,
final FocusRequestor focusRequestor) {
final FocusRequestor focusRequestor,
final boolean isSecondAttempt) {
AbstractTreeNode alreadySelected = alreadySelectedNode(element);
final Runnable onDone = new Runnable() {
@@ -226,7 +227,16 @@ public abstract class BaseProjectTreeBuilder extends AbstractTreeBuilder {
onDone.run();
}
}
}).notifyWhenRejected(result);
}).doWhenRejected(new Runnable() {
@Override
public void run() {
if (isSecondAttempt) {
result.setRejected();
} else {
_select(file, file, requestFocus, nonStopCondition, result, indicator, virtualSelectTarget, focusRequestor, true);
}
}
});
}
else {
if (virtualSelectTarget == null) {