From 9bcfad9a0b64eb7727d6a7461aadf980c8cde142 Mon Sep 17 00:00:00 2001
From: Kazuki Yamaguchi <k@rhe.jp>
Date: Mon, 12 Oct 2015 17:17:57 +0900
Subject: CustomListAdapter: getFrozenList を synchronize
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../net/lacolaco/smileessence/view/adapter/CustomListAdapter.java | 8 ++------
 .../smileessence/view/adapter/OrderedCustomListAdapter.java       | 2 +-
 .../smileessence/view/adapter/UnorderedCustomListAdapter.java     | 2 +-
 3 files changed, 4 insertions(+), 8 deletions(-)

(limited to 'app/src/main/java/net/lacolaco/smileessence/view/adapter')

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));
     }
 
-- 
cgit v1.2.3