--- a/src/Tools/jEdit/src/jedit/plugin.scala Fri Aug 06 21:52:49 2010 +0200
+++ b/src/Tools/jEdit/src/jedit/plugin.scala Sat Aug 07 13:19:48 2010 +0200
@@ -1,6 +1,4 @@
/* Title: Tools/jEdit/src/jedit/plugin.scala
- Author: Johannes Hölzl, TU Munich
- Author: Fabian Immler, TU Munich
Author: Makarius
Main Isabelle/jEdit plugin setup.
@@ -32,11 +30,6 @@
var session: Session = null
- /* name */
-
- val NAME = "Isabelle"
-
-
/* properties */
val OPTION_PREFIX = "options.isabelle."
@@ -110,7 +103,7 @@
}
- /* main jEdit components */ // FIXME ownership!?
+ /* main jEdit components */
def jedit_buffers(): Iterator[Buffer] = jEdit.getBuffers().iterator
@@ -149,12 +142,12 @@
}
- /* manage prover */
+ /* manage prover */ // FIXME async!?
private def prover_started(view: View): Boolean =
{
val timeout = Int_Property("startup-timeout") max 1000
- session.start(timeout, Isabelle.isabelle_args()) match {
+ session.started(timeout, Isabelle.isabelle_args()) match {
case Some(err) =>
val text = new JTextArea(err); text.setEditable(false)
Library.error_dialog(view, null, "Failed to start Isabelle process", text)