From f0150dd3415f8bbd4cd0d727c7c387823b65927e Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Thu, 23 Feb 2012 13:34:00 +0200
Subject: [PATCH] Renamed VButtonState to ButtonState as it is a server side
 class that happens to be in a client side package.

---
 .../gwt/client/ui/{VButtonState.java => ButtonState.java} | 2 +-
 .../vaadin/terminal/gwt/client/ui/VButtonPaintable.java   | 6 +++---
 .../terminal/gwt/client/ui/VNativeButtonPaintable.java    | 6 +++---
 src/com/vaadin/ui/Button.java                             | 8 ++++----
 4 files changed, 11 insertions(+), 11 deletions(-)
 rename src/com/vaadin/terminal/gwt/client/ui/{VButtonState.java => ButtonState.java} (96%)

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VButtonState.java b/src/com/vaadin/terminal/gwt/client/ui/ButtonState.java
similarity index 96%
rename from src/com/vaadin/terminal/gwt/client/ui/VButtonState.java
rename to src/com/vaadin/terminal/gwt/client/ui/ButtonState.java
index e452ba6910..7786f4ca87 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VButtonState.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/ButtonState.java
@@ -14,7 +14,7 @@ import com.vaadin.ui.Button;
  * 
  * @since 7.0
  */
-public class VButtonState extends ComponentState {
+public class ButtonState extends ComponentState {
     private boolean disableOnClick = false;
     private int clickShortcutKeyCode = 0;
 
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VButtonPaintable.java b/src/com/vaadin/terminal/gwt/client/ui/VButtonPaintable.java
index d191713aaf..940e115cfd 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VButtonPaintable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VButtonPaintable.java
@@ -96,12 +96,12 @@ public class VButtonPaintable extends VAbstractPaintableWidget {
     }
 
     @Override
-    public VButtonState getState() {
-        return (VButtonState) super.getState();
+    public ButtonState getState() {
+        return (ButtonState) super.getState();
     }
 
     @Override
     protected ComponentState createState() {
-        return GWT.create(VButtonState.class);
+        return GWT.create(ButtonState.class);
     }
 }
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VNativeButtonPaintable.java b/src/com/vaadin/terminal/gwt/client/ui/VNativeButtonPaintable.java
index febc76178a..a2aa9695de 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VNativeButtonPaintable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VNativeButtonPaintable.java
@@ -92,12 +92,12 @@ public class VNativeButtonPaintable extends VAbstractPaintableWidget {
     }
 
     @Override
-    public VButtonState getState() {
-        return (VButtonState) super.getState();
+    public ButtonState getState() {
+        return (ButtonState) super.getState();
     }
 
     @Override
     protected ComponentState createState() {
-        return GWT.create(VButtonState.class);
+        return GWT.create(ButtonState.class);
     }
 }
\ No newline at end of file
diff --git a/src/com/vaadin/ui/Button.java b/src/com/vaadin/ui/Button.java
index 4ca274abf9..84abcdc294 100644
--- a/src/com/vaadin/ui/Button.java
+++ b/src/com/vaadin/ui/Button.java
@@ -22,7 +22,7 @@ import com.vaadin.terminal.gwt.client.ComponentState;
 import com.vaadin.terminal.gwt.client.MouseEventDetails;
 import com.vaadin.terminal.gwt.client.ui.VButton.ButtonClientToServerRpc;
 import com.vaadin.terminal.gwt.client.ui.VButtonPaintable;
-import com.vaadin.terminal.gwt.client.ui.VButtonState;
+import com.vaadin.terminal.gwt.client.ui.ButtonState;
 import com.vaadin.terminal.gwt.server.RpcTarget;
 import com.vaadin.tools.ReflectTools;
 import com.vaadin.ui.ClientWidget.LoadStyle;
@@ -492,11 +492,11 @@ public class Button extends AbstractComponent implements
 
     @Override
     protected ComponentState createState() {
-        return new VButtonState();
+        return new ButtonState();
     }
 
     @Override
-    public VButtonState getState() {
-        return (VButtonState) super.getState();
+    public ButtonState getState() {
+        return (ButtonState) super.getState();
     }
 }
-- 
2.39.5