Some API changes for #875 as discussed at length.

svn changeset:12048/svn branch:6.3

1 files changed, 3 insertions, 3 deletions

diff --git a/src/com/vaadin/ui/Button.java b/src/com/vaadin/ui/Button.java
index 08fab9772a..004bf43a8f 100644
--- a/src/com/vaadin/ui/Button.java
+++ b/src/com/vaadin/ui/Button.java
@@ -357,16 +357,16 @@ public class Button extends AbstractField {
     public ClickShortcut setClickShortcut(int keyCode, int... modifiers) {
         ClickShortcut old = clickShortcut;
         if (old != null) {
-            removeAction(old);
+            removeShortcutListener(old);
         }
         clickShortcut = new ClickShortcut(this, keyCode, modifiers);
-        addAction(clickShortcut);
+        addShortcutListener(clickShortcut);
         return old;
     }
 
     public void removeClickShortcut() {
         if (clickShortcut != null) {
-            removeAction(clickShortcut);
+            removeShortcutListener(clickShortcut);
             clickShortcut = null;
         }
     }