more explicit indication of mutable collections;
authorwenzelm
Tue Jan 27 16:16:55 2009 +0100 (2009-01-27 ago)
changeset 34497184fda8cce04
parent 34496 1b2995592bb9
child 34498 f97b764f956f
more explicit indication of mutable collections;
src/Tools/jEdit/src/jedit/Plugin.scala
src/Tools/jEdit/src/jedit/ScrollerDockable.scala
src/Tools/jEdit/src/prover/Command.scala
src/Tools/jEdit/src/prover/Prover.scala
     1.1 --- a/src/Tools/jEdit/src/jedit/Plugin.scala	Tue Jan 20 23:13:54 2009 +0100
     1.2 +++ b/src/Tools/jEdit/src/jedit/Plugin.scala	Tue Jan 27 16:16:55 2009 +0100
     1.3 @@ -12,7 +12,7 @@
     1.4  import java.awt.Font
     1.5  import javax.swing.JScrollPane
     1.6  
     1.7 -import scala.collection.mutable.HashMap
     1.8 +import scala.collection.mutable
     1.9  
    1.10  import isabelle.prover.{Prover, Command}
    1.11  import isabelle.IsabelleSystem
    1.12 @@ -69,7 +69,7 @@
    1.13  
    1.14    // mapping buffer <-> prover
    1.15  
    1.16 -  private val mapping = new HashMap[JEditBuffer, ProverSetup]
    1.17 +  private val mapping = new mutable.HashMap[JEditBuffer, ProverSetup]
    1.18  
    1.19    private def install(view: View) {
    1.20      val buffer = view.getBuffer
     2.1 --- a/src/Tools/jEdit/src/jedit/ScrollerDockable.scala	Tue Jan 20 23:13:54 2009 +0100
     2.2 +++ b/src/Tools/jEdit/src/jedit/ScrollerDockable.scala	Tue Jan 27 16:16:55 2009 +0100
     2.3 @@ -11,7 +11,7 @@
     2.4  import isabelle.renderer.UserAgent
     2.5  
     2.6  
     2.7 -import scala.collection.mutable.{ArrayBuffer, HashMap}
     2.8 +import scala.collection.mutable
     2.9  
    2.10  import java.awt.{BorderLayout, Adjustable, Dimension}
    2.11  import java.awt.event.{ActionListener, ActionEvent, AdjustmentListener, AdjustmentEvent, ComponentListener, ComponentEvent}
    2.12 @@ -179,7 +179,7 @@
    2.13  //Concrete Implementations
    2.14  
    2.15  //containing the unrendered messages
    2.16 -class MessageBuffer extends HashMap[Int,Result] with Unrendered[Result]{
    2.17 +class MessageBuffer extends mutable.HashMap[Int,Result] with Unrendered[Result]{
    2.18    override def addUnrendered (id: Int, m: Result) {
    2.19      update(id, m)
    2.20    }
    2.21 @@ -192,7 +192,7 @@
    2.22  
    2.23  //containing the rendered messages
    2.24  class PanelCache (buffer: Unrendered[Result], val renderer: Renderer[Result, XHTMLPanel])
    2.25 -  extends HashMap[Int, XHTMLPanel] with Rendered[Result, XHTMLPanel]{
    2.26 +  extends mutable.HashMap[Int, XHTMLPanel] with Rendered[Result, XHTMLPanel]{
    2.27  
    2.28    override def getRendered (id: Int): Option[XHTMLPanel] = {
    2.29      //get message from buffer and render it if necessary
     3.1 --- a/src/Tools/jEdit/src/prover/Command.scala	Tue Jan 20 23:13:54 2009 +0100
     3.2 +++ b/src/Tools/jEdit/src/prover/Command.scala	Tue Jan 27 16:16:55 2009 +0100
     3.3 @@ -11,7 +11,7 @@
     3.4  import javax.swing.text.Position
     3.5  import javax.swing.tree.DefaultMutableTreeNode
     3.6  
     3.7 -import scala.collection.mutable.ListBuffer
     3.8 +import scala.collection.mutable
     3.9  
    3.10  import isabelle.proofdocument.{Text, Token, ProofDocument}
    3.11  import isabelle.jedit.{Isabelle, Plugin}
    3.12 @@ -61,7 +61,7 @@
    3.13  
    3.14    /* accumulated results */
    3.15  
    3.16 -  private val results = new ListBuffer[XML.Tree]
    3.17 +  private val results = new mutable.ListBuffer[XML.Tree]
    3.18    def add_result(tree: XML.Tree) { results += tree }
    3.19  
    3.20    def result_document = XML.document(
     4.1 --- a/src/Tools/jEdit/src/prover/Prover.scala	Tue Jan 20 23:13:54 2009 +0100
     4.2 +++ b/src/Tools/jEdit/src/prover/Prover.scala	Tue Jan 27 16:16:55 2009 +0100
     4.3 @@ -9,7 +9,7 @@
     4.4  package isabelle.prover
     4.5  
     4.6  
     4.7 -import scala.collection.mutable.{HashMap, HashSet}
     4.8 +import scala.collection.mutable
     4.9  import scala.collection.immutable.{TreeSet}
    4.10  
    4.11  import org.gjt.sp.util.Log
    4.12 @@ -23,20 +23,20 @@
    4.13    private var _logic = isabelle_system.getenv_strict("ISABELLE_LOGIC")
    4.14    private var process: Isar = null
    4.15  
    4.16 -  private val commands = new HashMap[IsarDocument.Command_ID, Command]
    4.17 +  private val commands = new mutable.HashMap[IsarDocument.Command_ID, Command]
    4.18  
    4.19  
    4.20    /* outer syntax keywords */
    4.21  
    4.22    val decl_info = new EventBus[(String, String)]
    4.23  
    4.24 -  private val keyword_decls = new HashSet[String] {
    4.25 +  private val keyword_decls = new mutable.HashSet[String] {
    4.26      override def +=(name: String) = {
    4.27        decl_info.event(name, OuterKeyword.MINOR)
    4.28        super.+=(name)
    4.29      }
    4.30    }
    4.31 -  private val command_decls = new HashMap[String, String] {
    4.32 +  private val command_decls = new mutable.HashMap[String, String] {
    4.33      override def +=(entry: (String, String)) = {
    4.34        decl_info.event(entry)
    4.35        super.+=(entry)