From 016afe26bce78503960acad606242a2cb14578c1 Mon Sep 17 00:00:00 2001 From: David Vacca Date: Thu, 16 May 2019 12:56:39 -0700 Subject: [PATCH] Adding @Nullable into Fabric UI Manager Summary: cleanup diff to add Nullable annotations into Fabric UI Manager classes Reviewed By: shergin Differential Revision: D15365295 fbshipit-source-id: b9d39addd5b71377389a7687ea3176cd4359c5ba --- .../main/java/com/facebook/react/fabric/FabricUIManager.java | 4 ++-- .../com/facebook/react/fabric/mounting/MountingManager.java | 4 ++-- .../fabric/mounting/mountitems/PreAllocateViewMountItem.java | 5 +++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java index 2f36cef5ef7..1efadeea295 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java @@ -187,7 +187,7 @@ public class FabricUIManager implements UIManager, LifecycleEventListener { int rootTag, int reactTag, final String componentName, - ReadableMap props, + @Nullable ReadableMap props, boolean isLayoutable) { ThemedReactContext context = mReactContextForRootTag.get(rootTag); String component = getComponent(componentName); @@ -453,7 +453,7 @@ public class FabricUIManager implements UIManager, LifecycleEventListener { @Override public void dispatchCommand( - final int reactTag, final int commandId, final ReadableArray commandArgs) { + final int reactTag, final int commandId, @Nullable final ReadableArray commandArgs) { synchronized (mMountItemsLock) { mMountItems.add(new DispatchCommandMountItem(reactTag, commandId, commandArgs)); } diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountingManager.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountingManager.java index 475f26b2c86..675c43c57ca 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountingManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountingManager.java @@ -174,7 +174,7 @@ public class MountingManager { ThemedReactContext themedReactContext, String componentName, int reactTag, - ReadableMap props, + @Nullable ReadableMap props, boolean isLayoutable) { if (mTagToViewState.get(reactTag) != null) { return; @@ -312,7 +312,7 @@ public class MountingManager { ThemedReactContext reactContext, String componentName, int reactTag, - ReadableMap props, + @Nullable ReadableMap props, boolean isLayoutable) { if (mTagToViewState.get(reactTag) != null) { diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/PreAllocateViewMountItem.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/PreAllocateViewMountItem.java index 13d70b8c6fa..ca117d45877 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/PreAllocateViewMountItem.java +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/PreAllocateViewMountItem.java @@ -9,6 +9,7 @@ package com.facebook.react.fabric.mounting.mountitems; import static com.facebook.react.fabric.FabricUIManager.DEBUG; import static com.facebook.react.fabric.FabricUIManager.TAG; +import androidx.annotation.Nullable; import com.facebook.common.logging.FLog; import com.facebook.react.bridge.ReadableMap; import com.facebook.react.fabric.mounting.MountingManager; @@ -20,7 +21,7 @@ public class PreAllocateViewMountItem implements MountItem { private final String mComponent; private final int mRootTag; private final int mReactTag; - private final ReadableMap mProps; + private final @Nullable ReadableMap mProps; private final ThemedReactContext mContext; private final boolean mIsLayoutable; @@ -29,7 +30,7 @@ public class PreAllocateViewMountItem implements MountItem { int rootTag, int reactTag, String component, - ReadableMap props, + @Nullable ReadableMap props, boolean isLayoutable) { mContext = context; mComponent = component;