Browse Source

Renamed VButtonState to ButtonState as it is a server side class that

happens to be in a client side package.
tags/7.0.0.alpha2
Artur Signell 12 years ago
parent
commit
f0150dd341

src/com/vaadin/terminal/gwt/client/ui/VButtonState.java → src/com/vaadin/terminal/gwt/client/ui/ButtonState.java View File

@@ -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;


+ 3
- 3
src/com/vaadin/terminal/gwt/client/ui/VButtonPaintable.java View File

@@ -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);
}
}

+ 3
- 3
src/com/vaadin/terminal/gwt/client/ui/VNativeButtonPaintable.java View File

@@ -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);
}
}

+ 4
- 4
src/com/vaadin/ui/Button.java View File

@@ -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();
}
}

Loading…
Cancel
Save