From df60bea0b911e921be38c4f3473a3b80506dd537 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Leif=20=C3=85strand?= Date: Wed, 20 Jun 2012 16:31:44 +0300 Subject: [PATCH] Update mini tutorial code to work with current APIs --- .../minitutorials/v7a1/FindCurrentRootAndApplication.java | 8 +++++--- .../tests/minitutorials/v7a1/UsingUriFragments.java | 6 +++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/FindCurrentRootAndApplication.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/FindCurrentRootAndApplication.java index bfdeab3980..c6e609c5ee 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/FindCurrentRootAndApplication.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/FindCurrentRootAndApplication.java @@ -9,6 +9,7 @@ import com.vaadin.terminal.WrappedRequest; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; +import com.vaadin.ui.Notification; import com.vaadin.ui.Root; /** @@ -30,9 +31,10 @@ public class FindCurrentRootAndApplication extends Root { String msg = "Running in "; msg += Application.getCurrentApplication().isProductionMode() ? "production" : "debug"; - msg += " mode"; - Root.getCurrentRoot().showNotification(msg); - Root.getCurrentRoot().showNotification("Hello Vaadin user!"); + msg += " mode in a Root with the caption " + + Root.getCurrentRoot().getCaption(); + + Notification.show(msg); } }); diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/UsingUriFragments.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/UsingUriFragments.java index 73fd49089a..e98b698c07 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/UsingUriFragments.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/UsingUriFragments.java @@ -29,7 +29,7 @@ public class UsingUriFragments extends Root { getContent().addComponent(label); // React to fragment changes - addListener(new FragmentChangedListener() { + getPage().addListener(new FragmentChangedListener() { public void fragmentChanged(FragmentChangedEvent source) { handleFragment(source.getFragment()); } @@ -41,8 +41,8 @@ public class UsingUriFragments extends Root { addComponent(new Button("Show and set fragment", new Button.ClickListener() { public void buttonClick(ClickEvent event) { - handleFragment(getFragment()); - setFragment("customFragment"); + handleFragment(getPage().getFragment()); + getPage().setFragment("customFragment"); } })); } -- 2.39.5