From ae568eedb5af671bfa458b8f6da9043ebc78559f Mon Sep 17 00:00:00 2001 From: Max Medvedev Date: Mon, 29 Dec 2014 23:55:39 +0300 Subject: [PATCH] some annotations added --- .../intellij/execution/process/OSProcessHandler.java | 2 +- .../com/intellij/execution/process/ProcessOutput.java | 10 ++++++++-- python/src/com/jetbrains/python/sdk/PySdkUtil.java | 1 + 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/platform/platform-api/src/com/intellij/execution/process/OSProcessHandler.java b/platform/platform-api/src/com/intellij/execution/process/OSProcessHandler.java index f20465efa38a..bcfa033b21b9 100644 --- a/platform/platform-api/src/com/intellij/execution/process/OSProcessHandler.java +++ b/platform/platform-api/src/com/intellij/execution/process/OSProcessHandler.java @@ -100,7 +100,7 @@ public class OSProcessHandler extends BaseOSProcessHandler { * @param process Process * @return True if process tree has been successfully killed. */ - protected boolean killProcessTree(final Process process) { + protected boolean killProcessTree(@NotNull Process process) { LOG.debug("killing process tree"); final boolean destroyed = OSProcessManager.getInstance().killProcessTree(process); if (!destroyed) { diff --git a/platform/platform-api/src/com/intellij/execution/process/ProcessOutput.java b/platform/platform-api/src/com/intellij/execution/process/ProcessOutput.java index c62ec5692a7f..03a27216a884 100644 --- a/platform/platform-api/src/com/intellij/execution/process/ProcessOutput.java +++ b/platform/platform-api/src/com/intellij/execution/process/ProcessOutput.java @@ -18,6 +18,7 @@ package com.intellij.execution.process; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.util.text.StringUtil; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import java.util.List; @@ -39,30 +40,35 @@ public class ProcessOutput { myExitCode = exitCode; } - public void appendStdout(String text) { + public void appendStdout(@Nullable String text) { myStdoutBuilder.append(text); } - public void appendStderr(String text) { + public void appendStderr(@Nullable String text) { myStderrBuilder.append(text); } + @NotNull public String getStdout() { return myStdoutBuilder.toString(); } + @NotNull public String getStderr() { return myStderrBuilder.toString(); } + @NotNull public List getStdoutLines() { return splitLines(getStdout()); } + @NotNull public List getStderrLines() { return splitLines(getStderr()); } + @NotNull private static List splitLines(String s) { String converted = StringUtil.convertLineSeparators(s); return StringUtil.split(converted, "\n"); diff --git a/python/src/com/jetbrains/python/sdk/PySdkUtil.java b/python/src/com/jetbrains/python/sdk/PySdkUtil.java index 48e7501cd313..24c2409c60a6 100644 --- a/python/src/com/jetbrains/python/sdk/PySdkUtil.java +++ b/python/src/com/jetbrains/python/sdk/PySdkUtil.java @@ -139,6 +139,7 @@ public class PySdkUtil { private static ProcessOutput getOutputForException(final Exception e) { LOG.warn(e); return new ProcessOutput() { + @NotNull @Override public String getStderr() { String err = super.getStderr();