From 41783b096b292f646ec7663fd6f76d077c3d798f Mon Sep 17 00:00:00 2001 From: Dennis Ushakov Date: Tue, 6 Mar 2018 17:30:25 +0300 Subject: [PATCH] extract logger for process output --- .../process/CommandOutputLogger.java | 27 +++++++++++++++++++ .../svn/commandLine/CommandOutputLogger.java | 21 +++------------ 2 files changed, 30 insertions(+), 18 deletions(-) create mode 100644 platform/platform-impl/src/com/intellij/execution/process/CommandOutputLogger.java diff --git a/platform/platform-impl/src/com/intellij/execution/process/CommandOutputLogger.java b/platform/platform-impl/src/com/intellij/execution/process/CommandOutputLogger.java new file mode 100644 index 000000000000..856341627777 --- /dev/null +++ b/platform/platform-impl/src/com/intellij/execution/process/CommandOutputLogger.java @@ -0,0 +1,27 @@ +// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +package com.intellij.execution.process; + +import com.intellij.openapi.application.ApplicationManager; +import com.intellij.openapi.diagnostic.Logger; +import com.intellij.openapi.util.Key; +import org.jetbrains.annotations.NotNull; + +public class CommandOutputLogger extends ProcessAdapter { + private final Logger myLogger; + + public CommandOutputLogger(Logger logger) { + myLogger = logger; + } + + @Override + public void onTextAvailable(@NotNull ProcessEvent event, @NotNull Key outputType) { + String line = event.getText(); + + if (myLogger.isDebugEnabled()) { + myLogger.debug(line); + } + if (ApplicationManager.getApplication().isUnitTestMode()) { + System.out.print(line); + } + } +} diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/CommandOutputLogger.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/CommandOutputLogger.java index 90fb31ef4264..7fe30097d1d4 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/CommandOutputLogger.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/CommandOutputLogger.java @@ -1,28 +1,13 @@ package org.jetbrains.idea.svn.commandLine; -import com.intellij.execution.process.ProcessAdapter; -import com.intellij.execution.process.ProcessEvent; -import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.diagnostic.Logger; -import com.intellij.openapi.util.Key; -import org.jetbrains.annotations.NotNull; /** * @author Konstantin Kolosovsky. */ -public class CommandOutputLogger extends ProcessAdapter { - +public class CommandOutputLogger extends com.intellij.execution.process.CommandOutputLogger { private static final Logger LOG = Logger.getInstance(CommandOutputLogger.class); - - @Override - public void onTextAvailable(@NotNull ProcessEvent event, @NotNull Key outputType) { - String line = event.getText(); - - if (LOG.isDebugEnabled()) { - LOG.debug(line); - } - if (ApplicationManager.getApplication().isUnitTestMode()) { - System.out.print(line); - } + public CommandOutputLogger() { + super(LOG); } }