# HG changeset patch
# User wenzelm
# Date 1626372903 -7200
# Node ID fbb30dac95a2c48769f7ca73e84755633c5e2527
# Parent  3868fed3c34bb4c5c42d3e0f77c252bc52f24510
clarified startup: implicitly enforce activation of isabelle.jedit_main.Plugin;

diff -r 3868fed3c34b -r fbb30dac95a2 src/Tools/jEdit/jedit_main/build.props
--- a/src/Tools/jEdit/jedit_main/build.props	Thu Jul 15 20:11:23 2021 +0200
+++ b/src/Tools/jEdit/jedit_main/build.props	Thu Jul 15 20:15:03 2021 +0200
@@ -11,5 +11,7 @@
   services.xml
 sources = \
   isabelle_sidekick.scala \
+  dockables.scala \
   plugin.scala \
-  scala_console.scala
+  scala_console.scala \
+  services.scala
diff -r 3868fed3c34b -r fbb30dac95a2 src/Tools/jEdit/jedit_main/dockables.scala
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/Tools/jEdit/jedit_main/dockables.scala	Thu Jul 15 20:15:03 2021 +0200
@@ -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 -r 3868fed3c34b -r fbb30dac95a2 src/Tools/jEdit/jedit_main/dockables.xml
--- a/src/Tools/jEdit/jedit_main/dockables.xml	Thu Jul 15 20:11:23 2021 +0200
+++ b/src/Tools/jEdit/jedit_main/dockables.xml	Thu Jul 15 20:15:03 2021 +0200
@@ -3,51 +3,51 @@
 
 <DOCKABLES>
 	<DOCKABLE NAME="isabelle-debugger" MOVABLE="TRUE">
-		new isabelle.jedit.Debugger_Dockable(view, position);
+		new isabelle.jedit_main.Debugger_Dockable(view, position);
 	</DOCKABLE>
 	<DOCKABLE NAME="isabelle-documentation" MOVABLE="TRUE">
-		new isabelle.jedit.Documentation_Dockable(view, position);
+		new isabelle.jedit_main.Documentation_Dockable(view, position);
 	</DOCKABLE>
 	<DOCKABLE NAME="isabelle-info" MOVABLE="TRUE">
-		new isabelle.jedit.Info_Dockable(view, position);
+		new isabelle.jedit_main.Info_Dockable(view, position);
 	</DOCKABLE>
 	<DOCKABLE NAME="isabelle-graphview" MOVABLE="TRUE">
-		new isabelle.jedit.Graphview_Dockable(view, position);
+		new isabelle.jedit_main.Graphview_Dockable(view, position);
 	</DOCKABLE>
 	<DOCKABLE NAME="isabelle-monitor" MOVABLE="TRUE">
-		new isabelle.jedit.Monitor_Dockable(view, position);
+		new isabelle.jedit_main.Monitor_Dockable(view, position);
 	</DOCKABLE>
 	<DOCKABLE NAME="isabelle-output" MOVABLE="TRUE">
-		new isabelle.jedit.Output_Dockable(view, position);
+		new isabelle.jedit_main.Output_Dockable(view, position);
 	</DOCKABLE>
 	<DOCKABLE NAME="isabelle-protocol" MOVABLE="TRUE">
-		new isabelle.jedit.Protocol_Dockable(view, position);
+		new isabelle.jedit_main.Protocol_Dockable(view, position);
 	</DOCKABLE>
 	<DOCKABLE NAME="isabelle-query" MOVABLE="TRUE">
-		new isabelle.jedit.Query_Dockable(view, position);
+		new isabelle.jedit_main.Query_Dockable(view, position);
 	</DOCKABLE>
 	<DOCKABLE NAME="isabelle-raw-output" MOVABLE="TRUE">
-		new isabelle.jedit.Raw_Output_Dockable(view, position);
+		new isabelle.jedit_main.Raw_Output_Dockable(view, position);
 	</DOCKABLE>
 	<DOCKABLE NAME="isabelle-simplifier-trace" MOVABLE="TRUE">
-		new isabelle.jedit.Simplifier_Trace_Dockable(view, position);
+		new isabelle.jedit_main.Simplifier_Trace_Dockable(view, position);
 	</DOCKABLE>
 	<DOCKABLE NAME="isabelle-sledgehammer" MOVABLE="TRUE">
-		new isabelle.jedit.Sledgehammer_Dockable(view, position);
+		new isabelle.jedit_main.Sledgehammer_Dockable(view, position);
 	</DOCKABLE>
 	<DOCKABLE NAME="isabelle-state" MOVABLE="TRUE">
-		new isabelle.jedit.State_Dockable(view, position);
+		new isabelle.jedit_main.State_Dockable(view, position);
 	</DOCKABLE>
 	<DOCKABLE NAME="isabelle-symbols" MOVABLE="TRUE">
-		new isabelle.jedit.Symbols_Dockable(view, position);
+		new isabelle.jedit_main.Symbols_Dockable(view, position);
 	</DOCKABLE>
 	<DOCKABLE NAME="isabelle-syslog" MOVABLE="TRUE">
-		new isabelle.jedit.Syslog_Dockable(view, position);
+		new isabelle.jedit_main.Syslog_Dockable(view, position);
 	</DOCKABLE>
 	<DOCKABLE NAME="isabelle-theories" MOVABLE="TRUE">
-		new isabelle.jedit.Theories_Dockable(view, position);
+		new isabelle.jedit_main.Theories_Dockable(view, position);
 	</DOCKABLE>
 	<DOCKABLE NAME="isabelle-timing" MOVABLE="TRUE">
-		new isabelle.jedit.Timing_Dockable(view, position);
+		new isabelle.jedit_main.Timing_Dockable(view, position);
 	</DOCKABLE>
 </DOCKABLES>
diff -r 3868fed3c34b -r fbb30dac95a2 src/Tools/jEdit/jedit_main/plugin.props
--- a/src/Tools/jEdit/jedit_main/plugin.props	Thu Jul 15 20:11:23 2021 +0200
+++ b/src/Tools/jEdit/jedit_main/plugin.props	Thu Jul 15 20:15:03 2021 +0200
@@ -9,7 +9,7 @@
 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
diff -r 3868fed3c34b -r fbb30dac95a2 src/Tools/jEdit/jedit_main/services.scala
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/Tools/jEdit/jedit_main/services.scala	Thu Jul 15 20:15:03 2021 +0200
@@ -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 -r 3868fed3c34b -r fbb30dac95a2 src/Tools/jEdit/jedit_main/services.xml
--- a/src/Tools/jEdit/jedit_main/services.xml	Thu Jul 15 20:11:23 2021 +0200
+++ b/src/Tools/jEdit/jedit_main/services.xml	Thu Jul 15 20:15:03 2021 +0200
@@ -3,16 +3,16 @@
 
 <SERVICES>
   <SERVICE CLASS="org.gjt.sp.jedit.buffer.FoldHandler" NAME="isabelle">
-    new isabelle.jedit.Fold_Handling.Fold_Handler();
+    new isabelle.jedit_main.Fold_Handler();
   </SERVICE>
   <SERVICE CLASS="org.gjt.sp.jedit.gui.DynamicContextMenuService" NAME="Spell_Checker">
-    new isabelle.jedit.Context_Menu();
+    new isabelle.jedit_main.Context_Menu();
   </SERVICE>
   <SERVICE NAME="isabelle-export" CLASS="org.gjt.sp.jedit.io.VFS">
-    new isabelle.jedit.Isabelle_Export.VFS();
+    new isabelle.jedit_main.Isabelle_Export_VFS();
   </SERVICE>
   <SERVICE NAME="isabelle-session" CLASS="org.gjt.sp.jedit.io.VFS">
-    new isabelle.jedit.Isabelle_Session.VFS();
+    new isabelle.jedit_main.Isabelle_Session_VFS();
   </SERVICE>
   <SERVICE NAME="isabelle" CLASS="sidekick.SideKickParser">
     new isabelle.jedit_main.Isabelle_Sidekick_Default();
@@ -45,15 +45,15 @@
     new isabelle.jedit_main.Scala_Console();
   </SERVICE>
   <SERVICE CLASS="isabelle.jedit.Active$Handler" NAME="misc">
-    new isabelle.jedit.Active$Misc_Handler();
+    new isabelle.jedit_main.Active_Misc_Handler();
   </SERVICE>
   <SERVICE CLASS="isabelle.jedit.Active$Handler" NAME="graphview">
-    new isabelle.jedit.Graphview_Dockable$Handler()
+    new isabelle.jedit_main.Graphview_Dockable_Handler()
   </SERVICE>
   <SERVICE CLASS="org.gjt.sp.jedit.gui.statusbar.StatusWidgetFactory" NAME="java-status">
-    new isabelle.jedit.Status_Widget$Java_Factory();
+    new isabelle.jedit_main.Status_Widget_Java_Factory();
   </SERVICE>
   <SERVICE CLASS="org.gjt.sp.jedit.gui.statusbar.StatusWidgetFactory" NAME="ml-status">
-    new isabelle.jedit.Status_Widget$ML_Factory();
+    new isabelle.jedit_main.Status_Widget_ML_Factory();
   </SERVICE>
 </SERVICES>