diff options
author | John Reck <jreck@google.com> | 2013-03-21 14:22:33 -0700 |
---|---|---|
committer | John Reck <jreck@google.com> | 2013-03-21 14:42:46 -0700 |
commit | 51177aac9078da153bcb191864fb368faf105681 (patch) | |
tree | 0b4774e431a7a27e7a26f93afda8e68ba4b7e058 /src/com/android/gallery3d/data/FilterDeleteSet.java | |
parent | 03d6a96b088e6a3d8884cc4025c9d7cb9550c2f2 (diff) | |
download | android_packages_apps_Snap-51177aac9078da153bcb191864fb368faf105681.tar.gz android_packages_apps_Snap-51177aac9078da153bcb191864fb368faf105681.tar.bz2 android_packages_apps_Snap-51177aac9078da153bcb191864fb368faf105681.zip |
Revert "New loading model"
Change-Id: I5d3d4c7a4ca0d11de01278529e1413fc62e6b4ed
Diffstat (limited to 'src/com/android/gallery3d/data/FilterDeleteSet.java')
-rw-r--r-- | src/com/android/gallery3d/data/FilterDeleteSet.java | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/src/com/android/gallery3d/data/FilterDeleteSet.java b/src/com/android/gallery3d/data/FilterDeleteSet.java index 7970d7c4a..c76412ff8 100644 --- a/src/com/android/gallery3d/data/FilterDeleteSet.java +++ b/src/com/android/gallery3d/data/FilterDeleteSet.java @@ -27,7 +27,7 @@ import java.util.ArrayList; // void clearDeletion(); // int getNumberOfDeletions(); // -public class FilterDeleteSet extends MediaSetWrapper implements ContentListener { +public class FilterDeleteSet extends MediaSet implements ContentListener { @SuppressWarnings("unused") private static final String TAG = "FilterDeleteSet"; @@ -65,7 +65,7 @@ public class FilterDeleteSet extends MediaSetWrapper implements ContentListener private ArrayList<Deletion> mCurrent = new ArrayList<Deletion>(); public FilterDeleteSet(Path path, MediaSet baseSet) { - super(baseSet, path, INVALID_DATA_VERSION); + super(path, INVALID_DATA_VERSION); mBaseSet = baseSet; mBaseSet.addContentListener(this); } @@ -141,18 +141,14 @@ public class FilterDeleteSet extends MediaSetWrapper implements ContentListener return base; } - @Override - protected boolean isDirtyLocked() { - synchronized (mRequests) { - return super.isDirtyLocked() || !mRequests.isEmpty(); - } - } - // We apply the pending requests in the mRequests to construct mCurrent in reload(). @Override - protected void load() throws InterruptedException { - super.load(); + public long reload() { + boolean newData = mBaseSet.reload() > mDataVersion; synchronized (mRequests) { + if (!newData && mRequests.isEmpty()) { + return mDataVersion; + } for (int i = 0; i < mRequests.size(); i++) { Request r = mRequests.get(i); switch (r.type) { @@ -222,6 +218,9 @@ public class FilterDeleteSet extends MediaSetWrapper implements ContentListener } mCurrent = result; } + + mDataVersion = nextVersionNumber(); + return mDataVersion; } private void sendRequest(int type, Path path, int indexHint) { |