From 64455ced5d7fbd89b485774e4085cb3a9592bdad Mon Sep 17 00:00:00 2001 From: Emil Sjolander Date: Wed, 12 Oct 2016 03:44:53 -0700 Subject: [PATCH] Rename reset() -> free() to be more in line with what it now does Reviewed By: lucasr Differential Revision: D3992808 fbshipit-source-id: 8428ae33268d1417ce8642b741e47150a17bf077 --- .../src/main/java/com/facebook/csslayout/CSSNode.java | 4 ++-- .../src/main/java/com/facebook/csslayout/CSSNodeAPI.java | 2 +- .../main/java/com/facebook/csslayout/CSSNodeDEPRECATED.java | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/csslayout/CSSNode.java b/ReactAndroid/src/main/java/com/facebook/csslayout/CSSNode.java index 1fb31ec48..996b5fa23 100644 --- a/ReactAndroid/src/main/java/com/facebook/csslayout/CSSNode.java +++ b/ReactAndroid/src/main/java/com/facebook/csslayout/CSSNode.java @@ -58,10 +58,10 @@ public class CSSNode implements CSSNodeAPI { private native void jni_CSSNodeFree(long nativePointer); @Override - public void reset() { + public void free() { assertNativeInstance(); if (mParent != null || (mChildren != null && mChildren.size() > 0)) { - throw new IllegalStateException("You should not reset an attached CSSNode"); + throw new IllegalStateException("You should not free an attached CSSNode"); } jni_CSSNodeFree(mNativePointer); diff --git a/ReactAndroid/src/main/java/com/facebook/csslayout/CSSNodeAPI.java b/ReactAndroid/src/main/java/com/facebook/csslayout/CSSNodeAPI.java index 51349a123..6141873eb 100644 --- a/ReactAndroid/src/main/java/com/facebook/csslayout/CSSNodeAPI.java +++ b/ReactAndroid/src/main/java/com/facebook/csslayout/CSSNodeAPI.java @@ -90,5 +90,5 @@ public interface CSSNodeAPI { void setData(Object data); Object getData(); void init(); - void reset(); + void free(); } diff --git a/ReactAndroid/src/main/java/com/facebook/csslayout/CSSNodeDEPRECATED.java b/ReactAndroid/src/main/java/com/facebook/csslayout/CSSNodeDEPRECATED.java index aca4af67f..a8da67599 100644 --- a/ReactAndroid/src/main/java/com/facebook/csslayout/CSSNodeDEPRECATED.java +++ b/ReactAndroid/src/main/java/com/facebook/csslayout/CSSNodeDEPRECATED.java @@ -63,7 +63,7 @@ public class CSSNodeDEPRECATED implements CSSNodeAPI { @Override public void init() { - reset(); + free(); } @Override @@ -640,9 +640,9 @@ public class CSSNodeDEPRECATED implements CSSNodeAPI { * recycling {@link CSSNodeDEPRECATED} instances. */ @Override - public void reset() { + public void free() { if (mParent != null || (mChildren != null && mChildren.size() > 0)) { - throw new IllegalStateException("You should not reset an attached CSSNodeDEPRECATED"); + throw new IllegalStateException("You should not free an attached CSSNodeDEPRECATED"); } style.reset();