diff options
author | Leif Åstrand <leif@vaadin.com> | 2012-10-08 17:07:25 +0300 |
---|---|---|
committer | Leif Åstrand <leif@vaadin.com> | 2012-10-08 17:07:25 +0300 |
commit | 38bfea7cfa409dfe0864a5f42fb528007499999d (patch) | |
tree | ee6fba1e14fc828d54d8b1db55698741b9a661a0 /uitest/src/com/vaadin/tests/minitutorials | |
parent | 48c19777e566dd8cd5e496ea364de8aea447abbf (diff) | |
download | vaadin-framework-38bfea7cfa409dfe0864a5f42fb528007499999d.tar.gz vaadin-framework-38bfea7cfa409dfe0864a5f42fb528007499999d.zip |
Remove CombinedRequest and BrowserDetails (#8165)
* Primary use case for CombinedRequest (special path and parameters)
already elimiated by other changes
* BrowserDetails.getLocation is now available through Page
* BrowserDetails.getWindowName only used internally in one location
* VaadinServletRequest.cast and similar for portlets removed now that a
normal cast can always be used as there's no CombinedRequest to consider
Change-Id: I44f28722a12f86015b3c30e83768e4611b87479c
Diffstat (limited to 'uitest/src/com/vaadin/tests/minitutorials')
-rw-r--r-- | uitest/src/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java | 2 | ||||
-rw-r--r-- | uitest/src/com/vaadin/tests/minitutorials/v7a1/UsingUriFragments.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java b/uitest/src/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java index ad3a30d4ca..737de10894 100644 --- a/uitest/src/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java +++ b/uitest/src/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java @@ -67,7 +67,7 @@ class DefaultRoot extends UI { class TouchRoot extends UI { @Override protected void init(VaadinRequest request) { - WebBrowser webBrowser = request.getBrowserDetails().getWebBrowser(); + WebBrowser webBrowser = getSession().getBrowser(); String screenSize = "" + webBrowser.getScreenWidth() + "x" + webBrowser.getScreenHeight(); getContent().addComponent( diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a1/UsingUriFragments.java b/uitest/src/com/vaadin/tests/minitutorials/v7a1/UsingUriFragments.java index db8b261628..6d9890a21c 100644 --- a/uitest/src/com/vaadin/tests/minitutorials/v7a1/UsingUriFragments.java +++ b/uitest/src/com/vaadin/tests/minitutorials/v7a1/UsingUriFragments.java @@ -36,7 +36,7 @@ public class UsingUriFragments extends UI { @Override protected void init(VaadinRequest request) { Label label = new Label("Hello, your fragment is " - + request.getBrowserDetails().getLocation().getFragment()); + + getPage().getLocation().getFragment()); getContent().addComponent(label); // React to fragment changes @@ -48,7 +48,7 @@ public class UsingUriFragments extends UI { }); // Handle the fragment received in the initial request - handleFragment(request.getBrowserDetails().getLocation().getFragment()); + handleFragment(getPage().getLocation().getFragment()); addComponent(new Button("Show and set fragment", new Button.ClickListener() { |