From 813ac7496e93faa2cf0f2763df421a146d38fc11 Mon Sep 17 00:00:00 2001
From: Ahbong Chang <cwahbong@google.com>
Date: Mon, 30 Jul 2012 11:34:13 +0800
Subject: Code clean up.

Remove unused imports.
Remove unused fields.
Remove unnecessary cast.
Add missing override annotations.

Change-Id: Idad2e587697a5015eb5363d7b71fab9de9cc8ffb
---
 gallerycommon/src/com/android/gallery3d/common/FileCache.java       | 1 +
 gallerycommon/src/com/android/gallery3d/common/Fingerprint.java     | 4 ----
 .../src/com/android/gallery3d/common/HttpClientFactory.java         | 1 -
 gallerycommon/src/com/android/gallery3d/common/Scroller.java        | 6 +++---
 4 files changed, 4 insertions(+), 8 deletions(-)

(limited to 'gallerycommon')

diff --git a/gallerycommon/src/com/android/gallery3d/common/FileCache.java b/gallerycommon/src/com/android/gallery3d/common/FileCache.java
index a69487f4c..d7deda6fa 100644
--- a/gallerycommon/src/com/android/gallery3d/common/FileCache.java
+++ b/gallerycommon/src/com/android/gallery3d/common/FileCache.java
@@ -92,6 +92,7 @@ public class FileCache implements Closeable {
         mDbHelper = new DatabaseHelper(context, dbName);
     }
 
+    @Override
     public void close() {
         mDbHelper.close();
     }
diff --git a/gallerycommon/src/com/android/gallery3d/common/Fingerprint.java b/gallerycommon/src/com/android/gallery3d/common/Fingerprint.java
index 39fcf9e09..2847e57ce 100644
--- a/gallerycommon/src/com/android/gallery3d/common/Fingerprint.java
+++ b/gallerycommon/src/com/android/gallery3d/common/Fingerprint.java
@@ -16,10 +16,6 @@
 
 package com.android.gallery3d.common;
 
-import android.content.ContentResolver;
-import android.net.Uri;
-
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.security.DigestInputStream;
diff --git a/gallerycommon/src/com/android/gallery3d/common/HttpClientFactory.java b/gallerycommon/src/com/android/gallery3d/common/HttpClientFactory.java
index cb95e3329..9e327aa51 100644
--- a/gallerycommon/src/com/android/gallery3d/common/HttpClientFactory.java
+++ b/gallerycommon/src/com/android/gallery3d/common/HttpClientFactory.java
@@ -20,7 +20,6 @@ import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.os.Build;
-import android.util.Log;
 
 import org.apache.http.HttpVersion;
 import org.apache.http.client.HttpClient;
diff --git a/gallerycommon/src/com/android/gallery3d/common/Scroller.java b/gallerycommon/src/com/android/gallery3d/common/Scroller.java
index 160f3ca43..6cefd6fb0 100644
--- a/gallerycommon/src/com/android/gallery3d/common/Scroller.java
+++ b/gallerycommon/src/com/android/gallery3d/common/Scroller.java
@@ -342,7 +342,7 @@ public class Scroller  {
         mFinalY = startY + dy;
         mDeltaX = dx;
         mDeltaY = dy;
-        mDurationReciprocal = 1.0f / (float) mDuration;
+        mDurationReciprocal = 1.0f / mDuration;
     }
 
     /**
@@ -370,8 +370,8 @@ public class Scroller  {
         if (mFlywheel && !mFinished) {
             float oldVel = getCurrVelocity();
 
-            float dx = (float) (mFinalX - mStartX);
-            float dy = (float) (mFinalY - mStartY);
+            float dx = mFinalX - mStartX;
+            float dy = mFinalY - mStartY;
             float hyp = FloatMath.sqrt(dx * dx + dy * dy);
 
             float ndx = dx / hyp;
-- 
cgit v1.2.3