diff options
| author | Teemu Suo-Anttila <teemusa@vaadin.com> | 2014-09-03 11:48:47 +0300 |
|---|---|---|
| committer | Teemu Suo-Anttila <teemusa@vaadin.com> | 2014-09-03 15:33:01 +0300 |
| commit | 927e424acc1e43a12bdbbcd971302d00717af540 (patch) | |
| tree | a91f0486fb646f6d1de9a4d590e25100347cc7ec /server/src/com/vaadin/ui/Button.java | |
| parent | 600d5b436d7ca33840b1b697082d140a5040bdf3 (diff) | |
| parent | f6282cbe0386d03b57a65450bc163b20bfecfb70 (diff) | |
| download | vaadin-framework-927e424acc1e43a12bdbbcd971302d00717af540.tar.gz vaadin-framework-927e424acc1e43a12bdbbcd971302d00717af540.zip | |
Merge remote-tracking branch 'origin/master' into grid
This merge needs Grid to use elemental.json instead of org.json
Change-Id: Ib3c387c7e282b2502f266bafbdaad8727f5dc6ef
Diffstat (limited to 'server/src/com/vaadin/ui/Button.java')
| -rw-r--r-- | server/src/com/vaadin/ui/Button.java | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/server/src/com/vaadin/ui/Button.java b/server/src/com/vaadin/ui/Button.java index 58b6f9de81..76b82aa034 100644 --- a/server/src/com/vaadin/ui/Button.java +++ b/server/src/com/vaadin/ui/Button.java @@ -19,8 +19,6 @@ package com.vaadin.ui; import java.io.Serializable; import java.lang.reflect.Method; -import org.json.JSONException; - import com.vaadin.event.Action; import com.vaadin.event.FieldEvents; import com.vaadin.event.FieldEvents.BlurEvent; @@ -63,12 +61,8 @@ public class Button extends AbstractComponent implements // Makes sure the enabled=false state is noticed at once - otherwise // a following setEnabled(true) call might have no effect. see // ticket #10030 - try { - getUI().getConnectorTracker().getDiffState(Button.this) - .put("enabled", false); - } catch (JSONException e) { - throw new RuntimeException(e); - } + getUI().getConnectorTracker().getDiffState(Button.this) + .put("enabled", false); } }; |