summaryrefslogtreecommitdiffstats
path: root/server/src
diff options
context:
space:
mode:
authorDenis <denis@vaadin.com>2016-12-07 13:27:43 +0200
committerPekka Hyvönen <pekka@vaadin.com>2016-12-07 13:27:43 +0200
commit5778c65bdef65337f8cbcc9d0504abbd11f8278f (patch)
tree640686f221eca3e3ae21f016c41fb034cd76a1ca /server/src
parent2c014bc4eca7c31aab600c233b67133cb4e4179b (diff)
downloadvaadin-framework-5778c65bdef65337f8cbcc9d0504abbd11f8278f.tar.gz
vaadin-framework-5778c65bdef65337f8cbcc9d0504abbd11f8278f.zip
Don't use V8 FieldEvents classes in v7 compatibility module. (#93)
* Don't use V8 FieldEvents classes in v7 compatibility module. Fixes vaadin/framework8-issues#363
Diffstat (limited to 'server/src')
-rw-r--r--server/src/main/java/com/vaadin/event/FieldEvents.java28
-rw-r--r--server/src/main/java/com/vaadin/ui/AbstractDateField.java12
-rw-r--r--server/src/main/java/com/vaadin/ui/AbstractFocusable.java12
-rw-r--r--server/src/main/java/com/vaadin/ui/CheckBox.java12
-rw-r--r--server/src/main/java/com/vaadin/ui/CheckBoxGroup.java12
-rw-r--r--server/src/main/java/com/vaadin/ui/ComboBox.java12
-rw-r--r--server/src/main/java/com/vaadin/ui/NativeSelect.java12
-rw-r--r--server/src/main/java/com/vaadin/ui/RadioButtonGroup.java12
-rw-r--r--server/src/main/java/com/vaadin/ui/TabSheet.java12
-rw-r--r--server/src/main/java/com/vaadin/ui/Window.java12
10 files changed, 0 insertions, 136 deletions
diff --git a/server/src/main/java/com/vaadin/event/FieldEvents.java b/server/src/main/java/com/vaadin/event/FieldEvents.java
index b0e539961b..4673318890 100644
--- a/server/src/main/java/com/vaadin/event/FieldEvents.java
+++ b/server/src/main/java/com/vaadin/event/FieldEvents.java
@@ -55,19 +55,6 @@ public interface FieldEvents {
*/
public Registration addFocusListener(FocusListener listener);
- /**
- * Removes a <code>BlurListener</code> from the Component.
- *
- * @param listener
- * @see FocusListener
- * @since 6.2
- *
- * @deprecated As of 8.0, replaced by {@link Registration#remove()} in
- * the registration object returned from
- * {@link #addFocusListener(FocusListener)}.
- */
- @Deprecated
- public void removeFocusListener(FocusListener listener);
}
/**
@@ -94,21 +81,6 @@ public interface FieldEvents {
*/
public Registration addBlurListener(BlurListener listener);
- /**
- * Removes a <code>BlurListener</code> from the Component.
- *
- * @see BlurListener
- * @since 6.2
- *
- * @param listener
- * the listener to remove
- *
- * @deprecated As of 8.0, replaced by {@link Registration#remove()} in
- * the registration object returned from
- * {@link #addFocusListener(FocusListener)}.
- */
- @Deprecated
- public void removeBlurListener(BlurListener listener);
}
/**
diff --git a/server/src/main/java/com/vaadin/ui/AbstractDateField.java b/server/src/main/java/com/vaadin/ui/AbstractDateField.java
index 1d3f1ee7b2..43d374c392 100644
--- a/server/src/main/java/com/vaadin/ui/AbstractDateField.java
+++ b/server/src/main/java/com/vaadin/ui/AbstractDateField.java
@@ -574,24 +574,12 @@ public abstract class AbstractDateField extends AbstractField<LocalDate>
}
@Override
- @Deprecated
- public void removeFocusListener(FocusListener listener) {
- removeListener(FocusEvent.EVENT_ID, FocusEvent.class, listener);
- }
-
- @Override
public Registration addBlurListener(BlurListener listener) {
return addListener(BlurEvent.EVENT_ID, BlurEvent.class, listener,
BlurListener.blurMethod);
}
@Override
- @Deprecated
- public void removeBlurListener(BlurListener listener) {
- removeListener(BlurEvent.EVENT_ID, BlurEvent.class, listener);
- }
-
- @Override
public void readDesign(Element design, DesignContext designContext) {
super.readDesign(design, designContext);
if (design.hasAttr("value") && !design.attr("value").isEmpty()) {
diff --git a/server/src/main/java/com/vaadin/ui/AbstractFocusable.java b/server/src/main/java/com/vaadin/ui/AbstractFocusable.java
index 959a18fc80..2ad0e4a9f5 100644
--- a/server/src/main/java/com/vaadin/ui/AbstractFocusable.java
+++ b/server/src/main/java/com/vaadin/ui/AbstractFocusable.java
@@ -47,24 +47,12 @@ public abstract class AbstractFocusable extends AbstractComponent
}
@Override
- @Deprecated
- public void removeBlurListener(BlurListener listener) {
- removeListener(BlurEvent.EVENT_ID, BlurEvent.class, listener);
- }
-
- @Override
public Registration addFocusListener(FocusListener listener) {
return addListener(FocusEvent.EVENT_ID, FocusEvent.class, listener,
FocusListener.focusMethod);
}
@Override
- @Deprecated
- public void removeFocusListener(FocusListener listener) {
- removeListener(FocusEvent.EVENT_ID, FocusEvent.class, listener);
- }
-
- @Override
public void focus() {
super.focus();
}
diff --git a/server/src/main/java/com/vaadin/ui/CheckBox.java b/server/src/main/java/com/vaadin/ui/CheckBox.java
index aa7cc565eb..8675332eb5 100644
--- a/server/src/main/java/com/vaadin/ui/CheckBox.java
+++ b/server/src/main/java/com/vaadin/ui/CheckBox.java
@@ -145,23 +145,11 @@ public class CheckBox extends AbstractField<Boolean>
}
@Override
- @Deprecated
- public void removeBlurListener(BlurListener listener) {
- removeListener(BlurEvent.EVENT_ID, BlurEvent.class, listener);
- }
-
- @Override
public Registration addFocusListener(FocusListener listener) {
return addListener(FocusEvent.EVENT_ID, FocusEvent.class, listener,
FocusListener.focusMethod);
}
- @Override
- @Deprecated
- public void removeFocusListener(FocusListener listener) {
- removeListener(FocusEvent.EVENT_ID, FocusEvent.class, listener);
- }
-
/*
* (non-Javadoc)
*
diff --git a/server/src/main/java/com/vaadin/ui/CheckBoxGroup.java b/server/src/main/java/com/vaadin/ui/CheckBoxGroup.java
index 016b5ca392..508d4ed4cc 100644
--- a/server/src/main/java/com/vaadin/ui/CheckBoxGroup.java
+++ b/server/src/main/java/com/vaadin/ui/CheckBoxGroup.java
@@ -161,24 +161,12 @@ public class CheckBoxGroup<T> extends AbstractMultiSelect<T>
}
@Override
- @Deprecated
- public void removeFocusListener(FocusListener listener) {
- removeListener(FocusEvent.EVENT_ID, FocusEvent.class, listener);
- }
-
- @Override
public Registration addBlurListener(BlurListener listener) {
return addListener(BlurEvent.EVENT_ID, BlurEvent.class, listener,
BlurListener.blurMethod);
}
@Override
- @Deprecated
- public void removeBlurListener(BlurListener listener) {
- removeListener(BlurEvent.EVENT_ID, BlurEvent.class, listener);
- }
-
- @Override
protected List<T> readItems(Element design, DesignContext context) {
setItemEnabledProvider(new DeclarativeItemEnabledProvider<>());
return super.readItems(design, context);
diff --git a/server/src/main/java/com/vaadin/ui/ComboBox.java b/server/src/main/java/com/vaadin/ui/ComboBox.java
index 093c5e9c7a..036d4bec1e 100644
--- a/server/src/main/java/com/vaadin/ui/ComboBox.java
+++ b/server/src/main/java/com/vaadin/ui/ComboBox.java
@@ -332,23 +332,11 @@ public class ComboBox<T> extends AbstractSingleSelect<T>
}
@Override
- @Deprecated
- public void removeBlurListener(BlurListener listener) {
- removeListener(BlurEvent.EVENT_ID, BlurEvent.class, listener);
- }
-
- @Override
public Registration addFocusListener(FocusListener listener) {
return addListener(FocusEvent.EVENT_ID, FocusEvent.class, listener,
FocusListener.focusMethod);
}
- @Override
- @Deprecated
- public void removeFocusListener(FocusListener listener) {
- removeListener(FocusEvent.EVENT_ID, FocusEvent.class, listener);
- }
-
/**
* Returns the page length of the suggestion popup.
*
diff --git a/server/src/main/java/com/vaadin/ui/NativeSelect.java b/server/src/main/java/com/vaadin/ui/NativeSelect.java
index b376979678..e7678b7515 100644
--- a/server/src/main/java/com/vaadin/ui/NativeSelect.java
+++ b/server/src/main/java/com/vaadin/ui/NativeSelect.java
@@ -104,24 +104,12 @@ public class NativeSelect<T> extends AbstractSingleSelect<T>
}
@Override
- @Deprecated
- public void removeFocusListener(FocusListener listener) {
- removeListener(FocusEvent.EVENT_ID, FocusEvent.class, listener);
- }
-
- @Override
public Registration addBlurListener(BlurListener listener) {
return addListener(BlurEvent.EVENT_ID, BlurEvent.class, listener,
BlurListener.blurMethod);
}
@Override
- @Deprecated
- public void removeBlurListener(BlurListener listener) {
- removeListener(BlurEvent.EVENT_ID, BlurEvent.class, listener);
- }
-
- @Override
protected NativeSelectState getState() {
return getState(true);
}
diff --git a/server/src/main/java/com/vaadin/ui/RadioButtonGroup.java b/server/src/main/java/com/vaadin/ui/RadioButtonGroup.java
index 325efd0457..0f3bd43c98 100644
--- a/server/src/main/java/com/vaadin/ui/RadioButtonGroup.java
+++ b/server/src/main/java/com/vaadin/ui/RadioButtonGroup.java
@@ -230,24 +230,12 @@ public class RadioButtonGroup<T> extends AbstractSingleSelect<T>
}
@Override
- @Deprecated
- public void removeFocusListener(FocusListener listener) {
- removeListener(FocusEvent.EVENT_ID, FocusEvent.class, listener);
- }
-
- @Override
public Registration addBlurListener(BlurListener listener) {
return addListener(BlurEvent.EVENT_ID, BlurEvent.class, listener,
BlurListener.blurMethod);
}
@Override
- @Deprecated
- public void removeBlurListener(BlurListener listener) {
- removeListener(BlurEvent.EVENT_ID, BlurEvent.class, listener);
- }
-
- @Override
protected List<T> readItems(Element design, DesignContext context) {
setItemEnabledProvider(new DeclarativeItemEnabledProvider<>());
return super.readItems(design, context);
diff --git a/server/src/main/java/com/vaadin/ui/TabSheet.java b/server/src/main/java/com/vaadin/ui/TabSheet.java
index 396c4975c1..58d67edc16 100644
--- a/server/src/main/java/com/vaadin/ui/TabSheet.java
+++ b/server/src/main/java/com/vaadin/ui/TabSheet.java
@@ -1369,24 +1369,12 @@ public class TabSheet extends AbstractComponentContainer
}
@Override
- @Deprecated
- public void removeBlurListener(BlurListener listener) {
- removeListener(BlurEvent.EVENT_ID, BlurEvent.class, listener);
- }
-
- @Override
public Registration addFocusListener(FocusListener listener) {
return addListener(FocusEvent.EVENT_ID, FocusEvent.class, listener,
FocusListener.focusMethod);
}
@Override
- @Deprecated
- public void removeFocusListener(FocusListener listener) {
- removeListener(FocusEvent.EVENT_ID, FocusEvent.class, listener);
- }
-
- @Override
public boolean isRendered(Component childComponent) {
return childComponent == getSelectedTab();
}
diff --git a/server/src/main/java/com/vaadin/ui/Window.java b/server/src/main/java/com/vaadin/ui/Window.java
index 028c585863..c3a66a6c18 100644
--- a/server/src/main/java/com/vaadin/ui/Window.java
+++ b/server/src/main/java/com/vaadin/ui/Window.java
@@ -1170,12 +1170,6 @@ public class Window extends Panel
FocusListener.focusMethod);
}
- @Override
- @Deprecated
- public void removeFocusListener(FocusListener listener) {
- removeListener(FocusEvent.EVENT_ID, FocusEvent.class, listener);
- }
-
/*
* (non-Javadoc)
*
@@ -1189,12 +1183,6 @@ public class Window extends Panel
BlurListener.blurMethod);
}
- @Override
- @Deprecated
- public void removeBlurListener(BlurListener listener) {
- removeListener(BlurEvent.EVENT_ID, BlurEvent.class, listener);
- }
-
/**
* {@inheritDoc}
*