From ccb1eed6ae40227d8bd160f9cdaf168aff71beb5 Mon Sep 17 00:00:00 2001 From: Dennis Ushakov Date: Fri, 27 Jul 2012 17:27:24 +0400 Subject: [PATCH] cleanup spaghetti incident --- .../execution/process/ColoredProcessHandler.java | 13 +------------ 1 file changed, 1 insertion(+), 12 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 96df0f61e596..58a076afec67 100644 --- a/platform/platform-api/src/com/intellij/execution/process/ColoredProcessHandler.java +++ b/platform/platform-api/src/com/intellij/execution/process/ColoredProcessHandler.java @@ -35,7 +35,6 @@ public class ColoredProcessHandler extends OSProcessHandler { private static final String TEXT_ATTRS_PATTERN = "m" + TEXT_ATTRS_PREFIX_CH + "\\["; private Key myCurrentColor; - @Nullable private final Charset myCharset; public static TextAttributes getByKey(final TextAttributesKey key){ return EditorColorsManager.getInstance().getGlobalScheme().getAttributes(key); @@ -56,17 +55,7 @@ public class ColoredProcessHandler extends OSProcessHandler { public ColoredProcessHandler(final Process process, final String commandLine, @Nullable final Charset charset) { - super(process, commandLine); - myCharset = charset; - } - - @Override - public Charset getCharset() { - if (myCharset != null) { - return myCharset; - } - // Charset wasn't specified - use default one - return super.getCharset(); + super(process, commandLine, charset); } public final void notifyTextAvailable(final String text, final Key outputType) {