moved new Symbol.Interpretation into plugin;
authorwenzelm
Mon, 25 Aug 2008 23:27:56 +0200
changeset 27999 c26e0373c24f
parent 27998 2cd94c30271c
child 28000 ca56bbb99607
moved new Symbol.Interpretation into plugin;
lib/jedit/plugin/isabelle_plugin.scala
src/Pure/Tools/isabelle_process.scala
--- a/lib/jedit/plugin/isabelle_plugin.scala	Mon Aug 25 22:42:04 2008 +0200
+++ b/lib/jedit/plugin/isabelle_plugin.scala	Mon Aug 25 23:27:56 2008 +0200
@@ -26,13 +26,18 @@
 
 object IsabellePlugin {
 
+  /* Isabelle symbols */
+
+  val symbols = new Symbol.Interpretation
+
+  def result_content(result: IsabelleProcess.Result) =
+    XML.content(YXML.parse_failsafe(symbols.decode(result.result))).mkString("")
+
+
   /* Isabelle process */
 
   var isabelle: IsabelleProcess = null
 
-  def result_content(result: IsabelleProcess.Result) =
-    XML.content(isabelle.decode_result(result)).mkString("")
-
 
   /* unique ids */
 
@@ -149,6 +154,7 @@
 
   }
 
+
   override def stop = {
     isabelle.kill
     consumer_thread.join
--- a/src/Pure/Tools/isabelle_process.scala	Mon Aug 25 22:42:04 2008 +0200
+++ b/src/Pure/Tools/isabelle_process.scala	Mon Aug 25 23:27:56 2008 +0200
@@ -84,12 +84,6 @@
   def session() = the_session
 
 
-  /* symbols */
-
-  val symbols = new Symbol.Interpretation
-  def decode_result(result: Result) = YXML.parse_failsafe(symbols.decode(result.result))
-
-
   /* results */
 
   private val results = new LinkedBlockingQueue[Result]