diff options
Diffstat (limited to 'java/java-impl/src/com/intellij/refactoring/inline/InlineToAnonymousClassHandler.java')
-rw-r--r-- | java/java-impl/src/com/intellij/refactoring/inline/InlineToAnonymousClassHandler.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/java/java-impl/src/com/intellij/refactoring/inline/InlineToAnonymousClassHandler.java b/java/java-impl/src/com/intellij/refactoring/inline/InlineToAnonymousClassHandler.java index e17326844249..8d7995fbf1b0 100644 --- a/java/java-impl/src/com/intellij/refactoring/inline/InlineToAnonymousClassHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/inline/InlineToAnonymousClassHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -91,7 +91,7 @@ public class InlineToAnonymousClassHandler extends JavaInlineActionHandler { }); } }, "Searching for class \"" + element.getQualifiedName() + "\" inheritors ...", true, element.getProject())) return false; - return inheritors.size() == 0; + return inheritors.isEmpty(); } @Override @@ -124,7 +124,12 @@ public class InlineToAnonymousClassHandler extends JavaInlineActionHandler { if (!ProgressManager.getInstance().runProcessWithProgressSynchronously(new Runnable(){ @Override public void run() { - errorMessage.set(getCannotInlineMessage(psiClass)); + ApplicationManager.getApplication().runReadAction(new Runnable() { + @Override + public void run() { + errorMessage.set(getCannotInlineMessage(psiClass)); + } + }); } }, "Check if inline is possible...", true, project)) return; if (errorMessage.get() != null) { |