pass directly the world to the listener constructor

Author: mquinson

src/main/java/server/Judge.java

@@ -1,7 +1,6 @@
 package main.java.server;
 
 import java.io.IOException;
-import java.io.PrintStream;
 import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -11,7 +10,6 @@
 import java.util.concurrent.TimeoutException;
 
 import com.rabbitmq.client.Channel;
-import com.rabbitmq.client.QueueingConsumer;
 
 import main.java.server.listener.BasicListener;
 import main.java.server.parser.RequestMsg;
@@ -118,8 +116,8 @@ public void initClientQueue(Channel channel, String clientQueue) {
 
 	public void setListeners(String clientQueue, Exercise exo) {
 		ListenerOutStream listenerOut = null;
-		for(World w : exo.getWorlds(WorldKind.CURRENT)) {
-			BasicListener l = new BasicListener(connector, clientQueue, 1000);
+		for(World world : exo.getWorlds(WorldKind.CURRENT)) {
+			BasicListener l = new BasicListener(world, connector, clientQueue, 1000);
 			listeners.add(l);
 			/*
 			if(listenerOut == null) {
@@ -128,7 +126,6 @@ public void setListeners(String clientQueue, Exercise exo) {
 		        System.setOut(outStream);
 			}
 			*/
-			l.setWorld(w);
 		}
 	}
 

src/main/java/server/listener/BasicListener.java

@@ -38,7 +38,8 @@ public class BasicListener {
 	 * @param messageQueue the message queue used to publish messages
 	 * @param delay The minimal time between two stream messages.
 	 */
-	public BasicListener(Connector connector, String messageQueue, long delay) {
+	public BasicListener(World world, final Connector connector, final String messageQueue, long delay) {
+		this.currWorld = world;
 		this.delay = delay;
 		this.connector = connector;
 		this.messageQueue = messageQueue;
@@ -76,14 +77,6 @@ public void sendOperations(Channel channel, World currWorld, int nbMessages) {
 		}
 	}
 
-	/**
-	 * Set or replaces the game world to listen to.
-	 * @param world
-	 */
-	public void setWorld(World world) {
-		currWorld = world;
-	}
-
 	public void flush(Channel channel) {
 		while(!currWorld.getSteps().isEmpty()) {
 			sendOperations(channel, currWorld, MAX_SIZE);
@@ -92,7 +85,7 @@ public void flush(Channel channel) {
 
 	@Override
 	public BasicListener clone() {
-		return new BasicListener(connector, messageQueue, delay);
+		return new BasicListener(currWorld, connector, messageQueue, delay);
 	}
 
 	/**