You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by so...@apache.org on 2017/03/07 02:09:47 UTC
[1/3] incubator-weex git commit: * [android] fix
ConcurrentModificationException in list sticky map
Repository: incubator-weex
Updated Branches:
refs/heads/0.11-dev 756754fcb -> 281dfad5b
* [android] fix ConcurrentModificationException in list sticky map
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/4418c330
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/4418c330
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/4418c330
Branch: refs/heads/0.11-dev
Commit: 4418c330c1181bb6d0a8de9f9ee8b07e2a335646
Parents: 0935fcd
Author: sospartan <so...@gmail.com>
Authored: Mon Mar 6 18:10:34 2017 +0800
Committer: sospartan <so...@gmail.com>
Committed: Mon Mar 6 18:10:34 2017 +0800
----------------------------------------------------------------------
.../taobao/weex/ui/component/helper/WXStickyHelper.java | 11 ++++++-----
.../weex/ui/component/list/BasicListComponent.java | 4 ++--
2 files changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4418c330/android/sdk/src/main/java/com/taobao/weex/ui/component/helper/WXStickyHelper.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/helper/WXStickyHelper.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/helper/WXStickyHelper.java
index 7ebee84..3d2eadb 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/helper/WXStickyHelper.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/helper/WXStickyHelper.java
@@ -209,6 +209,7 @@ import com.taobao.weex.ui.component.WXComponent;
import java.util.HashMap;
import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
/**
* Created by miomin on 16/7/7.
@@ -221,15 +222,15 @@ public class WXStickyHelper {
this.scrollable = scrollable;
}
- public void bindStickStyle(WXComponent component, Map<String, HashMap<String, WXComponent>> mStickyMap) {
+ public void bindStickStyle(WXComponent component, Map<String, Map<String, WXComponent>> mStickyMap) {
Scrollable scroller = component.getParentScroller();
if (scroller == null) {
return;
}
- HashMap<String, WXComponent> stickyMap = mStickyMap.get(scroller
+ Map<String, WXComponent> stickyMap = mStickyMap.get(scroller
.getRef());
if (stickyMap == null) {
- stickyMap = new HashMap<>();
+ stickyMap = new ConcurrentHashMap<>();
}
if (stickyMap.containsKey(component.getRef())) {
return;
@@ -238,12 +239,12 @@ public class WXStickyHelper {
mStickyMap.put(scroller.getRef(), stickyMap);
}
- public void unbindStickStyle(WXComponent component, Map<String, HashMap<String, WXComponent>> mStickyMap) {
+ public void unbindStickStyle(WXComponent component, Map<String, Map<String, WXComponent>> mStickyMap) {
Scrollable scroller = component.getParentScroller();
if (scroller == null) {
return;
}
- HashMap<String, WXComponent> stickyMap = mStickyMap.get(scroller
+ Map<String, WXComponent> stickyMap = mStickyMap.get(scroller
.getRef());
if (stickyMap == null) {
return;
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4418c330/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
index 142e22f..edf19b4 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
@@ -293,7 +293,7 @@ public abstract class BasicListComponent<T extends ViewGroup & ListComponentView
/**
* Map for storing component that is sticky.
**/
- private Map<String, HashMap<String, WXComponent>> mStickyMap = new HashMap<>();
+ private Map<String, Map<String, WXComponent>> mStickyMap = new HashMap<>();
private WXStickyHelper stickyHelper;
@@ -651,7 +651,7 @@ public abstract class BasicListComponent<T extends ViewGroup & ListComponentView
if (mStickyMap == null || bounceRecyclerView == null) {
return;
}
- HashMap<String, WXComponent> stickyMap = mStickyMap.get(getRef());
+ Map<String, WXComponent> stickyMap = mStickyMap.get(getRef());
if (stickyMap == null) {
return;
}
[2/3] incubator-weex git commit: * [android] fix build
Posted by so...@apache.org.
* [android] fix build
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/8c23b93a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/8c23b93a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/8c23b93a
Branch: refs/heads/0.11-dev
Commit: 8c23b93aa39922d5249751a20b980024250bcfc7
Parents: 4418c33
Author: sospartan <so...@gmail.com>
Authored: Tue Mar 7 10:08:29 2017 +0800
Committer: sospartan <so...@gmail.com>
Committed: Tue Mar 7 10:08:29 2017 +0800
----------------------------------------------------------------------
.../src/main/java/com/taobao/weex/ui/component/WXScroller.java | 4 ++--
.../sdk/src/main/java/com/taobao/weex/ui/view/WXScrollView.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8c23b93a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXScroller.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXScroller.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXScroller.java
index 9b6c7d9..73aefdf 100755
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXScroller.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXScroller.java
@@ -277,7 +277,7 @@ public class WXScroller extends WXVContainer<ViewGroup> implements WXScrollViewL
/**
* Map for storing component that is sticky.
**/
- private Map<String, HashMap<String, WXComponent>> mStickyMap = new HashMap<>();
+ private Map<String, Map<String, WXComponent>> mStickyMap = new HashMap<>();
private FrameLayout mRealView;
private int mContentHeight = 0;
@@ -624,7 +624,7 @@ public class WXScroller extends WXVContainer<ViewGroup> implements WXScrollViewL
return mOrientation;
}
- public Map<String, HashMap<String, WXComponent>> getStickMap() {
+ public Map<String, Map<String, WXComponent>> getStickMap() {
return mStickyMap;
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8c23b93a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXScrollView.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXScrollView.java b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXScrollView.java
index a11eb40..fa5930a 100755
--- a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXScrollView.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXScrollView.java
@@ -548,11 +548,11 @@ public class WXScrollView extends ScrollView implements Callback, IWXScroller,
}
}
- private View procSticky(Map<String, HashMap<String, WXComponent>> mStickyMap) {
+ private View procSticky(Map<String, Map<String, WXComponent>> mStickyMap) {
if (mStickyMap == null) {
return null;
}
- HashMap<String, WXComponent> stickyMap = mStickyMap.get(mWAScroller.getRef());
+ Map<String, WXComponent> stickyMap = mStickyMap.get(mWAScroller.getRef());
if (stickyMap == null) {
return null;
}
[3/3] incubator-weex git commit: Merge branch
'0.11-dev-fix-list-concurrent' of github.com:sospartan/incubator-weex into
0.11-dev This closes #40
Posted by so...@apache.org.
Merge branch '0.11-dev-fix-list-concurrent' of github.com:sospartan/incubator-weex into 0.11-dev
This closes #40
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/281dfad5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/281dfad5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/281dfad5
Branch: refs/heads/0.11-dev
Commit: 281dfad5beccfcbcf2690a58e0f5c0bbb1c95358
Parents: 756754f 8c23b93
Author: sospartan <so...@gmail.com>
Authored: Tue Mar 7 10:09:10 2017 +0800
Committer: sospartan <so...@gmail.com>
Committed: Tue Mar 7 10:09:10 2017 +0800
----------------------------------------------------------------------
.../java/com/taobao/weex/ui/component/WXScroller.java | 4 ++--
.../taobao/weex/ui/component/helper/WXStickyHelper.java | 11 ++++++-----
.../weex/ui/component/list/BasicListComponent.java | 4 ++--
.../main/java/com/taobao/weex/ui/view/WXScrollView.java | 4 ++--
4 files changed, 12 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/281dfad5/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
----------------------------------------------------------------------