From c669ff8ce84f349d3c4450dfe760cb436a7a91a8 Mon Sep 17 00:00:00 2001 From: Andrey Vlasovskikh Date: Tue, 23 Sep 2014 17:06:13 +0400 Subject: [PATCH] Renamed PyExternalProcessException to PyExecutionException --- ...ocessException.java => PyExecutionException.java} | 8 ++++---- .../python/packaging/PyPackageManagerImpl.java | 12 ++++++------ .../python/packaging/PyRemotePackageManagerImpl.java | 10 +++++----- .../packaging/ui/PyInstalledPackagesPanel.java | 8 ++++---- 4 files changed, 19 insertions(+), 19 deletions(-) rename python/openapi/src/com/jetbrains/python/packaging/{PyExternalProcessException.java => PyExecutionException.java} (86%) diff --git a/python/openapi/src/com/jetbrains/python/packaging/PyExternalProcessException.java b/python/openapi/src/com/jetbrains/python/packaging/PyExecutionException.java similarity index 86% rename from python/openapi/src/com/jetbrains/python/packaging/PyExternalProcessException.java rename to python/openapi/src/com/jetbrains/python/packaging/PyExecutionException.java index f4b404910639..3b1041ae4302 100644 --- a/python/openapi/src/com/jetbrains/python/packaging/PyExternalProcessException.java +++ b/python/openapi/src/com/jetbrains/python/packaging/PyExecutionException.java @@ -27,7 +27,7 @@ import java.util.regex.Pattern; /** * @author vlan */ -public class PyExternalProcessException extends ExecutionException { +public class PyExecutionException extends ExecutionException { private static final Pattern WITH_CR_DELIMITER_PATTERN = Pattern.compile("(?<=\r|\n|\r\n)"); @NotNull private String myName; @@ -35,12 +35,12 @@ public class PyExternalProcessException extends ExecutionException { @NotNull private String myMessage; @NotNull private final List myFixes; - public PyExternalProcessException(@NotNull String name, @NotNull List args, @NotNull String message) { + public PyExecutionException(@NotNull String name, @NotNull List args, @NotNull String message) { this(name, args, message, Collections.emptyList()); } - public PyExternalProcessException(@NotNull String name, @NotNull List args, @NotNull String message, - @NotNull List fixes) { + public PyExecutionException(@NotNull String name, @NotNull List args, @NotNull String message, + @NotNull List fixes) { super(String.format("External process error '%s %s':\n%s", name, StringUtil.join(args, " "), message)); myName = name; myArgs = args; diff --git a/python/src/com/jetbrains/python/packaging/PyPackageManagerImpl.java b/python/src/com/jetbrains/python/packaging/PyPackageManagerImpl.java index 9c0049b887ae..f6f3e3b91b9a 100644 --- a/python/src/com/jetbrains/python/packaging/PyPackageManagerImpl.java +++ b/python/src/com/jetbrains/python/packaging/PyPackageManagerImpl.java @@ -424,11 +424,11 @@ public class PyPackageManagerImpl extends PyPackageManager { final ProcessOutput output = getPythonProcessOutput(path, args, askForSudo, showProgress, workingDir); final int exitCode = output.getExitCode(); if (output.isTimeout()) { - throw new PyExternalProcessException(path, args, "Timed out"); + throw new PyExecutionException(path, args, "Timed out"); } else if (exitCode != 0) { final String message = output.getStderr() + "\n" + output.getStdout(); - throw new PyExternalProcessException(path, args, message); + throw new PyExecutionException(path, args, message); } return output.getStdout(); } @@ -499,7 +499,7 @@ public class PyPackageManagerImpl extends PyPackageManager { if (StringUtil.isEmptyOrSpaces(message)) { message = "Failed to perform action. Permission denied."; } - throw new PyExternalProcessException(helperPath, args, message); + throw new PyExecutionException(helperPath, args, message); } return result; } @@ -507,10 +507,10 @@ public class PyPackageManagerImpl extends PyPackageManager { throw e; } catch (ExecutionException e) { - throw new PyExternalProcessException(helperPath, args, e.getMessage()); + throw new PyExecutionException(helperPath, args, e.getMessage()); } catch (IOException e) { - throw new PyExternalProcessException(helperPath, args, e.getMessage()); + throw new PyExecutionException(helperPath, args, e.getMessage()); } } @@ -521,7 +521,7 @@ public class PyPackageManagerImpl extends PyPackageManager { for (String line : lines) { final List fields = StringUtil.split(line, "\t"); if (fields.size() < 3) { - throw new PyExternalProcessException(PACKAGING_TOOL, Collections.emptyList(), "Invalid output format"); + throw new PyExecutionException(PACKAGING_TOOL, Collections.emptyList(), "Invalid output format"); } final String name = fields.get(0); final String version = fields.get(1); diff --git a/python/src/com/jetbrains/python/packaging/PyRemotePackageManagerImpl.java b/python/src/com/jetbrains/python/packaging/PyRemotePackageManagerImpl.java index 8b239f8039cc..59efdec20d39 100644 --- a/python/src/com/jetbrains/python/packaging/PyRemotePackageManagerImpl.java +++ b/python/src/com/jetbrains/python/packaging/PyRemotePackageManagerImpl.java @@ -117,12 +117,12 @@ public class PyRemotePackageManagerImpl extends PyPackageManagerImpl { } } }); - throw new PyExternalProcessException(helperPath, args, "Vagrant instance is down. Launch vagrant", fixes); } else { - throw new PyExternalProcessException(helperPath, args, e.getMessage()); + throw new PyExecutionException(helperPath, args, e.getMessage()); } } final PythonRemoteInterpreterManager manager = PythonRemoteInterpreterManager.getInstance(); @@ -154,16 +154,16 @@ public class PyRemotePackageManagerImpl extends PyPackageManagerImpl { return processOutput; } catch (ExecutionException e) { - throw new PyExternalProcessException(helperPath, args, "Error running SDK: " + e.getMessage()); + throw new PyExecutionException(helperPath, args, "Error running SDK: " + e.getMessage()); } } else { - throw new PyExternalProcessException(helperPath, args, + throw new PyExecutionException(helperPath, args, PythonRemoteInterpreterManager.WEB_DEPLOYMENT_PLUGIN_IS_DISABLED); } } else { - throw new PyExternalProcessException(helperPath, args, "Invalid remote SDK"); + throw new PyExecutionException(helperPath, args, "Invalid remote SDK"); } } diff --git a/python/src/com/jetbrains/python/packaging/ui/PyInstalledPackagesPanel.java b/python/src/com/jetbrains/python/packaging/ui/PyInstalledPackagesPanel.java index 8b945da7c061..1d0ca880100e 100644 --- a/python/src/com/jetbrains/python/packaging/ui/PyInstalledPackagesPanel.java +++ b/python/src/com/jetbrains/python/packaging/ui/PyInstalledPackagesPanel.java @@ -97,18 +97,18 @@ public class PyInstalledPackagesPanel extends InstalledPackagesPanel { application.executeOnPooledThread(new Runnable() { @Override public void run() { - PyExternalProcessException exception = null; + PyExecutionException exception = null; try { myHasManagement = PyPackageManager.getInstance(selectedSdk).hasManagement(false); if (!myHasManagement) { - throw new PyExternalProcessException("pip", Collections.emptyList(), "Python packaging tools not found", + throw new PyExecutionException("pip", Collections.emptyList(), "Python packaging tools not found", ImmutableList.of(new PyInstallPackageManagementFix())); } } - catch (PyExternalProcessException e) { + catch (PyExecutionException e) { exception = e; } - final PyExternalProcessException problem = exception; + final PyExecutionException problem = exception; application.invokeLater(new Runnable() { @Override public void run() {