diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-08-21 00:31:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-08-16 04:55:08 +0000 |
| commit | 9cde0e3c015174898df8b8f3672185941fad4786 (patch) | |
| tree | 80a55c7b59c38377216daaada4e8bc47b69ceb9a /platform/lang-impl/src/com/intellij/codeInsight/intention/impl/QuickEditAction.java | |
| parent | 3b37877a2561bf9fbe072253a18688807d523505 (diff) | |
| parent | d76e3920c56d37c942092b7dca20fcaded81c0a5 (diff) | |
| download | idea-9cde0e3c015174898df8b8f3672185941fad4786.tar.gz | |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'platform/lang-impl/src/com/intellij/codeInsight/intention/impl/QuickEditAction.java')
| -rw-r--r-- | platform/lang-impl/src/com/intellij/codeInsight/intention/impl/QuickEditAction.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/QuickEditAction.java b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/QuickEditAction.java index ee4c91972046..62e3bcba3a22 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/QuickEditAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/QuickEditAction.java @@ -25,7 +25,10 @@ import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.EditorFactory; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.popup.Balloon; -import com.intellij.openapi.util.*; +import com.intellij.openapi.util.Condition; +import com.intellij.openapi.util.Key; +import com.intellij.openapi.util.Pair; +import com.intellij.openapi.util.TextRange; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.*; import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; @@ -138,7 +141,7 @@ public class QuickEditAction implements IntentionAction, LowPriorityAction { } @Nullable - protected JComponent createBalloonComponent(PsiFile file, Ref<Balloon> ref) { + protected JComponent createBalloonComponent(@NotNull PsiFile file) { return null; } |