Added generics

svn changeset:10303/svn branch:6.2

diff --git a/src/com/vaadin/ui/AbstractComponent.java b/src/com/vaadin/ui/AbstractComponent.java
index de1515d8560378823cc7e12e841eedf10b38f605..68910bb686c120a9d003985be6f26b5fd84b37bf 100644 (file)
--- a/src/com/vaadin/ui/AbstractComponent.java
+++ b/src/com/vaadin/ui/AbstractComponent.java
@@ -47,7 +47,7 @@ public abstract class AbstractComponent implements Component, MethodEventSource
     /**
      * Style names.
      */
-    private ArrayList styles;
+    private ArrayList<String> styles;
 
     /**
      * Caption text.
@@ -219,8 +219,8 @@ public abstract class AbstractComponent implements Component, MethodEventSource
     public String getStyleName() {
         String s = "";
         if (styles != null) {
-            for (final Iterator it = styles.iterator(); it.hasNext();) {
-                s += (String) it.next();
+            for (final Iterator<String> it = styles.iterator(); it.hasNext();) {
+                s += it.next();
                 if (it.hasNext()) {
                     s += " ";
                 }
@@ -240,7 +240,7 @@ public abstract class AbstractComponent implements Component, MethodEventSource
             return;
         }
         if (styles == null) {
-            styles = new ArrayList();
+            styles = new ArrayList<String>();
         }
         styles.clear();
         styles.add(style);
@@ -252,7 +252,7 @@ public abstract class AbstractComponent implements Component, MethodEventSource
             return;
         }
         if (styles == null) {
-            styles = new ArrayList();
+            styles = new ArrayList<String>();
         }
         if (!styles.contains(style)) {
             styles.add(style);

diff --git a/src/com/vaadin/ui/Embedded.java b/src/com/vaadin/ui/Embedded.java
index 298953d1b113b9779923f65d1e635c5247ff45b2..5d07b6d7780265af07fec816e3975e61590c8708 100644 (file)
--- a/src/com/vaadin/ui/Embedded.java
+++ b/src/com/vaadin/ui/Embedded.java
@@ -4,7 +4,7 @@
 
 package com.vaadin.ui;
 
-import java.util.Hashtable;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
@@ -63,9 +63,9 @@ public class Embedded extends AbstractComponent {
     private String standby = null;
 
     /**
-     * Hash of object parameteres.
+     * Hash of object parameters.
      */
-    private final Hashtable parameters = new Hashtable();
+    private final Map<String, String> parameters = new HashMap<String, String>();
 
     /**
      * Applet or other client side runnable properties.
@@ -148,9 +148,9 @@ public class Embedded extends AbstractComponent {
         }
 
         // Params
-        for (final Iterator i = getParameterNames(); i.hasNext();) {
+        for (final Iterator<String> i = getParameterNames(); i.hasNext();) {
             target.startTag("embeddedparam");
-            final String key = (String) i.next();
+            final String key = i.next();
             target.addAttribute("name", key);
             target.addAttribute("value", getParameter(key));
             target.endTag("embeddedparam");
@@ -181,7 +181,7 @@ public class Embedded extends AbstractComponent {
      * @return the Value of parameter or null if not found.
      */
     public String getParameter(String name) {
-        return (String) parameters.get(name);
+        return parameters.get(name);
     }
 
     /**
@@ -200,7 +200,7 @@ public class Embedded extends AbstractComponent {
      * 
      * @return the Iterator of parameters names.
      */
-    public Iterator getParameterNames() {
+    public Iterator<String> getParameterNames() {
         return parameters.keySet().iterator();
     }
 
@@ -447,7 +447,7 @@ public class Embedded extends AbstractComponent {
     }
 
     @Override
-    public void changeVariables(Object source, Map variables) {
+    public void changeVariables(Object source, Map<String, Object> variables) {
         super.changeVariables(source, variables);
         if (variables.containsKey(CLICK_EVENT)) {
             fireClick((Map<String, Object>) variables.get(CLICK_EVENT));