MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'packaging-result'

Browse Source
This commit is contained in:
Andrey Vlasovskikh
2014-10-02 17:21:23 +04:00
parent 152513298e 3970ef798d
commit 0b07573a58
28 changed files with 857 additions and 468 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/ide/src/com/jetbrains/python/configuration/PyActiveSdkConfigurable.java
+1 -1
View File
@@ -187,7 +187,7 @@ public class PyActiveSdkConfigurable implements UnnamedConfigurable {
mySdkCombo.putClientProperty("JComboBox.isTableCellEditor", Boolean.TRUE);
mySdkCombo.setRenderer(new PySdkListCellRenderer(false));
final PackagesNotificationPanel notificationsArea = new PackagesNotificationPanel(myProject);
final PackagesNotificationPanel notificationsArea = new PackagesNotificationPanel();
final JComponent notificationsComponent = notificationsArea.getComponent();
final Dimension preferredSize = mySdkCombo.getPreferredSize();
mySdkCombo.setPreferredSize(preferredSize);
python/ide/src/com/jetbrains/python/newProject/actions/AbstractProjectSettingsStep.java
+8 -1
View File
@@ -1,5 +1,6 @@
package com.jetbrains.python.newProject.actions;
import com.intellij.execution.ExecutionException;
import com.intellij.facet.ui.ValidationResult;
import com.intellij.icons.AllIcons;
import com.intellij.ide.impl.ProjectUtil;
@@ -322,7 +323,13 @@ abstract public class AbstractProjectSettingsStep extends AbstractActionWithPane
String warningText = frameworkName + " will be installed on selected interpreter";
myInstallFramework = true;
final PyPackageManager packageManager = PyPackageManager.getInstance(sdk);
if (!packageManager.hasManagement(PySdkUtil.isRemote(sdk))) {
boolean hasManagement = false;
try {
hasManagement = packageManager.hasManagement(PySdkUtil.isRemote(sdk));
}
catch (ExecutionException ignored) {
}
if (!hasManagement) {
warningText = "Python packaging tools and " + warningText;
}
setWarningText(warningText);