diff -r fec6fa1e460e -r 38acbfdb484f project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/netplay/PlayerListAdapter.java --- a/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/netplay/PlayerListAdapter.java Thu Aug 02 16:35:12 2012 +0200 +++ b/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/netplay/PlayerListAdapter.java Thu Aug 02 16:36:11 2012 +0200 @@ -16,15 +16,15 @@ import android.widget.BaseAdapter; import android.widget.TextView; -public class PlayerListAdapter extends BaseAdapter { +public class PlayerlistAdapter extends BaseAdapter { private List> players = new ArrayList>(); private Context context; - private PlayerList playerList; + private Playerlist playerlist; private DataSetObserver observer = new DataSetObserver() { @Override public void onChanged() { - reloadFromList(playerList); + reloadFromList(playerlist); } @Override @@ -33,7 +33,7 @@ } }; - public PlayerListAdapter(Context context) { + public PlayerlistAdapter(Context context) { this.context = context; } @@ -53,24 +53,24 @@ return true; } - public void setList(PlayerList playerList) { - if(this.playerList != null) { - this.playerList.unregisterObserver(observer); + public void setList(Playerlist playerlist) { + if(this.playerlist != null) { + this.playerlist.unregisterObserver(observer); } - this.playerList = playerList; - this.playerList.registerObserver(observer); - reloadFromList(playerList); + this.playerlist = playerlist; + this.playerlist.registerObserver(observer); + reloadFromList(playerlist); } public void invalidate() { - if(playerList != null) { - playerList.unregisterObserver(observer); + if(playerlist != null) { + playerlist.unregisterObserver(observer); } - playerList = null; + playerlist = null; notifyDataSetInvalidated(); } - private void reloadFromList(PlayerList list) { + private void reloadFromList(Playerlist list) { players = new ArrayList>(list.getMap().values()); Collections.sort(players, AlphabeticalOrderComparator.INSTANCE); notifyDataSetChanged();