tuned signature -- prefer static type Document.Node.Name;
authorwenzelm
Mon, 07 Apr 2014 21:23:02 +0200
changeset 56457 eea4bbe15745
parent 56450 16d4213d4cbc
child 56458 a8d960baa5c2
tuned signature -- prefer static type Document.Node.Name;
src/Tools/jEdit/src/document_model.scala
src/Tools/jEdit/src/jedit_editor.scala
src/Tools/jEdit/src/jedit_lib.scala
src/Tools/jEdit/src/jedit_resources.scala
src/Tools/jEdit/src/theories_dockable.scala
--- a/src/Tools/jEdit/src/document_model.scala	Mon Apr 07 16:37:57 2014 +0200
+++ b/src/Tools/jEdit/src/document_model.scala	Mon Apr 07 21:23:02 2014 +0200
@@ -119,7 +119,7 @@
         for {
           cmd <- snapshot.node.load_commands
           blob_name <- cmd.blobs_names
-          blob_buffer <- JEdit_Lib.jedit_buffer(blob_name.node)
+          blob_buffer <- JEdit_Lib.jedit_buffer(blob_name)
           if !JEdit_Lib.jedit_text_areas(blob_buffer).isEmpty
           start <- snapshot.node.command_start(cmd)
           range = snapshot.convert(cmd.proper_range + start)
--- a/src/Tools/jEdit/src/jedit_editor.scala	Mon Apr 07 16:37:57 2014 +0200
+++ b/src/Tools/jEdit/src/jedit_editor.scala	Mon Apr 07 21:23:02 2014 +0200
@@ -52,7 +52,7 @@
   {
     Swing_Thread.require()
 
-    JEdit_Lib.jedit_buffer(name.node) match {
+    JEdit_Lib.jedit_buffer(name) match {
       case Some(buffer) =>
         PIDE.document_model(buffer) match {
           case Some(model) => model.snapshot
--- a/src/Tools/jEdit/src/jedit_lib.scala	Mon Apr 07 16:37:57 2014 +0200
+++ b/src/Tools/jEdit/src/jedit_lib.scala	Mon Apr 07 21:23:02 2014 +0200
@@ -120,6 +120,9 @@
   def jedit_buffer(name: String): Option[Buffer] =
     jedit_buffers().find(buffer => buffer_name(buffer) == name)
 
+  def jedit_buffer(name: Document.Node.Name): Option[Buffer] =
+    jedit_buffer(name.node)
+
   def jedit_views(): Iterator[View] = jEdit.getViews().iterator
 
   def jedit_text_areas(view: View): Iterator[JEditTextArea] =
--- a/src/Tools/jEdit/src/jedit_resources.scala	Mon Apr 07 16:37:57 2014 +0200
+++ b/src/Tools/jEdit/src/jedit_resources.scala	Mon Apr 07 21:23:02 2014 +0200
@@ -57,7 +57,7 @@
   override def with_thy_text[A](name: Document.Node.Name, f: CharSequence => A): A =
   {
     Swing_Thread.now {
-      JEdit_Lib.jedit_buffer(name.node) match {
+      JEdit_Lib.jedit_buffer(name) match {
         case Some(buffer) =>
           JEdit_Lib.buffer_lock(buffer) {
             Some(f(buffer.getSegment(0, buffer.getLength)))
--- a/src/Tools/jEdit/src/theories_dockable.scala	Mon Apr 07 16:37:57 2014 +0200
+++ b/src/Tools/jEdit/src/theories_dockable.scala	Mon Apr 07 21:23:02 2014 +0200
@@ -41,7 +41,7 @@
           if (in_checkbox(peer.indexToLocation(index), point)) {
             if (clicks == 1) {
               for {
-                buffer <- JEdit_Lib.jedit_buffer(listData(index).node)
+                buffer <- JEdit_Lib.jedit_buffer(listData(index))
                 model <- PIDE.document_model(buffer)
               } model.node_required = !model.node_required
             }