1.1 --- a/src/Tools/jEdit/src/jedit/scala_console.scala	Fri Jan 08 12:26:44 2010 +0100
     1.2 +++ b/src/Tools/jEdit/src/jedit/scala_console.scala	Sat Jan 09 00:49:51 2010 +0100
     1.3 @@ -9,7 +9,7 @@
     1.4  
     1.5  import console.{Console, ConsolePane, Shell, Output}
     1.6  
     1.7 -import org.gjt.sp.jedit.jEdit
     1.8 +import org.gjt.sp.jedit.{jEdit, JARClassLoader}
     1.9  import org.gjt.sp.jedit.MiscUtilities
    1.10  
    1.11  import java.io.{Writer, PrintWriter}
    1.12 @@ -64,7 +64,21 @@
    1.13    {
    1.14      val settings = new GenericRunnerSettings(report_error)
    1.15      val printer = new PrintWriter(new Console_Writer, true)
    1.16 -    interpreters += (console -> new Interpreter(settings, printer))
    1.17 +    val interp = new Interpreter(settings, printer)
    1.18 +    {
    1.19 +      override def parentClassLoader = new JARClassLoader
    1.20 +    }
    1.21 +    interp.setContextClassLoader
    1.22 +
    1.23 +    val view = console.getView
    1.24 +    val edit_pane = view.getEditPane
    1.25 +    interp.bind("view", "org.gjt.sp.jedit.View", view)
    1.26 +    interp.bind("editPane", "org.gjt.sp.jedit.EditPane", edit_pane)
    1.27 +    interp.bind("buffer", "org.gjt.sp.jedit.Buffer", edit_pane.getBuffer)
    1.28 +    interp.bind("textArea", "org.gjt.sp.jedit.textarea.JEditTextArea", edit_pane.getTextArea)
    1.29 +    interp.bind("wm", "org.gjt.sp.jedit.gui.DockableWindowManager", view.getDockableWindowManager)
    1.30 +
    1.31 +    interpreters += (console -> interp)
    1.32    }
    1.33  
    1.34    override def closeConsole(console: Console)
    1.35 @@ -75,14 +89,12 @@
    1.36    override def printPrompt(console: Console, out: Output)
    1.37  	{
    1.38      out.writeAttrs(ConsolePane.colorAttributes(console.getInfoColor), "scala>")
    1.39 -		out.writeAttrs(null," ")
    1.40 +		out.writeAttrs(ConsolePane.colorAttributes(console.getPlainColor), " ")
    1.41  	}
    1.42  
    1.43    override def execute(console: Console, input: String, out: Output, err: Output, command: String)
    1.44    {
    1.45 -    with_console(console, out, err) {
    1.46 -      interpreters(console).interpret(command)
    1.47 -    }
    1.48 +    with_console(console, out, err) { interpreters(console).interpret(command) }
    1.49      if (err != null) err.commandDone()
    1.50  		out.commandDone()
    1.51    }