# HG changeset patch
# User wenzelm
# Date 1262378726 -3600
# Node ID 6b38fc0b34060057c6772395e2cbe57653ed389b
# Parent  7f72547f9b12504d991775056e2e76a3c4e93985
eliminated redundant session documents database;
tuned;

diff -r 7f72547f9b12 -r 6b38fc0b3406 src/Tools/jEdit/src/proofdocument/document.scala
--- a/src/Tools/jEdit/src/proofdocument/document.scala	Fri Jan 01 21:37:37 2010 +0100
+++ b/src/Tools/jEdit/src/proofdocument/document.scala	Fri Jan 01 21:45:26 2010 +0100
@@ -60,7 +60,7 @@
     val tokens: Linear_Set[Token],   // FIXME plain List, inside Command
     val token_start: Map[Token, Int],  // FIXME eliminate
     val commands: Linear_Set[Command],
-    var states: Map[Command, Command])   // FIXME immutable, eliminate!?
+    @volatile var states: Map[Command, Command])   // FIXME immutable, eliminate!?
   extends Session.Entity
 {
   def content = Token.string_from_tokens(Nil ++ tokens, token_start)
diff -r 7f72547f9b12 -r 6b38fc0b3406 src/Tools/jEdit/src/proofdocument/session.scala
--- a/src/Tools/jEdit/src/proofdocument/session.scala	Fri Jan 01 21:37:37 2010 +0100
+++ b/src/Tools/jEdit/src/proofdocument/session.scala	Fri Jan 01 21:45:26 2010 +0100
@@ -48,7 +48,8 @@
   def create_id(): Session.Entity_ID = synchronized { id_count += 1; "j" + id_count }
 
 
-  /* document state information -- owned by session_actor */
+
+  /** main actor **/
 
   @volatile private var syntax = new Outer_Syntax(system.symbols)
   def current_syntax: Outer_Syntax = syntax
@@ -56,14 +57,6 @@
   @volatile private var entities = Map[Session.Entity_ID, Session.Entity]()
   def lookup_entity(id: Session.Entity_ID): Option[Session.Entity] = entities.get(id)
 
-  // FIXME eliminate
-  @volatile private var documents = Map[Isar_Document.Document_ID, Document]()
-  def document(id: Isar_Document.Document_ID): Option[Document] = documents.get(id)
-
-
-
-  /** main actor **/
-
   private case class Register(entity: Session.Entity)
   private case class Start(timeout: Int, args: List[String])
   private case object Stop
@@ -95,7 +88,6 @@
             })
       }
       register(doc)
-      documents += (doc.id -> doc)  // FIXME remove
       prover.edit_document(change.parent.get.document.id, doc.id, id_changes)
 
       document_change.event(doc)
@@ -202,7 +194,6 @@
           val id = create_id()
           val doc = Document.empty(id)
           register(doc)
-          documents += (id -> doc)
           prover.begin_document(id, path)
           reply(doc)
 
@@ -221,7 +212,6 @@
 
   /* main methods */
 
-  // FIXME private?
   def register_entity(entity: Session.Entity) { session_actor !? Register(entity) }
 
   def start(timeout: Int, args: List[String]): Option[String] =