luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid default params

This commit is contained in:
Eugene Yokota 2017-01-24 20:23:56 -05:00
parent 08e9ce9526
commit 56b51df66b
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
internal/util-logging/src/main/scala/sbt/internal/util/ConsoleAppender.scala
View File

@ -149,7 +149,7 @@ object ConsoleAppender {
} }
} }
val formatEnabled = val formatEnabled: Boolean =
{ {
import java.lang.Boolean.{ getBoolean, parseBoolean } import java.lang.Boolean.{ getBoolean, parseBoolean }
val value = System.getProperty("sbt.log.format") val value = System.getProperty("sbt.log.format")
@ -180,8 +180,16 @@ object ConsoleAppender {
def apply(out: PrintStream): ConsoleAppender = apply(generateName, ConsoleOut.printStreamOut(out)) def apply(out: PrintStream): ConsoleAppender = apply(generateName, ConsoleOut.printStreamOut(out))
def apply(out: PrintWriter): ConsoleAppender = apply(generateName, ConsoleOut.printWriterOut(out)) def apply(out: PrintWriter): ConsoleAppender = apply(generateName, ConsoleOut.printWriterOut(out))
def apply(name: String = generateName, out: ConsoleOut = ConsoleOut.systemOut, ansiCodesSupported: Boolean = formatEnabled, def apply(): ConsoleAppender = apply(generateName, ConsoleOut.systemOut)
useColor: Boolean = formatEnabled, suppressedMessage: SuppressedTraceContext => Option[String] = noSuppressedMessage): ConsoleAppender = def apply(name: String): ConsoleAppender = apply(name, ConsoleOut.systemOut, formatEnabled, formatEnabled, noSuppressedMessage)
def apply(out: ConsoleOut): ConsoleAppender = apply(generateName, out, formatEnabled, formatEnabled, noSuppressedMessage)
def apply(name: String, out: ConsoleOut): ConsoleAppender = apply(name, out, formatEnabled, formatEnabled, noSuppressedMessage)
def apply(name: String, out: ConsoleOut, suppressedMessage: SuppressedTraceContext => Option[String]): ConsoleAppender =
apply(name, out, formatEnabled, formatEnabled, suppressedMessage)
def apply(name: String, out: ConsoleOut, useColor: Boolean): ConsoleAppender =
apply(name, out, formatEnabled, useColor, noSuppressedMessage)
def apply(name: String, out: ConsoleOut, ansiCodesSupported: Boolean,
useColor: Boolean, suppressedMessage: SuppressedTraceContext => Option[String]): ConsoleAppender =
{ {
val appender = new ConsoleAppender(name, out, ansiCodesSupported, useColor, suppressedMessage) val appender = new ConsoleAppender(name, out, ansiCodesSupported, useColor, suppressedMessage)
appender.start appender.start

11
internal/util-logging/src/main/scala/sbt/internal/util/MainLogging.scala
View File

@ -48,14 +48,15 @@ object MainAppender {
def defaultScreen(name: String, console: ConsoleOut, suppressedMessage: SuppressedTraceContext => Option[String]): Appender = def defaultScreen(name: String, console: ConsoleOut, suppressedMessage: SuppressedTraceContext => Option[String]): Appender =
ConsoleAppender(name, console, suppressedMessage = suppressedMessage) ConsoleAppender(name, console, suppressedMessage = suppressedMessage)
def defaultBacked( def defaultBacked: PrintWriter => Appender = defaultBacked(generateGlobalBackingName, ConsoleAppender.formatEnabled)
loggerName: String = generateGlobalBackingName, def defaultBacked(loggerName: String): PrintWriter => Appender = defaultBacked(loggerName, ConsoleAppender.formatEnabled)
useColor: Boolean = ConsoleAppender.formatEnabled def defaultBacked(useColor: Boolean): PrintWriter => Appender = defaultBacked(generateGlobalBackingName, useColor)
): PrintWriter => Appender = def defaultBacked(loggerName: String, useColor: Boolean): PrintWriter => Appender =
to => { to => {
ConsoleAppender( ConsoleAppender(
ConsoleAppender.generateName, ConsoleAppender.generateName,
ConsoleOut.printWriterOut(to), useColor = useColor ConsoleOut.printWriterOut(to),
useColor = useColor
) )
} }