diff options
author | Tor Norbye <tnorbye@google.com> | 2014-09-04 13:25:33 -0700 |
---|---|---|
committer | Tor Norbye <tnorbye@google.com> | 2014-09-04 13:25:33 -0700 |
commit | d245f58efbfc26b13b9b9d5e52e6a83a0d76216c (patch) | |
tree | bca7d49005d81d10c70bc3f547df041c636b4300 /platform/lang-impl/src/com/intellij/internal/ImageDuplicateResultsDialog.java | |
parent | 9cde0e3c015174898df8b8f3672185941fad4786 (diff) | |
parent | c3d3a90f6b4ead083d63e28e6b9fcea93d675678 (diff) | |
download | idea-d245f58efbfc26b13b9b9d5e52e6a83a0d76216c.tar.gz |
Merge remote-tracking branch 'aosp/upstream-master' into merge
Diffstat (limited to 'platform/lang-impl/src/com/intellij/internal/ImageDuplicateResultsDialog.java')
-rw-r--r-- | platform/lang-impl/src/com/intellij/internal/ImageDuplicateResultsDialog.java | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/platform/lang-impl/src/com/intellij/internal/ImageDuplicateResultsDialog.java b/platform/lang-impl/src/com/intellij/internal/ImageDuplicateResultsDialog.java index c7c62288c158..53d4a3edd7ef 100644 --- a/platform/lang-impl/src/com/intellij/internal/ImageDuplicateResultsDialog.java +++ b/platform/lang-impl/src/com/intellij/internal/ImageDuplicateResultsDialog.java @@ -39,7 +39,6 @@ import com.intellij.ui.*; import com.intellij.ui.awt.RelativePoint; import com.intellij.ui.components.JBList; import com.intellij.ui.components.JBScrollPane; -import com.intellij.ui.popup.NotLookupOrSearchCondition; import com.intellij.ui.treeStructure.Tree; import com.intellij.util.Function; import com.intellij.util.NotNullFunction; @@ -232,7 +231,6 @@ public class ImageDuplicateResultsDialog extends DialogWrapper { final JBPopup popup = JBPopupFactory.getInstance().createComponentPopupBuilder(viewComponent, viewComponent.getPreferredFocusableComponent()) - .setRequestFocusCondition(myProject, NotLookupOrSearchCondition.INSTANCE) .setProject(myProject) .setDimensionServiceKey(myProject, DocumentationManager.JAVADOC_LOCATION_AND_SIZE, false) .setResizable(true) |