aboutsummaryrefslogtreecommitdiffstats
path: root/src/com/vaadin/ui/Button.java
diff options
context:
space:
mode:
authorHenri Sara <hesara@vaadin.com>2011-11-08 18:02:55 +0200
committerHenri Sara <hesara@vaadin.com>2011-11-08 18:02:55 +0200
commit0ab1d01c8da1f280370452fa2427708fd6de513e (patch)
tree4bf67b8a478da3b25af35c33c031c837ef2cc2e7 /src/com/vaadin/ui/Button.java
parenta61302616430cbbfc97cbdbb85fe294842b3409c (diff)
downloadvaadin-framework-0ab1d01c8da1f280370452fa2427708fd6de513e.tar.gz
vaadin-framework-0ab1d01c8da1f280370452fa2427708fd6de513e.zip
Parameterize Property and Field with the value type.
The interfaces Property and Field and most of their implementations are now parameterized with the type of their value. The method getValue() returns the Property type but setValue() takes Object as its parameter. No implicit conversions between value type and strings are performed in most locations (fields). Among others, AbstractTextField, DateField and RichTextArea not have specific value types and do not accept arbitrary values. Most locations requiring migration will be visible as compilation errors, with the exception of some cases where a non-parameterized Property or Field (or one parametrized with Object) is used. Not yet done: - Label - converters - setValue() parameterization (causes much more migration effort)
Diffstat (limited to 'src/com/vaadin/ui/Button.java')
-rw-r--r--src/com/vaadin/ui/Button.java13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/com/vaadin/ui/Button.java b/src/com/vaadin/ui/Button.java
index 16314f94c3..2c8e17f071 100644
--- a/src/com/vaadin/ui/Button.java
+++ b/src/com/vaadin/ui/Button.java
@@ -36,8 +36,9 @@ import com.vaadin.ui.themes.BaseTheme;
*/
@SuppressWarnings("serial")
@ClientWidget(value = VButton.class, loadStyle = LoadStyle.EAGER)
-public class Button extends AbstractField implements FieldEvents.BlurNotifier,
- FieldEvents.FocusNotifier {
+// FIXME Button should not be a Field, but CheckBox should
+public class Button extends AbstractField<Boolean> implements
+ FieldEvents.BlurNotifier, FieldEvents.FocusNotifier {
/* Private members */
@@ -125,7 +126,7 @@ public class Button extends AbstractField implements FieldEvents.BlurNotifier,
* @deprecated use {@link CheckBox} instead of Button in "switchmode"
*/
@Deprecated
- public Button(String caption, Property dataSource) {
+ public Button(String caption, Property<Boolean> dataSource) {
setCaption(caption);
setSwitchMode(true);
setPropertyDataSource(dataSource);
@@ -178,7 +179,7 @@ public class Button extends AbstractField implements FieldEvents.BlurNotifier,
if (!isReadOnly() && variables.containsKey("state")) {
// Gets the new and old button states
final Boolean newValue = (Boolean) variables.get("state");
- final Boolean oldValue = (Boolean) getValue();
+ final Boolean oldValue = getValue();
if (isSwitchMode()) {
@@ -265,7 +266,7 @@ public class Button extends AbstractField implements FieldEvents.BlurNotifier,
* @return True iff the button is pressed down or checked.
*/
public boolean booleanValue() {
- Boolean value = (Boolean) getValue();
+ Boolean value = getValue();
return (null == value) ? false : value.booleanValue();
}
@@ -286,7 +287,7 @@ public class Button extends AbstractField implements FieldEvents.BlurNotifier,
* @see com.vaadin.data.Property#getType()
*/
@Override
- public Class getType() {
+ public Class<Boolean> getType() {
return Boolean.class;
}