diff -r 4feced261c68 -r de822cd3df3a project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/RoomPlayerlistFragment.java --- a/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/RoomPlayerlistFragment.java Tue Jan 21 22:38:13 2014 +0100 +++ b/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/RoomPlayerlistFragment.java Tue Jan 21 22:43:06 2014 +0100 @@ -38,73 +38,73 @@ import android.widget.AdapterView.OnItemClickListener; public class RoomPlayerlistFragment extends ListFragment implements OnItemClickListener { - private Netplay netplay; - private RoomPlayerlistAdapter adapter; - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - netplay = Netplay.getAppInstance(getActivity().getApplicationContext()); - adapter = new RoomPlayerlistAdapter(); - adapter.setSource(netplay.roomPlayerlist); - setListAdapter(adapter); - } + private Netplay netplay; + private RoomPlayerlistAdapter adapter; + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + netplay = Netplay.getAppInstance(getActivity().getApplicationContext()); + adapter = new RoomPlayerlistAdapter(); + adapter.setSource(netplay.roomPlayerlist); + setListAdapter(adapter); + } - @Override - public void onDestroy() { - super.onDestroy(); - adapter.invalidate(); - } - - @Override - public void onActivityCreated(Bundle savedInstanceState) { - super.onActivityCreated(savedInstanceState); - registerForContextMenu(getListView()); - getListView().setOnItemClickListener(this); - } + @Override + public void onDestroy() { + super.onDestroy(); + adapter.invalidate(); + } + + @Override + public void onActivityCreated(Bundle savedInstanceState) { + super.onActivityCreated(savedInstanceState); + registerForContextMenu(getListView()); + getListView().setOnItemClickListener(this); + } + + @Override + public void onCreateContextMenu(ContextMenu menu, View v, + ContextMenuInfo menuInfo) { + super.onCreateContextMenu(menu, v, menuInfo); + AdapterContextMenuInfo info = (AdapterContextMenuInfo)menuInfo; + String playerName = adapter.getItem(info.position).player.name; - @Override - public void onCreateContextMenu(ContextMenu menu, View v, - ContextMenuInfo menuInfo) { - super.onCreateContextMenu(menu, v, menuInfo); - AdapterContextMenuInfo info = (AdapterContextMenuInfo)menuInfo; - String playerName = adapter.getItem(info.position).player.name; - - MenuInflater inflater = getActivity().getMenuInflater(); - inflater.inflate(R.menu.room_playerlist_context, menu); - if(netplay.isChief() && !playerName.equals(netplay.getPlayerName())) { - inflater.inflate(R.menu.room_playerlist_chief_context, menu); - } - menu.setHeaderIcon(R.drawable.human); - menu.setHeaderTitle(playerName); - } - - @Override - public boolean onContextItemSelected(MenuItem item) { - AdapterContextMenuInfo info = (AdapterContextMenuInfo)item.getMenuInfo(); - PlayerInRoom player = adapter.getItem(info.position); - switch(item.getItemId()) { - case R.id.player_info: - netplay.sendPlayerInfoQuery(player.player.name); - return true; - case R.id.player_kick: - netplay.sendKick(player.player.name); - return true; - default: - return super.onContextItemSelected(item); - } - } - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - return inflater.inflate(R.layout.fragment_playerlist, container, false); - } - - public void onItemClick(AdapterView parent, View view, int position, long id) { - Player player = adapter.getItem(position).player; - if(player.name.equals(netplay.getPlayerName())) { - netplay.sendToggleReady(); - } - } + MenuInflater inflater = getActivity().getMenuInflater(); + inflater.inflate(R.menu.room_playerlist_context, menu); + if(netplay.isChief() && !playerName.equals(netplay.getPlayerName())) { + inflater.inflate(R.menu.room_playerlist_chief_context, menu); + } + menu.setHeaderIcon(R.drawable.human); + menu.setHeaderTitle(playerName); + } + + @Override + public boolean onContextItemSelected(MenuItem item) { + AdapterContextMenuInfo info = (AdapterContextMenuInfo)item.getMenuInfo(); + PlayerInRoom player = adapter.getItem(info.position); + switch(item.getItemId()) { + case R.id.player_info: + netplay.sendPlayerInfoQuery(player.player.name); + return true; + case R.id.player_kick: + netplay.sendKick(player.player.name); + return true; + default: + return super.onContextItemSelected(item); + } + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + return inflater.inflate(R.layout.fragment_playerlist, container, false); + } + + public void onItemClick(AdapterView parent, View view, int position, long id) { + Player player = adapter.getItem(position).player; + if(player.name.equals(netplay.getPlayerName())) { + netplay.sendToggleReady(); + } + } }