Update notifyDataChanged method to synchronized.

kifile · Sep 21, 2015 · 543b0c3 · 543b0c3
1 parent 5b6eae3
commit 543b0c3
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/framework/build.gradle b/framework/build.gradle
@@ -30,7 +30,7 @@ signing {
 
 group = 'com.kifile.android.cornerstone'
 archivesBaseName = 'Cornerstone'
-version = '1.0'
+version = '1.0.1'
 
 uploadArchives {
     repositories {

diff --git a/framework/framework.iml b/framework/framework.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":framework" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="Cornerstone" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":framework" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="com.kifile.android.cornerstone" external.system.module.version="1.0.1" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
@@ -37,13 +37,13 @@
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -85,8 +85,10 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/poms" />
+      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>
diff --git a/...ork/src/main/java/com/kifile/android/cornerstone/impl/providers/AbstractDataProvider.java b/...ork/src/main/java/com/kifile/android/cornerstone/impl/providers/AbstractDataProvider.java
@@ -63,7 +63,7 @@ public synchronized void unregisterDataObserver(DataObserver observer) {
         mObservers.remove(observer);
     }
 
-    protected synchronized void setData(DATA data) {
+    protected void setData(DATA data) {
         if (mData == null || !mData.equals(data) || isDataNeedUpdate()) {
             mData = data;
             notifyDataChanged();
@@ -77,7 +77,7 @@ public DATA getData() {
     }
 
     @Override
-    public void notifyDataChanged() {
+    public synchronized void notifyDataChanged() {
         for (DataObserver<DATA> observer : mObservers) {
             observer.onDataChanged(mData);
         }

diff --git a/...ork/src/main/java/com/kifile/android/cornerstone/impl/providers/CombinedDataProvider.java b/...ork/src/main/java/com/kifile/android/cornerstone/impl/providers/CombinedDataProvider.java
@@ -59,15 +59,15 @@ public void refresh(String key) {
     }
 
     @Override
-    public void notifyDataChanged() {
+    public synchronized void notifyDataChanged() {
         for (DataProvider provider : mCombinedProviders.values()) {
             if (provider.isDataNeedUpdate()) {
                 provider.notifyDataChanged();
             }
         }
     }
 
-    public void notifyDataChanged(String key) {
+    public synchronized void notifyDataChanged(String key) {
         DataProvider provider = getProvider(key);
         if (provider == null) {
             throw new IllegalArgumentException();