Fixed compiler warnings in demo and core source (#2274)

svn changeset:15451/svn branch:6.5

12 files changed, 15 insertions, 1 deletions

diff --git a/src/com/vaadin/ui/AbsoluteLayout.java b/src/com/vaadin/ui/AbsoluteLayout.java
index dfa1ab90f4..eca11b7984 100644
--- a/src/com/vaadin/ui/AbsoluteLayout.java
+++ b/src/com/vaadin/ui/AbsoluteLayout.java
@@ -556,6 +556,7 @@ public class AbsoluteLayout extends AbstractLayout {
      * @see com.vaadin.ui.AbstractComponent#changeVariables(java.lang.Object,
      * java.util.Map)
      */
+    @SuppressWarnings("unchecked")
     @Override
     public void changeVariables(Object source, Map<String, Object> variables) {
         super.changeVariables(source, variables);
diff --git a/src/com/vaadin/ui/AbstractOrderedLayout.java b/src/com/vaadin/ui/AbstractOrderedLayout.java
index 73ab2e81fd..fd7e3a39d4 100644
--- a/src/com/vaadin/ui/AbstractOrderedLayout.java
+++ b/src/com/vaadin/ui/AbstractOrderedLayout.java
@@ -340,6 +340,7 @@ public abstract class AbstractOrderedLayout extends AbstractLayout implements
         AlignmentUtils.setComponentAlignment(this, component, alignment);
     }
 
+    @SuppressWarnings("unchecked")
     @Override
     public void changeVariables(Object source, Map<String, Object> variables) {
         super.changeVariables(source, variables);
diff --git a/src/com/vaadin/ui/AbstractSelect.java b/src/com/vaadin/ui/AbstractSelect.java
index bd0a14a97a..ef09becb00 100644
--- a/src/com/vaadin/ui/AbstractSelect.java
+++ b/src/com/vaadin/ui/AbstractSelect.java
@@ -426,6 +426,7 @@ public abstract class AbstractSelect extends AbstractField implements
                 // (non-visible items can not be deselected)
                 final Collection<?> visible = getVisibleItemIds();
                 if (visible != null) {
+                    @SuppressWarnings("unchecked")
                     Set<Object> newsel = (Set<Object>) getValue();
                     if (newsel == null) {
                         newsel = new HashSet<Object>();
diff --git a/src/com/vaadin/ui/CssLayout.java b/src/com/vaadin/ui/CssLayout.java
index c393830165..4f8e00dec4 100644
--- a/src/com/vaadin/ui/CssLayout.java
+++ b/src/com/vaadin/ui/CssLayout.java
@@ -240,6 +240,7 @@ public class CssLayout extends AbstractLayout {
         }
     }
 
+    @SuppressWarnings("unchecked")
     @Override
     public void changeVariables(Object source, Map<String, Object> variables) {
         super.changeVariables(source, variables);
diff --git a/src/com/vaadin/ui/Embedded.java b/src/com/vaadin/ui/Embedded.java
index f906e696df..2945c84afa 100644
--- a/src/com/vaadin/ui/Embedded.java
+++ b/src/com/vaadin/ui/Embedded.java
@@ -447,6 +447,7 @@ public class Embedded extends AbstractComponent {
         removeListener(CLICK_EVENT, ClickEvent.class, listener);
     }
 
+    @SuppressWarnings("unchecked")
     @Override
     public void changeVariables(Object source, Map<String, Object> variables) {
         super.changeVariables(source, variables);
diff --git a/src/com/vaadin/ui/Form.java b/src/com/vaadin/ui/Form.java
index b6c7e693d6..0e487da603 100644
--- a/src/com/vaadin/ui/Form.java
+++ b/src/com/vaadin/ui/Form.java
@@ -1052,7 +1052,11 @@ public class Form extends AbstractField implements Item.Editor, Buffered, Item,
      * Get the field factory of the form.
      * 
      * @return the FieldFactory Factory used to create the fields.
+     * @deprecated Use {@link #getFormFieldFactory()} instead. Set the
+     *             FormFieldFactory using
+     *             {@link #setFormFieldFactory(FormFieldFactory)}.
      */
+    @Deprecated
     public FieldFactory getFieldFactory() {
         if (fieldFactory instanceof FieldFactory) {
             return (FieldFactory) fieldFactory;
diff --git a/src/com/vaadin/ui/GridLayout.java b/src/com/vaadin/ui/GridLayout.java
index b8619e5c76..ae678198f9 100644
--- a/src/com/vaadin/ui/GridLayout.java
+++ b/src/com/vaadin/ui/GridLayout.java
@@ -1369,6 +1369,7 @@ public class GridLayout extends AbstractLayout implements
         AlignmentUtils.setComponentAlignment(this, component, alignment);
     }
 
+    @SuppressWarnings("unchecked")
     @Override
     public void changeVariables(Object source, Map<String, Object> variables) {
         super.changeVariables(source, variables);
diff --git a/src/com/vaadin/ui/Label.java b/src/com/vaadin/ui/Label.java
index 0b37feab95..d1952dc2b3 100644
--- a/src/com/vaadin/ui/Label.java
+++ b/src/com/vaadin/ui/Label.java
@@ -42,7 +42,7 @@ import com.vaadin.ui.ClientWidget.LoadStyle;
 @ClientWidget(value = VLabel.class, loadStyle = LoadStyle.EAGER)
 public class Label extends AbstractComponent implements Property,
         Property.Viewer, Property.ValueChangeListener,
-        Property.ValueChangeNotifier, Comparable {
+        Property.ValueChangeNotifier, Comparable<Object> {
 
     /**
      * Content mode, where the label contains only plain text. The getValue()
diff --git a/src/com/vaadin/ui/Panel.java b/src/com/vaadin/ui/Panel.java
index 59d81ec9ec..017855a9a0 100644
--- a/src/com/vaadin/ui/Panel.java
+++ b/src/com/vaadin/ui/Panel.java
@@ -298,6 +298,7 @@ public class Panel extends AbstractComponentContainer implements Scrollable,
      * 
      * @see com.vaadin.terminal.VariableOwner#changeVariables(Object, Map)
      */
+    @SuppressWarnings("unchecked")
     @Override
     public void changeVariables(Object source, Map<String, Object> variables) {
         super.changeVariables(source, variables);
diff --git a/src/com/vaadin/ui/Select.java b/src/com/vaadin/ui/Select.java
index dbdd1cf0e9..e5c19ccdd3 100644
--- a/src/com/vaadin/ui/Select.java
+++ b/src/com/vaadin/ui/Select.java
@@ -384,6 +384,7 @@ public class Select extends AbstractSelect implements AbstractSelect.Filtering,
                 // (non-visible items can not be deselected)
                 final Collection<?> visible = getVisibleItemIds();
                 if (visible != null) {
+                    @SuppressWarnings("unchecked")
                     Set<Object> newsel = (Set<Object>) getValue();
                     if (newsel == null) {
                         newsel = new HashSet<Object>();
diff --git a/src/com/vaadin/ui/SplitPanel.java b/src/com/vaadin/ui/SplitPanel.java
index b07010d5dc..197569d1aa 100644
--- a/src/com/vaadin/ui/SplitPanel.java
+++ b/src/com/vaadin/ui/SplitPanel.java
@@ -390,6 +390,7 @@ public class SplitPanel extends AbstractLayout {
      * comment here, we use the default documentation from implemented
      * interface.
      */
+    @SuppressWarnings("unchecked")
     @Override
     public void changeVariables(Object source, Map<String, Object> variables) {
 
diff --git a/src/com/vaadin/ui/Table.java b/src/com/vaadin/ui/Table.java
index b8ebeddc22..9c077bc34e 100644
--- a/src/com/vaadin/ui/Table.java
+++ b/src/com/vaadin/ui/Table.java
@@ -1875,6 +1875,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
         Set<Object> renderedItemIds = getCurrentlyRenderedItemIds();
 
+        @SuppressWarnings("unchecked")
         HashSet<Object> newValue = new HashSet<Object>(
                 (Collection<Object>) getValue());