From 460030fc4fbbe3714271e6bcbed4cb0d4feaefd1 Mon Sep 17 00:00:00 2001 From: "pengfei.zhou" Date: Wed, 13 Nov 2019 17:26:59 +0800 Subject: [PATCH] rename SuperNode method --- Android/doric/src/main/java/pub/doric/shader/LinearNode.java | 4 ++-- Android/doric/src/main/java/pub/doric/shader/StackNode.java | 4 ++-- Android/doric/src/main/java/pub/doric/shader/SuperNode.java | 2 +- Android/doric/src/main/java/pub/doric/shader/ViewNode.java | 2 +- .../doric/src/main/java/pub/doric/shader/list/ListNode.java | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Android/doric/src/main/java/pub/doric/shader/LinearNode.java b/Android/doric/src/main/java/pub/doric/shader/LinearNode.java index fd06dfae..5577d516 100644 --- a/Android/doric/src/main/java/pub/doric/shader/LinearNode.java +++ b/Android/doric/src/main/java/pub/doric/shader/LinearNode.java @@ -36,8 +36,8 @@ public class LinearNode extends GroupNode { } @Override - protected void blendChildLayoutConfig(ViewNode viewNode, JSObject layoutConfig) { - super.blendChildLayoutConfig(viewNode, layoutConfig); + protected void blendSubLayoutConfig(ViewNode viewNode, JSObject layoutConfig) { + super.blendSubLayoutConfig(viewNode, layoutConfig); JSValue jsValue = layoutConfig.getProperty("alignment"); if (jsValue.isNumber()) { ((LinearLayout.LayoutParams) viewNode.getLayoutParams()).gravity = jsValue.asNumber().toInt(); diff --git a/Android/doric/src/main/java/pub/doric/shader/StackNode.java b/Android/doric/src/main/java/pub/doric/shader/StackNode.java index aa413105..6f0ef046 100644 --- a/Android/doric/src/main/java/pub/doric/shader/StackNode.java +++ b/Android/doric/src/main/java/pub/doric/shader/StackNode.java @@ -36,8 +36,8 @@ public class StackNode extends GroupNode { } @Override - protected void blendChildLayoutConfig(ViewNode viewNode, JSObject jsObject) { - super.blendChildLayoutConfig(viewNode, jsObject); + protected void blendSubLayoutConfig(ViewNode viewNode, JSObject jsObject) { + super.blendSubLayoutConfig(viewNode, jsObject); JSValue jsValue = jsObject.getProperty("alignment"); if (jsValue.isNumber()) { ((FrameLayout.LayoutParams) viewNode.getLayoutParams()).gravity = jsValue.asNumber().toInt(); diff --git a/Android/doric/src/main/java/pub/doric/shader/SuperNode.java b/Android/doric/src/main/java/pub/doric/shader/SuperNode.java index a9d7f83b..f2d003b0 100644 --- a/Android/doric/src/main/java/pub/doric/shader/SuperNode.java +++ b/Android/doric/src/main/java/pub/doric/shader/SuperNode.java @@ -38,7 +38,7 @@ public abstract class SuperNode extends ViewNode { return new ViewGroup.LayoutParams(0, 0); } - protected void blendChildLayoutConfig(ViewNode viewNode, JSObject jsObject) { + protected void blendSubLayoutConfig(ViewNode viewNode, JSObject jsObject) { JSValue jsValue = jsObject.getProperty("margin"); JSValue widthSpec = jsObject.getProperty("widthSpec"); JSValue heightSpec = jsObject.getProperty("heightSpec"); diff --git a/Android/doric/src/main/java/pub/doric/shader/ViewNode.java b/Android/doric/src/main/java/pub/doric/shader/ViewNode.java index 50cc3980..0b08bab7 100644 --- a/Android/doric/src/main/java/pub/doric/shader/ViewNode.java +++ b/Android/doric/src/main/java/pub/doric/shader/ViewNode.java @@ -129,7 +129,7 @@ public abstract class ViewNode extends DoricContextHolder { break; case "layoutConfig": if (prop.isObject() && mSuperNode != null) { - mSuperNode.blendChildLayoutConfig(this, prop.asObject()); + mSuperNode.blendSubLayoutConfig(this, prop.asObject()); } break; case "border": diff --git a/Android/doric/src/main/java/pub/doric/shader/list/ListNode.java b/Android/doric/src/main/java/pub/doric/shader/list/ListNode.java index a6f271e7..3ad110b3 100644 --- a/Android/doric/src/main/java/pub/doric/shader/list/ListNode.java +++ b/Android/doric/src/main/java/pub/doric/shader/list/ListNode.java @@ -82,7 +82,7 @@ public class ListNode extends SuperNode { } @Override - protected void blendChildLayoutConfig(ViewNode viewNode, JSObject jsObject) { - super.blendChildLayoutConfig(viewNode, jsObject); + protected void blendSubLayoutConfig(ViewNode viewNode, JSObject jsObject) { + super.blendSubLayoutConfig(viewNode, jsObject); } }