From 0df2e6ae03c03ccb143728f40434bf75643e952a Mon Sep 17 00:00:00 2001 From: anna Date: Mon, 5 Dec 2011 21:40:28 +0100 Subject: [PATCH] EA-32344 - IAE: DialogWrapperPeerFactoryImpl.createPeer (cherry picked from commit 6d50e432019807c7498c17b658c63afb095f4ce6) --- .../src/com/intellij/ide/plugins/PluginManager.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/PluginManager.java b/platform/platform-impl/src/com/intellij/ide/plugins/PluginManager.java index 3a795285ebbd..1dea77e5f51d 100644 --- a/platform/platform-impl/src/com/intellij/ide/plugins/PluginManager.java +++ b/platform/platform-impl/src/com/intellij/ide/plugins/PluginManager.java @@ -34,13 +34,13 @@ import com.intellij.openapi.extensions.LogProvider; import com.intellij.openapi.extensions.PluginId; import com.intellij.openapi.options.ShowSettingsUtil; import com.intellij.openapi.progress.ProcessCanceledException; -import com.intellij.openapi.project.Project; import com.intellij.openapi.util.BuildNumber; import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.Condition; import com.intellij.openapi.util.JDOMUtil; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; +import com.intellij.openapi.wm.IdeFocusManager; import com.intellij.util.ArrayUtil; import com.intellij.util.Function; import com.intellij.util.graph.CachingSemiGraph; @@ -58,11 +58,13 @@ import sun.reflect.Reflection; import javax.swing.*; import javax.swing.event.HyperlinkEvent; +import java.awt.*; import java.io.*; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.net.*; import java.util.*; +import java.util.List; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; @@ -581,8 +583,8 @@ public class PluginManager { final String description = event.getDescription(); if (EDIT.equals(description)) { final PluginManagerConfigurable configurable = new PluginManagerConfigurable(PluginManagerUISettings.getInstance()); - final Project project = null; - ShowSettingsUtil.getInstance().editConfigurable(project, configurable); + final Component focusOwner = IdeFocusManager.findInstance().getFocusOwner(); + ShowSettingsUtil.getInstance().editConfigurable(focusOwner, configurable); return; } final List disabledPlugins = getDisabledPlugins();