Merge pull request #68 from SlaynAndKorpil/fancierConsoleOutput

made ConsoleOutput message system fancier

framework/src/framework/BoardMeta.scala

@@ -9,7 +9,7 @@ import scala.language.postfixOps
 
 /**
   * Meta information and methods that are needed for a game.
- *
+  *
   * @usecase this gets mixed-in in [[framework.ChessBoard ChessBoard]]
   * @author Felix Lehner
   * @version alpha 0.2

framework/src/framework/ChessBoard.scala

@@ -933,7 +933,7 @@ object ChessBoard {
       None
     } catch {
       case _: Throwable =>
-        Error error "failed to save the data!"
+        Error write "failed to save the data!"
         Some(FileOperationError.FileNotFoundError(fileName))
     }
   }

framework/src/framework/ConsoleDebugger.scala

@@ -1,12 +1,6 @@
 package framework
 
-/**
-  * [Description]
-  *
-  * @author Felix Lehner
-  * @version
-  */
 trait ConsoleDebugger extends ConsoleOutput {
   override val typeDescription: String = "DEBUG"
-  def debug (message: String): Unit = println(formatMessage(message))
+  override val output: String => Unit = println
 }

framework/src/framework/ConsoleError.scala

@@ -1,12 +1,6 @@
 package framework
 
-/**
-  * [Description]
-  *
-  * @author Felix Lehner
-  * @version
-  */
 trait ConsoleError extends ConsoleOutput {
   override val typeDescription: String = "ERROR"
-  def error (message: String): Unit = System.err.println(formatMessage(message))
+  override val output: String => Unit = System.err.println
 }

framework/src/framework/ConsoleOutput.scala

@@ -4,14 +4,18 @@ package framework
   * An interface to the console for more uniform and coincide messages
   */
 trait ConsoleOutput {
-  /**The type of message*/
+  /** The type of message */
   val typeDescription: String
 
-  /**Describes the physical origin (i.e. the package)*/
+  /** Describes the physical origin (i.e. the package) */
   val name: String
 
+  /** Describes the output (i.e. System.out.println) */
+  val output: String => Unit
+
   /**
-    * Formats [[name]], [[typeDescription]] and the message to a uniform console output.
+    * Formats [[name]], [[typeDescription]] and the message to a uniform console output
+    * and then puts it in the [[output]].
     */
-  def formatMessage (message: String): String = s"$typeDescription $name >> $message"
+  def write(message: String): Unit = output(s"$typeDescription $name >> $message")
 }

graphics/src/graphics/CMenuBar.scala

@@ -69,7 +69,7 @@ trait CMenuBar {
           val loaded = gameFrame.load(path)
           loaded match {
             case Some(errorMessage) =>
-              Error error errorMessage.description
+              Error write errorMessage.description
             case _ =>
           }
         case _ =>

graphics/src/graphics/Icons.scala

@@ -25,7 +25,7 @@ object Icons {
   private def splitImg (image: BufferedImage): Seq[BufferedImage] =
     for (i <- 0 until 6) yield image.getSubimage(i*image.getWidth/6, 0, image.getWidth/6, image.getHeight)
 
-  // TODO unnecessary mem alloc, sequences should be deleted after loading => put in method scope
+  // TODO unnecessary mem alloc, sequences should be deleted after loading => write in method scope
   private val blackImages: Seq[BufferedImage] =
     splitImg(ImageIO.read(getClass.getResourceAsStream(assetsDir + (dirs \ "BlackPieces" \@ "dir"))))
   private val whiteImages: Seq[BufferedImage] =