Merge remote-tracking branch 'origin/6.8'

Conflicts:
	src/com/vaadin/terminal/gwt/client/ui/VEmbedded.java
	tests/testbench/com/vaadin/tests/components/embedded/EmbeddedPdf.java

1 files changed, 12 insertions, 3 deletions

diff --git a/src/com/vaadin/ui/Button.java b/src/com/vaadin/ui/Button.java
index 2e23d4ae74..dbebd9200c 100644
--- a/src/com/vaadin/ui/Button.java
+++ b/src/com/vaadin/ui/Button.java
@@ -311,6 +311,17 @@ public class Button extends AbstractComponent implements
     }
 
     /**
+     * Simulates a button click, notifying all server-side listeners.
+     * 
+     * No action is taken is the button is disabled.
+     */
+    public void click() {
+        if (isEnabled() && !isReadOnly()) {
+            fireClick();
+        }
+    }
+
+    /**
      * Fires a click event to all listeners without any event details.
      * 
      * In subclasses, override {@link #fireClick(MouseEventDetails)} instead of
@@ -445,9 +456,7 @@ public class Button extends AbstractComponent implements
 
         @Override
         public void handleAction(Object sender, Object target) {
-            if (button.isEnabled() && !button.isReadOnly()) {
-                button.fireClick();
-            }
+            button.click();
         }
     }