You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ace.apache.org by ja...@apache.org on 2013/11/11 14:07:57 UTC

svn commit: r1540698 - /ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/MainActionToolbar.java

Author: jawi
Date: Mon Nov 11 13:07:56 2013
New Revision: 1540698

URL: http://svn.apache.org/r1540698
Log:
ACE-427 - NPE when running Web UI without user-authentication.


Modified:
    ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/MainActionToolbar.java

Modified: ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/MainActionToolbar.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/MainActionToolbar.java?rev=1540698&r1=1540697&r2=1540698&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/MainActionToolbar.java (original)
+++ ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/MainActionToolbar.java Mon Nov 11 13:07:56 2013
@@ -34,6 +34,7 @@ import org.osgi.framework.ServiceReferen
 import org.osgi.service.event.EventHandler;
 
 import com.vaadin.event.ShortcutAction.KeyCode;
+import com.vaadin.terminal.gwt.server.WebApplicationContext;
 import com.vaadin.terminal.gwt.server.WebBrowser;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
@@ -402,7 +403,9 @@ public abstract class MainActionToolbar 
     }
 
     private void addCrossPlatformShortcut(Button button, int key, String description) {
-        ShortcutHelper.addCrossPlatformShortcut((WebBrowser) getWindow().getTerminal(), button, description, key);
+        // ACE-427 - NPE when using getMainWindow() if no authentication is used...
+        WebApplicationContext context = (WebApplicationContext) getApplication().getContext();
+        ShortcutHelper.addCrossPlatformShortcut(context.getBrowser(), button, description, key);
     }
 
     /**