diff options
Diffstat (limited to 'src/com/android/gallery3d/data')
30 files changed, 52 insertions, 3 deletions
diff --git a/src/com/android/gallery3d/data/BitmapPool.java b/src/com/android/gallery3d/data/BitmapPool.java index 1151dded7..5bc6d672b 100644 --- a/src/com/android/gallery3d/data/BitmapPool.java +++ b/src/com/android/gallery3d/data/BitmapPool.java @@ -23,6 +23,7 @@ import com.android.gallery3d.common.Utils; import java.util.ArrayList; public class BitmapPool { + @SuppressWarnings("unused") private static final String TAG = "BitmapPool"; private final ArrayList<Bitmap> mPool; diff --git a/src/com/android/gallery3d/data/ClusterAlbum.java b/src/com/android/gallery3d/data/ClusterAlbum.java index 569e5a4b3..8681952bf 100644 --- a/src/com/android/gallery3d/data/ClusterAlbum.java +++ b/src/com/android/gallery3d/data/ClusterAlbum.java @@ -19,6 +19,7 @@ package com.android.gallery3d.data; import java.util.ArrayList; public class ClusterAlbum extends MediaSet implements ContentListener { + @SuppressWarnings("unused") private static final String TAG = "ClusterAlbum"; private ArrayList<Path> mPaths = new ArrayList<Path>(); private String mName = ""; @@ -80,6 +81,7 @@ public class ClusterAlbum extends MediaSet implements ContentListener { ArrayList<Path> subset = new ArrayList<Path>(paths.subList(start, end)); final MediaItem[] buf = new MediaItem[end - start]; ItemConsumer consumer = new ItemConsumer() { + @Override public void consume(int index, MediaItem item) { buf[index] = item; } @@ -111,6 +113,7 @@ public class ClusterAlbum extends MediaSet implements ContentListener { return mDataVersion; } + @Override public void onContentDirty() { notifyContentChanged(); } @@ -123,6 +126,7 @@ public class ClusterAlbum extends MediaSet implements ContentListener { @Override public void delete() { ItemConsumer consumer = new ItemConsumer() { + @Override public void consume(int index, MediaItem item) { if ((item.getSupportedOperations() & SUPPORT_DELETE) != 0) { item.delete(); diff --git a/src/com/android/gallery3d/data/ClusterAlbumSet.java b/src/com/android/gallery3d/data/ClusterAlbumSet.java index 863e94ad5..a32ba87f4 100644 --- a/src/com/android/gallery3d/data/ClusterAlbumSet.java +++ b/src/com/android/gallery3d/data/ClusterAlbumSet.java @@ -25,6 +25,7 @@ import java.util.ArrayList; import java.util.HashSet; public class ClusterAlbumSet extends MediaSet implements ContentListener { + @SuppressWarnings("unused") private static final String TAG = "ClusterAlbumSet"; private GalleryApp mApplication; private MediaSet mBaseSet; @@ -70,6 +71,7 @@ public class ClusterAlbumSet extends MediaSet implements ContentListener { return mDataVersion; } + @Override public void onContentDirty() { notifyContentChanged(); } @@ -125,6 +127,7 @@ public class ClusterAlbumSet extends MediaSet implements ContentListener { private void updateClustersContents() { final HashSet<Path> existing = new HashSet<Path>(); mBaseSet.enumerateTotalMediaItems(new MediaSet.ItemConsumer() { + @Override public void consume(int index, MediaItem item) { existing.add(item.getPath()); } diff --git a/src/com/android/gallery3d/data/ComboAlbum.java b/src/com/android/gallery3d/data/ComboAlbum.java index 73c8ef36c..e100dc3e6 100644 --- a/src/com/android/gallery3d/data/ComboAlbum.java +++ b/src/com/android/gallery3d/data/ComboAlbum.java @@ -24,6 +24,7 @@ import java.util.ArrayList; // from the input albums. // This only handles SubMediaSets, not MediaItems. (That's all we need now) public class ComboAlbum extends MediaSet implements ContentListener { + @SuppressWarnings("unused") private static final String TAG = "ComboAlbum"; private final MediaSet[] mSets; private final String mName; @@ -86,6 +87,7 @@ public class ComboAlbum extends MediaSet implements ContentListener { return mDataVersion; } + @Override public void onContentDirty() { notifyContentChanged(); } diff --git a/src/com/android/gallery3d/data/ComboAlbumSet.java b/src/com/android/gallery3d/data/ComboAlbumSet.java index 6d9a2a3d4..3f3674500 100644 --- a/src/com/android/gallery3d/data/ComboAlbumSet.java +++ b/src/com/android/gallery3d/data/ComboAlbumSet.java @@ -24,6 +24,7 @@ import com.android.gallery3d.util.Future; // media sets from the input album sets. // This only handles SubMediaSets, not MediaItems. (That's all we need now) public class ComboAlbumSet extends MediaSet implements ContentListener { + @SuppressWarnings("unused") private static final String TAG = "ComboAlbumSet"; private final MediaSet[] mSets; private final String mName; @@ -83,6 +84,7 @@ public class ComboAlbumSet extends MediaSet implements ContentListener { return mDataVersion; } + @Override public void onContentDirty() { notifyContentChanged(); } diff --git a/src/com/android/gallery3d/data/DataManager.java b/src/com/android/gallery3d/data/DataManager.java index 9ffdc0b50..9485b0274 100644 --- a/src/com/android/gallery3d/data/DataManager.java +++ b/src/com/android/gallery3d/data/DataManager.java @@ -88,6 +88,7 @@ public class DataManager { new DateTakenComparator(); private static class DateTakenComparator implements Comparator<MediaItem> { + @Override public int compare(MediaItem item1, MediaItem item2) { return -Utils.compare(item1.getDateInMs(), item2.getDateInMs()); } diff --git a/src/com/android/gallery3d/data/DownloadCache.java b/src/com/android/gallery3d/data/DownloadCache.java index 7505dac34..be7820b01 100644 --- a/src/com/android/gallery3d/data/DownloadCache.java +++ b/src/com/android/gallery3d/data/DownloadCache.java @@ -282,6 +282,7 @@ public class DownloadCache { mProxySet.add(proxy); } + @Override public void onFutureDone(Future<File> future) { File file = future.get(); long id = 0; @@ -310,6 +311,7 @@ public class DownloadCache { } } + @Override public File run(JobContext jc) { // TODO: utilize etag jc.setMode(ThreadPool.MODE_NETWORK); @@ -345,6 +347,7 @@ public class DownloadCache { public synchronized Entry get(JobContext jc) { jc.setCancelListener(new CancelListener() { + @Override public void onCancel() { mTask.removeProxy(TaskProxy.this); synchronized (TaskProxy.this) { diff --git a/src/com/android/gallery3d/data/DownloadUtils.java b/src/com/android/gallery3d/data/DownloadUtils.java index 9e35c4593..137898e91 100644 --- a/src/com/android/gallery3d/data/DownloadUtils.java +++ b/src/com/android/gallery3d/data/DownloadUtils.java @@ -49,6 +49,7 @@ public class DownloadUtils { int rc = is.read(buffer, 0, buffer.length); final Thread thread = Thread.currentThread(); jc.setCancelListener(new CancelListener() { + @Override public void onCancel() { thread.interrupt(); } diff --git a/src/com/android/gallery3d/data/Face.java b/src/com/android/gallery3d/data/Face.java index 29af27f15..d2dc22bfc 100644 --- a/src/com/android/gallery3d/data/Face.java +++ b/src/com/android/gallery3d/data/Face.java @@ -58,6 +58,7 @@ public class Face implements Comparable<Face> { return false; } + @Override public int compareTo(Face another) { return mName.compareTo(another.mName); } diff --git a/src/com/android/gallery3d/data/FaceClustering.java b/src/com/android/gallery3d/data/FaceClustering.java index 126286c34..819915edb 100644 --- a/src/com/android/gallery3d/data/FaceClustering.java +++ b/src/com/android/gallery3d/data/FaceClustering.java @@ -94,6 +94,7 @@ public class FaceClustering extends Clustering { final FaceCluster untagged = new FaceCluster(mUntaggedString); baseSet.enumerateTotalMediaItems(new MediaSet.ItemConsumer() { + @Override public void consume(int index, MediaItem item) { Face[] faces = item.getFaces(); if (faces == null || faces.length == 0) { diff --git a/src/com/android/gallery3d/data/FilterDeleteSet.java b/src/com/android/gallery3d/data/FilterDeleteSet.java index dbd85d57d..2738387a6 100644 --- a/src/com/android/gallery3d/data/FilterDeleteSet.java +++ b/src/com/android/gallery3d/data/FilterDeleteSet.java @@ -28,6 +28,7 @@ import java.util.ArrayList; // int getNumberOfDeletions(); // public class FilterDeleteSet extends MediaSet implements ContentListener { + @SuppressWarnings("unused") private static final String TAG = "FilterDeleteSet"; private static final int REQUEST_ADD = 1; diff --git a/src/com/android/gallery3d/data/FilterSource.java b/src/com/android/gallery3d/data/FilterSource.java index b3e6ee356..e3f350f76 100644 --- a/src/com/android/gallery3d/data/FilterSource.java +++ b/src/com/android/gallery3d/data/FilterSource.java @@ -19,6 +19,7 @@ package com.android.gallery3d.data; import com.android.gallery3d.app.GalleryApp; class FilterSource extends MediaSource { + @SuppressWarnings("unused") private static final String TAG = "FilterSource"; private static final int FILTER_BY_MEDIATYPE = 0; private static final int FILTER_BY_DELETE = 1; diff --git a/src/com/android/gallery3d/data/FilterTypeSet.java b/src/com/android/gallery3d/data/FilterTypeSet.java index 1983a39f1..477ef73ad 100644 --- a/src/com/android/gallery3d/data/FilterTypeSet.java +++ b/src/com/android/gallery3d/data/FilterTypeSet.java @@ -100,6 +100,7 @@ public class FilterTypeSet extends MediaSet implements ContentListener { final Path[] buf = new Path[total]; mBaseSet.enumerateMediaItems(new MediaSet.ItemConsumer() { + @Override public void consume(int index, MediaItem item) { if (item.getMediaType() == mMediaType) { if (index < 0 || index >= total) return; @@ -124,6 +125,7 @@ public class FilterTypeSet extends MediaSet implements ContentListener { @Override public void delete() { ItemConsumer consumer = new ItemConsumer() { + @Override public void consume(int index, MediaItem item) { if ((item.getSupportedOperations() & SUPPORT_DELETE) != 0) { item.delete(); diff --git a/src/com/android/gallery3d/data/LocalImage.java b/src/com/android/gallery3d/data/LocalImage.java index c432ab44d..370ef2686 100644 --- a/src/com/android/gallery3d/data/LocalImage.java +++ b/src/com/android/gallery3d/data/LocalImage.java @@ -218,6 +218,7 @@ public class LocalImage extends LocalMediaItem { mLocalFilePath = localFilePath; } + @Override public BitmapRegionDecoder run(JobContext jc) { return DecodeUtils.createBitmapRegionDecoder(jc, mLocalFilePath, false); } diff --git a/src/com/android/gallery3d/data/LocalMediaItem.java b/src/com/android/gallery3d/data/LocalMediaItem.java index 7a54e8062..fdc973e8d 100644 --- a/src/com/android/gallery3d/data/LocalMediaItem.java +++ b/src/com/android/gallery3d/data/LocalMediaItem.java @@ -99,6 +99,7 @@ public abstract class LocalMediaItem extends MediaItem { return mimeType; } + @Override public long getSize() { return fileSize; } diff --git a/src/com/android/gallery3d/data/LocalSource.java b/src/com/android/gallery3d/data/LocalSource.java index 6735b16e4..a2e3d1443 100644 --- a/src/com/android/gallery3d/data/LocalSource.java +++ b/src/com/android/gallery3d/data/LocalSource.java @@ -245,6 +245,7 @@ class LocalSource extends MediaSource { // This is a comparator which compares the suffix number in two Paths. private static class IdComparator implements Comparator<PathId> { + @Override public int compare(PathId p1, PathId p2) { String s1 = p1.path.getSuffix(); String s2 = p2.path.getSuffix(); diff --git a/src/com/android/gallery3d/data/LocationClustering.java b/src/com/android/gallery3d/data/LocationClustering.java index b36bd63da..540322a33 100644 --- a/src/com/android/gallery3d/data/LocationClustering.java +++ b/src/com/android/gallery3d/data/LocationClustering.java @@ -29,6 +29,7 @@ import com.android.gallery3d.util.ReverseGeocoder; import java.util.ArrayList; class LocationClustering extends Clustering { + @SuppressWarnings("unused") private static final String TAG = "LocationClustering"; private static final int MIN_GROUPS = 1; @@ -70,6 +71,7 @@ class LocationClustering extends Clustering { // Separate items to two sets: with or without lat-long. final double[] latLong = new double[2]; baseSet.enumerateTotalMediaItems(new MediaSet.ItemConsumer() { + @Override public void consume(int index, MediaItem item) { if (index < 0 || index >= total) return; SmallItem s = new SmallItem(); @@ -137,6 +139,7 @@ class LocationClustering extends Clustering { if (hasUnresolvedAddress) { mHandler.post(new Runnable() { + @Override public void run() { Toast.makeText(mContext, R.string.no_connectivity, Toast.LENGTH_LONG).show(); diff --git a/src/com/android/gallery3d/data/MediaDetails.java b/src/com/android/gallery3d/data/MediaDetails.java index c18365df0..298224729 100644 --- a/src/com/android/gallery3d/data/MediaDetails.java +++ b/src/com/android/gallery3d/data/MediaDetails.java @@ -88,6 +88,7 @@ public class MediaDetails implements Iterable<Entry<Integer, Object>> { return mDetails.size(); } + @Override public Iterator<Entry<Integer, Object>> iterator() { return mDetails.entrySet().iterator(); } diff --git a/src/com/android/gallery3d/data/MediaSet.java b/src/com/android/gallery3d/data/MediaSet.java index 67525b1f3..d5d1048e0 100644 --- a/src/com/android/gallery3d/data/MediaSet.java +++ b/src/com/android/gallery3d/data/MediaSet.java @@ -32,6 +32,7 @@ import java.util.WeakHashMap; // getTotalMediaItemCount() returns the number of all MediaItems, including // those in sub-MediaSets. public abstract class MediaSet extends MediaObject { + @SuppressWarnings("unused") private static final String TAG = "MediaSet"; public static final int MEDIAITEM_BATCH_FETCH_COUNT = 500; @@ -270,6 +271,7 @@ public abstract class MediaSet extends MediaObject { } private class MultiSetSyncFuture implements Future<Integer>, SyncListener { + @SuppressWarnings("hiding") private static final String TAG = "Gallery.MultiSetSync"; private final SyncListener mListener; diff --git a/src/com/android/gallery3d/data/MtpClient.java b/src/com/android/gallery3d/data/MtpClient.java index dd65f9ef1..737b5b60d 100644 --- a/src/com/android/gallery3d/data/MtpClient.java +++ b/src/com/android/gallery3d/data/MtpClient.java @@ -179,7 +179,7 @@ public class MtpClient { * Opens the {@link android.hardware.usb.UsbDevice} for an MTP or PTP * device and return an {@link android.mtp.MtpDevice} for it. * - * @param device the device to open + * @param usbDevice the device to open * @return an MtpDevice for the device. */ private MtpDevice openDeviceLocked(UsbDevice usbDevice) { @@ -220,7 +220,7 @@ public class MtpClient { } /** - * Registers a {@link android.mtp.MtpClient.Listener} interface to receive + * Registers a {@link com.android.gallery3d.data.MtpClient.Listener} interface to receive * notifications when MTP or PTP devices are added or removed. * * @param listener the listener to register @@ -234,7 +234,7 @@ public class MtpClient { } /** - * Unregisters a {@link android.mtp.MtpClient.Listener} interface. + * Unregisters a {@link com.android.gallery3d.data.MtpClient.Listener} interface. * * @param listener the listener to unregister */ diff --git a/src/com/android/gallery3d/data/MtpContext.java b/src/com/android/gallery3d/data/MtpContext.java index 056211c9e..53b6faafb 100644 --- a/src/com/android/gallery3d/data/MtpContext.java +++ b/src/com/android/gallery3d/data/MtpContext.java @@ -81,11 +81,13 @@ public class MtpContext implements MtpClient.Listener { notifyDirty(); } + @Override public void deviceAdded(android.mtp.MtpDevice device) { notifyDirty(); showToast(R.string.camera_connected); } + @Override public void deviceRemoved(android.mtp.MtpDevice device) { notifyDirty(); showToast(R.string.camera_disconnected); diff --git a/src/com/android/gallery3d/data/MtpImage.java b/src/com/android/gallery3d/data/MtpImage.java index 1d0f88db1..801a1d244 100644 --- a/src/com/android/gallery3d/data/MtpImage.java +++ b/src/com/android/gallery3d/data/MtpImage.java @@ -80,6 +80,7 @@ public class MtpImage extends MediaItem { @Override public Job<Bitmap> requestImage(int type) { return new Job<Bitmap>() { + @Override public Bitmap run(JobContext jc) { byte[] thumbnail = mMtpContext.getMtpClient().getThumbnail( UsbDevice.getDeviceName(mDeviceId), mObjectId); @@ -95,6 +96,7 @@ public class MtpImage extends MediaItem { @Override public Job<BitmapRegionDecoder> requestLargeImage() { return new Job<BitmapRegionDecoder>() { + @Override public BitmapRegionDecoder run(JobContext jc) { byte[] bytes = mMtpContext.getMtpClient().getObject( UsbDevice.getDeviceName(mDeviceId), mObjectId, mObjectSize); diff --git a/src/com/android/gallery3d/data/MtpSource.java b/src/com/android/gallery3d/data/MtpSource.java index aaf50ad4c..47a2e6c66 100644 --- a/src/com/android/gallery3d/data/MtpSource.java +++ b/src/com/android/gallery3d/data/MtpSource.java @@ -19,6 +19,7 @@ package com.android.gallery3d.data; import com.android.gallery3d.app.GalleryApp; public class MtpSource extends MediaSource { + @SuppressWarnings("unused") private static final String TAG = "MtpSource"; private static final int MTP_DEVICESET = 0; diff --git a/src/com/android/gallery3d/data/SizeClustering.java b/src/com/android/gallery3d/data/SizeClustering.java index 2dbe49dfd..0bde55e9e 100644 --- a/src/com/android/gallery3d/data/SizeClustering.java +++ b/src/com/android/gallery3d/data/SizeClustering.java @@ -53,6 +53,7 @@ public class SizeClustering extends Clustering { final ArrayList<Path>[] group = (ArrayList<Path>[]) new ArrayList[SIZE_LEVELS.length]; baseSet.enumerateTotalMediaItems(new MediaSet.ItemConsumer() { + @Override public void consume(int index, MediaItem item) { // Find the cluster this item belongs to. long size = item.getSize(); diff --git a/src/com/android/gallery3d/data/SnailAlbum.java b/src/com/android/gallery3d/data/SnailAlbum.java index cd4f803ad..18905fb2b 100644 --- a/src/com/android/gallery3d/data/SnailAlbum.java +++ b/src/com/android/gallery3d/data/SnailAlbum.java @@ -21,6 +21,7 @@ import java.util.concurrent.atomic.AtomicBoolean; // This is a simple MediaSet which contains only one MediaItem -- a SnailItem. public class SnailAlbum extends MediaSet { + @SuppressWarnings("unused") private static final String TAG = "SnailAlbum"; private SnailItem mItem; private AtomicBoolean mDirty = new AtomicBoolean(false); diff --git a/src/com/android/gallery3d/data/SnailItem.java b/src/com/android/gallery3d/data/SnailItem.java index fdb1b0d56..3586d2cab 100644 --- a/src/com/android/gallery3d/data/SnailItem.java +++ b/src/com/android/gallery3d/data/SnailItem.java @@ -27,6 +27,7 @@ import com.android.gallery3d.util.ThreadPool.JobContext; // used so we can show an foreign component (like an // android.view.View) instead of a Bitmap. public class SnailItem extends MediaItem { + @SuppressWarnings("unused") private static final String TAG = "SnailItem"; private ScreenNail mScreenNail; @@ -38,6 +39,7 @@ public class SnailItem extends MediaItem { public Job<Bitmap> requestImage(int type) { // nothing to return return new Job<Bitmap>() { + @Override public Bitmap run(JobContext jc) { return null; } @@ -48,6 +50,7 @@ public class SnailItem extends MediaItem { public Job<BitmapRegionDecoder> requestLargeImage() { // nothing to return return new Job<BitmapRegionDecoder>() { + @Override public BitmapRegionDecoder run(JobContext jc) { return null; } diff --git a/src/com/android/gallery3d/data/SnailSource.java b/src/com/android/gallery3d/data/SnailSource.java index 5f663d2ec..7f971d3e0 100644 --- a/src/com/android/gallery3d/data/SnailSource.java +++ b/src/com/android/gallery3d/data/SnailSource.java @@ -18,6 +18,7 @@ package com.android.gallery3d.data; import com.android.gallery3d.app.GalleryApp; public class SnailSource extends MediaSource { + @SuppressWarnings("unused") private static final String TAG = "SnailSource"; private static final int SNAIL_ALBUM = 0; private static final int SNAIL_ITEM = 1; diff --git a/src/com/android/gallery3d/data/TagClustering.java b/src/com/android/gallery3d/data/TagClustering.java index 849f88510..407ca84c4 100644 --- a/src/com/android/gallery3d/data/TagClustering.java +++ b/src/com/android/gallery3d/data/TagClustering.java @@ -43,6 +43,7 @@ public class TagClustering extends Clustering { final ArrayList<Path> untagged = new ArrayList<Path>(); baseSet.enumerateTotalMediaItems(new MediaSet.ItemConsumer() { + @Override public void consume(int index, MediaItem item) { Path path = item.getPath(); diff --git a/src/com/android/gallery3d/data/TimeClustering.java b/src/com/android/gallery3d/data/TimeClustering.java index 9a0ae1d53..35cbab1ee 100644 --- a/src/com/android/gallery3d/data/TimeClustering.java +++ b/src/com/android/gallery3d/data/TimeClustering.java @@ -28,6 +28,7 @@ import java.util.Collections; import java.util.Comparator; public class TimeClustering extends Clustering { + @SuppressWarnings("unused") private static final String TAG = "TimeClustering"; // If 2 items are greater than 25 miles apart, they will be in different @@ -83,6 +84,7 @@ public class TimeClustering extends Clustering { new DateComparator(); private static class DateComparator implements Comparator<SmallItem> { + @Override public int compare(SmallItem item1, SmallItem item2) { return -Utils.compare(item1.dateInMs, item2.dateInMs); } @@ -101,6 +103,7 @@ public class TimeClustering extends Clustering { final double[] latLng = new double[2]; baseSet.enumerateTotalMediaItems(new MediaSet.ItemConsumer() { + @Override public void consume(int index, MediaItem item) { if (index < 0 || index >= total) return; SmallItem s = new SmallItem(); diff --git a/src/com/android/gallery3d/data/UriImage.java b/src/com/android/gallery3d/data/UriImage.java index b5bfe964b..8fc873e34 100644 --- a/src/com/android/gallery3d/data/UriImage.java +++ b/src/com/android/gallery3d/data/UriImage.java @@ -134,6 +134,7 @@ public class UriImage extends MediaItem { private boolean prepareInputFile(JobContext jc) { jc.setCancelListener(new CancelListener() { + @Override public void onCancel() { synchronized (this) { notifyAll(); @@ -166,6 +167,7 @@ public class UriImage extends MediaItem { } private class RegionDecoderJob implements Job<BitmapRegionDecoder> { + @Override public BitmapRegionDecoder run(JobContext jc) { if (!prepareInputFile(jc)) return null; BitmapRegionDecoder decoder = DecodeUtils.createBitmapRegionDecoder( |