From 80f8aa3c7e7e3acf2127ca507fe04951c44e6f6b Mon Sep 17 00:00:00 2001 From: Pascal Hartig Date: Mon, 22 Jan 2018 02:48:53 -0800 Subject: [PATCH] Mark model fields final Summary: These are already considered immutable, but not marked in their class. Reviewed By: emilsjolander Differential Revision: D6759564 fbshipit-source-id: 810dc8a9730fb330760d2aedecafcea81cf25cb1 --- java/com/facebook/yoga/YogaAlign.java | 2 +- java/com/facebook/yoga/YogaDimension.java | 2 +- java/com/facebook/yoga/YogaDirection.java | 2 +- java/com/facebook/yoga/YogaDisplay.java | 2 +- java/com/facebook/yoga/YogaEdge.java | 2 +- java/com/facebook/yoga/YogaExperimentalFeature.java | 2 +- java/com/facebook/yoga/YogaFlexDirection.java | 2 +- java/com/facebook/yoga/YogaJustify.java | 2 +- java/com/facebook/yoga/YogaLogLevel.java | 2 +- java/com/facebook/yoga/YogaMeasureMode.java | 2 +- java/com/facebook/yoga/YogaNode.java | 12 +++++++----- java/com/facebook/yoga/YogaNodeType.java | 2 +- java/com/facebook/yoga/YogaOverflow.java | 2 +- java/com/facebook/yoga/YogaPositionType.java | 2 +- java/com/facebook/yoga/YogaPrintOptions.java | 2 +- java/com/facebook/yoga/YogaUnit.java | 2 +- java/com/facebook/yoga/YogaWrap.java | 2 +- 17 files changed, 23 insertions(+), 21 deletions(-) diff --git a/java/com/facebook/yoga/YogaAlign.java b/java/com/facebook/yoga/YogaAlign.java index 9fc897fa..deb45f1d 100644 --- a/java/com/facebook/yoga/YogaAlign.java +++ b/java/com/facebook/yoga/YogaAlign.java @@ -22,7 +22,7 @@ public enum YogaAlign { SPACE_BETWEEN(6), SPACE_AROUND(7); - private int mIntValue; + private final int mIntValue; YogaAlign(int intValue) { mIntValue = intValue; diff --git a/java/com/facebook/yoga/YogaDimension.java b/java/com/facebook/yoga/YogaDimension.java index 0b0fe257..b6cb1f84 100644 --- a/java/com/facebook/yoga/YogaDimension.java +++ b/java/com/facebook/yoga/YogaDimension.java @@ -16,7 +16,7 @@ public enum YogaDimension { WIDTH(0), HEIGHT(1); - private int mIntValue; + private final int mIntValue; YogaDimension(int intValue) { mIntValue = intValue; diff --git a/java/com/facebook/yoga/YogaDirection.java b/java/com/facebook/yoga/YogaDirection.java index 17f3a37b..29789fcb 100644 --- a/java/com/facebook/yoga/YogaDirection.java +++ b/java/com/facebook/yoga/YogaDirection.java @@ -17,7 +17,7 @@ public enum YogaDirection { LTR(1), RTL(2); - private int mIntValue; + private final int mIntValue; YogaDirection(int intValue) { mIntValue = intValue; diff --git a/java/com/facebook/yoga/YogaDisplay.java b/java/com/facebook/yoga/YogaDisplay.java index c4b49a9c..b7d416ec 100644 --- a/java/com/facebook/yoga/YogaDisplay.java +++ b/java/com/facebook/yoga/YogaDisplay.java @@ -16,7 +16,7 @@ public enum YogaDisplay { FLEX(0), NONE(1); - private int mIntValue; + private final int mIntValue; YogaDisplay(int intValue) { mIntValue = intValue; diff --git a/java/com/facebook/yoga/YogaEdge.java b/java/com/facebook/yoga/YogaEdge.java index e75295ea..53677cff 100644 --- a/java/com/facebook/yoga/YogaEdge.java +++ b/java/com/facebook/yoga/YogaEdge.java @@ -23,7 +23,7 @@ public enum YogaEdge { VERTICAL(7), ALL(8); - private int mIntValue; + private final int mIntValue; YogaEdge(int intValue) { mIntValue = intValue; diff --git a/java/com/facebook/yoga/YogaExperimentalFeature.java b/java/com/facebook/yoga/YogaExperimentalFeature.java index c1eaa1e3..02dad1ed 100644 --- a/java/com/facebook/yoga/YogaExperimentalFeature.java +++ b/java/com/facebook/yoga/YogaExperimentalFeature.java @@ -15,7 +15,7 @@ import com.facebook.proguard.annotations.DoNotStrip; public enum YogaExperimentalFeature { WEB_FLEX_BASIS(0); - private int mIntValue; + private final int mIntValue; YogaExperimentalFeature(int intValue) { mIntValue = intValue; diff --git a/java/com/facebook/yoga/YogaFlexDirection.java b/java/com/facebook/yoga/YogaFlexDirection.java index 2608fd17..19bdd204 100644 --- a/java/com/facebook/yoga/YogaFlexDirection.java +++ b/java/com/facebook/yoga/YogaFlexDirection.java @@ -18,7 +18,7 @@ public enum YogaFlexDirection { ROW(2), ROW_REVERSE(3); - private int mIntValue; + private final int mIntValue; YogaFlexDirection(int intValue) { mIntValue = intValue; diff --git a/java/com/facebook/yoga/YogaJustify.java b/java/com/facebook/yoga/YogaJustify.java index 34a8922e..283e0b57 100644 --- a/java/com/facebook/yoga/YogaJustify.java +++ b/java/com/facebook/yoga/YogaJustify.java @@ -20,7 +20,7 @@ public enum YogaJustify { SPACE_AROUND(4), SPACE_EVENLY(5); - private int mIntValue; + private final int mIntValue; YogaJustify(int intValue) { mIntValue = intValue; diff --git a/java/com/facebook/yoga/YogaLogLevel.java b/java/com/facebook/yoga/YogaLogLevel.java index 7dd5273d..d16d98f4 100644 --- a/java/com/facebook/yoga/YogaLogLevel.java +++ b/java/com/facebook/yoga/YogaLogLevel.java @@ -20,7 +20,7 @@ public enum YogaLogLevel { VERBOSE(4), FATAL(5); - private int mIntValue; + private final int mIntValue; YogaLogLevel(int intValue) { mIntValue = intValue; diff --git a/java/com/facebook/yoga/YogaMeasureMode.java b/java/com/facebook/yoga/YogaMeasureMode.java index bcc7fe1c..42633fa2 100644 --- a/java/com/facebook/yoga/YogaMeasureMode.java +++ b/java/com/facebook/yoga/YogaMeasureMode.java @@ -17,7 +17,7 @@ public enum YogaMeasureMode { EXACTLY(1), AT_MOST(2); - private int mIntValue; + private final int mIntValue; YogaMeasureMode(int intValue) { mIntValue = intValue; diff --git a/java/com/facebook/yoga/YogaNode.java b/java/com/facebook/yoga/YogaNode.java index 815fd2c3..9836f9ca 100644 --- a/java/com/facebook/yoga/YogaNode.java +++ b/java/com/facebook/yoga/YogaNode.java @@ -33,13 +33,13 @@ public class YogaNode { private List mChildren; private YogaMeasureFunction mMeasureFunction; private YogaBaselineFunction mBaselineFunction; - private long mNativePointer; + private final long mNativePointer; private Object mData; /* Those flags needs be in sync with YGJNI.cpp */ - private final static int MARGIN = 1; - private final static int PADDING = 2; - private final static int BORDER = 4; + private static final int MARGIN = 1; + private static final int PADDING = 2; + private static final int BORDER = 4; @DoNotStrip private int mEdgeSetFlag = 0; @@ -100,6 +100,7 @@ public class YogaNode { } private native void jni_YGNodeFree(long nativePointer); + @Override protected void finalize() throws Throwable { try { jni_YGNodeFree(mNativePointer); @@ -170,7 +171,8 @@ public class YogaNode { return child; } - public @Nullable + @Nullable + public YogaNode getParent() { return mParent; } diff --git a/java/com/facebook/yoga/YogaNodeType.java b/java/com/facebook/yoga/YogaNodeType.java index 85811c3b..1b565ea1 100644 --- a/java/com/facebook/yoga/YogaNodeType.java +++ b/java/com/facebook/yoga/YogaNodeType.java @@ -16,7 +16,7 @@ public enum YogaNodeType { DEFAULT(0), TEXT(1); - private int mIntValue; + private final int mIntValue; YogaNodeType(int intValue) { mIntValue = intValue; diff --git a/java/com/facebook/yoga/YogaOverflow.java b/java/com/facebook/yoga/YogaOverflow.java index 2c02a8cf..510f0af4 100644 --- a/java/com/facebook/yoga/YogaOverflow.java +++ b/java/com/facebook/yoga/YogaOverflow.java @@ -17,7 +17,7 @@ public enum YogaOverflow { HIDDEN(1), SCROLL(2); - private int mIntValue; + private final int mIntValue; YogaOverflow(int intValue) { mIntValue = intValue; diff --git a/java/com/facebook/yoga/YogaPositionType.java b/java/com/facebook/yoga/YogaPositionType.java index 82fc7937..bbaeba38 100644 --- a/java/com/facebook/yoga/YogaPositionType.java +++ b/java/com/facebook/yoga/YogaPositionType.java @@ -16,7 +16,7 @@ public enum YogaPositionType { RELATIVE(0), ABSOLUTE(1); - private int mIntValue; + private final int mIntValue; YogaPositionType(int intValue) { mIntValue = intValue; diff --git a/java/com/facebook/yoga/YogaPrintOptions.java b/java/com/facebook/yoga/YogaPrintOptions.java index 272eb2e2..58e2dc95 100644 --- a/java/com/facebook/yoga/YogaPrintOptions.java +++ b/java/com/facebook/yoga/YogaPrintOptions.java @@ -17,7 +17,7 @@ public enum YogaPrintOptions { STYLE(2), CHILDREN(4); - private int mIntValue; + private final int mIntValue; YogaPrintOptions(int intValue) { mIntValue = intValue; diff --git a/java/com/facebook/yoga/YogaUnit.java b/java/com/facebook/yoga/YogaUnit.java index d8a10b36..8a08b0e5 100644 --- a/java/com/facebook/yoga/YogaUnit.java +++ b/java/com/facebook/yoga/YogaUnit.java @@ -18,7 +18,7 @@ public enum YogaUnit { PERCENT(2), AUTO(3); - private int mIntValue; + private final int mIntValue; YogaUnit(int intValue) { mIntValue = intValue; diff --git a/java/com/facebook/yoga/YogaWrap.java b/java/com/facebook/yoga/YogaWrap.java index 6b1dedcc..a19d3de3 100644 --- a/java/com/facebook/yoga/YogaWrap.java +++ b/java/com/facebook/yoga/YogaWrap.java @@ -17,7 +17,7 @@ public enum YogaWrap { WRAP(1), WRAP_REVERSE(2); - private int mIntValue; + private final int mIntValue; YogaWrap(int intValue) { mIntValue = intValue;