merged
authorwenzelm
Fri, 16 Jan 2009 23:00:24 +0100
changeset 34479 c787cbe6cdce
parent 34478 095e5cae6656 (current diff)
parent 34477 e561d0915f28 (diff)
child 34480 017fae24829f
merged
--- a/src/Tools/jEdit/src/jedit/ScrollerDockable.scala	Fri Jan 16 16:54:01 2009 +0100
+++ b/src/Tools/jEdit/src/jedit/ScrollerDockable.scala	Fri Jan 16 23:00:24 2009 +0100
@@ -228,7 +228,7 @@
         fontResolver.setFontMapping("Isabelle", Isabelle.plugin.font)
       panel.relayout()
     })
-    val tree = YXML.parse_failsafe(Isabelle.symbols.decode(r.result))
+    val tree = IsabelleProcess.parse_message(r.kind, Isabelle.symbols.decode(r.result))
     val document = XML.document(tree)
     panel.setDocument(document, UserAgent.baseURL)
     val sa = new SelectionActions
--- a/src/Tools/jEdit/src/prover/Command.scala	Fri Jan 16 16:54:01 2009 +0100
+++ b/src/Tools/jEdit/src/prover/Command.scala	Fri Jan 16 23:00:24 2009 +0100
@@ -13,7 +13,7 @@
 
 import isabelle.proofdocument.Token
 import isabelle.jedit.{Isabelle, Plugin}
-import isabelle.{YXML, XML}
+import isabelle.XML
 
 import sidekick.{SideKickParsedData, IAsset}
 
--- a/src/Tools/jEdit/src/prover/Prover.scala	Fri Jan 16 16:54:01 2009 +0100
+++ b/src/Tools/jEdit/src/prover/Prover.scala	Fri Jan 16 23:00:24 2009 +0100
@@ -75,7 +75,7 @@
       }
     }
     else {
-      val tree = YXML.parse_failsafe(isabelle_symbols.decode(r.result))
+      val tree = IsabelleProcess.parse_message(r.kind, isabelle_symbols.decode(r.result))
       if (st == null || (st.status != Command.Status.REMOVED && st.status != Command.Status.REMOVE)) {
         r.kind match {