From 0b79d44dcf8814717ba600a3559f5728ceecb4ad Mon Sep 17 00:00:00 2001
From: Martin Konicek <mkonicek@fb.com>
Date: Mon, 25 Jan 2016 05:55:06 -0800
Subject: [PATCH] Less Catalyst, more React

Summary:
Catalyst is the old project name. Rename a few files.

@public

Reviewed By: bestander

Differential Revision: D2859553
---
 .../src/main/java/com/facebook/react/flat/AndroidView.java  | 4 ++--
 .../main/java/com/facebook/react/flat/FlatShadowNode.java   | 4 ++--
 .../java/com/facebook/react/flat/FlatUIImplementation.java  | 6 +++---
 .../main/java/com/facebook/react/flat/FlatViewGroup.java    | 4 ++--
 .../src/main/java/com/facebook/react/flat/StateBuilder.java | 4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/AndroidView.java b/ReactAndroid/src/main/java/com/facebook/react/flat/AndroidView.java
index 0d6273f50..9aaccdaf8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/AndroidView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/AndroidView.java
@@ -10,7 +10,7 @@
 package com.facebook.react.flat;
 
 import com.facebook.csslayout.CSSNode;
-import com.facebook.react.uimanager.CatalystStylesDiffMap;
+import com.facebook.react.uimanager.ReactStylesDiffMap;
 import com.facebook.react.uimanager.ReactShadowNode;
 import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.ViewGroupManager;
@@ -70,7 +70,7 @@ import com.facebook.react.uimanager.ViewManager;
   }
 
   @Override
-  /* package*/ void handleUpdateProperties(CatalystStylesDiffMap styles) {
+  /* package*/ void handleUpdateProperties(ReactStylesDiffMap styles) {
     if (mReactShadowNode != null) {
       mReactShadowNode.updateProperties(styles);
     }
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 058d6e476..f331d1933 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatShadowNode.java
@@ -12,7 +12,7 @@ package com.facebook.react.flat;
 import javax.annotation.Nullable;
 
 import com.facebook.infer.annotation.Assertions;
-import com.facebook.react.uimanager.CatalystStylesDiffMap;
+import com.facebook.react.uimanager.ReactStylesDiffMap;
 import com.facebook.react.uimanager.LayoutShadowNode;
 import com.facebook.react.uimanager.annotations.ReactProp;
 import com.facebook.react.uimanager.ViewProps;
@@ -50,7 +50,7 @@ import com.facebook.react.uimanager.ViewProps;
   private int mMoveToIndexInParent;
   private boolean mIsOverflowVisible = true;
 
-  /* package */ void handleUpdateProperties(CatalystStylesDiffMap styles) {
+  /* package */ void handleUpdateProperties(ReactStylesDiffMap styles) {
     if (!mountsToView()) {
       // Make sure we mount this FlatShadowNode to a View if any of these properties are present.
       if (styles.hasKey(PROP_DECOMPOSED_MATRIX) ||
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatUIImplementation.java b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatUIImplementation.java
index 95093cc96..ab7ac4512 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatUIImplementation.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatUIImplementation.java
@@ -20,7 +20,7 @@ import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReadableArray;
-import com.facebook.react.uimanager.CatalystStylesDiffMap;
+import com.facebook.react.uimanager.ReactStylesDiffMap;
 import com.facebook.react.uimanager.ReactShadowNode;
 import com.facebook.react.uimanager.UIImplementation;
 import com.facebook.react.uimanager.ViewManager;
@@ -121,7 +121,7 @@ public class FlatUIImplementation extends UIImplementation {
   protected void handleCreateView(
       ReactShadowNode cssNode,
       int rootViewTag,
-      @Nullable CatalystStylesDiffMap styles) {
+      @Nullable ReactStylesDiffMap styles) {
     FlatShadowNode node = (FlatShadowNode) cssNode;
 
     if (styles != null) {
@@ -138,7 +138,7 @@ public class FlatUIImplementation extends UIImplementation {
   protected void handleUpdateView(
       ReactShadowNode cssNode,
       String className,
-      CatalystStylesDiffMap styles) {
+      ReactStylesDiffMap styles) {
     FlatShadowNode node = (FlatShadowNode) cssNode;
 
     node.handleUpdateProperties(styles);
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatViewGroup.java b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatViewGroup.java
index 7e0df6ca8..ce1c1c570 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatViewGroup.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatViewGroup.java
@@ -26,7 +26,7 @@ import android.view.ViewParent;
 
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.SoftAssertions;
-import com.facebook.react.touch.CatalystInterceptingViewGroup;
+import com.facebook.react.touch.ReactInterceptingViewGroup;
 import com.facebook.react.touch.OnInterceptTouchEventListener;
 import com.facebook.react.uimanager.PointerEvents;
 import com.facebook.react.uimanager.ReactCompoundView;
@@ -39,7 +39,7 @@ import com.facebook.react.views.image.ImageLoadEvent;
  * array of DrawCommands, executing them one by one.
  */
 /* package */ final class FlatViewGroup extends ViewGroup
-    implements CatalystInterceptingViewGroup, ReactCompoundView, ReactPointerEventsView {
+    implements ReactInterceptingViewGroup, ReactCompoundView, ReactPointerEventsView {
   /**
    * Helper class that allows AttachDetachListener to invalidate the hosting View.
    */
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/StateBuilder.java b/ReactAndroid/src/main/java/com/facebook/react/flat/StateBuilder.java
index c6c0f64d4..de5a3275c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/StateBuilder.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/StateBuilder.java
@@ -15,7 +15,7 @@ import javax.annotation.Nullable;
 
 import com.facebook.csslayout.CSSNode;
 import com.facebook.csslayout.Spacing;
-import com.facebook.react.uimanager.CatalystStylesDiffMap;
+import com.facebook.react.uimanager.ReactStylesDiffMap;
 import com.facebook.react.uimanager.OnLayoutEvent;
 import com.facebook.react.uimanager.events.EventDispatcher;
 
@@ -127,7 +127,7 @@ import com.facebook.react.uimanager.events.EventDispatcher;
   /* package */ void ensureBackingViewIsCreated(
       FlatShadowNode node,
       int tag,
-      @Nullable CatalystStylesDiffMap styles) {
+      @Nullable ReactStylesDiffMap styles) {
     if (node.isBackingViewCreated()) {
       if (styles != null) {
         // if the View is already created, make sure propagate new styles.