diff options
| author | Johannes Dahlström <johannesd@vaadin.com> | 2012-06-13 18:17:45 +0300 |
|---|---|---|
| committer | Johannes Dahlström <johannesd@vaadin.com> | 2012-06-13 18:17:45 +0300 |
| commit | 024b0a0043748d77e73a06cd7743d58d5412c5b0 (patch) | |
| tree | 17b8f34782354bd735b3299de2ef9727ad941e32 /src/com/vaadin/terminal/gwt/server/WebBrowser.java | |
| parent | 52d06a13b9e20cb752a21413e15adc250daa5e1c (diff) | |
| download | vaadin-framework-024b0a0043748d77e73a06cd7743d58d5412c5b0.tar.gz vaadin-framework-024b0a0043748d77e73a06cd7743d58d5412c5b0.zip | |
Fixed some errors caused by 6.8 merge; updated tests to use LegacyWindow/Application
Diffstat (limited to 'src/com/vaadin/terminal/gwt/server/WebBrowser.java')
| -rw-r--r-- | src/com/vaadin/terminal/gwt/server/WebBrowser.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/vaadin/terminal/gwt/server/WebBrowser.java b/src/com/vaadin/terminal/gwt/server/WebBrowser.java index 8e07ff4fe5..b87fea4233 100644 --- a/src/com/vaadin/terminal/gwt/server/WebBrowser.java +++ b/src/com/vaadin/terminal/gwt/server/WebBrowser.java @@ -41,6 +41,7 @@ public class WebBrowser implements Terminal { * * @return Always returns null. */ + @Override public String getDefaultTheme() { return null; } @@ -50,6 +51,7 @@ public class WebBrowser implements Terminal { * * @see com.vaadin.terminal.Terminal#getScreenHeight() */ + @Override public int getScreenHeight() { return screenHeight; } @@ -59,6 +61,7 @@ public class WebBrowser implements Terminal { * * @see com.vaadin.terminal.Terminal#getScreenWidth() */ + @Override public int getScreenWidth() { return screenWidth; } @@ -424,8 +427,7 @@ public class WebBrowser implements Terminal { if (request.getParameter("sw") != null) { updateClientSideDetails(request.getParameter("sw"), - request.getParameter("sh"), request.getParameter("cw"), - request.getParameter("ch"), request.getParameter("tzo"), + request.getParameter("sh"), request.getParameter("tzo"), request.getParameter("rtzo"), request.getParameter("dstd"), request.getParameter("dston"), request.getParameter("curdate"), |