summaryrefslogtreecommitdiffstats
path: root/src/com/vaadin/ui
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/vaadin/ui')
-rw-r--r--src/com/vaadin/ui/Button.java36
-rw-r--r--src/com/vaadin/ui/DateField.java16
-rw-r--r--src/com/vaadin/ui/OptionGroup.java40
-rw-r--r--src/com/vaadin/ui/Select.java15
-rw-r--r--src/com/vaadin/ui/TextField.java27
5 files changed, 93 insertions, 41 deletions
diff --git a/src/com/vaadin/ui/Button.java b/src/com/vaadin/ui/Button.java
index 004bf43a8f..038186ce16 100644
--- a/src/com/vaadin/ui/Button.java
+++ b/src/com/vaadin/ui/Button.java
@@ -11,6 +11,11 @@ import java.util.Map;
import com.vaadin.data.Property;
import com.vaadin.event.ShortcutListener;
+import com.vaadin.event.FieldEvents;
+import com.vaadin.event.FieldEvents.BlurEvent;
+import com.vaadin.event.FieldEvents.BlurListener;
+import com.vaadin.event.FieldEvents.FocusEvent;
+import com.vaadin.event.FieldEvents.FocusListener;
import com.vaadin.terminal.PaintException;
import com.vaadin.terminal.PaintTarget;
import com.vaadin.terminal.gwt.client.ui.VButton;
@@ -26,7 +31,8 @@ import com.vaadin.ui.themes.BaseTheme;
*/
@SuppressWarnings("serial")
@ClientWidget(VButton.class)
-public class Button extends AbstractField {
+public class Button extends AbstractField implements FieldEvents.BlurNotifier,
+ FieldEvents.FocusNotifier {
/* Private members */
@@ -143,7 +149,7 @@ public class Button extends AbstractField {
* @param variables
*/
@Override
- public void changeVariables(Object source, Map variables) {
+ public void changeVariables(Object source, Map<String, Object> variables) {
super.changeVariables(source, variables);
if (!isReadOnly() && variables.containsKey("state")) {
@@ -173,6 +179,13 @@ public class Button extends AbstractField {
}
}
}
+
+ if (variables.containsKey(FocusEvent.EVENT_ID)) {
+ fireEvent(new FocusEvent(this));
+ }
+ if (variables.containsKey(BlurEvent.EVENT_ID)) {
+ fireEvent(new BlurEvent(this));
+ }
}
/**
@@ -348,6 +361,25 @@ public class Button extends AbstractField {
super.setInternalValue(newValue);
}
+ public void addListener(BlurListener listener) {
+ addListener(BlurEvent.EVENT_ID, BlurEvent.class, listener,
+ BlurListener.blurMethod);
+ }
+
+ public void removeListener(BlurListener listener) {
+ removeListener(BlurEvent.EVENT_ID, BlurEvent.class, listener);
+ }
+
+ public void addListener(FocusListener listener) {
+ addListener(FocusEvent.EVENT_ID, FocusEvent.class, listener,
+ FocusListener.focusMethod);
+ }
+
+ public void removeListener(FocusListener listener) {
+ removeListener(FocusEvent.EVENT_ID, FocusEvent.class, listener);
+
+ }
+
/*
* Actions
*/
diff --git a/src/com/vaadin/ui/DateField.java b/src/com/vaadin/ui/DateField.java
index fca0cc472c..45fd45716d 100644
--- a/src/com/vaadin/ui/DateField.java
+++ b/src/com/vaadin/ui/DateField.java
@@ -21,7 +21,6 @@ import com.vaadin.terminal.PaintException;
import com.vaadin.terminal.PaintTarget;
import com.vaadin.terminal.gwt.client.ui.VDateField;
import com.vaadin.terminal.gwt.client.ui.VPopupCalendar;
-import com.vaadin.terminal.gwt.client.ui.VTextualDate;
/**
* <p>
@@ -93,9 +92,6 @@ public class DateField extends AbstractField implements
*/
protected static final String TYPE_INLINE = "inline";
- private static final String BLUR_EVENT = VTextualDate.BLUR_EVENT_IDENTIFIER;
- private static final String FOCUS_EVENT = VTextualDate.FOCUS_EVENT_IDENTIFIER;
-
/**
* Specified widget type.
*/
@@ -370,11 +366,11 @@ public class DateField extends AbstractField implements
}
}
- if (variables.containsKey(FOCUS_EVENT)) {
+ if (variables.containsKey(FocusEvent.EVENT_ID)) {
fireEvent(new FocusEvent(this));
}
- if (variables.containsKey(BLUR_EVENT)) {
+ if (variables.containsKey(BlurEvent.EVENT_ID)) {
fireEvent(new BlurEvent(this));
}
}
@@ -576,21 +572,21 @@ public class DateField extends AbstractField implements
}
public void addListener(FocusListener listener) {
- addListener(FOCUS_EVENT, FocusEvent.class, listener,
+ addListener(FocusEvent.EVENT_ID, FocusEvent.class, listener,
FocusListener.focusMethod);
}
public void removeListener(FocusListener listener) {
- removeListener(FOCUS_EVENT, FocusEvent.class, listener);
+ removeListener(FocusEvent.EVENT_ID, FocusEvent.class, listener);
}
public void addListener(BlurListener listener) {
- addListener(BLUR_EVENT, BlurEvent.class, listener,
+ addListener(BlurEvent.EVENT_ID, BlurEvent.class, listener,
BlurListener.blurMethod);
}
public void removeListener(BlurListener listener) {
- removeListener(BLUR_EVENT, BlurEvent.class, listener);
+ removeListener(BlurEvent.EVENT_ID, BlurEvent.class, listener);
}
/**
diff --git a/src/com/vaadin/ui/OptionGroup.java b/src/com/vaadin/ui/OptionGroup.java
index ab925f8785..d8baf0bf5c 100644
--- a/src/com/vaadin/ui/OptionGroup.java
+++ b/src/com/vaadin/ui/OptionGroup.java
@@ -5,8 +5,14 @@
package com.vaadin.ui;
import java.util.Collection;
+import java.util.Map;
import com.vaadin.data.Container;
+import com.vaadin.event.FieldEvents;
+import com.vaadin.event.FieldEvents.BlurEvent;
+import com.vaadin.event.FieldEvents.BlurListener;
+import com.vaadin.event.FieldEvents.FocusEvent;
+import com.vaadin.event.FieldEvents.FocusListener;
import com.vaadin.terminal.PaintException;
import com.vaadin.terminal.PaintTarget;
import com.vaadin.terminal.gwt.client.ui.VOptionGroup;
@@ -16,7 +22,8 @@ import com.vaadin.terminal.gwt.client.ui.VOptionGroup;
*/
@SuppressWarnings("serial")
@ClientWidget(VOptionGroup.class)
-public class OptionGroup extends AbstractSelect {
+public class OptionGroup extends AbstractSelect implements
+ FieldEvents.BlurNotifier, FieldEvents.FocusNotifier {
public OptionGroup() {
super();
@@ -40,4 +47,35 @@ public class OptionGroup extends AbstractSelect {
super.paintContent(target);
}
+ @Override
+ public void changeVariables(Object source, Map<String, Object> variables) {
+ super.changeVariables(source, variables);
+
+ if (variables.containsKey(FocusEvent.EVENT_ID)) {
+ fireEvent(new FocusEvent(this));
+ }
+ if (variables.containsKey(BlurEvent.EVENT_ID)) {
+ fireEvent(new BlurEvent(this));
+ }
+ }
+
+ public void addListener(BlurListener listener) {
+ addListener(BlurEvent.EVENT_ID, BlurEvent.class, listener,
+ BlurListener.blurMethod);
+ }
+
+ public void removeListener(BlurListener listener) {
+ removeListener(BlurEvent.EVENT_ID, BlurEvent.class, listener);
+ }
+
+ public void addListener(FocusListener listener) {
+ addListener(FocusEvent.EVENT_ID, FocusEvent.class, listener,
+ FocusListener.focusMethod);
+ }
+
+ public void removeListener(FocusListener listener) {
+ removeListener(FocusEvent.EVENT_ID, FocusEvent.class, listener);
+
+ }
+
}
diff --git a/src/com/vaadin/ui/Select.java b/src/com/vaadin/ui/Select.java
index 4174001d87..31c4ff6ef7 100644
--- a/src/com/vaadin/ui/Select.java
+++ b/src/com/vaadin/ui/Select.java
@@ -46,9 +46,6 @@ import com.vaadin.terminal.gwt.client.ui.VFilterSelect;
public class Select extends AbstractSelect implements AbstractSelect.Filtering,
FieldEvents.BlurNotifier, FieldEvents.FocusNotifier {
- private static final String BLUR_EVENT_ID = VFilterSelect.BLUR_EVENT_IDENTIFIER;
- private static final String FOCUS_EVENT_ID = VFilterSelect.FOCUS_EVENT_IDENTIFIER;
-
/**
* Holds value of property pageLength. 0 disables paging.
*/
@@ -432,10 +429,10 @@ public class Select extends AbstractSelect implements AbstractSelect.Filtering,
}
}
- if (variables.containsKey(FOCUS_EVENT_ID)) {
+ if (variables.containsKey(FocusEvent.EVENT_ID)) {
fireEvent(new FocusEvent(this));
}
- if (variables.containsKey(BLUR_EVENT_ID)) {
+ if (variables.containsKey(BlurEvent.EVENT_ID)) {
fireEvent(new BlurEvent(this));
}
@@ -496,21 +493,21 @@ public class Select extends AbstractSelect implements AbstractSelect.Filtering,
}
public void addListener(BlurListener listener) {
- addListener(BLUR_EVENT_ID, BlurEvent.class, listener,
+ addListener(BlurEvent.EVENT_ID, BlurEvent.class, listener,
BlurListener.blurMethod);
}
public void removeListener(BlurListener listener) {
- removeListener(BLUR_EVENT_ID, BlurEvent.class, listener);
+ removeListener(BlurEvent.EVENT_ID, BlurEvent.class, listener);
}
public void addListener(FocusListener listener) {
- addListener(FOCUS_EVENT_ID, FocusEvent.class, listener,
+ addListener(FocusEvent.EVENT_ID, FocusEvent.class, listener,
FocusListener.focusMethod);
}
public void removeListener(FocusListener listener) {
- removeListener(FOCUS_EVENT_ID, FocusEvent.class, listener);
+ removeListener(FocusEvent.EVENT_ID, FocusEvent.class, listener);
}
diff --git a/src/com/vaadin/ui/TextField.java b/src/com/vaadin/ui/TextField.java
index a3f76160a7..88451717ce 100644
--- a/src/com/vaadin/ui/TextField.java
+++ b/src/com/vaadin/ui/TextField.java
@@ -89,9 +89,6 @@ public class TextField extends AbstractField implements
*/
private int maxLength = -1;
- private static final String BLUR_EVENT = VTextField.BLUR_EVENT_IDENTIFIER;
- private static final String FOCUS_EVENT = VTextField.FOCUS_EVENT_IDENTIFIER;
-
/* Constructors */
/**
@@ -280,11 +277,11 @@ public class TextField extends AbstractField implements
}
}
- if (variables.containsKey(FOCUS_EVENT)) {
- fireFocus(variables.get(FOCUS_EVENT));
+ if (variables.containsKey(FocusEvent.EVENT_ID)) {
+ fireEvent(new FocusEvent(this));
}
- if (variables.containsKey(BLUR_EVENT)) {
- fireBlur(variables.get(BLUR_EVENT));
+ if (variables.containsKey(BlurEvent.EVENT_ID)) {
+ fireEvent(new BlurEvent(this));
}
}
@@ -619,30 +616,22 @@ public class TextField extends AbstractField implements
requestRepaint();
}
- private void fireFocus(Object object) {
- fireEvent(new FocusEvent(this));
- }
-
- private void fireBlur(Object object) {
- fireEvent(new BlurEvent(this));
- }
-
public void addListener(FocusListener listener) {
- addListener(FOCUS_EVENT, FocusEvent.class, listener,
+ addListener(FocusEvent.EVENT_ID, FocusEvent.class, listener,
FocusListener.focusMethod);
}
public void removeListener(FocusListener listener) {
- removeListener(FOCUS_EVENT, FocusEvent.class, listener);
+ removeListener(FocusEvent.EVENT_ID, FocusEvent.class, listener);
}
public void addListener(BlurListener listener) {
- addListener(BLUR_EVENT, BlurEvent.class, listener,
+ addListener(BlurEvent.EVENT_ID, BlurEvent.class, listener,
BlurListener.blurMethod);
}
public void removeListener(BlurListener listener) {
- removeListener(BLUR_EVENT, BlurEvent.class, listener);
+ removeListener(BlurEvent.EVENT_ID, BlurEvent.class, listener);
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-11 18:58:01 +0000