src/Pure/Tools/server.scala
changeset 83269 f6de20fbf55f
parent 83214 911fbc338de7
equal deleted inserted replaced
83268:dcbd1abb742c 83269:f6de20fbf55f
   256 
   256 
   257   class Connection_Progress private[Server](context: Context, more: JSON.Object.Entry*)
   257   class Connection_Progress private[Server](context: Context, more: JSON.Object.Entry*)
   258   extends Progress {
   258   extends Progress {
   259     override def verbose: Boolean = true
   259     override def verbose: Boolean = true
   260 
   260 
   261     override def output(message: Progress.Message): Unit = {
   261     override def output(msgs: Progress.Output): Unit =
   262       val more1 = ("verbose" -> message.verbose.toString) :: more.toList
   262       for (msg <- msgs) {
   263       message.kind match {
   263         msg match {
   264         case Progress.Kind.writeln => context.writeln(message.text, more1:_*)
   264           case message: Progress.Message =>
   265         case Progress.Kind.warning => context.warning(message.text, more1:_*)
   265             val more1 = ("verbose" -> message.verbose.toString) :: more.toList
   266         case Progress.Kind.error_message => context.error_message(message.text, more1:_*)
   266             message.kind match {
   267       }
   267               case Progress.Kind.writeln => context.writeln(message.text, more1: _*)
   268     }
   268               case Progress.Kind.warning => context.warning(message.text, more1: _*)
   269 
   269               case Progress.Kind.error_message => context.error_message(message.text, more1: _*)
   270     override def theory(theory: Progress.Theory): Unit = {
   270             }
   271       val entries: List[JSON.Object.Entry] =
   271           case theory: Progress.Theory =>
   272         List("theory" -> theory.theory, "session" -> theory.session) :::
   272             val entries: List[JSON.Object.Entry] =
   273           (theory.percentage match { case None => Nil case Some(p) => List("percentage" -> p) })
   273               List("theory" -> theory.theory, "session" -> theory.session) :::
   274       context.writeln(theory.message.text, entries ::: more.toList:_*)
   274                 (theory.percentage match { case None => Nil case Some(p) => List("percentage" -> p) })
   275     }
   275             context.writeln(theory.message.text, entries ::: more.toList:_*)
       
   276         }
       
   277       }
   276 
   278 
   277     override def nodes_status(nodes_status: Progress.Nodes_Status): Unit = {
   279     override def nodes_status(nodes_status: Progress.Nodes_Status): Unit = {
   278       val json =
   280       val json =
   279         List.from(for {
   281         List.from(for {
   280           name <- nodes_status.domain.iterator
   282           name <- nodes_status.domain.iterator