#2812, #2643 fixed some warnings in AddressBook tutorial

svn changeset:8002/svn branch:6.0

diff --git a/src/com/vaadin/demo/tutorial/addressbook/AddressBookApplication.java b/src/com/vaadin/demo/tutorial/addressbook/AddressBookApplication.java
index 2412f31916c5a6ee61ec5751f0a7a989a14e3037..3860ea08bf01c57655d87d96e42f836085810319 100644 (file)
--- 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 07395042107f4da4158bb056d524a59924da16dd..70fae91db7d8efc401ecb1bd227fb8284d2bd037 100644 (file)
--- 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 b753125505916424be68ff0d770b9e0489c7ee07..0a6bd6cf14cc0e536eb8e846ed3097e4fcbd69aa 100644 (file)
--- 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 c5aa3e37ed8022eee8cdce4d0b19a4df646501b6..96d2460545f42c7efaaec8fb9d402ae7d9a7550c 100644 (file)
--- 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 cf7d6949bbad31a6a72e783eab67ca05a46457ec..d9e08d76792013a841f48c0921e78311bd599885 100644 (file)
--- 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 4790e0ed3e23c9fe33ec8f71a95556dd04b2a27f..0bb35c9e9c164e8e052a540059b03c1f0d6a5066 100644 (file)
--- 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 f95c938beba02fa9551455fa657e4b20fe0be0aa..f289f636b909ae165e61cff412e1fe733b877321 100644 (file)
--- 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 a885ba564038fae31afacaf8a5591a335e193ede..31de64daf3d20345ed8e4e16364a9cbe17cf6570 100644 (file)
--- 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 f1bd945c38ccf909bec692a4a903396c31676992..30a48dbb9e5ff079efaa5704f8dfebbefe11595b 100644 (file)
--- 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 dcf53b4fa9e1dd0b74c9cd3dd41c63959733a7d3..de2313b2a7a1b5cef967b717248c9b4a66930b16 100644 (file)
--- 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 8ea22a4c7dd6b0e761a3f6f766148d5631a20e53..f6c3a591f2ae0eb939b1490b3a2e318644eb6ce9 100644 (file)
--- 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() {
                /*