From: Henri Sara <henri.sara@itmill.com>
Date: Mon, 25 May 2009 12:07:34 +0000 (+0000)
Subject: #2643 fix more demo warnings: some unparametrized Class references
X-Git-Tag: 6.7.0.beta1~2781
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d955777b90d3964251ff66d80da52c07e190628f;p=vaadin-framework.git

#2643 fix more demo warnings: some unparametrized Class references

svn changeset:7991/svn branch:6.0
---

diff --git a/src/com/vaadin/demo/sampler/Feature.java b/src/com/vaadin/demo/sampler/Feature.java
index 359d22a561..45ce902ecd 100644
--- a/src/com/vaadin/demo/sampler/Feature.java
+++ b/src/com/vaadin/demo/sampler/Feature.java
@@ -91,7 +91,7 @@ abstract public class Feature implements Serializable {
      * 
      * @return
      */
-    abstract public Class[] getRelatedFeatures();
+    abstract public Class<? extends Feature>[] getRelatedFeatures();
 
     /**
      * Gets the name of the icon for this feature, usually simpleName +
diff --git a/src/com/vaadin/demo/sampler/FeatureSet.java b/src/com/vaadin/demo/sampler/FeatureSet.java
index 9932b2093c..dad0a408bc 100644
--- a/src/com/vaadin/demo/sampler/FeatureSet.java
+++ b/src/com/vaadin/demo/sampler/FeatureSet.java
@@ -532,7 +532,7 @@ public class FeatureSet extends Feature {
     }
 
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return null;
     }
 
diff --git a/src/com/vaadin/demo/sampler/FeatureView.java b/src/com/vaadin/demo/sampler/FeatureView.java
index e36ad46756..af7c00215e 100644
--- a/src/com/vaadin/demo/sampler/FeatureView.java
+++ b/src/com/vaadin/demo/sampler/FeatureView.java
@@ -204,7 +204,7 @@ public class FeatureView extends HorizontalLayout {
                 right.addComponent(api);
             }
 
-            Class[] features = feature.getRelatedFeatures();
+            Class<? extends Feature>[] features = feature.getRelatedFeatures();
             if (features != null) {
                 VerticalLayout rel = new VerticalLayout();
                 Label caption = new Label("<span>Related Samples</span>",
diff --git a/src/com/vaadin/demo/sampler/features/accordions/AccordionDisabled.java b/src/com/vaadin/demo/sampler/features/accordions/AccordionDisabled.java
index 1d5d53d582..2bdd3fd078 100644
--- a/src/com/vaadin/demo/sampler/features/accordions/AccordionDisabled.java
+++ b/src/com/vaadin/demo/sampler/features/accordions/AccordionDisabled.java
@@ -23,8 +23,9 @@ public class AccordionDisabled extends Feature {
         return new APIResource[] { new APIResource(Accordion.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { AccordionIcons.class, FeatureSet.Tabsheets.class };
     }
 
diff --git a/src/com/vaadin/demo/sampler/features/accordions/AccordionIcons.java b/src/com/vaadin/demo/sampler/features/accordions/AccordionIcons.java
index 408ae3c46e..d9dd990446 100644
--- a/src/com/vaadin/demo/sampler/features/accordions/AccordionIcons.java
+++ b/src/com/vaadin/demo/sampler/features/accordions/AccordionIcons.java
@@ -23,8 +23,9 @@ public class AccordionIcons extends Feature {
         return new APIResource[] { new APIResource(Accordion.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { AccordionDisabled.class,
                 FeatureSet.Tabsheets.class };
     }
diff --git a/src/com/vaadin/demo/sampler/features/blueprints/ProminentPrimaryAction.java b/src/com/vaadin/demo/sampler/features/blueprints/ProminentPrimaryAction.java
index 3101cd19b8..9409a86da4 100644
--- a/src/com/vaadin/demo/sampler/features/blueprints/ProminentPrimaryAction.java
+++ b/src/com/vaadin/demo/sampler/features/blueprints/ProminentPrimaryAction.java
@@ -34,8 +34,9 @@ public class ProminentPrimaryAction extends Feature {
                 new APIResource(Link.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { ButtonPush.class, ButtonLink.class };
     }
 
diff --git a/src/com/vaadin/demo/sampler/features/buttons/ButtonLink.java b/src/com/vaadin/demo/sampler/features/buttons/ButtonLink.java
index 5a378a7fc6..435dbdf5de 100644
--- a/src/com/vaadin/demo/sampler/features/buttons/ButtonLink.java
+++ b/src/com/vaadin/demo/sampler/features/buttons/ButtonLink.java
@@ -28,8 +28,9 @@ public class ButtonLink extends Feature {
         return new APIResource[] { new APIResource(Button.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { ButtonPush.class, ButtonSwitch.class,
                 LinkCurrentWindow.class, ProminentPrimaryAction.class,
                 FeatureSet.Links.class };
diff --git a/src/com/vaadin/demo/sampler/features/buttons/ButtonPush.java b/src/com/vaadin/demo/sampler/features/buttons/ButtonPush.java
index a87f400df8..37d2b4d6a1 100644
--- a/src/com/vaadin/demo/sampler/features/buttons/ButtonPush.java
+++ b/src/com/vaadin/demo/sampler/features/buttons/ButtonPush.java
@@ -26,8 +26,9 @@ public class ButtonPush extends Feature {
         return new APIResource[] { new APIResource(Button.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { ButtonLink.class, ButtonSwitch.class,
                 ProminentPrimaryAction.class };
     }
diff --git a/src/com/vaadin/demo/sampler/features/buttons/ButtonSwitch.java b/src/com/vaadin/demo/sampler/features/buttons/ButtonSwitch.java
index 53be15fe57..5d0f56d51a 100644
--- a/src/com/vaadin/demo/sampler/features/buttons/ButtonSwitch.java
+++ b/src/com/vaadin/demo/sampler/features/buttons/ButtonSwitch.java
@@ -26,8 +26,9 @@ public class ButtonSwitch extends Feature {
         return new APIResource[] { new APIResource(Button.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { ButtonPush.class, ButtonLink.class };
     }
 
diff --git a/src/com/vaadin/demo/sampler/features/commons/Errors.java b/src/com/vaadin/demo/sampler/features/commons/Errors.java
index b7350707ca..7df9ec300f 100644
--- a/src/com/vaadin/demo/sampler/features/commons/Errors.java
+++ b/src/com/vaadin/demo/sampler/features/commons/Errors.java
@@ -41,8 +41,9 @@ public class Errors extends Feature {
         return new APIResource[] { new APIResource(AbstractComponent.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         // TODO link validation sample, form sample
         return new Class[] { Validation.class, FormBasic.class,
                 NotificationError.class };
diff --git a/src/com/vaadin/demo/sampler/features/commons/Icons.java b/src/com/vaadin/demo/sampler/features/commons/Icons.java
index 43ef1eb374..dece0523cb 100644
--- a/src/com/vaadin/demo/sampler/features/commons/Icons.java
+++ b/src/com/vaadin/demo/sampler/features/commons/Icons.java
@@ -42,7 +42,7 @@ public class Icons extends Feature {
     }
 
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         // TODO link embedded sample
         return null;
     }
diff --git a/src/com/vaadin/demo/sampler/features/commons/Tooltips.java b/src/com/vaadin/demo/sampler/features/commons/Tooltips.java
index 9f95cf7faa..73365d56df 100644
--- a/src/com/vaadin/demo/sampler/features/commons/Tooltips.java
+++ b/src/com/vaadin/demo/sampler/features/commons/Tooltips.java
@@ -27,7 +27,7 @@ public class Tooltips extends Feature {
     }
 
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         // TODO Auto-generated method stub
         return null;
     }
diff --git a/src/com/vaadin/demo/sampler/features/commons/Validation.java b/src/com/vaadin/demo/sampler/features/commons/Validation.java
index ea008e0d3e..b8c0c22559 100644
--- a/src/com/vaadin/demo/sampler/features/commons/Validation.java
+++ b/src/com/vaadin/demo/sampler/features/commons/Validation.java
@@ -38,8 +38,9 @@ public class Validation extends Feature {
                 new APIResource(Validator.class), new APIResource(Form.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { Errors.class, FeatureSet.Forms.class };
     }
 
diff --git a/src/com/vaadin/demo/sampler/features/dates/DateInline.java b/src/com/vaadin/demo/sampler/features/dates/DateInline.java
index a166b71b3a..ea47131952 100644
--- a/src/com/vaadin/demo/sampler/features/dates/DateInline.java
+++ b/src/com/vaadin/demo/sampler/features/dates/DateInline.java
@@ -26,8 +26,9 @@ public class DateInline extends Feature {
                 new APIResource(InlineDateField.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { DatePopup.class, DateLocale.class,
                 DateResolution.class };
     }
diff --git a/src/com/vaadin/demo/sampler/features/dates/DateLocale.java b/src/com/vaadin/demo/sampler/features/dates/DateLocale.java
index fc9dcfc25d..cf3ef581a0 100644
--- a/src/com/vaadin/demo/sampler/features/dates/DateLocale.java
+++ b/src/com/vaadin/demo/sampler/features/dates/DateLocale.java
@@ -29,8 +29,9 @@ public class DateLocale extends Feature {
                 new APIResource(Locale.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { DateInline.class, DatePopup.class,
                 DateResolution.class };
     }
diff --git a/src/com/vaadin/demo/sampler/features/dates/DatePopup.java b/src/com/vaadin/demo/sampler/features/dates/DatePopup.java
index 19801a0c8e..a5c3393131 100644
--- a/src/com/vaadin/demo/sampler/features/dates/DatePopup.java
+++ b/src/com/vaadin/demo/sampler/features/dates/DatePopup.java
@@ -25,8 +25,9 @@ public class DatePopup extends Feature {
                 new APIResource(PopupDateField.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { DateInline.class, DateLocale.class,
                 DateResolution.class };
     }
diff --git a/src/com/vaadin/demo/sampler/features/dates/DateResolution.java b/src/com/vaadin/demo/sampler/features/dates/DateResolution.java
index 7ed7ffda09..d4d64e0357 100644
--- a/src/com/vaadin/demo/sampler/features/dates/DateResolution.java
+++ b/src/com/vaadin/demo/sampler/features/dates/DateResolution.java
@@ -26,8 +26,9 @@ public class DateResolution extends Feature {
                 new APIResource(InlineDateField.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { DateInline.class, DatePopup.class,
                 DateLocale.class };
     }
diff --git a/src/com/vaadin/demo/sampler/features/form/FormBasic.java b/src/com/vaadin/demo/sampler/features/form/FormBasic.java
index 0aacbdc8db..4aa6e1a7fc 100644
--- a/src/com/vaadin/demo/sampler/features/form/FormBasic.java
+++ b/src/com/vaadin/demo/sampler/features/form/FormBasic.java
@@ -42,8 +42,9 @@ public class FormBasic extends Feature {
                 new APIResource(Validator.class), new APIResource(Form.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { Validation.class, Errors.class,
                 FeatureSet.Forms.class };
     }
diff --git a/src/com/vaadin/demo/sampler/features/form/FormPojo.java b/src/com/vaadin/demo/sampler/features/form/FormPojo.java
index a8d87c16d5..42b6e5506f 100644
--- a/src/com/vaadin/demo/sampler/features/form/FormPojo.java
+++ b/src/com/vaadin/demo/sampler/features/form/FormPojo.java
@@ -38,8 +38,9 @@ public class FormPojo extends Feature {
                 new APIResource(Validator.class), new APIResource(Form.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { Validation.class, Errors.class,
                 FeatureSet.Forms.class };
     }
diff --git a/src/com/vaadin/demo/sampler/features/layouts/ApplicationLayout.java b/src/com/vaadin/demo/sampler/features/layouts/ApplicationLayout.java
index d92aa49596..919e6d1ae0 100644
--- a/src/com/vaadin/demo/sampler/features/layouts/ApplicationLayout.java
+++ b/src/com/vaadin/demo/sampler/features/layouts/ApplicationLayout.java
@@ -32,8 +32,9 @@ public class ApplicationLayout extends Feature {
                 new APIResource(VerticalLayout.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { WebLayout.class, CustomLayouts.class };
     }
 
diff --git a/src/com/vaadin/demo/sampler/features/layouts/CustomLayouts.java b/src/com/vaadin/demo/sampler/features/layouts/CustomLayouts.java
index f7bc077071..c21de24577 100644
--- a/src/com/vaadin/demo/sampler/features/layouts/CustomLayouts.java
+++ b/src/com/vaadin/demo/sampler/features/layouts/CustomLayouts.java
@@ -30,8 +30,9 @@ public class CustomLayouts extends Feature {
         return new APIResource[] { new APIResource(CustomLayout.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { WebLayout.class, ApplicationLayout.class };
     }
 
diff --git a/src/com/vaadin/demo/sampler/features/layouts/ExpandingComponent.java b/src/com/vaadin/demo/sampler/features/layouts/ExpandingComponent.java
index 193f33d301..26dcb33c8f 100644
--- a/src/com/vaadin/demo/sampler/features/layouts/ExpandingComponent.java
+++ b/src/com/vaadin/demo/sampler/features/layouts/ExpandingComponent.java
@@ -30,8 +30,9 @@ public class ExpandingComponent extends Feature {
         };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] {};
     }
 
diff --git a/src/com/vaadin/demo/sampler/features/layouts/GridLayoutBasic.java b/src/com/vaadin/demo/sampler/features/layouts/GridLayoutBasic.java
index e76654d9be..b8215b3139 100644
--- a/src/com/vaadin/demo/sampler/features/layouts/GridLayoutBasic.java
+++ b/src/com/vaadin/demo/sampler/features/layouts/GridLayoutBasic.java
@@ -25,8 +25,9 @@ public class GridLayoutBasic extends Feature {
         return new APIResource[] { new APIResource(GridLayout.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { HorizontalLayoutBasic.class,
                 VerticalLayoutBasic.class, LayoutSpacing.class,
                 LayoutMargin.class };
diff --git a/src/com/vaadin/demo/sampler/features/layouts/HorizontalLayoutBasic.java b/src/com/vaadin/demo/sampler/features/layouts/HorizontalLayoutBasic.java
index 8f192901c7..4f72e20026 100644
--- a/src/com/vaadin/demo/sampler/features/layouts/HorizontalLayoutBasic.java
+++ b/src/com/vaadin/demo/sampler/features/layouts/HorizontalLayoutBasic.java
@@ -23,8 +23,9 @@ public class HorizontalLayoutBasic extends Feature {
         return new APIResource[] { new APIResource(HorizontalLayout.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { VerticalLayoutBasic.class, LayoutSpacing.class,
                 LayoutAlignment.class, };
     }
diff --git a/src/com/vaadin/demo/sampler/features/layouts/LayoutAlignment.java b/src/com/vaadin/demo/sampler/features/layouts/LayoutAlignment.java
index f24ca6bc52..2c28c887ea 100644
--- a/src/com/vaadin/demo/sampler/features/layouts/LayoutAlignment.java
+++ b/src/com/vaadin/demo/sampler/features/layouts/LayoutAlignment.java
@@ -31,8 +31,9 @@ public class LayoutAlignment extends Feature {
                 new APIResource(GridLayout.class), };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { HorizontalLayoutBasic.class,
                 VerticalLayoutBasic.class };
     }
diff --git a/src/com/vaadin/demo/sampler/features/layouts/LayoutMargin.java b/src/com/vaadin/demo/sampler/features/layouts/LayoutMargin.java
index 5e864bcdae..7efe32bef2 100644
--- a/src/com/vaadin/demo/sampler/features/layouts/LayoutMargin.java
+++ b/src/com/vaadin/demo/sampler/features/layouts/LayoutMargin.java
@@ -33,8 +33,9 @@ public class LayoutMargin extends Feature {
                 new APIResource(GridLayout.class), };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { LayoutSpacing.class, HorizontalLayoutBasic.class,
                 VerticalLayoutBasic.class, GridLayoutBasic.class };
     }
diff --git a/src/com/vaadin/demo/sampler/features/layouts/LayoutSpacing.java b/src/com/vaadin/demo/sampler/features/layouts/LayoutSpacing.java
index 6ccd1c2989..422a861add 100644
--- a/src/com/vaadin/demo/sampler/features/layouts/LayoutSpacing.java
+++ b/src/com/vaadin/demo/sampler/features/layouts/LayoutSpacing.java
@@ -31,8 +31,9 @@ public class LayoutSpacing extends Feature {
                 new APIResource(GridLayout.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { LayoutMargin.class, HorizontalLayoutBasic.class,
                 VerticalLayoutBasic.class, GridLayoutBasic.class };
     }
diff --git a/src/com/vaadin/demo/sampler/features/layouts/SplitPanelBasic.java b/src/com/vaadin/demo/sampler/features/layouts/SplitPanelBasic.java
index 36e19bafb7..58ef65c18b 100644
--- a/src/com/vaadin/demo/sampler/features/layouts/SplitPanelBasic.java
+++ b/src/com/vaadin/demo/sampler/features/layouts/SplitPanelBasic.java
@@ -28,8 +28,9 @@ public class SplitPanelBasic extends Feature {
         };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] {};
     }
 
diff --git a/src/com/vaadin/demo/sampler/features/layouts/VerticalLayoutBasic.java b/src/com/vaadin/demo/sampler/features/layouts/VerticalLayoutBasic.java
index 36b43bf380..af55c514dd 100644
--- a/src/com/vaadin/demo/sampler/features/layouts/VerticalLayoutBasic.java
+++ b/src/com/vaadin/demo/sampler/features/layouts/VerticalLayoutBasic.java
@@ -25,8 +25,9 @@ public class VerticalLayoutBasic extends Feature {
         return new APIResource[] { new APIResource(VerticalLayout.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { HorizontalLayoutBasic.class, LayoutSpacing.class,
                 LayoutAlignment.class, };
     }
diff --git a/src/com/vaadin/demo/sampler/features/layouts/WebLayout.java b/src/com/vaadin/demo/sampler/features/layouts/WebLayout.java
index 8eebd18e0c..3ef7b9676c 100644
--- a/src/com/vaadin/demo/sampler/features/layouts/WebLayout.java
+++ b/src/com/vaadin/demo/sampler/features/layouts/WebLayout.java
@@ -33,8 +33,9 @@ public class WebLayout extends Feature {
                 new APIResource(VerticalLayout.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { ApplicationLayout.class, CustomLayouts.class };
     }
 
diff --git a/src/com/vaadin/demo/sampler/features/link/LinkCurrentWindow.java b/src/com/vaadin/demo/sampler/features/link/LinkCurrentWindow.java
index 69b08b1b53..fdd2c2970e 100644
--- a/src/com/vaadin/demo/sampler/features/link/LinkCurrentWindow.java
+++ b/src/com/vaadin/demo/sampler/features/link/LinkCurrentWindow.java
@@ -24,8 +24,9 @@ public class LinkCurrentWindow extends Feature {
         return new APIResource[] { new APIResource(Link.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { LinkNoDecorations.class, LinkSizedWindow.class,
                 ButtonLink.class };
     }
diff --git a/src/com/vaadin/demo/sampler/features/link/LinkNoDecorations.java b/src/com/vaadin/demo/sampler/features/link/LinkNoDecorations.java
index cb6d1fc45d..4d3f22a54b 100644
--- a/src/com/vaadin/demo/sampler/features/link/LinkNoDecorations.java
+++ b/src/com/vaadin/demo/sampler/features/link/LinkNoDecorations.java
@@ -24,8 +24,9 @@ public class LinkNoDecorations extends Feature {
         return new APIResource[] { new APIResource(Link.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { LinkCurrentWindow.class, LinkSizedWindow.class,
                 ButtonLink.class };
     }
diff --git a/src/com/vaadin/demo/sampler/features/link/LinkSizedWindow.java b/src/com/vaadin/demo/sampler/features/link/LinkSizedWindow.java
index f752c014ff..dce9314dc8 100644
--- a/src/com/vaadin/demo/sampler/features/link/LinkSizedWindow.java
+++ b/src/com/vaadin/demo/sampler/features/link/LinkSizedWindow.java
@@ -24,8 +24,9 @@ public class LinkSizedWindow extends Feature {
         return new APIResource[] { new APIResource(Link.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { LinkCurrentWindow.class, LinkNoDecorations.class,
                 ButtonLink.class };
     }
diff --git a/src/com/vaadin/demo/sampler/features/notifications/NotificationCustom.java b/src/com/vaadin/demo/sampler/features/notifications/NotificationCustom.java
index 26da2b5036..c01f75a794 100644
--- a/src/com/vaadin/demo/sampler/features/notifications/NotificationCustom.java
+++ b/src/com/vaadin/demo/sampler/features/notifications/NotificationCustom.java
@@ -28,8 +28,9 @@ public class NotificationCustom extends Feature {
                 new APIResource(Window.Notification.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { NotificationHumanized.class,
                 NotificationWarning.class, NotificationError.class,
                 NotificationTray.class };
diff --git a/src/com/vaadin/demo/sampler/features/notifications/NotificationError.java b/src/com/vaadin/demo/sampler/features/notifications/NotificationError.java
index 87d77fd2ff..7cd6478839 100644
--- a/src/com/vaadin/demo/sampler/features/notifications/NotificationError.java
+++ b/src/com/vaadin/demo/sampler/features/notifications/NotificationError.java
@@ -32,8 +32,9 @@ public class NotificationError extends Feature {
                 new APIResource(Window.Notification.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { NotificationHumanized.class,
                 NotificationTray.class, NotificationWarning.class,
                 NotificationCustom.class };
diff --git a/src/com/vaadin/demo/sampler/features/notifications/NotificationHumanized.java b/src/com/vaadin/demo/sampler/features/notifications/NotificationHumanized.java
index 1c016b3ac7..af6900f2f4 100644
--- a/src/com/vaadin/demo/sampler/features/notifications/NotificationHumanized.java
+++ b/src/com/vaadin/demo/sampler/features/notifications/NotificationHumanized.java
@@ -33,8 +33,9 @@ public class NotificationHumanized extends Feature {
                 new APIResource(Window.Notification.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { NotificationTray.class, NotificationWarning.class,
                 NotificationError.class, NotificationCustom.class };
     }
diff --git a/src/com/vaadin/demo/sampler/features/notifications/NotificationTray.java b/src/com/vaadin/demo/sampler/features/notifications/NotificationTray.java
index fdcf6ec2f0..4d4ebf0fb7 100644
--- a/src/com/vaadin/demo/sampler/features/notifications/NotificationTray.java
+++ b/src/com/vaadin/demo/sampler/features/notifications/NotificationTray.java
@@ -33,8 +33,9 @@ public class NotificationTray extends Feature {
                 new APIResource(Window.Notification.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { NotificationHumanized.class,
                 NotificationWarning.class, NotificationError.class,
                 NotificationCustom.class };
diff --git a/src/com/vaadin/demo/sampler/features/notifications/NotificationWarning.java b/src/com/vaadin/demo/sampler/features/notifications/NotificationWarning.java
index 8ba9e1d55c..066709c417 100644
--- a/src/com/vaadin/demo/sampler/features/notifications/NotificationWarning.java
+++ b/src/com/vaadin/demo/sampler/features/notifications/NotificationWarning.java
@@ -33,8 +33,9 @@ public class NotificationWarning extends Feature {
                 new APIResource(Window.Notification.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { NotificationHumanized.class,
                 NotificationTray.class, NotificationError.class,
                 NotificationCustom.class };
diff --git a/src/com/vaadin/demo/sampler/features/panels/PanelBasic.java b/src/com/vaadin/demo/sampler/features/panels/PanelBasic.java
index 378f9f6f2b..6562360860 100644
--- a/src/com/vaadin/demo/sampler/features/panels/PanelBasic.java
+++ b/src/com/vaadin/demo/sampler/features/panels/PanelBasic.java
@@ -26,8 +26,9 @@ public class PanelBasic extends Feature {
                 new APIResource(Layout.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { PanelLight.class, FeatureSet.Layouts.class };
     }
 
diff --git a/src/com/vaadin/demo/sampler/features/panels/PanelLight.java b/src/com/vaadin/demo/sampler/features/panels/PanelLight.java
index 94eb662930..803460932c 100644
--- a/src/com/vaadin/demo/sampler/features/panels/PanelLight.java
+++ b/src/com/vaadin/demo/sampler/features/panels/PanelLight.java
@@ -26,8 +26,9 @@ public class PanelLight extends Feature {
                 new APIResource(Layout.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { PanelBasic.class, FeatureSet.Layouts.class };
     }
 
diff --git a/src/com/vaadin/demo/sampler/features/selects/ComboBoxContains.java b/src/com/vaadin/demo/sampler/features/selects/ComboBoxContains.java
index 6c6aab6389..425895946f 100644
--- a/src/com/vaadin/demo/sampler/features/selects/ComboBoxContains.java
+++ b/src/com/vaadin/demo/sampler/features/selects/ComboBoxContains.java
@@ -29,8 +29,9 @@ public class ComboBoxContains extends Feature {
         return new APIResource[] { new APIResource(ComboBox.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { ComboBoxPlain.class, ComboBoxStartsWith.class,
                 ComboBoxNewItems.class };
     }
diff --git a/src/com/vaadin/demo/sampler/features/selects/ComboBoxInputPrompt.java b/src/com/vaadin/demo/sampler/features/selects/ComboBoxInputPrompt.java
index 375edfb10c..da38ecc56f 100644
--- a/src/com/vaadin/demo/sampler/features/selects/ComboBoxInputPrompt.java
+++ b/src/com/vaadin/demo/sampler/features/selects/ComboBoxInputPrompt.java
@@ -29,8 +29,9 @@ public class ComboBoxInputPrompt extends Feature {
         return new APIResource[] { new APIResource(ComboBox.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { ComboBoxStartsWith.class, ComboBoxContains.class,
                 ComboBoxNewItems.class, TextFieldInputPrompt.class };
     }
diff --git a/src/com/vaadin/demo/sampler/features/selects/ComboBoxNewItems.java b/src/com/vaadin/demo/sampler/features/selects/ComboBoxNewItems.java
index 774aeecf73..b9ec8025ea 100644
--- a/src/com/vaadin/demo/sampler/features/selects/ComboBoxNewItems.java
+++ b/src/com/vaadin/demo/sampler/features/selects/ComboBoxNewItems.java
@@ -31,8 +31,9 @@ public class ComboBoxNewItems extends Feature {
         return new APIResource[] { new APIResource(ComboBox.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { ComboBoxPlain.class, ComboBoxStartsWith.class,
                 ComboBoxContains.class };
     }
diff --git a/src/com/vaadin/demo/sampler/features/selects/ComboBoxPlain.java b/src/com/vaadin/demo/sampler/features/selects/ComboBoxPlain.java
index 92d071a2ac..299534dfcc 100644
--- a/src/com/vaadin/demo/sampler/features/selects/ComboBoxPlain.java
+++ b/src/com/vaadin/demo/sampler/features/selects/ComboBoxPlain.java
@@ -26,8 +26,9 @@ public class ComboBoxPlain extends Feature {
         return new APIResource[] { new APIResource(ComboBox.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { ComboBoxStartsWith.class, ComboBoxContains.class,
                 ComboBoxNewItems.class };
     }
diff --git a/src/com/vaadin/demo/sampler/features/selects/ComboBoxStartsWith.java b/src/com/vaadin/demo/sampler/features/selects/ComboBoxStartsWith.java
index 08e95d9029..49a3e67685 100644
--- a/src/com/vaadin/demo/sampler/features/selects/ComboBoxStartsWith.java
+++ b/src/com/vaadin/demo/sampler/features/selects/ComboBoxStartsWith.java
@@ -29,8 +29,9 @@ public class ComboBoxStartsWith extends Feature {
         return new APIResource[] { new APIResource(ComboBox.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { ComboBoxPlain.class, ComboBoxContains.class,
                 ComboBoxNewItems.class };
     }
diff --git a/src/com/vaadin/demo/sampler/features/selects/ListSelectMultiple.java b/src/com/vaadin/demo/sampler/features/selects/ListSelectMultiple.java
index 2d532cc0d5..776d191343 100644
--- a/src/com/vaadin/demo/sampler/features/selects/ListSelectMultiple.java
+++ b/src/com/vaadin/demo/sampler/features/selects/ListSelectMultiple.java
@@ -27,8 +27,9 @@ public class ListSelectMultiple extends Feature {
         return new APIResource[] { new APIResource(ListSelect.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { NativeSelection.class, ListSelectSingle.class,
                 TwinColumnSelect.class };
     }
diff --git a/src/com/vaadin/demo/sampler/features/selects/ListSelectSingle.java b/src/com/vaadin/demo/sampler/features/selects/ListSelectSingle.java
index ef9ee3275c..dfaeefeb89 100644
--- a/src/com/vaadin/demo/sampler/features/selects/ListSelectSingle.java
+++ b/src/com/vaadin/demo/sampler/features/selects/ListSelectSingle.java
@@ -25,8 +25,9 @@ public class ListSelectSingle extends Feature {
         return new APIResource[] { new APIResource(ListSelect.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { NativeSelection.class, ListSelectMultiple.class,
                 TwinColumnSelect.class };
     }
diff --git a/src/com/vaadin/demo/sampler/features/selects/NativeSelection.java b/src/com/vaadin/demo/sampler/features/selects/NativeSelection.java
index c654406b40..7d3e886985 100644
--- a/src/com/vaadin/demo/sampler/features/selects/NativeSelection.java
+++ b/src/com/vaadin/demo/sampler/features/selects/NativeSelection.java
@@ -31,8 +31,9 @@ public class NativeSelection extends Feature {
         return new APIResource[] { new APIResource(NativeSelect.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { ComboBoxPlain.class, ListSelectSingle.class,
                 FeatureSet.Selects.class };
     }
diff --git a/src/com/vaadin/demo/sampler/features/selects/TwinColumnSelect.java b/src/com/vaadin/demo/sampler/features/selects/TwinColumnSelect.java
index 9034c1f1db..06a01e2127 100644
--- a/src/com/vaadin/demo/sampler/features/selects/TwinColumnSelect.java
+++ b/src/com/vaadin/demo/sampler/features/selects/TwinColumnSelect.java
@@ -28,8 +28,9 @@ public class TwinColumnSelect extends Feature {
         return new APIResource[] { new APIResource(TwinColSelect.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { NativeSelection.class, ListSelectMultiple.class,
                 ListSelectSingle.class };
     }
diff --git a/src/com/vaadin/demo/sampler/features/table/TableActions.java b/src/com/vaadin/demo/sampler/features/table/TableActions.java
index f497244c99..224524ff0a 100644
--- a/src/com/vaadin/demo/sampler/features/table/TableActions.java
+++ b/src/com/vaadin/demo/sampler/features/table/TableActions.java
@@ -32,8 +32,9 @@ public class TableActions extends Feature {
         return new APIResource[] { new APIResource(Table.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { FeatureSet.Tables.class };
     }
 
diff --git a/src/com/vaadin/demo/sampler/features/table/TableCellStyling.java b/src/com/vaadin/demo/sampler/features/table/TableCellStyling.java
index c99ef8e4a9..74bdee713c 100644
--- a/src/com/vaadin/demo/sampler/features/table/TableCellStyling.java
+++ b/src/com/vaadin/demo/sampler/features/table/TableCellStyling.java
@@ -34,8 +34,9 @@ public class TableCellStyling extends Feature {
         return new APIResource[] { new APIResource(Table.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { FeatureSet.Tables.class };
     }
 
diff --git a/src/com/vaadin/demo/sampler/features/table/TableColumnAlignment.java b/src/com/vaadin/demo/sampler/features/table/TableColumnAlignment.java
index 9f4a2591a7..130e558ca9 100644
--- a/src/com/vaadin/demo/sampler/features/table/TableColumnAlignment.java
+++ b/src/com/vaadin/demo/sampler/features/table/TableColumnAlignment.java
@@ -31,8 +31,9 @@ public class TableColumnAlignment extends Feature {
         return new APIResource[] { new APIResource(Table.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { FeatureSet.Tables.class };
     }
 
diff --git a/src/com/vaadin/demo/sampler/features/table/TableColumnCollapsing.java b/src/com/vaadin/demo/sampler/features/table/TableColumnCollapsing.java
index d263d73754..cdf2748b1d 100644
--- a/src/com/vaadin/demo/sampler/features/table/TableColumnCollapsing.java
+++ b/src/com/vaadin/demo/sampler/features/table/TableColumnCollapsing.java
@@ -34,8 +34,9 @@ public class TableColumnCollapsing extends Feature {
         return new APIResource[] { new APIResource(Table.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { FeatureSet.Tables.class };
     }
 
diff --git a/src/com/vaadin/demo/sampler/features/table/TableColumnHeaders.java b/src/com/vaadin/demo/sampler/features/table/TableColumnHeaders.java
index e895ee816a..cf0f996397 100644
--- a/src/com/vaadin/demo/sampler/features/table/TableColumnHeaders.java
+++ b/src/com/vaadin/demo/sampler/features/table/TableColumnHeaders.java
@@ -31,8 +31,9 @@ public class TableColumnHeaders extends Feature {
         return new APIResource[] { new APIResource(Table.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { FeatureSet.Tables.class };
     }
 
diff --git a/src/com/vaadin/demo/sampler/features/table/TableColumnReordering.java b/src/com/vaadin/demo/sampler/features/table/TableColumnReordering.java
index 005199c39d..4a92c94d2c 100644
--- a/src/com/vaadin/demo/sampler/features/table/TableColumnReordering.java
+++ b/src/com/vaadin/demo/sampler/features/table/TableColumnReordering.java
@@ -31,8 +31,9 @@ public class TableColumnReordering extends Feature {
         return new APIResource[] { new APIResource(Table.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { FeatureSet.Tables.class };
     }
 
diff --git a/src/com/vaadin/demo/sampler/features/table/TableHeaderIcons.java b/src/com/vaadin/demo/sampler/features/table/TableHeaderIcons.java
index 1274be04e4..e097b09811 100644
--- a/src/com/vaadin/demo/sampler/features/table/TableHeaderIcons.java
+++ b/src/com/vaadin/demo/sampler/features/table/TableHeaderIcons.java
@@ -32,8 +32,9 @@ public class TableHeaderIcons extends Feature {
         return new APIResource[] { new APIResource(Table.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { FeatureSet.Tables.class };
     }
 
diff --git a/src/com/vaadin/demo/sampler/features/table/TableLazyLoading.java b/src/com/vaadin/demo/sampler/features/table/TableLazyLoading.java
index 195959856f..ef9f9014c6 100644
--- a/src/com/vaadin/demo/sampler/features/table/TableLazyLoading.java
+++ b/src/com/vaadin/demo/sampler/features/table/TableLazyLoading.java
@@ -34,8 +34,9 @@ public class TableLazyLoading extends Feature {
         return new APIResource[] { new APIResource(Table.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { FeatureSet.Tables.class };
     }
 
diff --git a/src/com/vaadin/demo/sampler/features/table/TableMouseEvents.java b/src/com/vaadin/demo/sampler/features/table/TableMouseEvents.java
index a0a1825d01..810363cab2 100644
--- a/src/com/vaadin/demo/sampler/features/table/TableMouseEvents.java
+++ b/src/com/vaadin/demo/sampler/features/table/TableMouseEvents.java
@@ -33,8 +33,9 @@ public class TableMouseEvents extends Feature {
         return new APIResource[] { new APIResource(Table.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { FeatureSet.Tables.class };
     }
 
diff --git a/src/com/vaadin/demo/sampler/features/table/TableRowHeaders.java b/src/com/vaadin/demo/sampler/features/table/TableRowHeaders.java
index 8cd403d7e6..de4e484240 100644
--- a/src/com/vaadin/demo/sampler/features/table/TableRowHeaders.java
+++ b/src/com/vaadin/demo/sampler/features/table/TableRowHeaders.java
@@ -31,8 +31,9 @@ public class TableRowHeaders extends Feature {
         return new APIResource[] { new APIResource(Table.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { FeatureSet.Tables.class };
     }
 
diff --git a/src/com/vaadin/demo/sampler/features/table/TableRowStyling.java b/src/com/vaadin/demo/sampler/features/table/TableRowStyling.java
index c95443f960..99133821f5 100644
--- a/src/com/vaadin/demo/sampler/features/table/TableRowStyling.java
+++ b/src/com/vaadin/demo/sampler/features/table/TableRowStyling.java
@@ -34,8 +34,9 @@ public class TableRowStyling extends Feature {
         return new APIResource[] { new APIResource(Table.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { FeatureSet.Tables.class };
     }
 
diff --git a/src/com/vaadin/demo/sampler/features/table/TableSorting.java b/src/com/vaadin/demo/sampler/features/table/TableSorting.java
index 80b2176e31..f6f8e686d7 100644
--- a/src/com/vaadin/demo/sampler/features/table/TableSorting.java
+++ b/src/com/vaadin/demo/sampler/features/table/TableSorting.java
@@ -33,8 +33,9 @@ public class TableSorting extends Feature {
         return new APIResource[] { new APIResource(Table.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { FeatureSet.Tables.class };
     }
 
diff --git a/src/com/vaadin/demo/sampler/features/tabsheets/TabSheetDisabled.java b/src/com/vaadin/demo/sampler/features/tabsheets/TabSheetDisabled.java
index f010101074..459701a853 100644
--- a/src/com/vaadin/demo/sampler/features/tabsheets/TabSheetDisabled.java
+++ b/src/com/vaadin/demo/sampler/features/tabsheets/TabSheetDisabled.java
@@ -22,8 +22,9 @@ public class TabSheetDisabled extends Feature {
         return new APIResource[] { new APIResource(TabSheet.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { TabSheetIcons.class, TabSheetScrolling.class };
     }
 
diff --git a/src/com/vaadin/demo/sampler/features/tabsheets/TabSheetIcons.java b/src/com/vaadin/demo/sampler/features/tabsheets/TabSheetIcons.java
index 34e5322987..5325a0913f 100644
--- a/src/com/vaadin/demo/sampler/features/tabsheets/TabSheetIcons.java
+++ b/src/com/vaadin/demo/sampler/features/tabsheets/TabSheetIcons.java
@@ -22,8 +22,9 @@ public class TabSheetIcons extends Feature {
         return new APIResource[] { new APIResource(TabSheet.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { TabSheetScrolling.class, TabSheetDisabled.class };
     }
 
diff --git a/src/com/vaadin/demo/sampler/features/tabsheets/TabSheetScrolling.java b/src/com/vaadin/demo/sampler/features/tabsheets/TabSheetScrolling.java
index 7e9686aa98..056adaf722 100644
--- a/src/com/vaadin/demo/sampler/features/tabsheets/TabSheetScrolling.java
+++ b/src/com/vaadin/demo/sampler/features/tabsheets/TabSheetScrolling.java
@@ -22,8 +22,9 @@ public class TabSheetScrolling extends Feature {
         return new APIResource[] { new APIResource(TabSheet.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { TabSheetIcons.class, TabSheetDisabled.class };
     }
 
diff --git a/src/com/vaadin/demo/sampler/features/text/LabelPlain.java b/src/com/vaadin/demo/sampler/features/text/LabelPlain.java
index 6efeded44d..fbc174bf62 100644
--- a/src/com/vaadin/demo/sampler/features/text/LabelPlain.java
+++ b/src/com/vaadin/demo/sampler/features/text/LabelPlain.java
@@ -25,8 +25,9 @@ public class LabelPlain extends Feature {
         return new APIResource[] { new APIResource(Label.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { LabelPreformatted.class, LabelRich.class,
                 TextFieldSingle.class, TextArea.class, RichTextEditor.class };
     }
diff --git a/src/com/vaadin/demo/sampler/features/text/LabelPreformatted.java b/src/com/vaadin/demo/sampler/features/text/LabelPreformatted.java
index a2327806b3..0bd4d6d365 100644
--- a/src/com/vaadin/demo/sampler/features/text/LabelPreformatted.java
+++ b/src/com/vaadin/demo/sampler/features/text/LabelPreformatted.java
@@ -25,8 +25,9 @@ public class LabelPreformatted extends Feature {
         return new APIResource[] { new APIResource(Label.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { LabelPlain.class, LabelRich.class,
                 TextFieldSingle.class, TextArea.class, RichTextEditor.class };
     }
diff --git a/src/com/vaadin/demo/sampler/features/text/LabelRich.java b/src/com/vaadin/demo/sampler/features/text/LabelRich.java
index f9ea94e29e..9f8cfb78ca 100644
--- a/src/com/vaadin/demo/sampler/features/text/LabelRich.java
+++ b/src/com/vaadin/demo/sampler/features/text/LabelRich.java
@@ -25,8 +25,9 @@ public class LabelRich extends Feature {
         return new APIResource[] { new APIResource(Label.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { LabelPlain.class, LabelPreformatted.class,
                 RichTextEditor.class };
     }
diff --git a/src/com/vaadin/demo/sampler/features/text/RichTextEditor.java b/src/com/vaadin/demo/sampler/features/text/RichTextEditor.java
index 556d6ae905..bc0ca6cddd 100644
--- a/src/com/vaadin/demo/sampler/features/text/RichTextEditor.java
+++ b/src/com/vaadin/demo/sampler/features/text/RichTextEditor.java
@@ -25,8 +25,9 @@ public class RichTextEditor extends Feature {
         return new APIResource[] { new APIResource(RichTextArea.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { TextArea.class, LabelRich.class };
     }
 
diff --git a/src/com/vaadin/demo/sampler/features/text/TextArea.java b/src/com/vaadin/demo/sampler/features/text/TextArea.java
index 964c1051a3..cddf48c915 100644
--- a/src/com/vaadin/demo/sampler/features/text/TextArea.java
+++ b/src/com/vaadin/demo/sampler/features/text/TextArea.java
@@ -26,8 +26,9 @@ public class TextArea extends Feature {
         return new APIResource[] { new APIResource(TextField.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { RichTextEditor.class, TextFieldSingle.class,
                 FeatureSet.Texts.class };
     }
diff --git a/src/com/vaadin/demo/sampler/features/text/TextFieldInputPrompt.java b/src/com/vaadin/demo/sampler/features/text/TextFieldInputPrompt.java
index 80c9bd5020..149c3b9743 100644
--- a/src/com/vaadin/demo/sampler/features/text/TextFieldInputPrompt.java
+++ b/src/com/vaadin/demo/sampler/features/text/TextFieldInputPrompt.java
@@ -30,8 +30,9 @@ public class TextFieldInputPrompt extends Feature {
         return new APIResource[] { new APIResource(TextField.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         // TODO update CB -ref to 'suggest' pattern, when available
         return new Class[] { TextFieldSingle.class, TextFieldSecret.class,
                 ComboBoxInputPrompt.class, ComboBoxNewItems.class,
diff --git a/src/com/vaadin/demo/sampler/features/text/TextFieldSecret.java b/src/com/vaadin/demo/sampler/features/text/TextFieldSecret.java
index 6af6a3feb8..2a18395a85 100644
--- a/src/com/vaadin/demo/sampler/features/text/TextFieldSecret.java
+++ b/src/com/vaadin/demo/sampler/features/text/TextFieldSecret.java
@@ -26,8 +26,9 @@ public class TextFieldSecret extends Feature {
         return new APIResource[] { new APIResource(TextField.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         // TODO update CB -ref to 'suggest' pattern, when available
         return new Class[] { TextFieldSingle.class, ComboBoxNewItems.class,
                 FeatureSet.Texts.class };
diff --git a/src/com/vaadin/demo/sampler/features/text/TextFieldSingle.java b/src/com/vaadin/demo/sampler/features/text/TextFieldSingle.java
index cab38f5bdd..7a5e390144 100644
--- a/src/com/vaadin/demo/sampler/features/text/TextFieldSingle.java
+++ b/src/com/vaadin/demo/sampler/features/text/TextFieldSingle.java
@@ -28,8 +28,9 @@ public class TextFieldSingle extends Feature {
         return new APIResource[] { new APIResource(TextField.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         // TODO update CB -ref to 'suggest' pattern, when available
         return new Class[] { TextFieldSecret.class, ComboBoxNewItems.class,
                 FeatureSet.Texts.class };
diff --git a/src/com/vaadin/demo/sampler/features/trees/TreeActions.java b/src/com/vaadin/demo/sampler/features/trees/TreeActions.java
index 1a4e5aedd6..557eed7c44 100644
--- a/src/com/vaadin/demo/sampler/features/trees/TreeActions.java
+++ b/src/com/vaadin/demo/sampler/features/trees/TreeActions.java
@@ -25,8 +25,9 @@ public class TreeActions extends Feature {
         return new APIResource[] { new APIResource(Tree.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { TreeSingleSelect.class, TreeMultiSelect.class,
                 TreeMouseEvents.class };
     }
diff --git a/src/com/vaadin/demo/sampler/features/trees/TreeMouseEvents.java b/src/com/vaadin/demo/sampler/features/trees/TreeMouseEvents.java
index 54192f06e7..4fd4c69cfb 100644
--- a/src/com/vaadin/demo/sampler/features/trees/TreeMouseEvents.java
+++ b/src/com/vaadin/demo/sampler/features/trees/TreeMouseEvents.java
@@ -28,8 +28,9 @@ public class TreeMouseEvents extends Feature {
         return new APIResource[] { new APIResource(Tree.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { TreeSingleSelect.class, TreeMultiSelect.class,
                 TreeActions.class };
     }
diff --git a/src/com/vaadin/demo/sampler/features/trees/TreeMultiSelect.java b/src/com/vaadin/demo/sampler/features/trees/TreeMultiSelect.java
index f669d23957..a1e2a2fdc5 100644
--- a/src/com/vaadin/demo/sampler/features/trees/TreeMultiSelect.java
+++ b/src/com/vaadin/demo/sampler/features/trees/TreeMultiSelect.java
@@ -23,8 +23,9 @@ public class TreeMultiSelect extends Feature {
         return new APIResource[] { new APIResource(Tree.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { TreeSingleSelect.class, TreeActions.class,
                 TreeMouseEvents.class };
     }
diff --git a/src/com/vaadin/demo/sampler/features/trees/TreeSingleSelect.java b/src/com/vaadin/demo/sampler/features/trees/TreeSingleSelect.java
index a32f7d0608..6b6362fd5b 100644
--- a/src/com/vaadin/demo/sampler/features/trees/TreeSingleSelect.java
+++ b/src/com/vaadin/demo/sampler/features/trees/TreeSingleSelect.java
@@ -23,8 +23,9 @@ public class TreeSingleSelect extends Feature {
         return new APIResource[] { new APIResource(Tree.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { TreeMultiSelect.class, TreeActions.class };
     }
 
diff --git a/src/com/vaadin/demo/sampler/features/windows/NativeWindow.java b/src/com/vaadin/demo/sampler/features/windows/NativeWindow.java
index 695427f31a..0bb2bb2331 100644
--- a/src/com/vaadin/demo/sampler/features/windows/NativeWindow.java
+++ b/src/com/vaadin/demo/sampler/features/windows/NativeWindow.java
@@ -33,8 +33,9 @@ public class NativeWindow extends Feature {
         return new APIResource[] { new APIResource(Window.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { Subwindow.class, Links.class, Windows.class };
     }
 
diff --git a/src/com/vaadin/demo/sampler/features/windows/Subwindow.java b/src/com/vaadin/demo/sampler/features/windows/Subwindow.java
index 74f7bca1bf..0aaafd9e52 100644
--- a/src/com/vaadin/demo/sampler/features/windows/Subwindow.java
+++ b/src/com/vaadin/demo/sampler/features/windows/Subwindow.java
@@ -26,8 +26,9 @@ public class Subwindow extends Feature {
         return new APIResource[] { new APIResource(Window.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { NativeWindow.class, FeatureSet.Windows.class };
     }
 
diff --git a/src/com/vaadin/demo/sampler/features/windows/SubwindowAutoSized.java b/src/com/vaadin/demo/sampler/features/windows/SubwindowAutoSized.java
index ab35b4cd1a..642b986ee3 100644
--- a/src/com/vaadin/demo/sampler/features/windows/SubwindowAutoSized.java
+++ b/src/com/vaadin/demo/sampler/features/windows/SubwindowAutoSized.java
@@ -27,8 +27,9 @@ public class SubwindowAutoSized extends Feature {
         return new APIResource[] { new APIResource(Window.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { SubwindowSized.class, FeatureSet.Windows.class };
     }
 
diff --git a/src/com/vaadin/demo/sampler/features/windows/SubwindowClose.java b/src/com/vaadin/demo/sampler/features/windows/SubwindowClose.java
index f838295ffe..529bd58b5b 100644
--- a/src/com/vaadin/demo/sampler/features/windows/SubwindowClose.java
+++ b/src/com/vaadin/demo/sampler/features/windows/SubwindowClose.java
@@ -24,8 +24,9 @@ public class SubwindowClose extends Feature {
         return new APIResource[] { new APIResource(Window.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { FeatureSet.Windows.class };
     }
 
diff --git a/src/com/vaadin/demo/sampler/features/windows/SubwindowModal.java b/src/com/vaadin/demo/sampler/features/windows/SubwindowModal.java
index b82bf8d778..da5d14613d 100644
--- a/src/com/vaadin/demo/sampler/features/windows/SubwindowModal.java
+++ b/src/com/vaadin/demo/sampler/features/windows/SubwindowModal.java
@@ -27,8 +27,9 @@ public class SubwindowModal extends Feature {
         return new APIResource[] { new APIResource(Window.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] {
         //
                 Subwindow.class, //
diff --git a/src/com/vaadin/demo/sampler/features/windows/SubwindowPositioned.java b/src/com/vaadin/demo/sampler/features/windows/SubwindowPositioned.java
index 42023e77d7..11b46508ec 100644
--- a/src/com/vaadin/demo/sampler/features/windows/SubwindowPositioned.java
+++ b/src/com/vaadin/demo/sampler/features/windows/SubwindowPositioned.java
@@ -24,8 +24,9 @@ public class SubwindowPositioned extends Feature {
         return new APIResource[] { new APIResource(Window.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { FeatureSet.Windows.class };
     }
 
diff --git a/src/com/vaadin/demo/sampler/features/windows/SubwindowSized.java b/src/com/vaadin/demo/sampler/features/windows/SubwindowSized.java
index e1493ea5f0..a0b4a30fc2 100644
--- a/src/com/vaadin/demo/sampler/features/windows/SubwindowSized.java
+++ b/src/com/vaadin/demo/sampler/features/windows/SubwindowSized.java
@@ -25,8 +25,9 @@ public class SubwindowSized extends Feature {
         return new APIResource[] { new APIResource(Window.class) };
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Class[] getRelatedFeatures() {
+    public Class<? extends Feature>[] getRelatedFeatures() {
         return new Class[] { SubwindowAutoSized.class, FeatureSet.Windows.class };
     }