Browse Source

Added new Comparators

Kenneth van Ewijk 10 năm trước cách đây
mục cha
commit
48771a2ee2

+ 2 - 1
server/server/match/Match.java

@@ -13,6 +13,7 @@ import resources.image.Images.ImageType;
 import server.LevelReader;
 import server.NetworkUser;
 import server.match.levels.Level;
+import server.match.levels.LevelSorter;
 import server.match.objects.Ball;
 import server.match.objects.Player;
 import server.match.objects.ShootingLine;
@@ -46,7 +47,7 @@ public class Match implements Runnable {
 		this.nwuser2 = nwuser2;
 		System.out.println("New Match!");
 		levels = LevelReader.readLevelsFromFiles();
-		Collections.sort(levels);
+		Collections.sort(levels, new LevelSorter());
 		playLevel(getCurrentLevel());
 		
 		timer = new Timer();

+ 19 - 0
server/server/match/levels/LevelSorter.java

@@ -0,0 +1,19 @@
+package server.match.levels;
+
+import java.util.Comparator;
+
+public class LevelSorter implements Comparator<Level> {
+
+	@Override
+	public int compare(Level l1, Level l2) {
+		int comp = 0;
+		
+		if(l1.getNum() < l2.getNum())
+			comp = -1;
+		else if(l1.getNum() > l2.getNum())
+			comp = 1;
+		
+		return comp;
+	}
+	
+}

+ 19 - 0
server/server/match/levels/ReverseLevelSorter.java

@@ -0,0 +1,19 @@
+package server.match.levels;
+
+import java.util.Comparator;
+
+public class ReverseLevelSorter implements Comparator<Level> {
+
+	@Override
+	public int compare(Level l1, Level l2) {
+		int comp = 0;
+		
+		if(l1.getNum() > l2.getNum())
+			comp = -1;
+		else if(l1.getNum() < l2.getNum())
+			comp = 1;
+		
+		return comp;
+	}
+	
+}