Skip to content

Commit

Permalink
Don't use V8 FieldEvents classes in v7 compatibility module. (#93)
Browse files Browse the repository at this point in the history 
* Don't use V8 FieldEvents classes in v7 compatibility module.

Fixes vaadin/framework8-issues#363
  • Loading branch information
@pleku
Denis authored and pleku committed Dec 7, 2016
1 parent 2c014bc commit 5778c65
Show file tree
Hide file tree
Showing 12 changed files with 61 additions and 146 deletions.
51 changes: 48 additions & 3 deletions compatibility-server/src/main/java/com/vaadin/v7/ui/Grid.java
View file
Expand Up @@ -45,6 +45,10 @@
import com.vaadin.data.sort.Sort;
import com.vaadin.data.sort.SortOrder;
import com.vaadin.event.ContextClickEvent;
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.event.SortEvent;
import com.vaadin.event.SortEvent.SortListener;
import com.vaadin.event.SortEvent.SortNotifier;
Expand All @@ -60,8 +64,9 @@
import com.vaadin.shared.Registration;
import com.vaadin.shared.data.sort.SortDirection;
import com.vaadin.shared.util.SharedUtil;
import com.vaadin.ui.AbstractFocusable;
import com.vaadin.ui.AbstractComponent;
import com.vaadin.ui.Component;
import com.vaadin.ui.Component.Focusable;
import com.vaadin.ui.ConnectorTracker;
import com.vaadin.ui.SelectiveRenderer;
import com.vaadin.ui.UI;
Expand Down Expand Up @@ -89,6 +94,8 @@
import com.vaadin.v7.data.util.IndexedContainer;
import com.vaadin.v7.data.util.converter.Converter;
import com.vaadin.v7.data.util.converter.ConverterUtil;
import com.vaadin.v7.event.FieldEvents.BlurNotifier;
import com.vaadin.v7.event.FieldEvents.FocusNotifier;
import com.vaadin.v7.event.ItemClickEvent;
import com.vaadin.v7.event.ItemClickEvent.ItemClickListener;
import com.vaadin.v7.event.ItemClickEvent.ItemClickNotifier;
Expand Down Expand Up @@ -186,8 +193,9 @@
* @author Vaadin Ltd
*/
@Deprecated
public class Grid extends AbstractFocusable implements SelectionNotifier,
SortNotifier, SelectiveRenderer, ItemClickNotifier {
public class Grid extends AbstractComponent
implements SelectionNotifier, SortNotifier, SelectiveRenderer,
ItemClickNotifier, Focusable, FocusNotifier, BlurNotifier {

/**
* An event listener for column visibility change events in the Grid.
Expand Down Expand Up @@ -7409,6 +7417,43 @@ selectionMode, getDefaultSelectionMode(), SelectionMode.class,
}
}

@Override
public void addBlurListener(BlurListener listener) {
addListener(BlurEvent.EVENT_ID, BlurEvent.class, listener,
BlurListener.blurMethod);
}

@Override
public void removeBlurListener(BlurListener listener) {
removeListener(BlurEvent.EVENT_ID, BlurEvent.class, listener);
}

@Override
public void addFocusListener(FocusListener listener) {
addListener(FocusEvent.EVENT_ID, FocusEvent.class, listener,
FocusListener.focusMethod);
}

@Override
public void removeFocusListener(FocusListener listener) {
removeListener(FocusEvent.EVENT_ID, FocusEvent.class, listener);
}

@Override
public void focus() {
super.focus();
}

@Override
public int getTabIndex() {
return getState(false).tabIndex;
}

@Override
public void setTabIndex(int tabIndex) {
getState().tabIndex = tabIndex;
}

@Override
protected Collection<String> getCustomAttributes() {
Collection<String> result = super.getCustomAttributes();
Expand Down
28 changes: 0 additions & 28 deletions server/src/main/java/com/vaadin/event/FieldEvents.java
View file
Expand Up @@ -55,19 +55,6 @@ public interface FocusNotifier extends Serializable {
*/
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);
}

/**
Expand All @@ -94,21 +81,6 @@ public interface BlurNotifier extends Serializable {
*/
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);
}

/**
Expand Down
12 changes: 0 additions & 12 deletions server/src/main/java/com/vaadin/ui/AbstractDateField.java
View file
Expand Up @@ -573,24 +573,12 @@ public Registration addFocusListener(FocusListener listener) {
FocusListener.focusMethod);
}

@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);
Expand Down
12 changes: 0 additions & 12 deletions server/src/main/java/com/vaadin/ui/AbstractFocusable.java
View file
Expand Up @@ -46,24 +46,12 @@ public Registration addBlurListener(BlurListener listener) {
BlurListener.blurMethod);
}

@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();
Expand Down
12 changes: 0 additions & 12 deletions server/src/main/java/com/vaadin/ui/CheckBox.java
View file
Expand Up @@ -144,24 +144,12 @@ public Registration addBlurListener(BlurListener listener) {
BlurListener.blurMethod);
}

@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)
*
Expand Down
12 changes: 0 additions & 12 deletions server/src/main/java/com/vaadin/ui/CheckBoxGroup.java
View file
Expand Up @@ -160,24 +160,12 @@ public Registration addFocusListener(FocusListener listener) {
FocusListener.focusMethod);
}

@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<>());
Expand Down
12 changes: 0 additions & 12 deletions server/src/main/java/com/vaadin/ui/ComboBox.java
View file
Expand Up @@ -331,24 +331,12 @@ public Registration addBlurListener(BlurListener listener) {
BlurListener.blurMethod);
}

@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.
*
Expand Down
12 changes: 0 additions & 12 deletions server/src/main/java/com/vaadin/ui/NativeSelect.java
View file
Expand Up @@ -103,24 +103,12 @@ public Registration addFocusListener(FocusListener listener) {
FocusListener.focusMethod);
}

@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);
Expand Down
12 changes: 0 additions & 12 deletions server/src/main/java/com/vaadin/ui/RadioButtonGroup.java
View file
Expand Up @@ -229,24 +229,12 @@ public Registration addFocusListener(FocusListener listener) {
FocusListener.focusMethod);
}

@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<>());
Expand Down
12 changes: 0 additions & 12 deletions server/src/main/java/com/vaadin/ui/TabSheet.java
View file
Expand Up @@ -1368,24 +1368,12 @@ public Registration addBlurListener(BlurListener listener) {
BlurListener.blurMethod);
}

@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();
Expand Down
12 changes: 0 additions & 12 deletions server/src/main/java/com/vaadin/ui/Window.java
View file
Expand Up @@ -1170,12 +1170,6 @@ public Registration addFocusListener(FocusListener listener) {
FocusListener.focusMethod);
}

@Override
@Deprecated
public void removeFocusListener(FocusListener listener) {
removeListener(FocusEvent.EVENT_ID, FocusEvent.class, listener);
}

/*
* (non-Javadoc)
*
Expand All @@ -1189,12 +1183,6 @@ public Registration addBlurListener(BlurListener listener) {
BlurListener.blurMethod);
}

@Override
@Deprecated
public void removeBlurListener(BlurListener listener) {
removeListener(BlurEvent.EVENT_ID, BlurEvent.class, listener);
}

/**
* {@inheritDoc}
*
Expand Down
20 changes: 13 additions & 7 deletions uitest/src/main/java/com/vaadin/tests/components/AbstractComponentTest.java
View file
Expand Up @@ -249,25 +249,31 @@ protected void createActions() {

protected Command<T, Boolean> focusListenerCommand = new Command<T, Boolean>() {

private Registration focusListenerRegistration;

@Override
public void execute(T c, Boolean value, Object data) {
FocusNotifier fn = (FocusNotifier) c;
FocusNotifier focusNotifier = (FocusNotifier) c;
if (value) {
fn.addFocusListener(AbstractComponentTest.this);
} else {
fn.removeFocusListener(AbstractComponentTest.this);
focusListenerRegistration = focusNotifier
.addFocusListener(AbstractComponentTest.this);
} else if (focusListenerRegistration != null) {
focusListenerRegistration.remove();
}
}
};
protected Command<T, Boolean> blurListenerCommand = new Command<T, Boolean>() {

private Registration blurListenerRegistration;

@Override
public void execute(T c, Boolean value, Object data) {
BlurNotifier bn = (BlurNotifier) c;
if (value) {
bn.addBlurListener(AbstractComponentTest.this);
} else {
bn.removeBlurListener(AbstractComponentTest.this);
blurListenerRegistration = bn
.addBlurListener(AbstractComponentTest.this);
} else if (blurListenerRegistration != null) {
blurListenerRegistration.remove();
}
}
};
Expand Down

0 comments on commit 5778c65

Please sign in to comment.