You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ha...@apache.org on 2017/10/10 13:48:33 UTC
[14/15] incubator-weex git commit: reduce unused code and reuse
hashmap
reduce unused code and reuse hashmap
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/7f8b133f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/7f8b133f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/7f8b133f
Branch: refs/heads/website
Commit: 7f8b133f58850a84ad7654f98b9d5445d4bc176a
Parents: 036c5ac
Author: jianbai.gbj <ji...@alibaba-inc.com>
Authored: Mon Oct 9 19:52:50 2017 +0800
Committer: Hanks <zh...@gmail.com>
Committed: Tue Oct 10 21:42:52 2017 +0800
----------------------------------------------------------------------
android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java | 6 +-----
.../sdk/src/main/java/com/taobao/weex/dom/WXTextDomObject.java | 2 +-
.../sdk/src/main/java/com/taobao/weex/dom/flex/CSSNode.java | 2 +-
.../main/java/com/taobao/weex/ui/component/WXComponent.java | 2 +-
.../java/com/taobao/weex/ui/component/binding/Statements.java | 1 +
5 files changed, 5 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7f8b133f/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java b/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java
index f990792..782b16c 100644
--- a/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java
+++ b/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java
@@ -138,9 +138,6 @@ public class WXDomObject extends CSSNode implements Cloneable,ImmutableDomObject
return mRef;
}
- public void setRef(String ref) {
- this.mRef = ref;
- }
public String getType(){
return mType;
@@ -169,7 +166,6 @@ public class WXDomObject extends CSSNode implements Cloneable,ImmutableDomObject
}
-
public @NonNull DomContext getDomContext() {
return mDomContext;
}
@@ -466,7 +462,7 @@ public class WXDomObject extends CSSNode implements Cloneable,ImmutableDomObject
super.dirty();
}
- /** package **/public void applyStyleToNode() {
+ /** package **/ void applyStyleToNode() {
WXStyle stylesMap = getStyles();
int vp = getViewPortWidth();
if (!stylesMap.isEmpty()) {
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7f8b133f/android/sdk/src/main/java/com/taobao/weex/dom/WXTextDomObject.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/WXTextDomObject.java b/android/sdk/src/main/java/com/taobao/weex/dom/WXTextDomObject.java
index 749afbd..e9a5c79 100644
--- a/android/sdk/src/main/java/com/taobao/weex/dom/WXTextDomObject.java
+++ b/android/sdk/src/main/java/com/taobao/weex/dom/WXTextDomObject.java
@@ -175,7 +175,7 @@ public class WXTextDomObject extends WXDomObject {
spanned = createSpanned(mText);
if(hasNewLayout()){
if(WXEnvironment.isApkDebugable()) {
- WXLogUtils.w("TextDom", new IllegalStateException("Previous csslayout was ignored! markLayoutSeen() never called"));
+ WXLogUtils.d("Previous csslayout was ignored! markLayoutSeen() never called");
}
markUpdateSeen();
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7f8b133f/android/sdk/src/main/java/com/taobao/weex/dom/flex/CSSNode.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/flex/CSSNode.java b/android/sdk/src/main/java/com/taobao/weex/dom/flex/CSSNode.java
index 79ba6e5..624c4c9 100755
--- a/android/sdk/src/main/java/com/taobao/weex/dom/flex/CSSNode.java
+++ b/android/sdk/src/main/java/com/taobao/weex/dom/flex/CSSNode.java
@@ -173,7 +173,7 @@ public class CSSNode {
return;
} else if (mLayoutState == LayoutState.HAS_NEW_LAYOUT) {
if(WXEnvironment.isApkDebugable()){
- WXLogUtils.w("weex", new IllegalStateException("Previous csslayout was ignored! markLayoutSeen() never called"));
+ WXLogUtils.d("Previous csslayout was ignored! markLayoutSeen() never called");
}
markLayoutSeen();
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7f8b133f/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
index 1d64d5d..d801290 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
@@ -337,7 +337,7 @@ public abstract class WXComponent<T extends View> implements IWXObject, IWXActi
long startNanos = System.nanoTime();
if(!isLazy()) {
if (component == null) {
- component = this;
+ component = this;
}
setLayout(component.getDomObject());
setPadding(component.getDomObject().getPadding(), component.getDomObject().getBorder());
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7f8b133f/android/sdk/src/main/java/com/taobao/weex/ui/component/binding/Statements.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/binding/Statements.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/binding/Statements.java
index 1af8934..548a1a0 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/binding/Statements.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/binding/Statements.java
@@ -392,6 +392,7 @@ public class Statements {
Map<String, Object> dynamic = dynamicLocal.get();
if(dynamic == null) {
dynamic = new HashMap<>();
+ dynamicLocal.set(dynamic);
}
if(dynamic.size() > 0){
dynamic.clear();