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

Inlined PyPackageManager.showInstallationError()

Browse Source
This commit is contained in:
Andrey Vlasovskikh
2014-09-10 18:42:53 +04:00
parent 2d9898c904
commit 93d65d3aa5
4 changed files with 3 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/openapi/src/com/jetbrains/python/packaging/PyPackageManager.java
-4
View File
@@ -16,13 +16,11 @@
package com.jetbrains.python.packaging;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.projectRoots.Sdk;
import com.intellij.openapi.util.Key;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.awt.*;
import java.util.List;
import java.util.Set;
@@ -47,8 +45,6 @@ public abstract class PyPackageManager {
public abstract void install(@NotNull String requirementString) throws PyExternalProcessException;
public abstract void install(@NotNull List<PyRequirement> requirements, @NotNull List<String> extraArgs) throws PyExternalProcessException;
public abstract void uninstall(@NotNull List<PyPackage> packages) throws PyExternalProcessException;
public abstract void showInstallationError(Project project, String title, String description);
public abstract void showInstallationError(Component owner, String title, String description);
public abstract void refresh();
@NotNull
public abstract String createVirtualEnv(@NotNull String destinationDir, boolean useGlobalSite) throws PyExternalProcessException;
python/src/com/jetbrains/python/packaging/PyPackageManagerImpl.java
-14
View File
@@ -25,7 +25,6 @@ import com.intellij.openapi.application.Application;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.projectRoots.Sdk;
import com.intellij.openapi.projectRoots.SdkAdditionalData;
import com.intellij.openapi.projectRoots.impl.ProjectJdkImpl;
@@ -48,7 +47,6 @@ import com.intellij.util.PathMappingSettings;
import com.intellij.util.containers.HashSet;
import com.intellij.util.messages.MessageBusConnection;
import com.intellij.util.net.HttpConfigurable;
import com.intellij.webcore.packaging.PackagesNotificationPanel;
import com.jetbrains.python.PythonHelpersLocator;
import com.jetbrains.python.psi.LanguageLevel;
import com.jetbrains.python.psi.PyExpression;
@@ -61,11 +59,9 @@ import com.jetbrains.python.sdk.PythonSdkType;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.awt.*;
import java.io.File;
import java.io.IOException;
import java.util.*;
import java.util.List;
/**
* @author vlan
@@ -663,16 +659,6 @@ public class PyPackageManagerImpl extends PyPackageManager {
}
@Override
public void showInstallationError(Project project, String title, String description) {
PackagesNotificationPanel.showError(project, title, description);
}
@Override
public void showInstallationError(Component owner, String title, String description) {
PackagesNotificationPanel.showError(owner, title, description);
}
private class MySdkRootWatcher extends BulkFileListener.Adapter {
@Override
public void after(@NotNull List<? extends VFileEvent> events) {
python/src/com/jetbrains/python/packaging/ui/PyInstalledPackagesPanel.java
+1 -1
View File
@@ -133,7 +133,7 @@ public class PyInstalledPackagesPanel extends InstalledPackagesPanel {
if (!exceptions.isEmpty()) {
final String firstLine = "Install Python packaging tools failed. ";
final String description = PyPackageManagerUI.createDescription(exceptions, firstLine);
packageManager.showInstallationError(myProject, "Failed to install Python packaging tools", description);
PackagesNotificationPanel.showError(myProject, "Failed to install Python packaging tools", description);
}
packageManager.refresh();
updatePackages(new PyPackageManagementService(myProject, sdk));
python/src/com/jetbrains/python/sdk/CreateVirtualEnvDialog.java
+2 -1
View File
@@ -48,6 +48,7 @@ import com.intellij.ui.components.JBLabel;
import com.intellij.util.NullableConsumer;
import com.intellij.util.PathUtil;
import com.intellij.util.PlatformUtils;
import com.intellij.webcore.packaging.PackagesNotificationPanel;
import com.jetbrains.python.packaging.PyExternalProcessException;
import com.jetbrains.python.packaging.PyPackageManager;
import com.jetbrains.python.packaging.PyPackageService;
@@ -424,7 +425,7 @@ public class CreateVirtualEnvDialog extends IdeaDialog {
ApplicationManager.getApplication().invokeLater(new Runnable() {
@Override
public void run() {
packageManager.showInstallationError(getOwner(), "Failed to Create Virtual Environment", e.toString());
PackagesNotificationPanel.showError(getOwner(), "Failed to Create Virtual Environment", e.toString());
}
}, ModalityState.any());
}