You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by gu...@apache.org on 2017/09/27 02:07:44 UTC
[15/18] incubator-weex git commit: reduce method
reduce method
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/aab31956
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/aab31956
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/aab31956
Branch: refs/heads/master
Commit: aab319565d38311588eca6d639a4c5e7edf5fb58
Parents: ca7d560
Author: jianbai.gbj <ji...@alibaba-inc.com>
Authored: Tue Sep 26 19:08:32 2017 +0800
Committer: jianbai.gbj <ji...@alibaba-inc.com>
Committed: Tue Sep 26 19:08:32 2017 +0800
----------------------------------------------------------------------
.../main/java/com/taobao/weex/dom/WXAttr.java | 9 +-
.../com/taobao/weex/dom/binding/ELUtils.java | 12 ---
.../taobao/weex/dom/binding/WXStatement.java | 93 ++------------------
3 files changed, 11 insertions(+), 103 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/aab31956/android/sdk/src/main/java/com/taobao/weex/dom/WXAttr.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/WXAttr.java b/android/sdk/src/main/java/com/taobao/weex/dom/WXAttr.java
index 3434fe3..c3b0399 100644
--- a/android/sdk/src/main/java/com/taobao/weex/dom/WXAttr.java
+++ b/android/sdk/src/main/java/com/taobao/weex/dom/WXAttr.java
@@ -30,6 +30,7 @@ import com.taobao.weex.common.Constants.Name;
import com.taobao.weex.common.WXImageSharpen;
import com.taobao.weex.dom.binding.ELUtils;
import com.taobao.weex.dom.binding.WXStatement;
+import com.taobao.weex.el.parse.Parser;
import com.taobao.weex.ui.view.listview.WXRecyclerView;
import com.taobao.weex.utils.WXLogUtils;
import com.taobao.weex.utils.WXUtils;
@@ -484,15 +485,17 @@ public class WXAttr implements Map<String, Object>,Cloneable {
mBindingAttrs.put(key, value);
return true;
}
- if(ELUtils.isVif(key)){
+ if(WXStatement.WX_IF.equals(key)){
if(mStatement == null){
mStatement = new WXStatement();
}
- mStatement.put(key, ELUtils.vifBlock(value.toString()));
+ if(value != null) {
+ mStatement.put(key, Parser.parse(value.toString()));
+ }
return true;
}
- if(ELUtils.isVfor(key)){
+ if(WXStatement.WX_FOR.equals(key)){
if(mStatement == null){
mStatement = new WXStatement();
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/aab31956/android/sdk/src/main/java/com/taobao/weex/dom/binding/ELUtils.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/binding/ELUtils.java b/android/sdk/src/main/java/com/taobao/weex/dom/binding/ELUtils.java
index c2f3bb8..c0924f0 100644
--- a/android/sdk/src/main/java/com/taobao/weex/dom/binding/ELUtils.java
+++ b/android/sdk/src/main/java/com/taobao/weex/dom/binding/ELUtils.java
@@ -93,18 +93,6 @@ public class ELUtils {
return value;
}
- public static boolean isVif(String name){
- return WXStatement.WX_IF.equals(name);
- }
-
- public static boolean isVfor(String name){
- return WXStatement.WX_FOR.equals(name);
- }
-
- public static Token vifBlock(String code){
- return Parser.parse(code);
- }
-
public static Object vforBlock(Object vfor){
if(vfor instanceof JSONObject){
if(((JSONObject) vfor).containsKey(WXStatement.WX_FOR_LIST)){
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/aab31956/android/sdk/src/main/java/com/taobao/weex/dom/binding/WXStatement.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/binding/WXStatement.java b/android/sdk/src/main/java/com/taobao/weex/dom/binding/WXStatement.java
index e17c708..726951d 100644
--- a/android/sdk/src/main/java/com/taobao/weex/dom/binding/WXStatement.java
+++ b/android/sdk/src/main/java/com/taobao/weex/dom/binding/WXStatement.java
@@ -18,18 +18,14 @@
*/
package com.taobao.weex.dom.binding;
-import android.support.annotation.NonNull;
import android.support.v4.util.ArrayMap;
-
-import java.util.Collection;
-import java.util.Map;
-import java.util.Set;
+import android.support.v4.util.SimpleArrayMap;
/**
* Created by furture on 2017/8/17.
* statement expression for template list, like v-if v-for
*/
-public class WXStatement implements Map<String, Object>,Cloneable {
+public class WXStatement extends ArrayMap implements Cloneable {
/**
* v-for statement, like
@@ -67,94 +63,15 @@ public class WXStatement implements Map<String, Object>,Cloneable {
* */
public static final String WX_IF = "[[match]]";
-
- private final ArrayMap<String, Object> map;
-
public WXStatement() {
- this.map = new ArrayMap<>();
- }
-
- public WXStatement(ArrayMap<String, Object> map) {
- this.map = map;
- }
-
- @Override
- public boolean equals(Object o) {
- return map.equals(o);
- }
-
- @Override
- public int hashCode() {
- return map.hashCode();
- }
-
-
- @Override
- public int size() {
- return map.size();
- }
-
- @Override
- public boolean isEmpty() {
- return map.isEmpty();
}
- @Override
- public boolean containsKey(Object key) {
- return map.containsKey(key);
- }
-
- @Override
- public boolean containsValue(Object value) {
- return map.containsValue(value);
+ public WXStatement(SimpleArrayMap map) {
+ super(map);
}
@Override
- public Object get(Object key) {
- return map.get(key);
- }
-
- @Override
- public Object put(String key, Object value) {
- return map.put(key, value);
- }
-
- @Override
- public Object remove(Object key) {
- return map.remove(key);
- }
-
- @Override
- public void putAll(@NonNull Map<? extends String, ?> m) {
- map.putAll(m);
- }
-
- @Override
- public void clear() {
- map.clear();
- }
-
- @NonNull
- @Override
- public Set<String> keySet() {
- return map.keySet();
- }
-
- @NonNull
- @Override
- public Collection<Object> values() {
- return map.values();
- }
-
- @NonNull
- @Override
- public Set<Entry<String, Object>> entrySet() {
- return map.entrySet();
- }
-
-
- @Override
protected WXStatement clone(){
- return new WXStatement(map);
+ return new WXStatement(this);
}
}