From 698774d27379dbb62e91e2fe60fd3622c451801d Mon Sep 17 00:00:00 2001 From: Emil Sjolander Date: Wed, 12 Oct 2016 02:49:37 -0700 Subject: [PATCH] Clearly mark java CSSNode as deprecated. It will go away very soon Summary: Clearly mark java CSSNode as deprecated. It will go away very soon. Reviewed By: lucasr Differential Revision: D3992775 --- .../com/facebook/react/flat/FlatReactModalShadowNode.java | 4 ++-- .../main/java/com/facebook/react/flat/FlatRootShadowNode.java | 2 +- .../src/main/java/com/facebook/react/flat/FlatShadowNode.java | 4 ++-- .../main/java/com/facebook/react/flat/NativeViewWrapper.java | 4 ++-- .../src/main/java/com/facebook/react/flat/RCTVirtualText.java | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatReactModalShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatReactModalShadowNode.java index 8f754287f..c145b88da 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatReactModalShadowNode.java +++ b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatReactModalShadowNode.java @@ -16,7 +16,7 @@ import android.view.Display; import android.view.Surface; import android.view.WindowManager; -import com.facebook.csslayout.CSSNode; +import com.facebook.csslayout.CSSNodeDEPRECATED; /** * FlatReactModalShadowNode @@ -45,7 +45,7 @@ class FlatReactModalShadowNode extends FlatShadowNode implements AndroidView { */ @Override @TargetApi(16) - public void addChildAt(CSSNode child, int i) { + public void addChildAt(CSSNodeDEPRECATED child, int i) { super.addChildAt(child, i); Context context = getThemedContext(); diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatRootShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatRootShadowNode.java index b976b4c1b..f7e4a5827 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatRootShadowNode.java +++ b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatRootShadowNode.java @@ -20,7 +20,7 @@ package com.facebook.react.flat; } /** - * Returns true when this CSSNode tree needs to be re-laid out. If true, FlatUIImplementation + * Returns true when this CSSNodeDEPRECATED tree needs to be re-laid out. If true, FlatUIImplementation * will request LayoutEngine to perform a layout pass to update node boundaries. This is used * to avoid unnecessary node updates. */ 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 0e87d9ef2..3e6af0f47 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatShadowNode.java +++ b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatShadowNode.java @@ -13,7 +13,7 @@ import javax.annotation.Nullable; import android.graphics.Rect; -import com.facebook.csslayout.CSSNode; +import com.facebook.csslayout.CSSNodeDEPRECATED; import com.facebook.infer.annotation.Assertions; import com.facebook.react.uimanager.LayoutShadowNode; import com.facebook.react.uimanager.OnLayoutEvent; @@ -201,7 +201,7 @@ import com.facebook.react.uimanager.ReactClippingViewGroupHelper; } @Override - public void addChildAt(CSSNode child, int i) { + public void addChildAt(CSSNodeDEPRECATED child, int i) { super.addChildAt(child, i); if (mForceMountChildrenToView && child instanceof FlatShadowNode) { ((FlatShadowNode) child).forceMountToView(); diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/NativeViewWrapper.java b/ReactAndroid/src/main/java/com/facebook/react/flat/NativeViewWrapper.java index 3cd0421b0..aede449bf 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/flat/NativeViewWrapper.java +++ b/ReactAndroid/src/main/java/com/facebook/react/flat/NativeViewWrapper.java @@ -11,7 +11,7 @@ package com.facebook.react.flat; import javax.annotation.Nullable; -import com.facebook.csslayout.CSSNode; +import com.facebook.csslayout.CSSNodeDEPRECATED; import com.facebook.csslayout.CSSNodeAPI; import com.facebook.react.uimanager.ReactStylesDiffMap; import com.facebook.react.uimanager.ReactShadowNode; @@ -93,7 +93,7 @@ import com.facebook.react.uimanager.ViewManager; } @Override - public void addChildAt(CSSNode child, int i) { + public void addChildAt(CSSNodeDEPRECATED child, int i) { super.addChildAt(child, i); if (mForceMountGrandChildrenToView && child instanceof FlatShadowNode) { ((FlatShadowNode) child).forceMountChildrenToView(); 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 d0814a689..cf4137720 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTVirtualText.java +++ b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTVirtualText.java @@ -16,7 +16,7 @@ import android.text.Spannable; import android.text.SpannableStringBuilder; import android.text.TextUtils; -import com.facebook.csslayout.CSSNode; +import com.facebook.csslayout.CSSNodeDEPRECATED; import com.facebook.react.bridge.ReadableMap; import com.facebook.react.uimanager.PixelUtil; import com.facebook.react.uimanager.ViewProps; @@ -40,7 +40,7 @@ import com.facebook.react.uimanager.annotations.ReactProp; private ShadowStyleSpan mShadowStyleSpan = ShadowStyleSpan.INSTANCE; @Override - public void addChildAt(CSSNode child, int i) { + public void addChildAt(CSSNodeDEPRECATED child, int i) { super.addChildAt(child, i); notifyChanged(true); }