Skip to content

Commit 6a3fcbc

Browse files
committed
encapsulate and protect
1 parent 9294ffb commit 6a3fcbc

File tree

2 files changed

+16
-7
lines changed

2 files changed

+16
-7
lines changed

library/src/se/emilsjolander/stickylistheaders/ExpandableStickyListHeadersAdapter.java

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,24 @@
1313
*/
1414
class ExpandableStickyListHeadersAdapter extends BaseAdapter implements StickyListHeadersAdapter {
1515

16-
protected final StickyListHeadersAdapter mInnerAdapter;
17-
DualHashMap<View,Long> mViewToItemIdMap = new DualHashMap<View, Long>();
18-
DistinctMultiHashMap<Integer,View> mHeaderIdToViewMap = new DistinctMultiHashMap<Integer, View>();
19-
List<Long> mCollapseHeaderIds = new ArrayList<>();
16+
final StickyListHeadersAdapter mInnerAdapter;
17+
private DualHashMap<View,Long> mViewToItemIdMap = new DualHashMap<>();
18+
private DistinctMultiHashMap<Integer,View> mHeaderIdToViewMap = new DistinctMultiHashMap<>();
19+
20+
private List<Long> mCollapseHeaderIds = new ArrayList<>();
2021

2122
ExpandableStickyListHeadersAdapter(StickyListHeadersAdapter innerAdapter){
2223
this.mInnerAdapter = innerAdapter;
2324
}
2425

26+
public List<Long> getCollapseHeaderIds() {
27+
return mCollapseHeaderIds;
28+
}
29+
30+
public void setCollapseHeaderIds(List<Long> collapseHeaderIds) {
31+
this.mCollapseHeaderIds = new ArrayList<>(collapseHeaderIds);
32+
}
33+
2534
@Override
2635
public View getHeaderView(int position, View convertView, ViewGroup parent) {
2736
return mInnerAdapter.getHeaderView(position,convertView,parent);
@@ -110,7 +119,7 @@ public boolean isHeaderCollapsed(long headerId){
110119

111120
public void expand(long headerId) {
112121
if(isHeaderCollapsed(headerId)){
113-
mCollapseHeaderIds.remove((Object) headerId);
122+
mCollapseHeaderIds.remove(headerId);
114123
}
115124
}
116125

library/src/se/emilsjolander/stickylistheaders/ExpandableStickyListHeadersListView.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,11 +102,11 @@ public boolean isHeaderCollapsed(long headerId){
102102
}
103103

104104
public List<Long> getCollapsedHeaderIds() {
105-
return mExpandableStickyListHeadersAdapter.mCollapseHeaderIds;
105+
return mExpandableStickyListHeadersAdapter.getCollapseHeaderIds();
106106
}
107107

108108
public void setCollapsedHeaderIds(List<Long> collapsedHeaderIds ) {
109-
mExpandableStickyListHeadersAdapter.mCollapseHeaderIds = collapsedHeaderIds;
109+
mExpandableStickyListHeadersAdapter.setCollapseHeaderIds(collapsedHeaderIds);
110110
}
111111

112112
public void setAnimExecutor(IAnimationExecutor animExecutor) {

0 commit comments

Comments
 (0)