From 3336a5071bdf56f112f866a714a19ec70fc7e55c Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 16 Feb 2015 10:40:07 +0100 Subject: rhbz#1192732: Revert "From the context of the code, this field should... ...not be static." This reverts commit 6d4c1f0d4a623bf7f3b3a0af2ece5c969d5aec77. Whatever made the author of that commit think rhinoWindow shouldn't be static, it clearly needs to be, as in edit()'s Runnable.run(), the usage of rhinoWindow at the end relies on rhinoWindow being set via the new ScriptEditorForJavaScript(context, url) call to initUI() (or else rhinoWindow already being set from a previous such call if already editor != null). --- .../script/framework/provider/javascript/ScriptEditorForJavaScript.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripting') diff --git a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java index 41ab77c1879b..63023ea61caa 100644 --- a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java +++ b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java @@ -48,7 +48,7 @@ public class ScriptEditorForJavaScript implements ScriptEditor { // template for JavaScript scripts private static String JSTEMPLATE; - private Main rhinoWindow; + static private Main rhinoWindow; private URL scriptURL; // global list of ScriptEditors, key is URL of file being edited private static Map BEING_EDITED = new -- cgit