#6209 Icon is not removed from context menu

svn changeset:16671/svn branch:6.5

src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java

@@ -995,6 +995,8 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler,
                 // TODO need some uri handling ??
                 actionMap.put(key + "_i", client.translateVaadinUri(action
                         .getStringAttribute("icon")));
+            } else {
+                actionMap.remove(key + "_i");
             }
         }
 

src/com/vaadin/terminal/gwt/client/ui/VTree.java

@@ -183,6 +183,8 @@ public class VTree extends SimpleFocusablePanel implements Paintable,
                 // TODO need some uri handling ??
                 actionMap.put(key + "_i", client.translateVaadinUri(action
                         .getStringAttribute("icon")));
+            } else {
+                actionMap.remove(key + "_i");
             }
         }