diff options
| author | Edoardo Vacchi <uncommonnonsense@gmail.com> | 2014-11-24 17:23:29 +0100 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2016-05-17 12:26:04 +0000 |
| commit | 31709daa2d13fbf7b25456f8ad99053fe81daf38 (patch) | |
| tree | 383ec9cabd5faca5bfda48bcf7c8d431c2036b06 /server/src/main | |
| parent | 107c1b84d493af79c3735745143fd9dd7740fc6f (diff) | |
| download | vaadin-framework-31709daa2d13fbf7b25456f8ad99053fe81daf38.tar.gz vaadin-framework-31709daa2d13fbf7b25456f8ad99053fe81daf38.zip | |
Remove shortcut listener from subclasses of AbstractComponent (#16498).
e.g., Panel shadows actionManager with its own instance field
* solution: always invoke getActionManager()
Change-Id: Ibeca2ad53cb1175ae1ebcfb4d68b3d2bf36ea8b2
Diffstat (limited to 'server/src/main')
| -rw-r--r-- | server/src/main/java/com/vaadin/ui/AbstractComponent.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/server/src/main/java/com/vaadin/ui/AbstractComponent.java b/server/src/main/java/com/vaadin/ui/AbstractComponent.java index bf13f032d2..8fa1f523ff 100644 --- a/server/src/main/java/com/vaadin/ui/AbstractComponent.java +++ b/server/src/main/java/com/vaadin/ui/AbstractComponent.java @@ -1382,9 +1382,7 @@ public abstract class AbstractComponent extends AbstractClientConnector } public void removeShortcutListener(ShortcutListener shortcut) { - if (actionManager != null) { - actionManager.removeAction(shortcut); - } + getActionManager().removeAction(shortcut); } /** |