#2812, #2643 fixed some warnings in AddressBook tutorial

svn changeset:8002/svn branch:6.0

11 files changed, 14 insertions, 3 deletions

diff --git a/src/com/vaadin/demo/tutorial/addressbook/AddressBookApplication.java b/src/com/vaadin/demo/tutorial/addressbook/AddressBookApplication.java
index 2412f31916..3860ea08bf 100644
--- a/src/com/vaadin/demo/tutorial/addressbook/AddressBookApplication.java
+++ b/src/com/vaadin/demo/tutorial/addressbook/AddressBookApplication.java
@@ -29,6 +29,7 @@ import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
 import com.vaadin.ui.Window.Notification;
 
+@SuppressWarnings("serial")
 public class AddressBookApplication extends Application implements
 		ClickListener, ValueChangeListener, ItemClickListener {
 
@@ -72,7 +73,7 @@ public class AddressBookApplication extends Application implements
 		horizontalSplit.setSplitPosition(200, SplitPanel.UNITS_PIXELS);
 		horizontalSplit.setFirstComponent(tree);
 
-		getMainWindow().setLayout(layout);
+		getMainWindow().setContent(layout);
 	}
 
 	private HorizontalLayout createToolbar() {
diff --git a/src/com/vaadin/demo/tutorial/addressbook/data/Person.java b/src/com/vaadin/demo/tutorial/addressbook/data/Person.java
index 0739504210..70fae91db7 100644
--- a/src/com/vaadin/demo/tutorial/addressbook/data/Person.java
+++ b/src/com/vaadin/demo/tutorial/addressbook/data/Person.java
@@ -2,6 +2,7 @@ package com.vaadin.demo.tutorial.addressbook.data;
 
 import java.io.Serializable;
 
+@SuppressWarnings("serial")
 public class Person implements Serializable {
 	private String firstName = "";
 	private String lastName = "";
diff --git a/src/com/vaadin/demo/tutorial/addressbook/data/PersonContainer.java b/src/com/vaadin/demo/tutorial/addressbook/data/PersonContainer.java
index b753125505..0a6bd6cf14 100644
--- a/src/com/vaadin/demo/tutorial/addressbook/data/PersonContainer.java
+++ b/src/com/vaadin/demo/tutorial/addressbook/data/PersonContainer.java
@@ -5,6 +5,7 @@ import java.util.Random;
 
 import com.vaadin.data.util.BeanItemContainer;
 
+@SuppressWarnings("serial")
 public class PersonContainer extends BeanItemContainer<Person> implements
 		Serializable {
 
diff --git a/src/com/vaadin/demo/tutorial/addressbook/data/SearchFilter.java b/src/com/vaadin/demo/tutorial/addressbook/data/SearchFilter.java
index c5aa3e37ed..96d2460545 100644
--- a/src/com/vaadin/demo/tutorial/addressbook/data/SearchFilter.java
+++ b/src/com/vaadin/demo/tutorial/addressbook/data/SearchFilter.java
@@ -2,6 +2,7 @@ package com.vaadin.demo.tutorial.addressbook.data;
 
 import java.io.Serializable;
 
+@SuppressWarnings("serial")
 public class SearchFilter implements Serializable {
 
 	private final String term;
diff --git a/src/com/vaadin/demo/tutorial/addressbook/ui/HelpWindow.java b/src/com/vaadin/demo/tutorial/addressbook/ui/HelpWindow.java
index cf7d6949bb..d9e08d7679 100644
--- a/src/com/vaadin/demo/tutorial/addressbook/ui/HelpWindow.java
+++ b/src/com/vaadin/demo/tutorial/addressbook/ui/HelpWindow.java
@@ -3,6 +3,7 @@ package com.vaadin.demo.tutorial.addressbook.ui;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Window;
 
+@SuppressWarnings("serial")
 public class HelpWindow extends Window {
 	private static final String HELP_HTML_SNIPPET = "This is "
 			+ "an application built during <strong><a href=\""
diff --git a/src/com/vaadin/demo/tutorial/addressbook/ui/ListView.java b/src/com/vaadin/demo/tutorial/addressbook/ui/ListView.java
index 4790e0ed3e..0bb35c9e9c 100644
--- a/src/com/vaadin/demo/tutorial/addressbook/ui/ListView.java
+++ b/src/com/vaadin/demo/tutorial/addressbook/ui/ListView.java
@@ -2,6 +2,7 @@ package com.vaadin.demo.tutorial.addressbook.ui;
 
 import com.vaadin.ui.SplitPanel;
 
+@SuppressWarnings("serial")
 public class ListView extends SplitPanel {
 	public ListView(PersonList personList, PersonForm personForm) {
 		addStyleName("view");
diff --git a/src/com/vaadin/demo/tutorial/addressbook/ui/NavigationTree.java b/src/com/vaadin/demo/tutorial/addressbook/ui/NavigationTree.java
index f95c938beb..f289f636b9 100644
--- a/src/com/vaadin/demo/tutorial/addressbook/ui/NavigationTree.java
+++ b/src/com/vaadin/demo/tutorial/addressbook/ui/NavigationTree.java
@@ -4,6 +4,7 @@ import com.vaadin.demo.tutorial.addressbook.AddressBookApplication;
 import com.vaadin.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.ui.Tree;
 
+@SuppressWarnings("serial")
 public class NavigationTree extends Tree {
 	public static final Object SHOW_ALL = "Show all";
 	public static final Object SEARCH = "Search";
diff --git a/src/com/vaadin/demo/tutorial/addressbook/ui/PersonForm.java b/src/com/vaadin/demo/tutorial/addressbook/ui/PersonForm.java
index a885ba5640..31de64daf3 100644
--- a/src/com/vaadin/demo/tutorial/addressbook/ui/PersonForm.java
+++ b/src/com/vaadin/demo/tutorial/addressbook/ui/PersonForm.java
@@ -22,6 +22,7 @@ import com.vaadin.ui.TextField;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
 
+@SuppressWarnings("serial")
 public class PersonForm extends Form implements ClickListener {
 
 	private Button save = new Button("Save", (ClickListener) this);
diff --git a/src/com/vaadin/demo/tutorial/addressbook/ui/PersonList.java b/src/com/vaadin/demo/tutorial/addressbook/ui/PersonList.java
index f1bd945c38..30a48dbb9e 100644
--- a/src/com/vaadin/demo/tutorial/addressbook/ui/PersonList.java
+++ b/src/com/vaadin/demo/tutorial/addressbook/ui/PersonList.java
@@ -8,6 +8,7 @@ import com.vaadin.ui.Component;
 import com.vaadin.ui.Link;
 import com.vaadin.ui.Table;
 
+@SuppressWarnings("serial")
 public class PersonList extends Table {
 	public PersonList(AddressBookApplication app) {
 		setSizeFull();
diff --git a/src/com/vaadin/demo/tutorial/addressbook/ui/SearchView.java b/src/com/vaadin/demo/tutorial/addressbook/ui/SearchView.java
index dcf53b4fa9..de2313b2a7 100644
--- a/src/com/vaadin/demo/tutorial/addressbook/ui/SearchView.java
+++ b/src/com/vaadin/demo/tutorial/addressbook/ui/SearchView.java
@@ -13,6 +13,7 @@ import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
 import com.vaadin.ui.Window.Notification;
 
+@SuppressWarnings("serial")
 public class SearchView extends Panel {
 
 	private TextField tf;
@@ -24,13 +25,13 @@ public class SearchView extends Panel {
 	public SearchView(final AddressBookApplication app) {
 		this.app = app;
 		addStyleName("view");
-		
+
 		setCaption("Search contacts");
 		setSizeFull();
 
 		/* Use a FormLayout as main layout for this Panel */
 		FormLayout formLayout = new FormLayout();
-		setLayout(formLayout);
+		setContent(formLayout);
 
 		/* Create UI components */
 		tf = new TextField("Search term");
diff --git a/src/com/vaadin/demo/tutorial/addressbook/ui/SharingOptions.java b/src/com/vaadin/demo/tutorial/addressbook/ui/SharingOptions.java
index 8ea22a4c7d..f6c3a591f2 100644
--- a/src/com/vaadin/demo/tutorial/addressbook/ui/SharingOptions.java
+++ b/src/com/vaadin/demo/tutorial/addressbook/ui/SharingOptions.java
@@ -6,6 +6,7 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.Window;
 import com.vaadin.ui.Button.ClickEvent;
 
+@SuppressWarnings("serial")
 public class SharingOptions extends Window {
 	public SharingOptions() {
 		/*