ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Android] Get rid of some unnecessary variables in the getView() methods of some adapters. 

Directly referencing convertView is fine.
This commit is contained in:
Lioncash 2013-11-15 16:31:52 -05:00
parent 0e415467c4
commit d3731d0827
3 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowserAdapter.java
View File

@ -56,19 +56,18 @@ public final class FolderBrowserAdapter extends ArrayAdapter<FolderBrowserItem>
@Override @Override
public View getView(int position, View convertView, ViewGroup parent) public View getView(int position, View convertView, ViewGroup parent)
{ {
View v = convertView; if (convertView == null)
if (v == null)
{ {
LayoutInflater vi = LayoutInflater.from(context); LayoutInflater vi = LayoutInflater.from(context);
v = vi.inflate(id, parent, false); convertView = vi.inflate(id, parent, false);
} }
final FolderBrowserItem item = items.get(position); final FolderBrowserItem item = items.get(position);
if (item != null) if (item != null)
{ {
ImageView icon = (ImageView) v.findViewById(R.id.ListItemIcon); ImageView icon = (ImageView) convertView.findViewById(R.id.ListItemIcon);
TextView title = (TextView) v.findViewById(R.id.ListItemTitle); TextView title = (TextView) convertView.findViewById(R.id.ListItemTitle);
TextView subtitle = (TextView) v.findViewById(R.id.ListItemSubTitle); TextView subtitle = (TextView) convertView.findViewById(R.id.ListItemSubTitle);
if(title != null) if(title != null)
{ {
@ -100,6 +99,6 @@ public final class FolderBrowserAdapter extends ArrayAdapter<FolderBrowserItem>
} }
} }
} }
return v; return convertView;
} }
} }

13
Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListAdapter.java
View File

@ -55,19 +55,18 @@ public final class GameListAdapter extends ArrayAdapter<GameListItem>
@Override @Override
public View getView(int position, View convertView, ViewGroup parent) public View getView(int position, View convertView, ViewGroup parent)
{ {
View v = convertView; if (convertView == null)
if (v == null)
{ {
LayoutInflater vi = LayoutInflater.from(context); LayoutInflater vi = LayoutInflater.from(context);
v = vi.inflate(id, parent, false); convertView = vi.inflate(id, parent, false);
} }
final GameListItem item = items.get(position); final GameListItem item = items.get(position);
if (item != null) if (item != null)
{ {
TextView title = (TextView) v.findViewById(R.id.ListItemTitle); TextView title = (TextView) convertView.findViewById(R.id.ListItemTitle);
TextView subtitle = (TextView) v.findViewById(R.id.ListItemSubTitle); TextView subtitle = (TextView) convertView.findViewById(R.id.ListItemSubTitle);
ImageView icon = (ImageView) v.findViewById(R.id.ListItemIcon); ImageView icon = (ImageView) convertView.findViewById(R.id.ListItemIcon);
if (title != null) if (title != null)
title.setText(item.getName()); title.setText(item.getName());
@ -83,7 +82,7 @@ public final class GameListAdapter extends ArrayAdapter<GameListItem>
} }
} }
return v; return convertView;
} }
} }

9
Source/Android/src/org/dolphinemu/dolphinemu/sidemenu/SideMenuAdapter.java
View File

@ -54,23 +54,22 @@ public final class SideMenuAdapter extends ArrayAdapter<SideMenuItem>
@Override @Override
public View getView(int position, View convertView, ViewGroup parent) public View getView(int position, View convertView, ViewGroup parent)
{ {
View v = convertView; if (convertView == null)
if (v == null)
{ {
LayoutInflater vi = LayoutInflater.from(context); LayoutInflater vi = LayoutInflater.from(context);
v = vi.inflate(id, null); convertView = vi.inflate(id, null);
} }
final SideMenuItem item = items.get(position); final SideMenuItem item = items.get(position);
if (item != null) if (item != null)
{ {
TextView title = (TextView) v.findViewById(R.id.SideMenuTitle); TextView title = (TextView) convertView.findViewById(R.id.SideMenuTitle);
if (title != null) if (title != null)
title.setText(item.getName()); title.setText(item.getName());
} }
return v; return convertView;
} }
} }