diff --git a/src/Tools/jEdit/jedit_main/build.props b/src/Tools/jEdit/jedit_main/build.props
--- a/src/Tools/jEdit/jedit_main/build.props
+++ b/src/Tools/jEdit/jedit_main/build.props
@@ -1,15 +1,17 @@
description = Isabelle/jEdit main plugin
lib = $JEDIT_SETTINGS/jars
name = isabelle_jedit_main
requirements = \
env:ISABELLE_SCALA_JAR \
env:JEDIT_JARS
resources = \
actions.xml \
dockables.xml \
plugin.props \
services.xml
sources = \
isabelle_sidekick.scala \
+ dockables.scala \
plugin.scala \
- scala_console.scala
+ scala_console.scala \
+ services.scala
diff --git a/src/Tools/jEdit/jedit_main/dockables.scala b/src/Tools/jEdit/jedit_main/dockables.scala
new file mode 100644
--- /dev/null
+++ b/src/Tools/jEdit/jedit_main/dockables.scala
@@ -0,0 +1,50 @@
+/* Title: Tools/jEdit/jedit_main/dockables.scala
+ Author: Makarius
+
+Isabelle/jEdit dockables.
+*/
+
+package isabelle.jedit_main
+
+
+import org.gjt.sp.jedit.View
+
+
+class Debugger_Dockable(view: View, position: String)
+ extends isabelle.jedit.Debugger_Dockable(view, position)
+
+class Documentation_Dockable(view: View, position: String)
+ extends isabelle.jedit.Documentation_Dockable(view, position)
+
+class Info_Dockable(view: View, position: String)
+ extends isabelle.jedit.Info_Dockable(view, position)
+
+class Graphview_Dockable(view: View, position: String)
+ extends isabelle.jedit.Graphview_Dockable(view, position)
+
+class Protocol_Dockable(view: View, position: String)
+ extends isabelle.jedit.Protocol_Dockable(view, position)
+
+class Query_Dockable(view: View, position: String)
+ extends isabelle.jedit.Query_Dockable(view, position)
+
+class Raw_Output_Dockable(view: View, position: String)
+ extends isabelle.jedit.Raw_Output_Dockable(view, position)
+
+class Simplifier_Trace_Dockable(view: View, position: String)
+ extends isabelle.jedit.Simplifier_Trace_Dockable(view, position)
+
+class Sledgehammer_Dockable(view: View, position: String)
+ extends isabelle.jedit.Sledgehammer_Dockable(view, position)
+
+class State_Dockable(view: View, position: String)
+ extends isabelle.jedit.State_Dockable(view, position)
+
+class Syslog_Dockable(view: View, position: String)
+ extends isabelle.jedit.Syslog_Dockable(view, position)
+
+class Theories_Dockable(view: View, position: String)
+ extends isabelle.jedit.Theories_Dockable(view, position)
+
+class Timing_Dockable(view: View, position: String)
+ extends isabelle.jedit.Timing_Dockable(view, position)
diff --git a/src/Tools/jEdit/jedit_main/dockables.xml b/src/Tools/jEdit/jedit_main/dockables.xml
--- a/src/Tools/jEdit/jedit_main/dockables.xml
+++ b/src/Tools/jEdit/jedit_main/dockables.xml
@@ -1,53 +1,53 @@
- new isabelle.jedit.Debugger_Dockable(view, position);
+ new isabelle.jedit_main.Debugger_Dockable(view, position);
- new isabelle.jedit.Documentation_Dockable(view, position);
+ new isabelle.jedit_main.Documentation_Dockable(view, position);
- new isabelle.jedit.Info_Dockable(view, position);
+ new isabelle.jedit_main.Info_Dockable(view, position);
- new isabelle.jedit.Graphview_Dockable(view, position);
+ new isabelle.jedit_main.Graphview_Dockable(view, position);
- new isabelle.jedit.Monitor_Dockable(view, position);
+ new isabelle.jedit_main.Monitor_Dockable(view, position);
- new isabelle.jedit.Output_Dockable(view, position);
+ new isabelle.jedit_main.Output_Dockable(view, position);
- new isabelle.jedit.Protocol_Dockable(view, position);
+ new isabelle.jedit_main.Protocol_Dockable(view, position);
- new isabelle.jedit.Query_Dockable(view, position);
+ new isabelle.jedit_main.Query_Dockable(view, position);
- new isabelle.jedit.Raw_Output_Dockable(view, position);
+ new isabelle.jedit_main.Raw_Output_Dockable(view, position);
- new isabelle.jedit.Simplifier_Trace_Dockable(view, position);
+ new isabelle.jedit_main.Simplifier_Trace_Dockable(view, position);
- new isabelle.jedit.Sledgehammer_Dockable(view, position);
+ new isabelle.jedit_main.Sledgehammer_Dockable(view, position);
- new isabelle.jedit.State_Dockable(view, position);
+ new isabelle.jedit_main.State_Dockable(view, position);
- new isabelle.jedit.Symbols_Dockable(view, position);
+ new isabelle.jedit_main.Symbols_Dockable(view, position);
- new isabelle.jedit.Syslog_Dockable(view, position);
+ new isabelle.jedit_main.Syslog_Dockable(view, position);
- new isabelle.jedit.Theories_Dockable(view, position);
+ new isabelle.jedit_main.Theories_Dockable(view, position);
- new isabelle.jedit.Timing_Dockable(view, position);
+ new isabelle.jedit_main.Timing_Dockable(view, position);
diff --git a/src/Tools/jEdit/jedit_main/plugin.props b/src/Tools/jEdit/jedit_main/plugin.props
--- a/src/Tools/jEdit/jedit_main/plugin.props
+++ b/src/Tools/jEdit/jedit_main/plugin.props
@@ -1,111 +1,111 @@
## Isabelle/jEdit plugin properties
##
##:wrap=soft:maxLineLen=100:
#identification
plugin.isabelle.jedit_main.Plugin.name=Isabelle
plugin.isabelle.jedit_main.Plugin.author=Johannes H\u00F6lzl, Lars Hupel, Fabian Immler, Markus Kaiser, Makarius Wenzel
plugin.isabelle.jedit_main.Plugin.version=11.2
plugin.isabelle.jedit_main.Plugin.description=Isabelle Prover IDE
#system parameters
-plugin.isabelle.jedit_main.Plugin.activate=startup # FIXME
+plugin.isabelle.jedit_main.Plugin.activate=defer
plugin.isabelle.jedit_main.Plugin.usePluginHome=false
#dependencies
plugin.isabelle.jedit_main.Plugin.depend.0=jdk 11
plugin.isabelle.jedit_main.Plugin.depend.1=jedit 05.05.00.00
plugin.isabelle.jedit_main.Plugin.depend.2=plugin console.ConsolePlugin 5.1.4
plugin.isabelle.jedit_main.Plugin.depend.3=plugin errorlist.ErrorListPlugin 2.3
plugin.isabelle.jedit_main.Plugin.depend.4=plugin sidekick.SideKickPlugin 1.8
plugin.isabelle.jedit_main.Plugin.depend.5=plugin isabelle.jedit_base.Plugin 1.0
#options
plugin.isabelle.jedit_main.Plugin.option-group=isabelle-general isabelle-rendering
options.isabelle-general.label=General
options.isabelle-general.code=new isabelle.jedit.Isabelle_Options1();
options.isabelle-rendering.label=Rendering
options.isabelle-rendering.code=new isabelle.jedit.Isabelle_Options2();
#menu actions and dockables
plugin.isabelle.jedit_main.Plugin.menu.label=Isabelle
plugin.isabelle.jedit_main.Plugin.menu= \
isabelle-export-browser \
isabelle-session-browser \
isabelle.preview \
isabelle.draft \
isabelle.java-monitor \
- \
isabelle-debugger \
isabelle-documentation \
isabelle-monitor \
isabelle-output \
isabelle-protocol \
isabelle-query \
isabelle-raw-output \
isabelle-simplifier-trace \
isabelle-sledgehammer \
isabelle-state \
isabelle-symbols \
isabelle-syslog \
isabelle-theories \
isabelle-timing
isabelle-debugger.label=Debugger panel
isabelle-debugger.title=Debugger
isabelle-documentation.label=Documentation panel
isabelle-documentation.title=Documentation
isabelle-graphview.label=Graphview panel
isabelle-graphview.title=Graphview
isabelle-info.label=Info panel
isabelle-info.title=Info
isabelle-monitor.label=Monitor panel
isabelle-monitor.title=Monitor
isabelle-output.label=Output panel
isabelle-output.title=Output
isabelle-protocol.label=Protocol panel
isabelle-protocol.title=Protocol
isabelle-query.label=Query panel
isabelle-query.title=Query
isabelle-raw-output.label=Raw Output panel
isabelle-raw-output.title=Raw Output
isabelle-simplifier-trace.label=Simplifier Trace panel
isabelle-simplifier-trace.title=Simplifier Trace
isabelle-sledgehammer.label=Sledgehammer panel
isabelle-sledgehammer.title=Sledgehammer
isabelle-state.label=State panel
isabelle-state.title=State
isabelle-symbols.label=Symbols panel
isabelle-symbols.title=Symbols
isabelle-syslog.label=Syslog panel
isabelle-syslog.title=Syslog
isabelle-theories.label=Theories panel
isabelle-theories.title=Theories
isabelle-timing.label=Timing panel
isabelle-timing.title=Timing
#SideKick
mode.isabelle-news.folding=sidekick
mode.isabelle-news.sidekick.parser=isabelle-news
mode.isabelle-options.folding=sidekick
mode.isabelle-options.sidekick.parser=isabelle-options
mode.isabelle-root.folding=sidekick
mode.isabelle-root.sidekick.parser=isabelle-root
mode.isabelle.customSettings=true
mode.isabelle.folding=isabelle
mode.isabelle.sidekick.parser=isabelle
mode.isabelle.sidekick.showStatusWindow.label=true
mode.isabelle-ml.folding=sidekick
mode.isabelle-ml.sidekick.parser=isabelle-ml
mode.sml.folding=sidekick
mode.sml.sidekick.parser=isabelle-sml
mode.bibtex.folding=sidekick
mode.bibtex.sidekick.parser=bibtex
sidekick.parser.isabelle.label=isabelle
sidekick.parser.isabelle-context.label=isabelle-context
sidekick.parser.isabelle-markup.label=isabelle-markup
sidekick.parser.isabelle-ml.label=isabelle-ml
sidekick.parser.isabelle-sml.label=isabelle-sml
sidekick.parser.isabelle-news.label=isabelle-news
sidekick.parser.isabelle-options.label=isabelle-options
sidekick.parser.isabelle-root.label=isabelle-root
sidekick.parser.bibtex.label=bibtex
diff --git a/src/Tools/jEdit/jedit_main/services.scala b/src/Tools/jEdit/jedit_main/services.scala
new file mode 100644
--- /dev/null
+++ b/src/Tools/jEdit/jedit_main/services.scala
@@ -0,0 +1,24 @@
+/* Title: Tools/jEdit/jedit_main/services.scala
+ Author: Makarius
+
+Isabelle/jEdit services.
+*/
+
+package isabelle.jedit_main
+
+
+class Fold_Handler extends isabelle.jedit.Fold_Handling.Fold_Handler
+
+class Context_Menu extends isabelle.jedit.Context_Menu
+
+class Isabelle_Export_VFS extends isabelle.jedit.Isabelle_Export.VFS
+
+class Isabelle_Session_VFS extends isabelle.jedit.Isabelle_Session.VFS
+
+class Active_Misc_Handler extends isabelle.jedit.Active.Misc_Handler
+
+class Graphview_Dockable_Handler extends isabelle.jedit.Graphview_Dockable.Handler
+
+class Status_Widget_Java_Factory extends isabelle.jedit.Status_Widget.Java_Factory
+
+class Status_Widget_ML_Factory extends isabelle.jedit.Status_Widget.ML_Factory
diff --git a/src/Tools/jEdit/jedit_main/services.xml b/src/Tools/jEdit/jedit_main/services.xml
--- a/src/Tools/jEdit/jedit_main/services.xml
+++ b/src/Tools/jEdit/jedit_main/services.xml
@@ -1,59 +1,59 @@
- new isabelle.jedit.Fold_Handling.Fold_Handler();
+ new isabelle.jedit_main.Fold_Handler();
- new isabelle.jedit.Isabelle_Export.VFS();
+ new isabelle.jedit_main.Isabelle_Export_VFS();
- new isabelle.jedit.Isabelle_Session.VFS();
+ new isabelle.jedit_main.Isabelle_Session_VFS();
new isabelle.jedit_main.Isabelle_Sidekick_Default();
new isabelle.jedit_main.Isabelle_Sidekick_Context();
new isabelle.jedit_main.Isabelle_Sidekick_Markup();
new isabelle.jedit_main.Isabelle_Sidekick_ML();
new isabelle.jedit_main.Isabelle_Sidekick_SML();
new isabelle.jedit_main.Isabelle_Sidekick_News();
new isabelle.jedit_main.Isabelle_Sidekick_Options();
new isabelle.jedit_main.Isabelle_Sidekick_Root();
new isabelle.jedit_main.Isabelle_Sidekick_Bibtex();
new isabelle.jedit_main.Scala_Console();
- new isabelle.jedit.Active$Misc_Handler();
+ new isabelle.jedit_main.Active_Misc_Handler();
- new isabelle.jedit.Graphview_Dockable$Handler()
+ new isabelle.jedit_main.Graphview_Dockable_Handler()
- new isabelle.jedit.Status_Widget$Java_Factory();
+ new isabelle.jedit_main.Status_Widget_Java_Factory();
- new isabelle.jedit.Status_Widget$ML_Factory();
+ new isabelle.jedit_main.Status_Widget_ML_Factory();