Added generics to KeyMapper and made it based on HashMap instead of

Hashtable

1 files changed, 3 insertions, 3 deletions

diff --git a/src/com/vaadin/ui/Tree.java b/src/com/vaadin/ui/Tree.java
index 619f722e23..499fe9d63f 100644
--- a/src/com/vaadin/ui/Tree.java
+++ b/src/com/vaadin/ui/Tree.java
@@ -81,7 +81,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
     /**
      * Action mapper.
      */
-    private KeyMapper actionMapper = null;
+    private KeyMapper<Action> actionMapper = null;
 
     /**
      * Is the tree selectable on the client side.
@@ -448,7 +448,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
                     (String) variables.get("action"), ",");
             if (st.countTokens() == 2) {
                 final Object itemId = itemIdMapper.get(st.nextToken());
-                final Action action = (Action) actionMapper.get(st.nextToken());
+                final Action action = actionMapper.get(st.nextToken());
                 if (action != null && (itemId == null || containsId(itemId))
                         && actionHandlers != null) {
                     for (Handler ah : actionHandlers) {
@@ -1027,7 +1027,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
 
             if (actionHandlers == null) {
                 actionHandlers = new LinkedList<Action.Handler>();
-                actionMapper = new KeyMapper();
+                actionMapper = new KeyMapper<Action>();
             }
 
             if (!actionHandlers.contains(actionHandler)) {