#113: tidy up System.out.println's

rladstaetter · Jan 15, 2023 · 48a6dac · 48a6dac
1 parent 0c3c6ea
commit 48a6dac
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 11 deletions.
diff --git a/app/src/main/scala/app/logorrr/conf/mut/MutLogFileSettings.scala b/app/src/main/scala/app/logorrr/conf/mut/MutLogFileSettings.scala
@@ -46,9 +46,7 @@ class MutLogFileSettings {
     bind(someLogEntrySettingsProperty)
 
     override def computeValue(): Boolean = {
-      val res = Option(someLogEntrySettingsProperty.get()).exists(_.isDefined)
-      println(s"compute to $res")
-      res
+      Option(someLogEntrySettingsProperty.get()).exists(_.isDefined)
     }
   }
 

diff --git a/app/src/main/scala/app/logorrr/views/block/BlockImage.scala b/app/src/main/scala/app/logorrr/views/block/BlockImage.scala
@@ -81,7 +81,6 @@ class BlockImage[Elem <: BlockView.E] extends CanLog {
     assert(width <= BlockImage.MaxWidth, s"width was ${width} which exceeds ${BlockImage.MaxWidth}.")
     assert(height <= BlockImage.MaxHeight, s"height was ${height} which exceeds ${BlockImage.MaxHeight}.")
     assert(height * width > 0)
-    //      println(s"Allocating ${intWidth * intHeight} memory ...")
     Option(this.intBuffer) match {
       case Some(value) =>
         value.clear()

diff --git a/app/src/main/scala/app/logorrr/views/text/LineNumberBar.scala b/app/src/main/scala/app/logorrr/views/text/LineNumberBar.scala
@@ -12,6 +12,7 @@ object LineNumberBar {
   val maxDuration: FiniteDuration = 1200 millis
 
 }
+
 case class LineNumberBar(e: LogEntry
                          , instant: Instant
                          , timings: Map[Int, Instant]
@@ -23,7 +24,6 @@ case class LineNumberBar(e: LogEntry
       case Some(nextTi) =>
         nextTi.toEpochMilli - instant.toEpochMilli
       case None =>
-        //   println(s"timings.size ${timings.size}, linenumber: ${e.lineNumber + 1}")
         0L
     }
 

diff --git a/app/src/test/scala/app/logorrr/LogProducer.scala b/app/src/test/scala/app/logorrr/LogProducer.scala
@@ -36,12 +36,12 @@ object LogProducer {
       val writer = SimpleWriter(path)
 
       new Thread(writer).start()
-      System.out.println(s"producing log entries in ${path.toAbsolutePath.toString}, press enter to stop")
+      Console.println(s"producing log entries in ${path.toAbsolutePath.toString}, press enter to stop")
       val keyboard = new Scanner(System.in)
       keyboard.nextLine()
       writer.stop()
     } else {
-      println("Usage: LogProducer <path to log file>")
+      Console.println("Usage: LogProducer <path to log file>")
     }
 
   }

diff --git a/build/src/main/scala/app/logorrr/build/CodeSigner.scala b/build/src/main/scala/app/logorrr/build/CodeSigner.scala
@@ -10,7 +10,7 @@ object CodeSigner {
 
   def main(args: Array[String]): Unit = {
     if (args.length != 4) {
-      System.out.println("CodeSigner <developerId> <codesign> <entitlements> <path to config>")
+      Console.println("CodeSigner <developerId> <codesign> <entitlements> <path to config>")
     } else {
       val developerId = args(0)
       val codesign = Paths.get(args(1))
@@ -19,7 +19,7 @@ object CodeSigner {
       if (Files.exists(file)) {
         Files.readAllLines(file).asScala.map(f => sign(codesign, entitlements, developerId, file.getParent.resolve(f)))
       } else {
-        System.out.println(s"${file.toAbsolutePath} does not exist, could not execute signing operation ...")
+        Console.println(s"${file.toAbsolutePath} does not exist, could not execute signing operation ...")
       }
     }
   }

diff --git a/build/src/main/scala/app/logorrr/build/Commander.scala b/build/src/main/scala/app/logorrr/build/Commander.scala
@@ -6,7 +6,7 @@ import scala.jdk.CollectionConverters._
 object Commander {
 
   def execCmd(workingDir: Path, cmds: Seq[String]): Int = {
-    System.out.println(cmds.mkString(" "))
+    Console.println(cmds.mkString(" "))
     new ProcessBuilder()
       .directory(workingDir.toFile)
       .inheritIO()

diff --git a/docs/src/main/scala/app/logorrr/docs/IconCreatorApp.scala b/docs/src/main/scala/app/logorrr/docs/IconCreatorApp.scala
@@ -30,7 +30,7 @@ object IconCreatorApp {
     c.snapshot(spp, writableImage)
     val renderedImage = SwingFXUtils.fromFXImage(writableImage, null)
     ImageIO.write(renderedImage, "png", target.toFile)
-    System.out.println(s"Wrote ${target.toAbsolutePath} .")
+    Console.println(s"Wrote ${target.toAbsolutePath} .")
   }
 
   def main(args: Array[String]): Unit = {