norohind/vanilla
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Remove unneeded use of SongData.Field

Browse Source
This commit is contained in:
Christopher Eby 2010-03-20 16:55:14 -05:00
parent cb013cc51e
commit 5fda18dc67
1 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/org/kreed/vanilla/SongSelector.java
View File

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