# HG changeset patch # User wenzelm # Date 1229789789 -3600 # Node ID d5a41da986c377c01955f65c930294932f64e784 # Parent c57a53d4469aa413c081ed55eb9822d495d015a6 more conventional action names; diff -r c57a53d4469a -r d5a41da986c3 src/Tools/jEdit/plugin/actions.xml --- a/src/Tools/jEdit/plugin/actions.xml Sat Dec 20 17:14:27 2008 +0100 +++ b/src/Tools/jEdit/plugin/actions.xml Sat Dec 20 17:16:29 2008 +0100 @@ -1,20 +1,20 @@ - + - wm.addDockableWindow("Isabelle_output"); + wm.addDockableWindow("isabelle-output"); - + - wm.addDockableWindow("Isabelle_state"); + wm.addDockableWindow("isabelle-state"); - + - wm.addDockableWindow("Isabelle_scroller"); + wm.addDockableWindow("isabelle-scroller"); - + isabelle.jedit.Plugin$.MODULE$.plugin().install(view); diff -r c57a53d4469a -r d5a41da986c3 src/Tools/jEdit/plugin/dockables.xml --- a/src/Tools/jEdit/plugin/dockables.xml Sat Dec 20 17:14:27 2008 +0100 +++ b/src/Tools/jEdit/plugin/dockables.xml Sat Dec 20 17:16:29 2008 +0100 @@ -3,13 +3,13 @@ - + new isabelle.jedit.OutputDockable(view, position); - + new isabelle.jedit.StateViewDockable(view, position); - + new isabelle.jedit.ScrollerDockable(view, position); \ No newline at end of file diff -r c57a53d4469a -r d5a41da986c3 src/Tools/jEdit/src/jedit/Plugin.scala --- a/src/Tools/jEdit/src/jedit/Plugin.scala Sat Dec 20 17:14:27 2008 +0100 +++ b/src/Tools/jEdit/src/jedit/Plugin.scala Sat Dec 20 17:16:29 2008 +0100 @@ -79,7 +79,7 @@ case None => case Some(prover_setup) => prover_setup.theory_view.activate - val dockable = epu.getEditPane.getView.getDockableWindowManager.getDockable("Isabelle_output") + val dockable = epu.getEditPane.getView.getDockableWindowManager.getDockable("isabelle-output") if(dockable != null) { val output_dockable = dockable.asInstanceOf[OutputDockable] if(output_dockable.getComponent(0) != prover_setup.output_text_view ) { diff -r c57a53d4469a -r d5a41da986c3 src/Tools/jEdit/src/jedit/ProverSetup.scala --- a/src/Tools/jEdit/src/jedit/ProverSetup.scala Sat Dec 20 17:14:27 2008 +0100 +++ b/src/Tools/jEdit/src/jedit/ProverSetup.scala Sat Dec 20 17:16:29 2008 +0100 @@ -48,7 +48,7 @@ theory_view.activate prover.outputInfo.add( text => { output_text_view.append(text) - val dockable = view.getDockableWindowManager.getDockable("Isabelle_output") + val dockable = view.getDockableWindowManager.getDockable("isabelle-output") //link process output if dockable is active if(dockable != null) { val output_dockable = dockable.asInstanceOf[OutputDockable] @@ -62,7 +62,7 @@ //register for state-view stateUpdate.add(state => { - val state_view = view.getDockableWindowManager.getDockable("Isabelle_state") + val state_view = view.getDockableWindowManager.getDockable("isabelle-state") val state_panel = if(state_view != null) state_view.asInstanceOf[StateViewDockable].panel else null if(state_panel != null){ if (state == null)