--- a/src/Tools/jEdit/src/jedit/Plugin.scala Thu Sep 03 11:52:05 2009 +0200
+++ b/src/Tools/jEdit/src/jedit/Plugin.scala Thu Sep 03 12:15:39 2009 +0200
@@ -63,7 +63,7 @@
/* settings */
- def default_logic =
+ def default_logic(): String =
{
val logic = Isabelle.Property("logic")
if (logic != null) logic else Isabelle.system.getenv_strict("ISABELLE_LOGIC")
--- a/src/Tools/jEdit/src/jedit/TheoryView.scala Thu Sep 03 11:52:05 2009 +0200
+++ b/src/Tools/jEdit/src/jedit/TheoryView.scala Thu Sep 03 12:15:39 2009 +0200
@@ -40,14 +40,14 @@
}
-class TheoryView (text_area: JEditTextArea)
- extends TextAreaExtension with BufferListener
+class TheoryView(text_area: JEditTextArea)
+ extends TextAreaExtension with BufferListener
{
val buffer = text_area.getBuffer
// start prover
- val prover: Prover = new Prover(Isabelle.system, Isabelle.default_logic, change_receiver)
+ val prover: Prover = new Prover(Isabelle.system, Isabelle.default_logic(), change_receiver)
prover.start() // start actor
@@ -260,6 +260,7 @@
}
}
+
/* TextAreaExtension methods */
override def paintValidLine(gfx: Graphics2D,
@@ -285,7 +286,8 @@
gfx.setColor(saved_color)
}
- override def getToolTipText(x: Int, y: Int) = {
+ override def getToolTipText(x: Int, y: Int): String =
+ {
val document = current_document()
val offset = from_current(document, text_area.xyToOffset(x, y))
val cmd = document.find_command_at(offset)