From 2daf69606495badae9cba7ea3b9c1d8f9bb99f54 Mon Sep 17 00:00:00 2001 From: Alexander Blom Date: Thu, 7 Jan 2016 03:51:22 -0800 Subject: [PATCH] Move UIManager annotations to separate package Summary: Moves ReactProp and ReactPropGroup to `com.facebook.react.uimanager.annotations`. This is needed so that future annotation processor can run on code inside the com.facebook.react.uimanager package. @public Reviewed By: astreet Differential Revision: D2754842 --- .../src/main/java/com/facebook/react/flat/FlatShadowNode.java | 2 +- .../src/main/java/com/facebook/react/flat/RCTImageView.java | 2 +- .../src/main/java/com/facebook/react/flat/RCTRawText.java | 2 +- .../src/main/java/com/facebook/react/flat/RCTText.java | 2 +- .../main/java/com/facebook/react/flat/RCTTextInlineImage.java | 2 +- .../src/main/java/com/facebook/react/flat/RCTView.java | 4 ++-- .../src/main/java/com/facebook/react/flat/RCTViewManager.java | 2 +- .../src/main/java/com/facebook/react/flat/RCTVirtualText.java | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatShadowNode.java index 40b8f4753..82c540c46 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatShadowNode.java +++ b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatShadowNode.java @@ -14,7 +14,7 @@ import javax.annotation.Nullable; import com.facebook.infer.annotation.Assertions; import com.facebook.react.uimanager.CatalystStylesDiffMap; import com.facebook.react.uimanager.LayoutShadowNode; -import com.facebook.react.uimanager.ReactProp; +import com.facebook.react.uimanager.annotations.ReactProp; import com.facebook.react.uimanager.ViewProps; /** diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTImageView.java b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTImageView.java index 1b735b615..248891df6 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTImageView.java +++ b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTImageView.java @@ -14,7 +14,7 @@ import javax.annotation.Nullable; import com.facebook.csslayout.Spacing; import com.facebook.drawee.drawable.ScalingUtils.ScaleType; import com.facebook.react.uimanager.PixelUtil; -import com.facebook.react.uimanager.ReactProp; +import com.facebook.react.uimanager.annotations.ReactProp; import com.facebook.react.uimanager.ViewProps; import com.facebook.react.views.image.ImageResizeMode; diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTRawText.java b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTRawText.java index 786c75eaa..093f32e91 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTRawText.java +++ b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTRawText.java @@ -14,7 +14,7 @@ import javax.annotation.Nullable; import android.text.Spannable; import android.text.SpannableStringBuilder; -import com.facebook.react.uimanager.ReactProp; +import com.facebook.react.uimanager.annotations.ReactProp; /** * RCTRawText is a FlatTextShadowNode that can only contain raw text (but not styling). diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTText.java b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTText.java index 1bef0088d..20b96e207 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTText.java +++ b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTText.java @@ -22,7 +22,7 @@ import com.facebook.csslayout.CSSNode; import com.facebook.csslayout.MeasureOutput; import com.facebook.fbui.widget.text.staticlayouthelper.StaticLayoutHelper; import com.facebook.react.uimanager.PixelUtil; -import com.facebook.react.uimanager.ReactProp; +import com.facebook.react.uimanager.annotations.ReactProp; import com.facebook.react.uimanager.ViewDefaults; import com.facebook.react.uimanager.ViewProps; diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTTextInlineImage.java b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTTextInlineImage.java index ade633a50..fba7bd917 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTTextInlineImage.java +++ b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTTextInlineImage.java @@ -14,7 +14,7 @@ import javax.annotation.Nullable; import android.text.SpannableStringBuilder; import android.text.Spanned; -import com.facebook.react.uimanager.ReactProp; +import com.facebook.react.uimanager.annotations.ReactProp; /** * RCTTextInlineImage diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTView.java b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTView.java index 1790f02da..55c17e7aa 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTView.java +++ b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTView.java @@ -13,8 +13,8 @@ import javax.annotation.Nullable; import com.facebook.react.bridge.ReadableMap; import com.facebook.react.uimanager.PixelUtil; -import com.facebook.react.uimanager.ReactProp; -import com.facebook.react.uimanager.ReactPropGroup; +import com.facebook.react.uimanager.annotations.ReactProp; +import com.facebook.react.uimanager.annotations.ReactPropGroup; import com.facebook.react.uimanager.ViewProps; /* package */ final class RCTView extends FlatShadowNode { diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTViewManager.java index 71882f3ad..c4cd5278b 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTViewManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTViewManager.java @@ -21,7 +21,7 @@ import com.facebook.react.bridge.ReadableMap; import com.facebook.react.common.MapBuilder; import com.facebook.react.uimanager.PixelUtil; import com.facebook.react.uimanager.PointerEvents; -import com.facebook.react.uimanager.ReactProp; +import com.facebook.react.uimanager.annotations.ReactProp; import com.facebook.react.uimanager.ViewProps; import com.facebook.react.views.view.ReactDrawableHelper; diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTVirtualText.java b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTVirtualText.java index 8f1179277..8e6a26994 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTVirtualText.java +++ b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTVirtualText.java @@ -17,7 +17,7 @@ import android.text.SpannableStringBuilder; import android.text.TextUtils; import com.facebook.react.uimanager.PixelUtil; -import com.facebook.react.uimanager.ReactProp; +import com.facebook.react.uimanager.annotations.ReactProp; import com.facebook.react.uimanager.ViewProps; /**