#5692 Generics and warnings cleanup: FeatureBrowser

svn changeset:15381/svn branch:6.5

diff --git a/tests/src/com/vaadin/tests/featurebrowser/FeatureBrowser.java b/tests/src/com/vaadin/tests/featurebrowser/FeatureBrowser.java
index d4eb6867a1a9612510f050e280056ef39fcd0d07..92856aad41f7a915fe417074eec1ad1f04c69b55 100644 (file)
--- a/tests/src/com/vaadin/tests/featurebrowser/FeatureBrowser.java
+++ b/tests/src/com/vaadin/tests/featurebrowser/FeatureBrowser.java
@@ -120,7 +120,8 @@ public class FeatureBrowser extends CustomComponent implements
         // new FeatureParameters());
 
         // Pre-open all menus
-        for (final Iterator i = features.getItemIds().iterator(); i.hasNext();) {
+        for (final Iterator<?> i = features.getItemIds().iterator(); i
+                .hasNext();) {
             features.expandItem(i.next());
         }
 
@@ -240,7 +241,7 @@ public class FeatureBrowser extends CustomComponent implements
     }
 
     @Override
-    public Iterator getComponentIterator() {
+    public Iterator<Component> getComponentIterator() {
         // TODO Auto-generated method stub
         return null;
     }

diff --git a/tests/src/com/vaadin/tests/featurebrowser/FeatureParameters.java b/tests/src/com/vaadin/tests/featurebrowser/FeatureParameters.java
index 80c329665179b86c14c90138b08f1e936ea748a6..b11cd57ca778d522a1017dbf583c7e28fb688ae8 100644 (file)
--- a/tests/src/com/vaadin/tests/featurebrowser/FeatureParameters.java
+++ b/tests/src/com/vaadin/tests/featurebrowser/FeatureParameters.java
@@ -151,11 +151,12 @@ public class FeatureParameters extends Feature implements URIHandler,
      * 
      * @see com.vaadin.terminal.ParameterHandler#handleParameters(Map)
      */
-    public void handleParameters(Map parameters) {
+    public void handleParameters(Map<String, String[]> parameters) {
         params.removeAllItems();
-        for (final Iterator i = parameters.keySet().iterator(); i.hasNext();) {
-            final String name = (String) i.next();
-            final String[] values = (String[]) parameters.get(name);
+        for (final Iterator<String> i = parameters.keySet().iterator(); i
+                .hasNext();) {
+            final String name = i.next();
+            final String[] values = parameters.get(name);
             String v = "";
             for (int j = 0; j < values.length; j++) {
                 if (v.length() > 0) {

diff --git a/tests/src/com/vaadin/tests/featurebrowser/FeatureTree.java b/tests/src/com/vaadin/tests/featurebrowser/FeatureTree.java
index c5ccb3ef5fd31c83209bd3d3d8cd93d3db971440..f1dc49b4236f1a9008eba81a90cb9b9ef38d9929 100644 (file)
--- a/tests/src/com/vaadin/tests/featurebrowser/FeatureTree.java
+++ b/tests/src/com/vaadin/tests/featurebrowser/FeatureTree.java
@@ -47,13 +47,13 @@ public class FeatureTree extends Feature implements Action.Handler {
     }
 
     public void expandAll() {
-        for (final Iterator i = t.rootItemIds().iterator(); i.hasNext();) {
+        for (final Iterator<?> i = t.rootItemIds().iterator(); i.hasNext();) {
             t.expandItemsRecursively(i.next());
         }
     }
 
     public void collapseAll() {
-        for (final Iterator i = t.rootItemIds().iterator(); i.hasNext();) {
+        for (final Iterator<?> i = t.rootItemIds().iterator(); i.hasNext();) {
             t.collapseItemsRecursively(i.next());
         }
     }

diff --git a/tests/src/com/vaadin/tests/featurebrowser/IntroWelcome.java b/tests/src/com/vaadin/tests/featurebrowser/IntroWelcome.java
index 16437c8f4c35d2c2721e6f392b4cc03b005ce6f1..4daad847038d859cd56e6dcd4ee3b693ddb4000d 100644 (file)
--- a/tests/src/com/vaadin/tests/featurebrowser/IntroWelcome.java
+++ b/tests/src/com/vaadin/tests/featurebrowser/IntroWelcome.java
@@ -158,9 +158,10 @@ public class IntroWelcome extends Feature implements URIHandler,
      * 
      * @see com.vaadin.terminal.ParameterHandler#handleParameters(Map)
      */
-    public void handleParameters(Map parameters) {
-        for (final Iterator i = parameters.keySet().iterator(); i.hasNext();) {
-            final String name = (String) i.next();
+    public void handleParameters(Map<String, String[]> parameters) {
+        for (final Iterator<String> i = parameters.keySet().iterator(); i
+                .hasNext();) {
+            final String name = i.next();
             if (name.equals("systemStatus")) {
                 String status = "";
                 status += "timestamp=" + new Date() + " ";

diff --git a/tests/src/com/vaadin/tests/featurebrowser/PropertyPanel.java b/tests/src/com/vaadin/tests/featurebrowser/PropertyPanel.java
index 713920248589188f2868bbf43515019caa234f1e..3a6c379b5ce988b47f83c5f229f7ce4be6896207 100644 (file)
--- a/tests/src/com/vaadin/tests/featurebrowser/PropertyPanel.java
+++ b/tests/src/com/vaadin/tests/featurebrowser/PropertyPanel.java
@@ -43,7 +43,7 @@ public class PropertyPanel extends Panel implements Button.ClickListener,
 
     private final OrderedLayout formsLayout = new OrderedLayout();
 
-    private final LinkedList forms = new LinkedList();
+    private final LinkedList<Form> forms = new LinkedList<Form>();
 
     private final Button setButton = new Button("Set", this);
 
@@ -53,7 +53,7 @@ public class PropertyPanel extends Panel implements Button.ClickListener,
 
     private final Object objectToConfigure;
 
-    private final BeanItem config;
+    private final BeanItem<Object> config;
 
     protected static final int COLUMNS = 3;
 
@@ -70,7 +70,7 @@ public class PropertyPanel extends Panel implements Button.ClickListener,
 
         // Target object
         this.objectToConfigure = objectToConfigure;
-        config = new BeanItem(objectToConfigure);
+        config = new BeanItem<Object>(objectToConfigure);
 
         // Control buttons
         final OrderedLayout buttons = new OrderedLayout(
@@ -134,9 +134,9 @@ public class PropertyPanel extends Panel implements Button.ClickListener,
         allProperties.removeAllItems();
 
         // Collect demoed properties
-        final HashSet listed = new HashSet();
-        for (final Iterator i = forms.iterator(); i.hasNext();) {
-            listed.addAll(((Form) i.next()).getItemPropertyIds());
+        final HashSet<Object> listed = new HashSet<Object>();
+        for (final Iterator<Form> i = forms.iterator(); i.hasNext();) {
+            listed.addAll(i.next().getItemPropertyIds());
         }
 
         // Resolve all properties
@@ -433,8 +433,8 @@ public class PropertyPanel extends Panel implements Button.ClickListener,
 
         // Discard all changed on all forms
         if (event.getButton() == discardButton) {
-            for (final Iterator i = forms.iterator(); i.hasNext();) {
-                ((Form) i.next()).discard();
+            for (final Iterator<Form> i = forms.iterator(); i.hasNext();) {
+                i.next().discard();
             }
         }
 
@@ -469,8 +469,8 @@ public class PropertyPanel extends Panel implements Button.ClickListener,
 
     /** Find a field from all forms */
     public Field getField(Object propertyId) {
-        for (final Iterator i = forms.iterator(); i.hasNext();) {
-            final Form f = (Form) i.next();
+        for (final Iterator<Form> i = forms.iterator(); i.hasNext();) {
+            final Form f = i.next();
             final Field af = f.getField(propertyId);
             if (af != null) {
                 return af;
@@ -484,8 +484,8 @@ public class PropertyPanel extends Panel implements Button.ClickListener,
     }
 
     protected void commit() {
-        for (final Iterator i = forms.iterator(); i.hasNext();) {
-            ((Form) i.next()).commit();
+        for (final Iterator<Form> i = forms.iterator(); i.hasNext();) {
+            i.next().commit();
         }
     }