From 4eb11454bddf53c25c3fe1779e6c444fd21bf039 Mon Sep 17 00:00:00 2001
From: YuviPanda <yuvipanda@gmail.com>
Date: Sat, 23 Feb 2013 21:56:52 +0530
Subject: [PATCH] Slight refactoring of MediaDetailProvider

---
 .../contributions/ContributionsActivity.java        |  4 ++--
 .../commons/media/MediaDetailPagerFragment.java     | 13 +++++--------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsActivity.java b/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsActivity.java
index 9410da108..e1467110a 100644
--- a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsActivity.java
+++ b/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsActivity.java
@@ -182,12 +182,12 @@ public  class       ContributionsActivity
         contributionsList.setCursor(null);
     }
 
-    public Media getItem(int i) {
+    public Media getMediaAtPosition(int i) {
         allContributions.moveToPosition(i);
         return Contribution.fromCursor(allContributions);
     }
 
-    public int getCount() {
+    public int getTotalMediaCount() {
         if(allContributions == null) {
             return 0;
         }
diff --git a/commons/src/main/java/org/wikimedia/commons/media/MediaDetailPagerFragment.java b/commons/src/main/java/org/wikimedia/commons/media/MediaDetailPagerFragment.java
index 22ce16b90..13107e52b 100644
--- a/commons/src/main/java/org/wikimedia/commons/media/MediaDetailPagerFragment.java
+++ b/commons/src/main/java/org/wikimedia/commons/media/MediaDetailPagerFragment.java
@@ -1,6 +1,5 @@
 package org.wikimedia.commons.media;
 
-import android.app.Activity;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
@@ -12,22 +11,20 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import com.actionbarsherlock.app.SherlockFragment;
-import com.actionbarsherlock.app.SherlockFragmentActivity;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
 import com.actionbarsherlock.widget.ShareActionProvider;
 import org.wikimedia.commons.Media;
 import org.wikimedia.commons.R;
-import org.wikimedia.commons.Utils;
 
 public class MediaDetailPagerFragment extends SherlockFragment {
     private ViewPager pager;
     private ShareActionProvider shareActionProvider;
 
     public interface MediaDetailProvider {
-        public Media getItem(int i);
-        public int getCount();
+        public Media getMediaAtPosition(int i);
+        public int getTotalMediaCount();
     }
     private class MediaDetailAdapter extends FragmentStatePagerAdapter {
 
@@ -37,13 +34,13 @@ public class MediaDetailPagerFragment extends SherlockFragment {
 
         @Override
         public Fragment getItem(int i) {
-            Media m = ((MediaDetailProvider)getActivity()).getItem(i);
+            Media m = ((MediaDetailProvider)getActivity()).getMediaAtPosition(i);
             return MediaDetailFragment.forMedia((m));
         }
 
         @Override
         public int getCount() {
-            return ((MediaDetailProvider)getActivity()).getCount();
+            return ((MediaDetailProvider)getActivity()).getTotalMediaCount();
         }
     }
 
@@ -64,7 +61,7 @@ public class MediaDetailPagerFragment extends SherlockFragment {
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         MediaDetailProvider provider = (MediaDetailProvider)getSherlockActivity();
-        Media m = provider.getItem(pager.getCurrentItem());
+        Media m = provider.getMediaAtPosition(pager.getCurrentItem());
         switch(item.getItemId()) {
             case R.id.menu_share_current_image:
                 Intent shareIntent = new Intent();