From 5fda18dc6747e4df71ca54dedcb469e2ce8fe74b Mon Sep 17 00:00:00 2001
From: Christopher Eby <kreed@kreed.org>
Date: Sat, 20 Mar 2010 16:55:14 -0500
Subject: [PATCH] Remove unneeded use of SongData.Field

---
 src/org/kreed/vanilla/SongSelector.java | 28 +++++++++----------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/src/org/kreed/vanilla/SongSelector.java b/src/org/kreed/vanilla/SongSelector.java
index c7bf665e..a642e1d2 100644
--- a/src/org/kreed/vanilla/SongSelector.java
+++ b/src/org/kreed/vanilla/SongSelector.java
@@ -227,7 +227,7 @@ public class SongSelector extends TabActivity implements AdapterView.OnItemClick
 			view.setBackgroundDrawable(background);
 			view.setLayoutParams(params);
 			view.setPadding(5, 2, 5, 2);
-			view.setTag(new SongData.Field(i, null));
+			view.setTag(i);
 			view.setOnClickListener(this);
 			mLimiterViews.addView(view);
 		}
@@ -243,24 +243,16 @@ public class SongSelector extends TabActivity implements AdapterView.OnItemClick
 		if (view == mClearButton) {
 			mTextFilter.setText("");
 		} else {
-			SongData.Field data = null;
-			try {
-				data = (SongData.Field)view.getTag();
-			} catch (ClassCastException e) {
-			}
-
-			if (data != null) {
-				SongData.Field limiter = getAdapter(mTabHost.getCurrentTab()).getLimiter();
-				int field = data.field - 1;
-				limiter = limiter.field == 0 ? null : new SongData.Field(field, limiter.data);
-				for (int i = 3; --i != -1; ) {
-					MediaAdapter adapter = getAdapter(i);
-					SongData.Field currentLimiter = adapter.getLimiter();
-					if (currentLimiter != null && currentLimiter.field > field)
-						adapter.setLimiter(limiter);
-				}
-				updateLimiterViews();
+			SongData.Field limiter = getAdapter(mTabHost.getCurrentTab()).getLimiter();
+			int field = (Integer)view.getTag() - 1;
+			limiter = limiter.field == 0 ? null : new SongData.Field(field, limiter.data);
+			for (int i = 3; --i != -1; ) {
+				MediaAdapter adapter = getAdapter(i);
+				SongData.Field currentLimiter = adapter.getLimiter();
+				if (currentLimiter != null && currentLimiter.field > field)
+					adapter.setLimiter(limiter);
 			}
+			updateLimiterViews();
 		}
 	}