From 7de9df14ab9562d8145342dd35c485d4b3454a85 Mon Sep 17 00:00:00 2001 From: Ekaterina Tuzova Date: Thu, 20 Feb 2014 12:09:19 +0400 Subject: [PATCH] fixes according code review --- .../python/configuration/PyActiveSdkConfigurable.java | 3 +-- .../python/configuration/PythonSdkDetailsDialog.java | 2 +- .../src/com/jetbrains/python/sdk/PythonSdkDetailsStep.java | 5 ++--- python/src/com/jetbrains/python/sdk/PythonSdkType.java | 5 +++-- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/python/ide/src/com/jetbrains/python/configuration/PyActiveSdkConfigurable.java b/python/ide/src/com/jetbrains/python/configuration/PyActiveSdkConfigurable.java index 1148a04b0726..31688e326ce8 100644 --- a/python/ide/src/com/jetbrains/python/configuration/PyActiveSdkConfigurable.java +++ b/python/ide/src/com/jetbrains/python/configuration/PyActiveSdkConfigurable.java @@ -38,7 +38,6 @@ import com.intellij.openapi.ui.ComboBox; import com.intellij.openapi.ui.FixedSizeButton; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.ui.CollectionComboBoxModel; -import com.intellij.ui.awt.RelativePoint; import com.intellij.util.NullableConsumer; import com.intellij.webcore.packaging.PackagesNotificationPanel; import com.jetbrains.python.packaging.ui.PyInstalledPackagesPanel; @@ -130,7 +129,7 @@ public class PyActiveSdkConfigurable implements UnnamedConfigurable { .show(myProject, myProjectSdksModel.getSdks(), myModule == null ? new PythonSdkDetailsDialog(myProject, myDetailsCallback) : new PythonSdkDetailsDialog(myModule, myDetailsCallback), myMainPanel, - RelativePoint.fromScreen(myDetailsButton.getLocationOnScreen()), true, + myDetailsButton.getLocationOnScreen(), true, new NullableConsumer() { @Override public void consume(Sdk sdk) { diff --git a/python/ide/src/com/jetbrains/python/configuration/PythonSdkDetailsDialog.java b/python/ide/src/com/jetbrains/python/configuration/PythonSdkDetailsDialog.java index cbe20933578f..997f59a1bc67 100644 --- a/python/ide/src/com/jetbrains/python/configuration/PythonSdkDetailsDialog.java +++ b/python/ide/src/com/jetbrains/python/configuration/PythonSdkDetailsDialog.java @@ -246,7 +246,7 @@ public class PythonSdkDetailsDialog extends DialogWrapper { private void addSdk(AnActionButton button) { PythonSdkDetailsStep - .show(myProject, myProjectSdksModel.getSdks(), this, myMainPanel, button.getPreferredPopupPoint(), false, new NullableConsumer() { + .show(myProject, myProjectSdksModel.getSdks(), this, myMainPanel, button.getPreferredPopupPoint().getScreenPoint(), false, new NullableConsumer() { @Override public void consume(Sdk sdk) { addCreatedSdk(sdk, false); diff --git a/python/src/com/jetbrains/python/sdk/PythonSdkDetailsStep.java b/python/src/com/jetbrains/python/sdk/PythonSdkDetailsStep.java index 3ad84db79638..df04801e130c 100644 --- a/python/src/com/jetbrains/python/sdk/PythonSdkDetailsStep.java +++ b/python/src/com/jetbrains/python/sdk/PythonSdkDetailsStep.java @@ -28,7 +28,6 @@ import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.Messages; import com.intellij.openapi.ui.popup.*; import com.intellij.openapi.ui.popup.util.BaseListPopupStep; -import com.intellij.ui.awt.RelativePoint; import com.intellij.util.NullableConsumer; import com.jetbrains.python.remote.PythonRemoteInterpreterManager; import com.jetbrains.python.sdk.flavors.PythonSdkFlavor; @@ -55,13 +54,13 @@ public class PythonSdkDetailsStep extends BaseListPopupStep { public static void show(final Project project, final Sdk[] existingSdks, DialogWrapper moreDialog, - JComponent ownerComponent, final RelativePoint popupPoint, + JComponent ownerComponent, final Point popupPoint, final boolean showMore, final NullableConsumer callback) { myMore = moreDialog; final ListPopupStep sdkHomesStep = new PythonSdkDetailsStep(project, ownerComponent, existingSdks, showMore, callback); final ListPopup popup = JBPopupFactory.getInstance().createListPopup(sdkHomesStep); - popup.showInScreenCoordinates(ownerComponent, popupPoint.getPoint()); + popup.showInScreenCoordinates(ownerComponent, popupPoint); } public PythonSdkDetailsStep(Project project, diff --git a/python/src/com/jetbrains/python/sdk/PythonSdkType.java b/python/src/com/jetbrains/python/sdk/PythonSdkType.java index 32279e1d7b85..a6ae533638cd 100644 --- a/python/src/com/jetbrains/python/sdk/PythonSdkType.java +++ b/python/src/com/jetbrains/python/sdk/PythonSdkType.java @@ -53,7 +53,6 @@ import com.intellij.psi.PsiElement; import com.intellij.reference.SoftReference; import com.intellij.remotesdk.RemoteSdkData; import com.intellij.remotesdk.RemoteSdkDataHolder; -import com.intellij.ui.awt.RelativePoint; import com.intellij.util.ArrayUtil; import com.intellij.util.Consumer; import com.intellij.util.NullableConsumer; @@ -280,8 +279,10 @@ public class PythonSdkType extends SdkType { public void showCustomCreateUI(SdkModel sdkModel, final JComponent parentComponent, final Consumer sdkCreatedCallback) { Project project = CommonDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext(parentComponent)); + final Point point = parentComponent.getMousePosition(); + SwingUtilities.convertPointToScreen(point, parentComponent); PythonSdkDetailsStep - .show(project, sdkModel.getSdks(), null, parentComponent, RelativePoint.getCenterOf(parentComponent), true, new NullableConsumer() { + .show(project, sdkModel.getSdks(), null, parentComponent, point, false, new NullableConsumer() { @Override public void consume(@Nullable Sdk sdk) { if (sdk != null) {