aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Dahlström <johannesd@vaadin.com>2016-06-16 16:51:38 +0300
committerJohannes Dahlström <johannesd@vaadin.com>2016-07-07 10:11:16 +0000
commit32a5a7616abafc42b08adb9ccf18f4636a0a56da (patch)
tree53c5d5a1735296bf42842d9c3dc2c5f0a8b19383
parent57d6cf71500bb676260bcb65b0bfe83dbe198d10 (diff)
downloadvaadin-framework-32a5a7616abafc42b08adb9ccf18f4636a0a56da.tar.gz
vaadin-framework-32a5a7616abafc42b08adb9ccf18f4636a0a56da.zip
Rename package c.v.event.handler to c.v.event.typed
Change-Id: I2cf9d3fd9c7174780bca4876383bbf4d363cad39
-rw-r--r--server/src/main/java/com/vaadin/event/typed/Event.java (renamed from server/src/main/java/com/vaadin/event/handler/Event.java)6
-rw-r--r--server/src/main/java/com/vaadin/event/typed/Handler.java (renamed from server/src/main/java/com/vaadin/event/handler/Handler.java)2
-rw-r--r--server/src/main/java/com/vaadin/event/typed/Registration.java (renamed from server/src/main/java/com/vaadin/event/handler/Registration.java)2
-rw-r--r--server/src/main/java/com/vaadin/server/AbstractClientConnector.java10
-rw-r--r--server/src/main/java/com/vaadin/server/communication/data/typed/AbstractDataSource.java2
-rw-r--r--server/src/main/java/com/vaadin/server/communication/data/typed/DataProvider.java2
-rw-r--r--server/src/main/java/com/vaadin/server/communication/data/typed/DataSource.java2
-rw-r--r--server/src/main/java/com/vaadin/server/communication/data/typed/SelectionModel.java3
-rw-r--r--server/src/main/java/com/vaadin/server/communication/data/typed/SingleSelection.java4
-rw-r--r--server/src/main/java/com/vaadin/ui/components/HasValue.java4
-rw-r--r--server/src/main/java/com/vaadin/ui/components/field/DateField.java11
-rw-r--r--server/src/main/java/com/vaadin/ui/components/fields/AbstractTextField.java6
-rw-r--r--server/src/main/java/com/vaadin/ui/components/fields/CheckBox.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/databinding/CheckBoxTestUI.java2
14 files changed, 30 insertions, 32 deletions
diff --git a/server/src/main/java/com/vaadin/event/handler/Event.java b/server/src/main/java/com/vaadin/event/typed/Event.java
index 57b908ce08..cbdbe54ec1 100644
--- a/server/src/main/java/com/vaadin/event/handler/Event.java
+++ b/server/src/main/java/com/vaadin/event/typed/Event.java
@@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package com.vaadin.event.handler;
+package com.vaadin.event.typed;
import java.util.EventObject;
@@ -56,9 +56,9 @@ public class Event<T> extends EventObject {
}
/**
- * Gets the pay load value.
+ * Gets the payload value.
*
- * @return pay load value
+ * @return payload value
*/
public T getValue() {
return value;
diff --git a/server/src/main/java/com/vaadin/event/handler/Handler.java b/server/src/main/java/com/vaadin/event/typed/Handler.java
index c03c84dd34..50b18c4bf2 100644
--- a/server/src/main/java/com/vaadin/event/handler/Handler.java
+++ b/server/src/main/java/com/vaadin/event/typed/Handler.java
@@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package com.vaadin.event.handler;
+package com.vaadin.event.typed;
import java.io.Serializable;
import java.util.function.Consumer;
diff --git a/server/src/main/java/com/vaadin/event/handler/Registration.java b/server/src/main/java/com/vaadin/event/typed/Registration.java
index ffbcd95612..c5809cbeb0 100644
--- a/server/src/main/java/com/vaadin/event/handler/Registration.java
+++ b/server/src/main/java/com/vaadin/event/typed/Registration.java
@@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package com.vaadin.event.handler;
+package com.vaadin.event.typed;
import java.io.Serializable;
diff --git a/server/src/main/java/com/vaadin/server/AbstractClientConnector.java b/server/src/main/java/com/vaadin/server/AbstractClientConnector.java
index dd6515f216..c043d8b091 100644
--- a/server/src/main/java/com/vaadin/server/AbstractClientConnector.java
+++ b/server/src/main/java/com/vaadin/server/AbstractClientConnector.java
@@ -35,8 +35,8 @@ import java.util.concurrent.ConcurrentHashMap;
import com.vaadin.event.EventRouter;
import com.vaadin.event.MethodEventSource;
-import com.vaadin.event.handler.Handler;
-import com.vaadin.event.handler.Registration;
+import com.vaadin.event.typed.Handler;
+import com.vaadin.event.typed.Registration;
import com.vaadin.shared.communication.ClientRpc;
import com.vaadin.shared.communication.ServerRpc;
import com.vaadin.shared.communication.SharedState;
@@ -1016,11 +1016,11 @@ public abstract class AbstractClientConnector
}
private static final Method EVENT_HANDLER_METHOD = ReflectTools.findMethod(
- Handler.class, "accept", com.vaadin.event.handler.Event.class);
+ Handler.class, "accept", com.vaadin.event.typed.Event.class);
@SuppressWarnings("rawtypes")
protected <T> Registration onEvent(
- Class<? extends com.vaadin.event.handler.Event> eventType,
+ Class<? extends com.vaadin.event.typed.Event> eventType,
Handler<? super T> handler) {
Objects.requireNonNull(handler, "Handler cannot be null");
addListener(eventType, handler, EVENT_HANDLER_METHOD);
@@ -1029,7 +1029,7 @@ public abstract class AbstractClientConnector
@SuppressWarnings("rawtypes")
protected <T> Registration onEvent(String eventId,
- Class<? extends com.vaadin.event.handler.Event> eventType,
+ Class<? extends com.vaadin.event.typed.Event> eventType,
Handler<? super T> handler) {
addListener(eventId, eventType, handler, EVENT_HANDLER_METHOD);
return () -> removeListener(eventType, handler);
diff --git a/server/src/main/java/com/vaadin/server/communication/data/typed/AbstractDataSource.java b/server/src/main/java/com/vaadin/server/communication/data/typed/AbstractDataSource.java
index bb7f7ceb22..abba026774 100644
--- a/server/src/main/java/com/vaadin/server/communication/data/typed/AbstractDataSource.java
+++ b/server/src/main/java/com/vaadin/server/communication/data/typed/AbstractDataSource.java
@@ -18,7 +18,7 @@ package com.vaadin.server.communication.data.typed;
import java.util.LinkedHashSet;
import java.util.Set;
-import com.vaadin.event.handler.Registration;
+import com.vaadin.event.typed.Registration;
/**
* Base class for AbstractDataSource. Provides tracking for
diff --git a/server/src/main/java/com/vaadin/server/communication/data/typed/DataProvider.java b/server/src/main/java/com/vaadin/server/communication/data/typed/DataProvider.java
index 61dc1b6c05..cf3fa922a3 100644
--- a/server/src/main/java/com/vaadin/server/communication/data/typed/DataProvider.java
+++ b/server/src/main/java/com/vaadin/server/communication/data/typed/DataProvider.java
@@ -21,7 +21,7 @@ import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.Set;
-import com.vaadin.event.handler.Registration;
+import com.vaadin.event.typed.Registration;
import com.vaadin.server.AbstractExtension;
import com.vaadin.server.ClientConnector;
import com.vaadin.shared.data.DataRequestRpc;
diff --git a/server/src/main/java/com/vaadin/server/communication/data/typed/DataSource.java b/server/src/main/java/com/vaadin/server/communication/data/typed/DataSource.java
index 93003e0454..e94abf6337 100644
--- a/server/src/main/java/com/vaadin/server/communication/data/typed/DataSource.java
+++ b/server/src/main/java/com/vaadin/server/communication/data/typed/DataSource.java
@@ -19,7 +19,7 @@ import java.io.Serializable;
import java.util.Arrays;
import java.util.Collection;
-import com.vaadin.event.handler.Registration;
+import com.vaadin.event.typed.Registration;
/**
* Minimal DataSource API for communication between the DataProvider and a back
diff --git a/server/src/main/java/com/vaadin/server/communication/data/typed/SelectionModel.java b/server/src/main/java/com/vaadin/server/communication/data/typed/SelectionModel.java
index 58c405bdf9..ae3779747f 100644
--- a/server/src/main/java/com/vaadin/server/communication/data/typed/SelectionModel.java
+++ b/server/src/main/java/com/vaadin/server/communication/data/typed/SelectionModel.java
@@ -33,8 +33,7 @@ import com.vaadin.ui.components.Listing;
*/
public interface SelectionModel<T> extends Serializable, ListingExtension<T> {
- public class SelectionEvent<T>
- extends com.vaadin.event.handler.Event<T> {
+ public class SelectionEvent<T> extends com.vaadin.event.typed.Event<T> {
public SelectionEvent(ClientConnector source, T value,
boolean userOriginated) {
super(source, value, userOriginated);
diff --git a/server/src/main/java/com/vaadin/server/communication/data/typed/SingleSelection.java b/server/src/main/java/com/vaadin/server/communication/data/typed/SingleSelection.java
index 74b9dd43be..3c0acf6e3f 100644
--- a/server/src/main/java/com/vaadin/server/communication/data/typed/SingleSelection.java
+++ b/server/src/main/java/com/vaadin/server/communication/data/typed/SingleSelection.java
@@ -18,8 +18,8 @@ package com.vaadin.server.communication.data.typed;
import java.util.Collection;
import java.util.Collections;
-import com.vaadin.event.handler.Handler;
-import com.vaadin.event.handler.Registration;
+import com.vaadin.event.typed.Handler;
+import com.vaadin.event.typed.Registration;
import com.vaadin.server.communication.data.typed.SelectionModel.Single;
import com.vaadin.shared.data.selection.SelectionServerRpc;
diff --git a/server/src/main/java/com/vaadin/ui/components/HasValue.java b/server/src/main/java/com/vaadin/ui/components/HasValue.java
index 0ad7411177..ab4daccc0b 100644
--- a/server/src/main/java/com/vaadin/ui/components/HasValue.java
+++ b/server/src/main/java/com/vaadin/ui/components/HasValue.java
@@ -17,8 +17,8 @@ package com.vaadin.ui.components;
import java.io.Serializable;
-import com.vaadin.event.handler.Handler;
-import com.vaadin.event.handler.Registration;
+import com.vaadin.event.typed.Handler;
+import com.vaadin.event.typed.Registration;
/**
* Generic interface for Components that have a value.
diff --git a/server/src/main/java/com/vaadin/ui/components/field/DateField.java b/server/src/main/java/com/vaadin/ui/components/field/DateField.java
index 171b5f8210..46e62659db 100644
--- a/server/src/main/java/com/vaadin/ui/components/field/DateField.java
+++ b/server/src/main/java/com/vaadin/ui/components/field/DateField.java
@@ -24,8 +24,8 @@ import org.jsoup.nodes.Element;
import com.vaadin.event.FieldEvents.BlurEvent;
import com.vaadin.event.FieldEvents.FocusEvent;
-import com.vaadin.event.handler.Handler;
-import com.vaadin.event.handler.Registration;
+import com.vaadin.event.typed.Handler;
+import com.vaadin.event.typed.Registration;
import com.vaadin.shared.ui.components.field.DateFieldServerRpc;
import com.vaadin.shared.ui.components.field.DateFieldState;
import com.vaadin.ui.AbstractComponent;
@@ -43,8 +43,8 @@ public class DateField extends AbstractComponent
private static final DateTimeFormatter FORMATTER = DateTimeFormatter
.ofPattern("dd-MM-uuuu");
- public static class DateChange extends
- com.vaadin.event.handler.Event<LocalDate> {
+ public static class DateChange
+ extends com.vaadin.event.typed.Event<LocalDate> {
protected DateChange(DateField source, LocalDate date,
boolean userOriginated) {
super(source, date, userOriginated);
@@ -99,8 +99,7 @@ public class DateField extends AbstractComponent
}
@Override
- public Registration onChange(
- Handler<LocalDate> handler) {
+ public Registration onChange(Handler<LocalDate> handler) {
return onEvent(DateChange.class, handler);
}
diff --git a/server/src/main/java/com/vaadin/ui/components/fields/AbstractTextField.java b/server/src/main/java/com/vaadin/ui/components/fields/AbstractTextField.java
index 3587ddaf78..af28b301c6 100644
--- a/server/src/main/java/com/vaadin/ui/components/fields/AbstractTextField.java
+++ b/server/src/main/java/com/vaadin/ui/components/fields/AbstractTextField.java
@@ -26,8 +26,8 @@ import com.vaadin.event.FieldEvents.BlurListener;
import com.vaadin.event.FieldEvents.FocusEvent;
import com.vaadin.event.FieldEvents.FocusListener;
import com.vaadin.event.FieldEvents.TextChangeListener;
-import com.vaadin.event.handler.Handler;
-import com.vaadin.event.handler.Registration;
+import com.vaadin.event.typed.Handler;
+import com.vaadin.event.typed.Registration;
import com.vaadin.shared.ui.components.fields.TextFieldServerRpc;
import com.vaadin.shared.ui.components.fields.TextFieldState;
import com.vaadin.ui.AbstractComponent;
@@ -44,7 +44,7 @@ public abstract class AbstractTextField extends AbstractComponent
implements HasValue<String> {
public static class TextChangeEvent
- extends com.vaadin.event.handler.Event<String> {
+ extends com.vaadin.event.typed.Event<String> {
public static final String ID = TextChangeListener.EVENT_ID;
diff --git a/server/src/main/java/com/vaadin/ui/components/fields/CheckBox.java b/server/src/main/java/com/vaadin/ui/components/fields/CheckBox.java
index 76f9c1d388..ffcf279040 100644
--- a/server/src/main/java/com/vaadin/ui/components/fields/CheckBox.java
+++ b/server/src/main/java/com/vaadin/ui/components/fields/CheckBox.java
@@ -21,8 +21,8 @@ import org.jsoup.nodes.Attributes;
import org.jsoup.nodes.Element;
import com.vaadin.event.FieldEvents.FocusAndBlurServerRpcImpl;
-import com.vaadin.event.handler.Handler;
-import com.vaadin.event.handler.Registration;
+import com.vaadin.event.typed.Handler;
+import com.vaadin.event.typed.Registration;
import com.vaadin.shared.MouseEventDetails;
import com.vaadin.shared.ui.checkbox.CheckBoxServerRpc;
import com.vaadin.shared.ui.checkbox.CheckBoxState;
@@ -34,7 +34,7 @@ import com.vaadin.ui.declarative.DesignContext;
public class CheckBox extends AbstractComponent implements HasValue<Boolean> {
public class StateChangeEvent
- extends com.vaadin.event.handler.Event<Boolean> {
+ extends com.vaadin.event.typed.Event<Boolean> {
public StateChangeEvent(Boolean value, boolean userOriginated) {
super(CheckBox.this, value, userOriginated);
}
diff --git a/uitest/src/main/java/com/vaadin/tests/databinding/CheckBoxTestUI.java b/uitest/src/main/java/com/vaadin/tests/databinding/CheckBoxTestUI.java
index f545f7bd94..c39572f8bf 100644
--- a/uitest/src/main/java/com/vaadin/tests/databinding/CheckBoxTestUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/databinding/CheckBoxTestUI.java
@@ -1,6 +1,6 @@
package com.vaadin.tests.databinding;
-import com.vaadin.event.handler.Registration;
+import com.vaadin.event.typed.Registration;
import com.vaadin.server.VaadinRequest;
import com.vaadin.server.communication.data.typed.Binder;
import com.vaadin.tests.components.AbstractTestUIWithLog;