aboutsummaryrefslogtreecommitdiffstats
path: root/app/src/main/java/net/lacolaco/smileessence/view/adapter
diff options
context:
space:
mode:
authorKazuki Yamaguchi <k@rhe.jp>2015-10-12 17:17:57 +0900
committerKazuki Yamaguchi <k@rhe.jp>2015-10-12 17:17:57 +0900
commit9bcfad9a0b64eb7727d6a7461aadf980c8cde142 (patch)
tree30285221fd7c4eb267bda19a5b5b2bc6bf2c3927 /app/src/main/java/net/lacolaco/smileessence/view/adapter
parent1536d6d46c4ae715a1b81be9f3e99dbfbd497569 (diff)
downloadSmileEssence-9bcfad9a0b64eb7727d6a7461aadf980c8cde142.tar.gz
CustomListAdapter: getFrozenList を synchronize
Diffstat (limited to 'app/src/main/java/net/lacolaco/smileessence/view/adapter')
-rw-r--r--app/src/main/java/net/lacolaco/smileessence/view/adapter/CustomListAdapter.java8
-rw-r--r--app/src/main/java/net/lacolaco/smileessence/view/adapter/OrderedCustomListAdapter.java2
-rw-r--r--app/src/main/java/net/lacolaco/smileessence/view/adapter/UnorderedCustomListAdapter.java2
3 files changed, 4 insertions, 8 deletions
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/adapter/CustomListAdapter.java b/app/src/main/java/net/lacolaco/smileessence/view/adapter/CustomListAdapter.java
index 559f4524..dfd395b9 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/adapter/CustomListAdapter.java
+++ b/app/src/main/java/net/lacolaco/smileessence/view/adapter/CustomListAdapter.java
@@ -13,7 +13,7 @@ public abstract class CustomListAdapter<T extends IViewModel> extends BaseAdapte
// ------------------------------ FIELDS ------------------------------
- private boolean isNotifiable = true;
+ protected boolean isNotifiable = true;
private List<T> frozenList = new ArrayList<>();
private Activity activity;
@@ -25,10 +25,6 @@ public abstract class CustomListAdapter<T extends IViewModel> extends BaseAdapte
// --------------------- GETTER / SETTER METHODS ---------------------
- public final boolean isNotifiable() {
- return isNotifiable;
- }
-
public final void setNotifiable(boolean notifiable) {
isNotifiable = notifiable;
}
@@ -68,7 +64,7 @@ public abstract class CustomListAdapter<T extends IViewModel> extends BaseAdapte
protected abstract List<T> getFrozenList();
public void update() {
- if (isNotifiable()) {
+ if (isNotifiable) {
updateForce();
}
}
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/adapter/OrderedCustomListAdapter.java b/app/src/main/java/net/lacolaco/smileessence/view/adapter/OrderedCustomListAdapter.java
index 1299c7c3..43d04b2e 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/adapter/OrderedCustomListAdapter.java
+++ b/app/src/main/java/net/lacolaco/smileessence/view/adapter/OrderedCustomListAdapter.java
@@ -50,7 +50,7 @@ public class OrderedCustomListAdapter<T extends IViewModel & IdObject> extends C
// ------------------------ OVERRIDE METHODS ------------------------
@Override
- protected List<T> getFrozenList() {
+ protected synchronized List<T> getFrozenList() {
return Collections.unmodifiableList(new ArrayList<>(treeMap.values()));
}
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/adapter/UnorderedCustomListAdapter.java b/app/src/main/java/net/lacolaco/smileessence/view/adapter/UnorderedCustomListAdapter.java
index 2afc0316..7fc367cb 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/adapter/UnorderedCustomListAdapter.java
+++ b/app/src/main/java/net/lacolaco/smileessence/view/adapter/UnorderedCustomListAdapter.java
@@ -44,7 +44,7 @@ public class UnorderedCustomListAdapter<T extends IViewModel> extends CustomList
// ------------------------ OVERRIDE METHODS ------------------------
@Override
- protected List<T> getFrozenList() {
+ protected synchronized List<T> getFrozenList() {
return Collections.unmodifiableList(new ArrayList<>(list));
}