From 543b0c39aec6fe70b5e416647f83f88a490962c3 Mon Sep 17 00:00:00 2001
From: kifile <kifile@kifile.com>
Date: Mon, 21 Sep 2015 08:41:55 +0800
Subject: [PATCH] Update notifyDataChanged method to synchronized.

---
 framework/build.gradle                                 |  2 +-
 framework/framework.iml                                | 10 ++++++----
 .../impl/providers/AbstractDataProvider.java           |  4 ++--
 .../impl/providers/CombinedDataProvider.java           |  4 ++--
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/framework/build.gradle b/framework/build.gradle
index dd05115..a02f39e 100644
--- 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
index aea34e9..fdfb21a 100644
--- 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>
\ No newline at end of file
diff --git a/framework/src/main/java/com/kifile/android/cornerstone/impl/providers/AbstractDataProvider.java b/framework/src/main/java/com/kifile/android/cornerstone/impl/providers/AbstractDataProvider.java
index bf329a3..cb7ab86 100644
--- a/framework/src/main/java/com/kifile/android/cornerstone/impl/providers/AbstractDataProvider.java
+++ b/framework/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/framework/src/main/java/com/kifile/android/cornerstone/impl/providers/CombinedDataProvider.java b/framework/src/main/java/com/kifile/android/cornerstone/impl/providers/CombinedDataProvider.java
index 711b004..417fe3f 100644
--- a/framework/src/main/java/com/kifile/android/cornerstone/impl/providers/CombinedDataProvider.java
+++ b/framework/src/main/java/com/kifile/android/cornerstone/impl/providers/CombinedDataProvider.java
@@ -59,7 +59,7 @@ public void refresh(String key) {
     }
 
     @Override
-    public void notifyDataChanged() {
+    public synchronized void notifyDataChanged() {
         for (DataProvider provider : mCombinedProviders.values()) {
             if (provider.isDataNeedUpdate()) {
                 provider.notifyDataChanged();
@@ -67,7 +67,7 @@ public void notifyDataChanged() {
         }
     }
 
-    public void notifyDataChanged(String key) {
+    public synchronized void notifyDataChanged(String key) {
         DataProvider provider = getProvider(key);
         if (provider == null) {
             throw new IllegalArgumentException();