From 7d5c95c9c4cadd2592a6fc6c6e352b3ff3e149f2 Mon Sep 17 00:00:00 2001 From: anna Date: Wed, 31 Aug 2011 17:03:59 +0200 Subject: [PATCH] show definitions: cancel update after success --- .../hint/actions/ShowImplementationsAction.java | 2 +- .../codeInsight/navigation/BackgroundUpdaterTask.java | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/codeInsight/hint/actions/ShowImplementationsAction.java b/platform/lang-impl/src/com/intellij/codeInsight/hint/actions/ShowImplementationsAction.java index 7f0f7c160bca..31a75cccd1d2 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/hint/actions/ShowImplementationsAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/hint/actions/ShowImplementationsAction.java @@ -354,7 +354,7 @@ public class ShowImplementationsAction extends AnAction implements PopupAction { @Override public void onSuccess() { - if (!isCanceled()) { + if (!setCanceled()) { myComponent.update(myElements, myComponent.getIndex()); } super.onSuccess(); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/navigation/BackgroundUpdaterTask.java b/platform/lang-impl/src/com/intellij/codeInsight/navigation/BackgroundUpdaterTask.java index 41d9cdf332aa..e965e6424e78 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/navigation/BackgroundUpdaterTask.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/navigation/BackgroundUpdaterTask.java @@ -78,12 +78,10 @@ public abstract class BackgroundUpdaterTask extends Task.Backgroundable { protected abstract void replaceModel(List data); protected abstract void paintBusy(boolean paintBusy); - public void setCanceled() { + public boolean setCanceled() { + boolean canceled = myCanceled; myCanceled = true; - } - - public boolean isCanceled() { - return myCanceled; + return canceled; } public void updateComponent(PsiElement element, @Nullable final Comparator comparator) {