author | wenzelm |
Wed, 22 Jun 2011 20:25:35 +0200 | |
changeset 43510 | 17d431c92575 |
parent 43487 | 98cd7e83fc5b |
child 43513 | 06951ddfc812 |
permissions | -rw-r--r-- |
43282
5d294220ca43
moved sources -- eliminated Netbeans artifact of jedit package directory;
wenzelm
parents:
41537
diff
changeset
|
1 |
/* Title: Tools/jEdit/src/plugin.scala |
36760 | 2 |
Author: Makarius |
3 |
||
4 |
Main Isabelle/jEdit plugin setup. |
|
5 |
*/ |
|
34407 | 6 |
|
34318
c13e168a8ae6
original sources from Johannes Hölzl a48e0c6ab1aea77c52d596f7efc007a543d3d10c with minor modifications of directory layout;
wenzelm
parents:
diff
changeset
|
7 |
package isabelle.jedit |
c13e168a8ae6
original sources from Johannes Hölzl a48e0c6ab1aea77c52d596f7efc007a543d3d10c with minor modifications of directory layout;
wenzelm
parents:
diff
changeset
|
8 |
|
34429 | 9 |
|
36015 | 10 |
import isabelle._ |
11 |
||
34429 | 12 |
import java.io.{FileInputStream, IOException} |
34318
c13e168a8ae6
original sources from Johannes Hölzl a48e0c6ab1aea77c52d596f7efc007a543d3d10c with minor modifications of directory layout;
wenzelm
parents:
diff
changeset
|
13 |
import java.awt.Font |
c13e168a8ae6
original sources from Johannes Hölzl a48e0c6ab1aea77c52d596f7efc007a543d3d10c with minor modifications of directory layout;
wenzelm
parents:
diff
changeset
|
14 |
|
34497 | 15 |
import scala.collection.mutable |
39517 | 16 |
import scala.swing.ComboBox |
34406
f81cd75ae331
restructured: independent provers in different buffers
immler@in.tum.de
parents:
34337
diff
changeset
|
17 |
|
39241 | 18 |
import org.gjt.sp.jedit.{jEdit, GUIUtilities, EBMessage, EBPlugin, |
19 |
Buffer, EditPane, ServiceManager, View} |
|
34406
f81cd75ae331
restructured: independent provers in different buffers
immler@in.tum.de
parents:
34337
diff
changeset
|
20 |
import org.gjt.sp.jedit.buffer.JEditBuffer |
39043 | 21 |
import org.gjt.sp.jedit.textarea.{JEditTextArea, TextArea} |
43452
5cf548485529
avoid setTokenMarker fluctuation on buffer reload etc. via static isabelle_token_marker, which is installed by hijacking the jEdit ModeProvider;
wenzelm
parents:
43449
diff
changeset
|
22 |
import org.gjt.sp.jedit.syntax.{Token => JEditToken, ModeProvider} |
39633 | 23 |
import org.gjt.sp.jedit.msg.{EditorStarted, BufferUpdate, EditPaneUpdate, PropertiesChanged} |
37068 | 24 |
import org.gjt.sp.jedit.gui.DockableWindowManager |
34429 | 25 |
|
43443
5d9693c2337e
basic support for extended syntax styles: sub/superscript;
wenzelm
parents:
43390
diff
changeset
|
26 |
import org.gjt.sp.util.SyntaxUtilities |
39241 | 27 |
import org.gjt.sp.util.Log |
28 |
||
39630
44181423183a
explicit Session.Phase indication with associated event bus;
wenzelm
parents:
39628
diff
changeset
|
29 |
import scala.actors.Actor |
44181423183a
explicit Session.Phase indication with associated event bus;
wenzelm
parents:
39628
diff
changeset
|
30 |
import Actor._ |
44181423183a
explicit Session.Phase indication with associated event bus;
wenzelm
parents:
39628
diff
changeset
|
31 |
|
34318
c13e168a8ae6
original sources from Johannes Hölzl a48e0c6ab1aea77c52d596f7efc007a543d3d10c with minor modifications of directory layout;
wenzelm
parents:
diff
changeset
|
32 |
|
34618 | 33 |
object Isabelle |
34 |
{ |
|
34784
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34782
diff
changeset
|
35 |
/* plugin instance */ |
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34782
diff
changeset
|
36 |
|
43443
5d9693c2337e
basic support for extended syntax styles: sub/superscript;
wenzelm
parents:
43390
diff
changeset
|
37 |
var plugin: Plugin = null |
34784
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34782
diff
changeset
|
38 |
var system: Isabelle_System = null |
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34782
diff
changeset
|
39 |
var session: Session = null |
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34782
diff
changeset
|
40 |
|
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34782
diff
changeset
|
41 |
|
34618 | 42 |
/* properties */ |
43 |
||
44 |
val OPTION_PREFIX = "options.isabelle." |
|
45 |
||
46 |
object Property |
|
47 |
{ |
|
36814
dc85664dbf6d
support Isabelle plugin properties with defaults;
wenzelm
parents:
36760
diff
changeset
|
48 |
def apply(name: String): String = |
dc85664dbf6d
support Isabelle plugin properties with defaults;
wenzelm
parents:
36760
diff
changeset
|
49 |
jEdit.getProperty(OPTION_PREFIX + name) |
dc85664dbf6d
support Isabelle plugin properties with defaults;
wenzelm
parents:
36760
diff
changeset
|
50 |
def apply(name: String, default: String): String = |
dc85664dbf6d
support Isabelle plugin properties with defaults;
wenzelm
parents:
36760
diff
changeset
|
51 |
jEdit.getProperty(OPTION_PREFIX + name, default) |
dc85664dbf6d
support Isabelle plugin properties with defaults;
wenzelm
parents:
36760
diff
changeset
|
52 |
def update(name: String, value: String) = |
dc85664dbf6d
support Isabelle plugin properties with defaults;
wenzelm
parents:
36760
diff
changeset
|
53 |
jEdit.setProperty(OPTION_PREFIX + name, value) |
34468
9d4b4f290676
maintain Isabelle properties via object Isabelle.Property with apply/update methods;
wenzelm
parents:
34463
diff
changeset
|
54 |
} |
34433 | 55 |
|
34618 | 56 |
object Boolean_Property |
57 |
{ |
|
36814
dc85664dbf6d
support Isabelle plugin properties with defaults;
wenzelm
parents:
36760
diff
changeset
|
58 |
def apply(name: String): Boolean = |
dc85664dbf6d
support Isabelle plugin properties with defaults;
wenzelm
parents:
36760
diff
changeset
|
59 |
jEdit.getBooleanProperty(OPTION_PREFIX + name) |
dc85664dbf6d
support Isabelle plugin properties with defaults;
wenzelm
parents:
36760
diff
changeset
|
60 |
def apply(name: String, default: Boolean): Boolean = |
dc85664dbf6d
support Isabelle plugin properties with defaults;
wenzelm
parents:
36760
diff
changeset
|
61 |
jEdit.getBooleanProperty(OPTION_PREFIX + name, default) |
dc85664dbf6d
support Isabelle plugin properties with defaults;
wenzelm
parents:
36760
diff
changeset
|
62 |
def update(name: String, value: Boolean) = |
dc85664dbf6d
support Isabelle plugin properties with defaults;
wenzelm
parents:
36760
diff
changeset
|
63 |
jEdit.setBooleanProperty(OPTION_PREFIX + name, value) |
34618 | 64 |
} |
65 |
||
66 |
object Int_Property |
|
67 |
{ |
|
36814
dc85664dbf6d
support Isabelle plugin properties with defaults;
wenzelm
parents:
36760
diff
changeset
|
68 |
def apply(name: String): Int = |
dc85664dbf6d
support Isabelle plugin properties with defaults;
wenzelm
parents:
36760
diff
changeset
|
69 |
jEdit.getIntegerProperty(OPTION_PREFIX + name) |
dc85664dbf6d
support Isabelle plugin properties with defaults;
wenzelm
parents:
36760
diff
changeset
|
70 |
def apply(name: String, default: Int): Int = |
dc85664dbf6d
support Isabelle plugin properties with defaults;
wenzelm
parents:
36760
diff
changeset
|
71 |
jEdit.getIntegerProperty(OPTION_PREFIX + name, default) |
dc85664dbf6d
support Isabelle plugin properties with defaults;
wenzelm
parents:
36760
diff
changeset
|
72 |
def update(name: String, value: Int) = |
dc85664dbf6d
support Isabelle plugin properties with defaults;
wenzelm
parents:
36760
diff
changeset
|
73 |
jEdit.setIntegerProperty(OPTION_PREFIX + name, value) |
34618 | 74 |
} |
75 |
||
40848
8662b9b1f123
more abstract/uniform handling of time, preferring seconds as Double;
wenzelm
parents:
40474
diff
changeset
|
76 |
object Double_Property |
8662b9b1f123
more abstract/uniform handling of time, preferring seconds as Double;
wenzelm
parents:
40474
diff
changeset
|
77 |
{ |
8662b9b1f123
more abstract/uniform handling of time, preferring seconds as Double;
wenzelm
parents:
40474
diff
changeset
|
78 |
def apply(name: String): Double = |
8662b9b1f123
more abstract/uniform handling of time, preferring seconds as Double;
wenzelm
parents:
40474
diff
changeset
|
79 |
jEdit.getDoubleProperty(OPTION_PREFIX + name, 0.0) |
8662b9b1f123
more abstract/uniform handling of time, preferring seconds as Double;
wenzelm
parents:
40474
diff
changeset
|
80 |
def apply(name: String, default: Double): Double = |
8662b9b1f123
more abstract/uniform handling of time, preferring seconds as Double;
wenzelm
parents:
40474
diff
changeset
|
81 |
jEdit.getDoubleProperty(OPTION_PREFIX + name, default) |
8662b9b1f123
more abstract/uniform handling of time, preferring seconds as Double;
wenzelm
parents:
40474
diff
changeset
|
82 |
def update(name: String, value: Double) = |
8662b9b1f123
more abstract/uniform handling of time, preferring seconds as Double;
wenzelm
parents:
40474
diff
changeset
|
83 |
jEdit.setDoubleProperty(OPTION_PREFIX + name, value) |
8662b9b1f123
more abstract/uniform handling of time, preferring seconds as Double;
wenzelm
parents:
40474
diff
changeset
|
84 |
} |
8662b9b1f123
more abstract/uniform handling of time, preferring seconds as Double;
wenzelm
parents:
40474
diff
changeset
|
85 |
|
40850 | 86 |
object Time_Property |
87 |
{ |
|
88 |
def apply(name: String): Time = |
|
89 |
Time.seconds(Double_Property(name)) |
|
90 |
def apply(name: String, default: Time): Time = |
|
91 |
Time.seconds(Double_Property(name, default.seconds)) |
|
92 |
def update(name: String, value: Time) = |
|
93 |
Double_Property.update(name, value.seconds) |
|
94 |
} |
|
95 |
||
40848
8662b9b1f123
more abstract/uniform handling of time, preferring seconds as Double;
wenzelm
parents:
40474
diff
changeset
|
96 |
|
37164 | 97 |
/* font */ |
98 |
||
99 |
def font_family(): String = jEdit.getProperty("view.font") |
|
100 |
||
37019 | 101 |
def font_size(): Float = |
102 |
(jEdit.getIntegerProperty("view.fontsize", 16) * |
|
103 |
Int_Property("relative-font-size", 100)).toFloat / 100 |
|
36814
dc85664dbf6d
support Isabelle plugin properties with defaults;
wenzelm
parents:
36760
diff
changeset
|
104 |
|
34618 | 105 |
|
39043 | 106 |
/* text area ranges */ |
107 |
||
108 |
case class Gfx_Range(val x: Int, val y: Int, val length: Int) |
|
109 |
||
110 |
def gfx_range(text_area: TextArea, range: Text.Range): Option[Gfx_Range] = |
|
111 |
{ |
|
112 |
val p = text_area.offsetToXY(range.start) |
|
113 |
val q = text_area.offsetToXY(range.stop) |
|
114 |
if (p != null && q != null && p.y == q.y) Some(new Gfx_Range(p.x, p.y, q.x - p.x)) |
|
115 |
else None |
|
116 |
} |
|
117 |
||
118 |
||
37201
8517a650cfdc
control tooltip font via Swing HTML, with tooltip-font-size property;
wenzelm
parents:
37177
diff
changeset
|
119 |
/* tooltip markup */ |
8517a650cfdc
control tooltip font via Swing HTML, with tooltip-font-size property;
wenzelm
parents:
37177
diff
changeset
|
120 |
|
8517a650cfdc
control tooltip font via Swing HTML, with tooltip-font-size property;
wenzelm
parents:
37177
diff
changeset
|
121 |
def tooltip(text: String): String = |
37203
c4261f3bbdd7
more flexibile font size via CSS <style> instead of old <font> element;
wenzelm
parents:
37201
diff
changeset
|
122 |
"<html><pre style=\"font-family: " + font_family() + "; font-size: " + |
c4261f3bbdd7
more flexibile font size via CSS <style> instead of old <font> element;
wenzelm
parents:
37201
diff
changeset
|
123 |
Int_Property("tooltip-font-size", 10).toString + "px; \">" + // FIXME proper scaling (!?) |
c4261f3bbdd7
more flexibile font size via CSS <style> instead of old <font> element;
wenzelm
parents:
37201
diff
changeset
|
124 |
HTML.encode(text) + "</pre></html>" |
37201
8517a650cfdc
control tooltip font via Swing HTML, with tooltip-font-size property;
wenzelm
parents:
37177
diff
changeset
|
125 |
|
40849 | 126 |
def tooltip_dismiss_delay(): Time = |
40852 | 127 |
Time_Property("tooltip-dismiss-delay", Time.seconds(8.0)) max Time.seconds(0.5) |
38854
eb6a35be18ca
Isabelle/jEdit property for global tooltip dismiss delay;
wenzelm
parents:
38843
diff
changeset
|
128 |
|
eb6a35be18ca
Isabelle/jEdit property for global tooltip dismiss delay;
wenzelm
parents:
38843
diff
changeset
|
129 |
def setup_tooltips() |
eb6a35be18ca
Isabelle/jEdit property for global tooltip dismiss delay;
wenzelm
parents:
38843
diff
changeset
|
130 |
{ |
eb6a35be18ca
Isabelle/jEdit property for global tooltip dismiss delay;
wenzelm
parents:
38843
diff
changeset
|
131 |
Swing_Thread.now { |
eb6a35be18ca
Isabelle/jEdit property for global tooltip dismiss delay;
wenzelm
parents:
38843
diff
changeset
|
132 |
val manager = javax.swing.ToolTipManager.sharedInstance |
40849 | 133 |
manager.setDismissDelay(tooltip_dismiss_delay().ms.toInt) |
38854
eb6a35be18ca
Isabelle/jEdit property for global tooltip dismiss delay;
wenzelm
parents:
38843
diff
changeset
|
134 |
} |
eb6a35be18ca
Isabelle/jEdit property for global tooltip dismiss delay;
wenzelm
parents:
38843
diff
changeset
|
135 |
} |
eb6a35be18ca
Isabelle/jEdit property for global tooltip dismiss delay;
wenzelm
parents:
38843
diff
changeset
|
136 |
|
37201
8517a650cfdc
control tooltip font via Swing HTML, with tooltip-font-size property;
wenzelm
parents:
37177
diff
changeset
|
137 |
|
39241 | 138 |
/* icons */ |
139 |
||
140 |
def load_icon(name: String): javax.swing.Icon = |
|
141 |
{ |
|
142 |
val icon = GUIUtilities.loadIcon(name) |
|
143 |
if (icon.getIconWidth < 0 || icon.getIconHeight < 0) |
|
39630
44181423183a
explicit Session.Phase indication with associated event bus;
wenzelm
parents:
39628
diff
changeset
|
144 |
Log.log(Log.ERROR, icon, "Bad icon: " + name) |
39241 | 145 |
icon |
146 |
} |
|
147 |
||
148 |
||
41382 | 149 |
/* check JVM */ |
150 |
||
151 |
def check_jvm() |
|
152 |
{ |
|
153 |
if (!Platform.is_hotspot) { |
|
154 |
Library.warning_dialog(jEdit.getActiveView, "Bad Java Virtual Machine", |
|
155 |
"This is " + Platform.jvm_name, |
|
156 |
"Isabelle/jEdit requires Java Hotspot from Sun/Oracle/Apple!") |
|
157 |
} |
|
158 |
} |
|
159 |
||
160 |
||
38221 | 161 |
/* main jEdit components */ |
34784
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34782
diff
changeset
|
162 |
|
37177 | 163 |
def jedit_buffers(): Iterator[Buffer] = jEdit.getBuffers().iterator |
34784
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34782
diff
changeset
|
164 |
|
37177 | 165 |
def jedit_views(): Iterator[View] = jEdit.getViews().iterator |
34784
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34782
diff
changeset
|
166 |
|
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34782
diff
changeset
|
167 |
def jedit_text_areas(view: View): Iterator[JEditTextArea] = |
37177 | 168 |
view.getEditPanes().iterator.map(_.getTextArea) |
34784
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34782
diff
changeset
|
169 |
|
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34782
diff
changeset
|
170 |
def jedit_text_areas(): Iterator[JEditTextArea] = |
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34782
diff
changeset
|
171 |
jedit_views().flatMap(jedit_text_areas(_)) |
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34782
diff
changeset
|
172 |
|
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34782
diff
changeset
|
173 |
def jedit_text_areas(buffer: JEditBuffer): Iterator[JEditTextArea] = |
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34782
diff
changeset
|
174 |
jedit_text_areas().filter(_.getBuffer == buffer) |
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34782
diff
changeset
|
175 |
|
38843 | 176 |
def buffer_lock[A](buffer: JEditBuffer)(body: => A): A = |
38640 | 177 |
{ |
178 |
try { buffer.readLock(); body } |
|
179 |
finally { buffer.readUnlock() } |
|
180 |
} |
|
181 |
||
38843 | 182 |
def swing_buffer_lock[A](buffer: JEditBuffer)(body: => A): A = |
183 |
Swing_Thread.now { buffer_lock(buffer) { body } } |
|
184 |
||
40474
576b88b1dce9
added buffer_text convenience, with explicit locking;
wenzelm
parents:
39741
diff
changeset
|
185 |
def buffer_text(buffer: JEditBuffer): String = |
576b88b1dce9
added buffer_text convenience, with explicit locking;
wenzelm
parents:
39741
diff
changeset
|
186 |
buffer_lock(buffer) { buffer.getText(0, buffer.getLength) } |
576b88b1dce9
added buffer_text convenience, with explicit locking;
wenzelm
parents:
39741
diff
changeset
|
187 |
|
34784
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34782
diff
changeset
|
188 |
|
43449 | 189 |
/* document model and view */ |
190 |
||
191 |
def document_model(buffer: Buffer): Option[Document_Model] = Document_Model(buffer) |
|
192 |
def document_view(text_area: JEditTextArea): Option[Document_View] = Document_View(text_area) |
|
193 |
||
43510
17d431c92575
init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents:
43487
diff
changeset
|
194 |
def init_model(buffer: Buffer) |
17d431c92575
init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents:
43487
diff
changeset
|
195 |
{ |
17d431c92575
init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents:
43487
diff
changeset
|
196 |
swing_buffer_lock(buffer) { |
17d431c92575
init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents:
43487
diff
changeset
|
197 |
val opt_model = |
17d431c92575
init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents:
43487
diff
changeset
|
198 |
document_model(buffer) match { |
17d431c92575
init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents:
43487
diff
changeset
|
199 |
case Some(model) => Some(model) |
17d431c92575
init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents:
43487
diff
changeset
|
200 |
case None => |
17d431c92575
init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents:
43487
diff
changeset
|
201 |
// FIXME strip protocol prefix of URL |
17d431c92575
init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents:
43487
diff
changeset
|
202 |
Thy_Header.split_thy_path(system.posix_path(buffer.getPath)) match { |
17d431c92575
init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents:
43487
diff
changeset
|
203 |
case Some((dir, thy_name)) => |
17d431c92575
init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents:
43487
diff
changeset
|
204 |
Some(Document_Model.init(session, buffer, dir + "/" + thy_name)) |
17d431c92575
init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents:
43487
diff
changeset
|
205 |
case None => None |
17d431c92575
init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents:
43487
diff
changeset
|
206 |
} |
17d431c92575
init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents:
43487
diff
changeset
|
207 |
} |
17d431c92575
init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents:
43487
diff
changeset
|
208 |
if (opt_model.isDefined) { |
17d431c92575
init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents:
43487
diff
changeset
|
209 |
for (text_area <- jedit_text_areas(buffer)) { |
17d431c92575
init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents:
43487
diff
changeset
|
210 |
if (document_view(text_area).map(_.model) != opt_model) |
17d431c92575
init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents:
43487
diff
changeset
|
211 |
Document_View.init(opt_model.get, text_area) |
17d431c92575
init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents:
43487
diff
changeset
|
212 |
} |
17d431c92575
init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents:
43487
diff
changeset
|
213 |
} |
17d431c92575
init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents:
43487
diff
changeset
|
214 |
} |
17d431c92575
init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents:
43487
diff
changeset
|
215 |
} |
17d431c92575
init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents:
43487
diff
changeset
|
216 |
|
17d431c92575
init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents:
43487
diff
changeset
|
217 |
def exit_model(buffer: Buffer) |
17d431c92575
init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents:
43487
diff
changeset
|
218 |
{ |
17d431c92575
init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents:
43487
diff
changeset
|
219 |
swing_buffer_lock(buffer) { |
17d431c92575
init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents:
43487
diff
changeset
|
220 |
jedit_text_areas(buffer).foreach(Document_View.exit) |
17d431c92575
init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents:
43487
diff
changeset
|
221 |
Document_Model.exit(buffer) |
17d431c92575
init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents:
43487
diff
changeset
|
222 |
} |
17d431c92575
init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents:
43487
diff
changeset
|
223 |
} |
17d431c92575
init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents:
43487
diff
changeset
|
224 |
|
17d431c92575
init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents:
43487
diff
changeset
|
225 |
def init_view(buffer: Buffer, text_area: JEditTextArea) |
17d431c92575
init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents:
43487
diff
changeset
|
226 |
{ |
17d431c92575
init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents:
43487
diff
changeset
|
227 |
swing_buffer_lock(buffer) { |
17d431c92575
init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents:
43487
diff
changeset
|
228 |
document_model(buffer) match { |
17d431c92575
init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents:
43487
diff
changeset
|
229 |
case Some(model) => Document_View.init(model, text_area) |
17d431c92575
init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents:
43487
diff
changeset
|
230 |
case None => |
17d431c92575
init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents:
43487
diff
changeset
|
231 |
} |
17d431c92575
init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents:
43487
diff
changeset
|
232 |
} |
17d431c92575
init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents:
43487
diff
changeset
|
233 |
} |
17d431c92575
init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents:
43487
diff
changeset
|
234 |
|
17d431c92575
init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents:
43487
diff
changeset
|
235 |
def exit_view(buffer: Buffer, text_area: JEditTextArea) |
17d431c92575
init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents:
43487
diff
changeset
|
236 |
{ |
17d431c92575
init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents:
43487
diff
changeset
|
237 |
swing_buffer_lock(buffer) { |
17d431c92575
init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents:
43487
diff
changeset
|
238 |
Document_View.exit(text_area) |
17d431c92575
init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents:
43487
diff
changeset
|
239 |
} |
17d431c92575
init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents:
43487
diff
changeset
|
240 |
} |
17d431c92575
init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents:
43487
diff
changeset
|
241 |
|
43449 | 242 |
|
37068 | 243 |
/* dockable windows */ |
244 |
||
245 |
private def wm(view: View): DockableWindowManager = view.getDockableWindowManager |
|
246 |
||
39515 | 247 |
def docked_session(view: View): Option[Session_Dockable] = |
248 |
wm(view).getDockableWindow("isabelle-session") match { |
|
249 |
case dockable: Session_Dockable => Some(dockable) |
|
250 |
case _ => None |
|
251 |
} |
|
252 |
||
37068 | 253 |
def docked_output(view: View): Option[Output_Dockable] = |
254 |
wm(view).getDockableWindow("isabelle-output") match { |
|
255 |
case dockable: Output_Dockable => Some(dockable) |
|
256 |
case _ => None |
|
257 |
} |
|
258 |
||
259 |
def docked_raw_output(view: View): Option[Raw_Output_Dockable] = |
|
260 |
wm(view).getDockableWindow("isabelle-raw-output") match { |
|
261 |
case dockable: Raw_Output_Dockable => Some(dockable) |
|
262 |
case _ => None |
|
263 |
} |
|
264 |
||
265 |
def docked_protocol(view: View): Option[Protocol_Dockable] = |
|
266 |
wm(view).getDockableWindow("isabelle-protocol") match { |
|
267 |
case dockable: Protocol_Dockable => Some(dockable) |
|
268 |
case _ => None |
|
269 |
} |
|
270 |
||
271 |
||
39517 | 272 |
/* logic image */ |
273 |
||
274 |
def default_logic(): String = |
|
275 |
{ |
|
276 |
val logic = system.getenv("JEDIT_LOGIC") |
|
277 |
if (logic != "") logic |
|
278 |
else system.getenv_strict("ISABELLE_LOGIC") |
|
279 |
} |
|
280 |
||
281 |
class Logic_Entry(val name: String, val description: String) |
|
282 |
{ |
|
283 |
override def toString = description |
|
284 |
} |
|
285 |
||
286 |
def logic_selector(logic: String): ComboBox[Logic_Entry] = |
|
287 |
{ |
|
288 |
val entries = |
|
289 |
new Logic_Entry("", "default (" + default_logic() + ")") :: |
|
290 |
system.find_logics().map(name => new Logic_Entry(name, name)) |
|
291 |
val component = new ComboBox(entries) |
|
292 |
entries.find(_.name == logic) match { |
|
293 |
case None => |
|
294 |
case Some(entry) => component.selection.item = entry |
|
295 |
} |
|
39702 | 296 |
component.tooltip = "Isabelle logic image" |
39517 | 297 |
component |
298 |
} |
|
39702 | 299 |
|
300 |
def start_session() |
|
301 |
{ |
|
40852 | 302 |
val timeout = Time_Property("startup-timeout", Time.seconds(10)) max Time.seconds(5) |
39702 | 303 |
val modes = system.getenv("JEDIT_PRINT_MODE").split(",").toList.map("-m" + _) |
304 |
val logic = { |
|
305 |
val logic = Property("logic") |
|
306 |
if (logic != null && logic != "") logic |
|
307 |
else Isabelle.default_logic() |
|
308 |
} |
|
40850 | 309 |
session.start(timeout, modes ::: List(logic)) |
39702 | 310 |
} |
34318
c13e168a8ae6
original sources from Johannes Hölzl a48e0c6ab1aea77c52d596f7efc007a543d3d10c with minor modifications of directory layout;
wenzelm
parents:
diff
changeset
|
311 |
} |
c13e168a8ae6
original sources from Johannes Hölzl a48e0c6ab1aea77c52d596f7efc007a543d3d10c with minor modifications of directory layout;
wenzelm
parents:
diff
changeset
|
312 |
|
34429 | 313 |
|
34618 | 314 |
class Plugin extends EBPlugin |
315 |
{ |
|
39630
44181423183a
explicit Session.Phase indication with associated event bus;
wenzelm
parents:
39628
diff
changeset
|
316 |
/* session management */ |
44181423183a
explicit Session.Phase indication with associated event bus;
wenzelm
parents:
39628
diff
changeset
|
317 |
|
43510
17d431c92575
init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents:
43487
diff
changeset
|
318 |
@volatile private var session_ready = false |
39735
969ede84aac0
more uniform init/exit model/view in session_manager, trading race wrt. session.phase for race wrt. global editor state;
wenzelm
parents:
39702
diff
changeset
|
319 |
|
39633 | 320 |
private val session_manager = actor { |
321 |
loop { |
|
322 |
react { |
|
39735
969ede84aac0
more uniform init/exit model/view in session_manager, trading race wrt. session.phase for race wrt. global editor state;
wenzelm
parents:
39702
diff
changeset
|
323 |
case phase: Session.Phase => |
43510
17d431c92575
init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents:
43487
diff
changeset
|
324 |
session_ready = phase == Session.Ready |
39735
969ede84aac0
more uniform init/exit model/view in session_manager, trading race wrt. session.phase for race wrt. global editor state;
wenzelm
parents:
39702
diff
changeset
|
325 |
phase match { |
969ede84aac0
more uniform init/exit model/view in session_manager, trading race wrt. session.phase for race wrt. global editor state;
wenzelm
parents:
39702
diff
changeset
|
326 |
case Session.Failed => |
969ede84aac0
more uniform init/exit model/view in session_manager, trading race wrt. session.phase for race wrt. global editor state;
wenzelm
parents:
39702
diff
changeset
|
327 |
Swing_Thread.now { |
969ede84aac0
more uniform init/exit model/view in session_manager, trading race wrt. session.phase for race wrt. global editor state;
wenzelm
parents:
39702
diff
changeset
|
328 |
val text = new scala.swing.TextArea(Isabelle.session.syslog()) |
969ede84aac0
more uniform init/exit model/view in session_manager, trading race wrt. session.phase for race wrt. global editor state;
wenzelm
parents:
39702
diff
changeset
|
329 |
text.editable = false |
969ede84aac0
more uniform init/exit model/view in session_manager, trading race wrt. session.phase for race wrt. global editor state;
wenzelm
parents:
39702
diff
changeset
|
330 |
Library.error_dialog(jEdit.getActiveView, "Failed to start Isabelle process", text) |
969ede84aac0
more uniform init/exit model/view in session_manager, trading race wrt. session.phase for race wrt. global editor state;
wenzelm
parents:
39702
diff
changeset
|
331 |
} |
969ede84aac0
more uniform init/exit model/view in session_manager, trading race wrt. session.phase for race wrt. global editor state;
wenzelm
parents:
39702
diff
changeset
|
332 |
|
43510
17d431c92575
init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents:
43487
diff
changeset
|
333 |
case Session.Ready => Isabelle.jedit_buffers.foreach(Isabelle.init_model) |
17d431c92575
init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents:
43487
diff
changeset
|
334 |
case Session.Shutdown => Isabelle.jedit_buffers.foreach(Isabelle.exit_model) |
39735
969ede84aac0
more uniform init/exit model/view in session_manager, trading race wrt. session.phase for race wrt. global editor state;
wenzelm
parents:
39702
diff
changeset
|
335 |
case _ => |
969ede84aac0
more uniform init/exit model/view in session_manager, trading race wrt. session.phase for race wrt. global editor state;
wenzelm
parents:
39702
diff
changeset
|
336 |
} |
969ede84aac0
more uniform init/exit model/view in session_manager, trading race wrt. session.phase for race wrt. global editor state;
wenzelm
parents:
39702
diff
changeset
|
337 |
|
969ede84aac0
more uniform init/exit model/view in session_manager, trading race wrt. session.phase for race wrt. global editor state;
wenzelm
parents:
39702
diff
changeset
|
338 |
case bad => System.err.println("session_manager: ignoring bad message " + bad) |
39630
44181423183a
explicit Session.Phase indication with associated event bus;
wenzelm
parents:
39628
diff
changeset
|
339 |
} |
44181423183a
explicit Session.Phase indication with associated event bus;
wenzelm
parents:
39628
diff
changeset
|
340 |
} |
44181423183a
explicit Session.Phase indication with associated event bus;
wenzelm
parents:
39628
diff
changeset
|
341 |
} |
44181423183a
explicit Session.Phase indication with associated event bus;
wenzelm
parents:
39628
diff
changeset
|
342 |
|
44181423183a
explicit Session.Phase indication with associated event bus;
wenzelm
parents:
39628
diff
changeset
|
343 |
|
34618 | 344 |
/* main plugin plumbing */ |
34433 | 345 |
|
34767 | 346 |
override def handleMessage(message: EBMessage) |
34618 | 347 |
{ |
43510
17d431c92575
init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents:
43487
diff
changeset
|
348 |
Swing_Thread.assert() |
34767 | 349 |
message match { |
41383
514bb82514df
check JVM later, to avoid potential conflict with jEdit splash screen;
wenzelm
parents:
41382
diff
changeset
|
350 |
case msg: EditorStarted => |
43510
17d431c92575
init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents:
43487
diff
changeset
|
351 |
Isabelle.check_jvm() |
17d431c92575
init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents:
43487
diff
changeset
|
352 |
if (Isabelle.Boolean_Property("auto-start")) |
17d431c92575
init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents:
43487
diff
changeset
|
353 |
Isabelle.start_session() |
39630
44181423183a
explicit Session.Phase indication with associated event bus;
wenzelm
parents:
39628
diff
changeset
|
354 |
|
37557
1ae272fd4082
refresh Isabelle token marker after buffer properties changed, e.g. when fold mode is switched;
wenzelm
parents:
37241
diff
changeset
|
355 |
case msg: BufferUpdate |
39735
969ede84aac0
more uniform init/exit model/view in session_manager, trading race wrt. session.phase for race wrt. global editor state;
wenzelm
parents:
39702
diff
changeset
|
356 |
if msg.getWhat == BufferUpdate.PROPERTIES_CHANGED => |
39634 | 357 |
|
39633 | 358 |
val buffer = msg.getBuffer |
43510
17d431c92575
init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents:
43487
diff
changeset
|
359 |
if (buffer != null && session_ready) |
17d431c92575
init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents:
43487
diff
changeset
|
360 |
Isabelle.init_model(buffer) |
37557
1ae272fd4082
refresh Isabelle token marker after buffer properties changed, e.g. when fold mode is switched;
wenzelm
parents:
37241
diff
changeset
|
361 |
|
39634 | 362 |
case msg: EditPaneUpdate |
39735
969ede84aac0
more uniform init/exit model/view in session_manager, trading race wrt. session.phase for race wrt. global editor state;
wenzelm
parents:
39702
diff
changeset
|
363 |
if (msg.getWhat == EditPaneUpdate.BUFFER_CHANGING || |
39637
cc3452317b5f
slightly more robust EditBus plumbing wrt. Document_View/Document_Model;
wenzelm
parents:
39634
diff
changeset
|
364 |
msg.getWhat == EditPaneUpdate.BUFFER_CHANGED || |
39634 | 365 |
msg.getWhat == EditPaneUpdate.CREATED || |
366 |
msg.getWhat == EditPaneUpdate.DESTROYED) => |
|
367 |
||
34784
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34782
diff
changeset
|
368 |
val edit_pane = msg.getEditPane |
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34782
diff
changeset
|
369 |
val buffer = edit_pane.getBuffer |
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34782
diff
changeset
|
370 |
val text_area = edit_pane.getTextArea |
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34782
diff
changeset
|
371 |
|
39637
cc3452317b5f
slightly more robust EditBus plumbing wrt. Document_View/Document_Model;
wenzelm
parents:
39634
diff
changeset
|
372 |
if (buffer != null && text_area != null) { |
39735
969ede84aac0
more uniform init/exit model/view in session_manager, trading race wrt. session.phase for race wrt. global editor state;
wenzelm
parents:
39702
diff
changeset
|
373 |
if (msg.getWhat == EditPaneUpdate.BUFFER_CHANGED || |
43510
17d431c92575
init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents:
43487
diff
changeset
|
374 |
msg.getWhat == EditPaneUpdate.CREATED) { |
17d431c92575
init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents:
43487
diff
changeset
|
375 |
if (session_ready) |
17d431c92575
init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents:
43487
diff
changeset
|
376 |
Isabelle.init_view(buffer, text_area) |
17d431c92575
init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents:
43487
diff
changeset
|
377 |
} |
17d431c92575
init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents:
43487
diff
changeset
|
378 |
else Isabelle.exit_view(buffer, text_area) |
34671 | 379 |
} |
34784
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34782
diff
changeset
|
380 |
|
34777
91d6089cef88
class Session models full session, with or without prover process (cf. heaps, browser_info);
wenzelm
parents:
34774
diff
changeset
|
381 |
case msg: PropertiesChanged => |
43390 | 382 |
Swing_Thread.now { Isabelle.setup_tooltips() } |
34791 | 383 |
Isabelle.session.global_settings.event(Session.Global_Settings) |
34784
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34782
diff
changeset
|
384 |
|
34318
c13e168a8ae6
original sources from Johannes Hölzl a48e0c6ab1aea77c52d596f7efc007a543d3d10c with minor modifications of directory layout;
wenzelm
parents:
diff
changeset
|
385 |
case _ => |
c13e168a8ae6
original sources from Johannes Hölzl a48e0c6ab1aea77c52d596f7efc007a543d3d10c with minor modifications of directory layout;
wenzelm
parents:
diff
changeset
|
386 |
} |
c13e168a8ae6
original sources from Johannes Hölzl a48e0c6ab1aea77c52d596f7efc007a543d3d10c with minor modifications of directory layout;
wenzelm
parents:
diff
changeset
|
387 |
} |
c13e168a8ae6
original sources from Johannes Hölzl a48e0c6ab1aea77c52d596f7efc007a543d3d10c with minor modifications of directory layout;
wenzelm
parents:
diff
changeset
|
388 |
|
34618 | 389 |
override def start() |
390 |
{ |
|
43443
5d9693c2337e
basic support for extended syntax styles: sub/superscript;
wenzelm
parents:
43390
diff
changeset
|
391 |
Isabelle.plugin = this |
39630
44181423183a
explicit Session.Phase indication with associated event bus;
wenzelm
parents:
39628
diff
changeset
|
392 |
Isabelle.setup_tooltips() |
34615 | 393 |
Isabelle.system = new Isabelle_System |
34774 | 394 |
Isabelle.system.install_fonts() |
39628
f6e82967b5cd
Plugin.stop: refrain from invalidating Isabelle.session -- some actors/dockables out there might still refer to it;
wenzelm
parents:
39518
diff
changeset
|
395 |
Isabelle.session = new Session(Isabelle.system) |
43487 | 396 |
SyntaxUtilities.setStyleExtender(new Token_Markup.Style_Extender(Isabelle.system.symbols)) |
43482
ebb90ff55b79
added SyntaxUtilities.StyleExtender hook, with actual functionality in Isabelle/Scala;
wenzelm
parents:
43460
diff
changeset
|
397 |
ModeProvider.instance = new Token_Markup.Mode_Provider(ModeProvider.instance) |
39633 | 398 |
Isabelle.session.phase_changed += session_manager |
34318
c13e168a8ae6
original sources from Johannes Hölzl a48e0c6ab1aea77c52d596f7efc007a543d3d10c with minor modifications of directory layout;
wenzelm
parents:
diff
changeset
|
399 |
} |
34618 | 400 |
|
39628
f6e82967b5cd
Plugin.stop: refrain from invalidating Isabelle.session -- some actors/dockables out there might still refer to it;
wenzelm
parents:
39518
diff
changeset
|
401 |
override def stop() |
34618 | 402 |
{ |
39628
f6e82967b5cd
Plugin.stop: refrain from invalidating Isabelle.session -- some actors/dockables out there might still refer to it;
wenzelm
parents:
39518
diff
changeset
|
403 |
Isabelle.session.stop() |
39633 | 404 |
Isabelle.session.phase_changed -= session_manager |
34318
c13e168a8ae6
original sources from Johannes Hölzl a48e0c6ab1aea77c52d596f7efc007a543d3d10c with minor modifications of directory layout;
wenzelm
parents:
diff
changeset
|
405 |
} |
c13e168a8ae6
original sources from Johannes Hölzl a48e0c6ab1aea77c52d596f7efc007a543d3d10c with minor modifications of directory layout;
wenzelm
parents:
diff
changeset
|
406 |
} |