diff -r a49d01b96185 -r 0bb16bc5c8b4 project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/EngineProtocol/FrontendDataUtils.java --- a/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/EngineProtocol/FrontendDataUtils.java Sun Nov 27 00:54:00 2011 +0100 +++ b/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/EngineProtocol/FrontendDataUtils.java Sun Nov 27 00:55:45 2011 +0100 @@ -21,7 +21,6 @@ import java.io.File; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.List; @@ -167,8 +166,8 @@ return data; } - public static ArrayList<HashMap<String, Object>> getTeams(Context c){ - ArrayList<HashMap<String, Object>> ret = new ArrayList<HashMap<String, Object>>(); + public static List<HashMap<String, Object>> getTeams(Context c){ + List<HashMap<String, Object>> ret = new ArrayList<HashMap<String, Object>>(); File teamsDir = new File(c.getFilesDir().getAbsolutePath() + '/' + Team.DIRECTORY_TEAMS); File[] teamFileNames = teamsDir.listFiles(); @@ -177,14 +176,14 @@ Team t = Team.getTeamFromXml(s.getAbsolutePath()); if(t != null){ t.file = s.getName(); - ret.add(teamToHashMap(t)); + ret.add(teamToMap(t)); } } } return ret; } - public static HashMap<String, Object> teamToHashMap(Team t){ + public static HashMap<String, Object> teamToMap(Team t){ HashMap<String, Object> hashmap = new HashMap<String, Object>(); hashmap.put("team", t); hashmap.put("txt", t.name);