1 files changed, 2 insertions, 7 deletions
diff --git a/server/src/com/vaadin/ui/Button.java b/server/src/com/vaadin/ui/Button.java
index f568d770e8..8546d8f830 100644
--- a/server/src/com/vaadin/ui/Button.java
+++ b/server/src/com/vaadin/ui/Button.java
@@ -478,7 +478,6 @@ public class Button extends AbstractComponent implements
      */
     public void setDisableOnClick(boolean disableOnClick) {
         getState().setDisableOnClick(disableOnClick);
-        requestRepaint();
     }
 
     /*
@@ -499,7 +498,6 @@ public class Button extends AbstractComponent implements
     @Override
     public void setTabIndex(int tabIndex) {
         getState().setTabIndex(tabIndex);
-        requestRepaint();
     }
 
     @Override
@@ -509,7 +507,7 @@ public class Button extends AbstractComponent implements
     }
 
     @Override
-    public ButtonState getState() {
+    protected ButtonState getState() {
         return (ButtonState) super.getState();
     }
 
@@ -526,10 +524,7 @@ public class Button extends AbstractComponent implements
      *            <code>false</code> otherwise
      */
     public void setHtmlContentAllowed(boolean htmlContentAllowed) {
-        if (getState().isHtmlContentAllowed() != htmlContentAllowed) {
-            getState().setHtmlContentAllowed(htmlContentAllowed);
-            requestRepaint();
-        }
+        getState().setHtmlContentAllowed(htmlContentAllowed);
     }
 
     /**