From e8c5abc4cf552011de3a8c20cc45902916ebc5a9 Mon Sep 17 00:00:00 2001
From: Dennis Ushakov <dennis.ushakov@gmail.com>
Date: Mon, 30 Jul 2012 16:01:58 +0400
Subject: [PATCH] npe fix, api cleanup

---
 .../intellij/execution/process/ColoredProcessHandler.java   | 6 +++---
 .../execution/process/KillableColoredProcessHandler.java    | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/platform/platform-api/src/com/intellij/execution/process/ColoredProcessHandler.java b/platform/platform-api/src/com/intellij/execution/process/ColoredProcessHandler.java
index 58a076afec67..3ac382ba43c3 100644
--- a/platform/platform-api/src/com/intellij/execution/process/ColoredProcessHandler.java
+++ b/platform/platform-api/src/com/intellij/execution/process/ColoredProcessHandler.java
@@ -22,7 +22,7 @@ import com.intellij.openapi.editor.colors.EditorColorsManager;
 import com.intellij.openapi.editor.colors.TextAttributesKey;
 import com.intellij.openapi.editor.markup.TextAttributes;
 import com.intellij.openapi.util.Key;
-import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.NotNull;
 
 import java.nio.charset.Charset;
 
@@ -49,12 +49,12 @@ public class ColoredProcessHandler extends OSProcessHandler {
   }
 
   public ColoredProcessHandler(Process process, String commandLine) {
-    this(process, commandLine, null);
+    super(process, commandLine);
   }
 
   public ColoredProcessHandler(final Process process,
                                final String commandLine,
-                               @Nullable final Charset charset) {
+                               @NotNull final Charset charset) {
     super(process, commandLine, charset);
   }
 
diff --git a/platform/platform-impl/src/com/intellij/execution/process/KillableColoredProcessHandler.java b/platform/platform-impl/src/com/intellij/execution/process/KillableColoredProcessHandler.java
index 1bebb4a56c9d..356ff1729e1c 100644
--- a/platform/platform-impl/src/com/intellij/execution/process/KillableColoredProcessHandler.java
+++ b/platform/platform-impl/src/com/intellij/execution/process/KillableColoredProcessHandler.java
@@ -17,7 +17,7 @@ package com.intellij.execution.process;
 
 import com.intellij.execution.KillableProcess;
 import com.intellij.openapi.util.SystemInfo;
-import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.NotNull;
 
 import java.nio.charset.Charset;
 
@@ -30,7 +30,7 @@ import java.nio.charset.Charset;
  * P.S: probably OSProcessHandler is better place for this feature but it can affect other run configurations and should be tested
  */
 public class KillableColoredProcessHandler extends ColoredProcessHandler implements KillableProcess {
-  public KillableColoredProcessHandler(final Process process, final String commandLine, @Nullable final Charset charset) {
+  public KillableColoredProcessHandler(final Process process, final String commandLine, @NotNull final Charset charset) {
     super(process, commandLine, charset);
   }