--- a/src/Tools/jEdit/src/jedit/isabelle_options.scala Sat Sep 18 16:05:12 2010 +0200
+++ b/src/Tools/jEdit/src/jedit/isabelle_options.scala Sat Sep 18 17:11:39 2010 +0200
@@ -7,7 +7,7 @@
package isabelle.jedit
-import javax.swing.{JComboBox, JSpinner}
+import javax.swing.JSpinner
import org.gjt.sp.jedit.AbstractOptionPane
--- a/src/Tools/jEdit/src/jedit/output_dockable.scala Sat Sep 18 16:05:12 2010 +0200
+++ b/src/Tools/jEdit/src/jedit/output_dockable.scala Sat Sep 18 17:11:39 2010 +0200
@@ -26,7 +26,7 @@
val html_panel =
new HTML_Panel(Isabelle.system, Isabelle.font_family(), scala.math.round(Isabelle.font_size()))
- add(html_panel, BorderLayout.CENTER)
+ set_content(html_panel)
/* component state -- owned by Swing thread */
--- a/src/Tools/jEdit/src/jedit/plugin.scala Sat Sep 18 16:05:12 2010 +0200
+++ b/src/Tools/jEdit/src/jedit/plugin.scala Sat Sep 18 17:11:39 2010 +0200
@@ -11,7 +11,6 @@
import java.io.{FileInputStream, IOException}
import java.awt.Font
-import javax.swing.JTextArea
import scala.collection.mutable
import scala.swing.ComboBox
@@ -221,7 +220,8 @@
val timeout = Int_Property("startup-timeout") max 1000
session.started(timeout, Isabelle.isabelle_args()) match {
case Some(err) =>
- val text = new JTextArea(err); text.setEditable(false)
+ val text = new scala.swing.TextArea(err)
+ text.editable = false
Library.error_dialog(view, null, "Failed to start Isabelle process", text)
false
case None => true