From 5d62b4a19a415760cf05a3e0384f27b589fdd050 Mon Sep 17 00:00:00 2001 From: Joshua Gross Date: Sun, 24 Jan 2021 22:10:05 -0800 Subject: [PATCH] Rename Event.dispatchV2 -> dispatchModern Summary: See title. dispatchV2 was just introduced yesterday, so nothing relies on it yet / it's safe to rename (there are no released versions of RN with `dispatchV2`). And... dispatchModern is a better name. Changelog: [Internal] Reviewed By: mdvacca Differential Revision: D26039008 fbshipit-source-id: 009ae721b8caef23a389c33b51f6f8952a6a73da --- .../main/java/com/facebook/react/uimanager/events/Event.java | 2 +- .../facebook/react/uimanager/events/EventDispatcherImpl.java | 2 +- .../java/com/facebook/react/views/image/ImageLoadEvent.java | 2 +- .../main/java/com/facebook/react/views/scroll/ScrollEvent.java | 2 +- .../react/views/textinput/ReactContentSizeChangedEvent.java | 2 +- .../facebook/react/views/textinput/ReactTextChangedEvent.java | 2 +- .../facebook/react/views/textinput/ReactTextInputBlurEvent.java | 2 +- .../react/views/textinput/ReactTextInputEndEditingEvent.java | 2 +- .../com/facebook/react/views/textinput/ReactTextInputEvent.java | 2 +- .../react/views/textinput/ReactTextInputFocusEvent.java | 2 +- .../react/views/textinput/ReactTextInputKeyPressEvent.java | 2 +- .../react/views/textinput/ReactTextInputSelectionEvent.java | 2 +- .../react/views/textinput/ReactTextInputSubmitEditingEvent.java | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/Event.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/Event.java index 621700d4d52..d1a0c1aa3fa 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/Event.java +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/Event.java @@ -127,7 +127,7 @@ public abstract class Event { * Dispatch this event to JS using a V2 EventEmitter. Events must explicitly override this, by * default it uses the V1 dispatcher. */ - public void dispatchV2(RCTModernEventEmitter rctEventEmitter) { + public void dispatchModern(RCTModernEventEmitter rctEventEmitter) { dispatch(rctEventEmitter); } } diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/EventDispatcherImpl.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/EventDispatcherImpl.java index 29816986a7f..a99d6b1eb31 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/EventDispatcherImpl.java +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/EventDispatcherImpl.java @@ -366,7 +366,7 @@ public class EventDispatcherImpl implements EventDispatcher, LifecycleEventListe } Systrace.endAsyncFlow( Systrace.TRACE_TAG_REACT_JAVA_BRIDGE, event.getEventName(), event.getUniqueID()); - event.dispatchV2(mReactEventEmitter); + event.dispatchModern(mReactEventEmitter); event.dispose(); } clearEventsToDispatch(); diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/image/ImageLoadEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/image/ImageLoadEvent.java index bfb8c6d8e32..8dacc3cffc1 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/image/ImageLoadEvent.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/image/ImageLoadEvent.java @@ -151,7 +151,7 @@ public class ImageLoadEvent extends Event { } @Override - public void dispatchV2(RCTModernEventEmitter rctEventEmitter) { + public void dispatchModern(RCTModernEventEmitter rctEventEmitter) { rctEventEmitter.receiveEvent(getSurfaceId(), getViewTag(), getEventName(), getEventData()); } diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ScrollEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ScrollEvent.java index 9abc523589d..3141aa5545d 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ScrollEvent.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ScrollEvent.java @@ -121,7 +121,7 @@ public class ScrollEvent extends Event { } @Override - public void dispatchV2(RCTModernEventEmitter rctEventEmitter) { + public void dispatchModern(RCTModernEventEmitter rctEventEmitter) { rctEventEmitter.receiveEvent( getSurfaceId(), getViewTag(), getEventName(), serializeEventData()); } diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactContentSizeChangedEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactContentSizeChangedEvent.java index 564b000769d..b4de623e005 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactContentSizeChangedEvent.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactContentSizeChangedEvent.java @@ -44,7 +44,7 @@ public class ReactContentSizeChangedEvent extends Event { } @Override - public void dispatchV2(RCTModernEventEmitter rctEventEmitter) { + public void dispatchModern(RCTModernEventEmitter rctEventEmitter) { rctEventEmitter.receiveEvent( getSurfaceId(), getViewTag(), getEventName(), serializeEventData()); } diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextChangedEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextChangedEvent.java index c12fd684b0c..0cb062ea0c6 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextChangedEvent.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextChangedEvent.java @@ -46,7 +46,7 @@ public class ReactTextChangedEvent extends Event { } @Override - public void dispatchV2(RCTModernEventEmitter rctEventEmitter) { + public void dispatchModern(RCTModernEventEmitter rctEventEmitter) { rctEventEmitter.receiveEvent( getSurfaceId(), getViewTag(), getEventName(), serializeEventData()); } diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputBlurEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputBlurEvent.java index fa332f29158..7c0d1e5e28b 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputBlurEvent.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputBlurEvent.java @@ -43,7 +43,7 @@ import com.facebook.react.uimanager.events.RCTModernEventEmitter; } @Override - public void dispatchV2(RCTModernEventEmitter rctEventEmitter) { + public void dispatchModern(RCTModernEventEmitter rctEventEmitter) { rctEventEmitter.receiveEvent( getSurfaceId(), getViewTag(), getEventName(), serializeEventData()); } diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputEndEditingEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputEndEditingEvent.java index 50189f7d5d6..1e04b54fdf8 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputEndEditingEvent.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputEndEditingEvent.java @@ -49,7 +49,7 @@ class ReactTextInputEndEditingEvent extends Event } @Override - public void dispatchV2(RCTModernEventEmitter rctEventEmitter) { + public void dispatchModern(RCTModernEventEmitter rctEventEmitter) { rctEventEmitter.receiveEvent( getSurfaceId(), getViewTag(), getEventName(), serializeEventData()); } diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputEvent.java index 45034d425a7..c367f389fc8 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputEvent.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputEvent.java @@ -58,7 +58,7 @@ public class ReactTextInputEvent extends Event { } @Override - public void dispatchV2(RCTModernEventEmitter rctEventEmitter) { + public void dispatchModern(RCTModernEventEmitter rctEventEmitter) { rctEventEmitter.receiveEvent( getSurfaceId(), getViewTag(), getEventName(), serializeEventData()); } diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputFocusEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputFocusEvent.java index 57f434a6822..a1a1843e83c 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputFocusEvent.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputFocusEvent.java @@ -43,7 +43,7 @@ import com.facebook.react.uimanager.events.RCTModernEventEmitter; } @Override - public void dispatchV2(RCTModernEventEmitter rctEventEmitter) { + public void dispatchModern(RCTModernEventEmitter rctEventEmitter) { rctEventEmitter.receiveEvent( getSurfaceId(), getViewTag(), getEventName(), serializeEventData()); } diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputKeyPressEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputKeyPressEvent.java index 5894b417017..4b858872699 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputKeyPressEvent.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputKeyPressEvent.java @@ -47,7 +47,7 @@ public class ReactTextInputKeyPressEvent extends Event { } @Override - public void dispatchV2(RCTModernEventEmitter rctEventEmitter) { + public void dispatchModern(RCTModernEventEmitter rctEventEmitter) { rctEventEmitter.receiveEvent( getSurfaceId(), getViewTag(), getEventName(), serializeEventData()); } diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputSelectionEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputSelectionEvent.java index 0c7004e9558..0c4f72402bc 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputSelectionEvent.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputSelectionEvent.java @@ -44,7 +44,7 @@ import com.facebook.react.uimanager.events.RCTModernEventEmitter; } @Override - public void dispatchV2(RCTModernEventEmitter rctEventEmitter) { + public void dispatchModern(RCTModernEventEmitter rctEventEmitter) { rctEventEmitter.receiveEvent( getSurfaceId(), getViewTag(), getEventName(), serializeEventData()); } diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputSubmitEditingEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputSubmitEditingEvent.java index eb72879cf61..6cbb00b9935 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputSubmitEditingEvent.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputSubmitEditingEvent.java @@ -47,7 +47,7 @@ import com.facebook.react.uimanager.events.RCTModernEventEmitter; } @Override - public void dispatchV2(RCTModernEventEmitter rctEventEmitter) { + public void dispatchModern(RCTModernEventEmitter rctEventEmitter) { rctEventEmitter.receiveEvent( getSurfaceId(), getViewTag(), getEventName(), serializeEventData()); }