# HG changeset patch
# User wenzelm
# Date 1245929765 -7200
# Node ID 5e61055bf35b7f429148cd554e3c66773bb3b58d
# Parent  25b178e4faafe8d85f12ed0f6a360297b938f0bd
renamed IsabelleProcess to Isabelle_Process;
renamed IsabelleSystem to Isabelle_System;

diff -r 25b178e4faaf -r 5e61055bf35b src/Tools/jEdit/src/jedit/Plugin.scala
--- a/src/Tools/jEdit/src/jedit/Plugin.scala	Thu Jun 25 00:36:20 2009 +0200
+++ b/src/Tools/jEdit/src/jedit/Plugin.scala	Thu Jun 25 13:36:05 2009 +0200
@@ -15,7 +15,7 @@
 import scala.collection.mutable
 
 import isabelle.prover.{Prover, Command}
-import isabelle.IsabelleSystem
+import isabelle.Isabelle_System
 
 import org.gjt.sp.jedit.{jEdit, EBMessage, EBPlugin, Buffer, EditPane, ServiceManager, View}
 import org.gjt.sp.jedit.buffer.JEditBuffer
@@ -36,7 +36,7 @@
   }
 
   // Isabelle system instance
-  var system: IsabelleSystem = null
+  var system: Isabelle_System = null
   def symbols = system.symbols
   lazy val completion = new Completion + symbols
 
@@ -129,7 +129,7 @@
   }
 
   override def start() {
-    Isabelle.system = new IsabelleSystem
+    Isabelle.system = new Isabelle_System
     Isabelle.plugin = this
     
     if (Isabelle.Property("font-path") != null && Isabelle.Property("font-size") != null)
diff -r 25b178e4faaf -r 5e61055bf35b src/Tools/jEdit/src/jedit/ScrollerDockable.scala
--- a/src/Tools/jEdit/src/jedit/ScrollerDockable.scala	Thu Jun 25 00:36:20 2009 +0200
+++ b/src/Tools/jEdit/src/jedit/ScrollerDockable.scala	Thu Jun 25 13:36:05 2009 +0200
@@ -7,7 +7,7 @@
 package isabelle.jedit
 
 
-import isabelle.IsabelleProcess.Result
+import isabelle.Isabelle_Process.Result
 import isabelle.renderer.UserAgent
 
 
@@ -228,7 +228,7 @@
         fontResolver.setFontMapping("Isabelle", Isabelle.plugin.font)
       panel.relayout()
     })
-    val document = XML.document(IsabelleProcess.parse_message(Isabelle.system, r))
+    val document = XML.document(Isabelle_Process.parse_message(Isabelle.system, r))
     panel.setDocument(document, UserAgent.baseURL)
     val sa = new SelectionActions
     sa.install(panel)
diff -r 25b178e4faaf -r 5e61055bf35b src/Tools/jEdit/src/jedit/VFS.scala
--- a/src/Tools/jEdit/src/jedit/VFS.scala	Thu Jun 25 00:36:20 2009 +0200
+++ b/src/Tools/jEdit/src/jedit/VFS.scala	Thu Jun 25 13:36:05 2009 +0200
@@ -26,7 +26,7 @@
 
   def input_converter(in: InputStream): ByteArrayInputStream =
   {
-    val reader = new InputStreamReader(in, IsabelleSystem.charset)
+    val reader = new InputStreamReader(in, Isabelle_System.charset)
     val buffer = new StringBuilder
     val array = new Array[Char](BUFFER_SIZE)
 
@@ -40,7 +40,7 @@
     }
 
     val str = Isabelle.symbols.decode(buffer.toString)
-    new ByteArrayInputStream(str.getBytes(IsabelleSystem.charset))
+    new ByteArrayInputStream(str.getBytes(Isabelle_System.charset))
   }
 
   class OutputConverter(out: OutputStream) extends ByteArrayOutputStream
diff -r 25b178e4faaf -r 5e61055bf35b src/Tools/jEdit/src/prover/Prover.scala
--- a/src/Tools/jEdit/src/prover/Prover.scala	Thu Jun 25 00:36:20 2009 +0200
+++ b/src/Tools/jEdit/src/prover/Prover.scala	Thu Jun 25 13:36:05 2009 +0200
@@ -27,15 +27,15 @@
   case class SetIsCommandKeyword(is_command_keyword: String => Boolean)
 }
 
-class Prover(isabelle_system: IsabelleSystem, logic: String) extends Actor
+class Prover(isabelle_system: Isabelle_System, logic: String) extends Actor
 {
   /* prover process */
 
   private val process =
   {
-    val results = new EventBus[IsabelleProcess.Result] + handle_result
+    val results = new EventBus[Isabelle_Process.Result] + handle_result
     results.logger = Log.log(Log.ERROR, null, _)
-    new IsabelleProcess(isabelle_system, results, "-m", "xsymbols", logic) with IsarDocument
+    new Isabelle_Process(isabelle_system, results, "-m", "xsymbols", logic) with IsarDocument
   }
 
   def stop() { process.kill }
@@ -89,7 +89,7 @@
   val output_info = new EventBus[String]
   var change_receiver: Actor = null
   
-  private def handle_result(result: IsabelleProcess.Result)
+  private def handle_result(result: Isabelle_Process.Result)
   {
     def command_change(c: Command) = this ! c
     val (running, command) =
@@ -101,18 +101,18 @@
           else (false, null)
       }
 
-    if (result.kind == IsabelleProcess.Kind.STDOUT ||
-        result.kind == IsabelleProcess.Kind.STDIN)
+    if (result.kind == Isabelle_Process.Kind.STDOUT ||
+        result.kind == Isabelle_Process.Kind.STDIN)
       output_info.event(result.toString)
     else {
       result.kind match {
 
-        case IsabelleProcess.Kind.WRITELN
-        | IsabelleProcess.Kind.PRIORITY
-        | IsabelleProcess.Kind.WARNING
-        | IsabelleProcess.Kind.ERROR =>
+        case Isabelle_Process.Kind.WRITELN
+        | Isabelle_Process.Kind.PRIORITY
+        | Isabelle_Process.Kind.WARNING
+        | Isabelle_Process.Kind.ERROR =>
           if (command != null) {
-            if (result.kind == IsabelleProcess.Kind.ERROR)
+            if (result.kind == Isabelle_Process.Kind.ERROR)
               command.status = Command.Status.FAILED
             command.add_result(running, process.parse_message(result))
             command_change(command)
@@ -120,7 +120,7 @@
             output_info.event(result.toString)
           }
 
-        case IsabelleProcess.Kind.STATUS =>
+        case Isabelle_Process.Kind.STATUS =>
           //{{{ handle all kinds of status messages here
           process.parse_message(result) match {
             case XML.Elem(Markup.MESSAGE, _, elems) =>