diff options
Diffstat (limited to 'python/pluginSrc')
5 files changed, 12 insertions, 12 deletions
diff --git a/python/pluginSrc/com/jetbrains/python/packaging/PyManagePackagesDialog.java b/python/pluginSrc/com/jetbrains/python/packaging/PyManagePackagesDialog.java index 4a663c38b65e..4a9df08f6eb7 100644 --- a/python/pluginSrc/com/jetbrains/python/packaging/PyManagePackagesDialog.java +++ b/python/pluginSrc/com/jetbrains/python/packaging/PyManagePackagesDialog.java @@ -48,7 +48,7 @@ public class PyManagePackagesDialog extends DialogWrapper { List<Sdk> sdks = PythonSdkType.getAllSdks(); Collections.sort(sdks, new PreferredSdkComparator()); final JComboBox sdkComboBox = new JComboBox(new CollectionComboBoxModel(sdks, sdk)); - sdkComboBox.setRenderer(new PySdkListCellRenderer()); + sdkComboBox.setRenderer(new PySdkListCellRenderer(false)); PackagesNotificationPanel notificationPanel = new PackagesNotificationPanel(project); final PyInstalledPackagesPanel packagesPanel = new PyInstalledPackagesPanel(project, notificationPanel); diff --git a/python/pluginSrc/com/jetbrains/python/psi/impl/PyJavaClassType.java b/python/pluginSrc/com/jetbrains/python/psi/impl/PyJavaClassType.java index a667bb69f849..e9014b3759c2 100644 --- a/python/pluginSrc/com/jetbrains/python/psi/impl/PyJavaClassType.java +++ b/python/pluginSrc/com/jetbrains/python/psi/impl/PyJavaClassType.java @@ -18,8 +18,8 @@ package com.jetbrains.python.psi.impl; import com.intellij.psi.*; import com.intellij.util.ProcessingContext; import com.jetbrains.python.psi.AccessDirection; +import com.jetbrains.python.psi.PyCallSiteExpression; import com.jetbrains.python.psi.PyExpression; -import com.jetbrains.python.psi.PyQualifiedExpression; import com.jetbrains.python.psi.resolve.CompletionVariantsProcessor; import com.jetbrains.python.psi.resolve.PyResolveContext; import com.jetbrains.python.psi.resolve.RatedResolveResult; @@ -113,7 +113,7 @@ public class PyJavaClassType implements PyClassLikeType { @Nullable @Override - public PyType getCallType(@NotNull TypeEvalContext context, @NotNull PyQualifiedExpression callSite) { + public PyType getCallType(@NotNull TypeEvalContext context, @NotNull PyCallSiteExpression callSite) { return getReturnType(context); } diff --git a/python/pluginSrc/com/jetbrains/python/psi/impl/PyJavaMethodType.java b/python/pluginSrc/com/jetbrains/python/psi/impl/PyJavaMethodType.java index 6f0fd48e8742..cb5d94e516bb 100644 --- a/python/pluginSrc/com/jetbrains/python/psi/impl/PyJavaMethodType.java +++ b/python/pluginSrc/com/jetbrains/python/psi/impl/PyJavaMethodType.java @@ -21,8 +21,8 @@ import com.intellij.psi.PsiMethod; import com.intellij.util.ArrayUtil; import com.intellij.util.ProcessingContext; import com.jetbrains.python.psi.AccessDirection; +import com.jetbrains.python.psi.PyCallSiteExpression; import com.jetbrains.python.psi.PyExpression; -import com.jetbrains.python.psi.PyQualifiedExpression; import com.jetbrains.python.psi.resolve.PyResolveContext; import com.jetbrains.python.psi.resolve.RatedResolveResult; import com.jetbrains.python.psi.types.PyCallableParameter; @@ -58,7 +58,7 @@ public class PyJavaMethodType implements PyCallableType { @Nullable @Override - public PyType getCallType(@NotNull TypeEvalContext context, @NotNull PyQualifiedExpression callSite) { + public PyType getCallType(@NotNull TypeEvalContext context, @NotNull PyCallSiteExpression callSite) { return getReturnType(context); } diff --git a/python/pluginSrc/com/jetbrains/python/run/PyPluginCommonOptionsForm.form b/python/pluginSrc/com/jetbrains/python/run/PyPluginCommonOptionsForm.form index edec809c4952..0332fda9195b 100644 --- a/python/pluginSrc/com/jetbrains/python/run/PyPluginCommonOptionsForm.form +++ b/python/pluginSrc/com/jetbrains/python/run/PyPluginCommonOptionsForm.form @@ -75,7 +75,7 @@ <text value="Use SDK of module:"/> </properties> </component> - <component id="5f300" class="javax.swing.JComboBox" binding="myModuleComboBox"> + <component id="5f300" class="com.intellij.application.options.ModulesComboBox" binding="myModuleComboBox"> <constraints> <grid row="1" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/> </constraints> diff --git a/python/pluginSrc/com/jetbrains/python/run/PyPluginCommonOptionsForm.java b/python/pluginSrc/com/jetbrains/python/run/PyPluginCommonOptionsForm.java index 4a1957e9e631..cf0e440353a4 100644 --- a/python/pluginSrc/com/jetbrains/python/run/PyPluginCommonOptionsForm.java +++ b/python/pluginSrc/com/jetbrains/python/run/PyPluginCommonOptionsForm.java @@ -15,7 +15,6 @@ */ package com.jetbrains.python.run; -import com.intellij.application.options.ModuleListCellRenderer; import com.intellij.execution.configuration.EnvironmentVariablesComponent; import com.intellij.execution.util.PathMappingsComponent; import com.intellij.ide.util.PropertiesComponent; @@ -27,6 +26,7 @@ import com.intellij.openapi.projectRoots.impl.SdkListCellRenderer; import com.intellij.openapi.roots.ModuleRootManager; import com.intellij.openapi.roots.ProjectRootManager; import com.intellij.openapi.roots.ui.configuration.ModulesAlphaComparator; +import com.intellij.application.options.ModulesComboBox; import com.intellij.openapi.ui.TextFieldWithBrowseButton; import com.intellij.openapi.util.io.FileUtil; import com.intellij.ui.CollectionComboBoxModel; @@ -58,7 +58,7 @@ public class PyPluginCommonOptionsForm implements AbstractPyCommonOptionsForm { private RawCommandLineEditor myInterpreterOptionsTextField; private JComboBox myInterpreterComboBox; private JRadioButton myUseModuleSdkRadioButton; - private JComboBox myModuleComboBox; + private ModulesComboBox myModuleComboBox; private JPanel myMainPanel; private JRadioButton myUseSpecifiedSdkRadioButton; private JBLabel myPythonInterpreterJBLabel; @@ -77,8 +77,8 @@ public class PyPluginCommonOptionsForm implements AbstractPyCommonOptionsForm { final List<Module> validModules = data.getValidModules(); Collections.sort(validModules, new ModulesAlphaComparator()); Module selection = validModules.size() > 0 ? validModules.get(0) : null; - myModuleComboBox.setModel(new CollectionComboBoxModel(validModules, selection)); - myModuleComboBox.setRenderer(new ModuleListCellRenderer()); + myModuleComboBox.setModules(validModules); + myModuleComboBox.setSelectedModule(selection); myInterpreterComboBox.setRenderer(new SdkListCellRenderer("<Project Default>")); myWorkingDirectoryTextField.addBrowseFolderListener("Select Working Directory", "", data.getProject(), @@ -181,11 +181,11 @@ public class PyPluginCommonOptionsForm implements AbstractPyCommonOptionsForm { } public Module getModule() { - return (Module)myModuleComboBox.getSelectedItem(); + return myModuleComboBox.getSelectedModule(); } public void setModule(Module module) { - myModuleComboBox.setSelectedItem(module); + myModuleComboBox.setSelectedModule(module); } public boolean isUseModuleSdk() { |