project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/netplay/Room.java
changeset 7358 57a508884052
parent 7352 641f11cdd319
--- a/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/netplay/Room.java	Tue Jul 24 16:57:48 2012 +0200
+++ b/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/netplay/Room.java	Thu Jul 26 11:01:32 2012 +0200
@@ -1,7 +1,5 @@
 package org.hedgewars.hedgeroid.netplay;
 
-import java.util.Comparator;
-
 import org.hedgewars.hedgeroid.R;
 
 import android.content.res.Resources;
@@ -10,15 +8,13 @@
 	public static final String MAP_REGULAR = "+rnd+";
 	public static final String MAP_MAZE = "+maze+";
 	public static final String MAP_DRAWN = "+drawn+";
-	public static final Comparator<Room> ID_COMPARATOR = new ByIdComparator();
 	
 	public final String name, map, scheme, weapons, owner;
 	public final int playerCount, teamCount;
 	public final boolean inProgress;
-	public final long id;	// for ListView
 	
 	public Room(String name, String map, String scheme, String weapons,
-			String owner, int playerCount, int teamCount, boolean inProgress, long id) {
+			String owner, int playerCount, int teamCount, boolean inProgress) {
 		this.name = name;
 		this.map = map;
 		this.scheme = scheme;
@@ -27,7 +23,6 @@
 		this.playerCount = playerCount;
 		this.teamCount = teamCount;
 		this.inProgress = inProgress;
-		this.id = id;
 	}
 
 	public static String formatMapName(Resources res, String map) {
@@ -42,10 +37,4 @@
 		}
 		return map;
 	}
-	
-	private static final class ByIdComparator implements Comparator<Room> {
-		public int compare(Room lhs, Room rhs) {
-			return lhs.id<rhs.id ? -1 : lhs.id>rhs.id ? 1 : 0;
-		}
-	}
 }