--- a/src/Pure/System/progress.scala Sun Sep 02 23:08:31 2018 +0200
+++ b/src/Pure/System/progress.scala Sun Sep 02 23:25:53 2018 +0200
@@ -21,7 +21,7 @@
def echo(msg: String) {}
def echo_if(cond: Boolean, msg: String) { if (cond) echo(msg) }
def theory(session: String, theory: String) {}
- def nodes_status(nodes_status: List[(Document.Node.Name, Document_Status.Node_Status)]) {}
+ def nodes_status(nodes_status: Document_Status.Nodes_Status, names: List[Document.Node.Name]) {}
def echo_warning(msg: String) { echo(Output.warning_text(msg)) }
def echo_error_message(msg: String) { echo(Output.error_message_text(msg)) }
--- a/src/Pure/Thy/thy_resources.scala Sun Sep 02 23:08:31 2018 +0200
+++ b/src/Pure/Thy/thy_resources.scala Sun Sep 02 23:25:53 2018 +0200
@@ -153,7 +153,7 @@
val delay_nodes_status =
Standard_Thread.delay_first(nodes_status_delay max Time.zero) {
val (nodes_status, names) = nodes_status_update.value
- progress.nodes_status(names.map(name => (name -> nodes_status(name))))
+ progress.nodes_status(nodes_status, names)
}
val consumer =
--- a/src/Pure/Tools/server.scala Sun Sep 02 23:08:31 2018 +0200
+++ b/src/Pure/Tools/server.scala Sun Sep 02 23:25:53 2018 +0200
@@ -274,11 +274,9 @@
(List("session" -> session, "theory" -> theory) ::: more.toList):_*)
override def nodes_status(
- nodes_status: List[(Document.Node.Name, Document_Status.Node_Status)])
+ nodes_status: Document_Status.Nodes_Status, names: List[Document.Node.Name])
{
- val json =
- for ((name, status) <- nodes_status)
- yield name.json + ("status" -> status.json)
+ val json = names.map(name => name.json + ("status" -> nodes_status(name).json))
context.notify(JSON.Object(Markup.KIND -> Markup.NODES_STATUS, Markup.NODES_STATUS -> json))
}