[Libreoffice-commits] core.git: scripting/java

[Stephan Bergmann]

 scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3336a5071bdf56f112f866a714a19ec70fc7e55c
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Feb 16 10:40:07 2015 +0100

    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).

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 41ab77c..63023ea 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<URL, ScriptEditorForJavaScript> BEING_EDITED = new