removed Enum State from ServerConnectionHandler.java because it's in ConnectionHandler.java now.
This commit is contained in:
		
							parent
							
								
									2277fee73a
								
							
						
					
					
						commit
						86aa801b34
					
				| 
						 | 
					@ -2,6 +2,7 @@ package ch.zhaw.pm2.multichat.server;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import ch.zhaw.pm2.multichat.protocol.ChatProtocolException;
 | 
					import ch.zhaw.pm2.multichat.protocol.ChatProtocolException;
 | 
				
			||||||
import ch.zhaw.pm2.multichat.protocol.ConnectionHandler;
 | 
					import ch.zhaw.pm2.multichat.protocol.ConnectionHandler;
 | 
				
			||||||
 | 
					import static ch.zhaw.pm2.multichat.protocol.ConnectionHandler.State.*;
 | 
				
			||||||
import ch.zhaw.pm2.multichat.protocol.NetworkHandler;
 | 
					import ch.zhaw.pm2.multichat.protocol.NetworkHandler;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import java.io.EOFException;
 | 
					import java.io.EOFException;
 | 
				
			||||||
| 
						 | 
					@ -15,7 +16,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 | 
				
			||||||
import java.util.concurrent.locks.Condition;
 | 
					import java.util.concurrent.locks.Condition;
 | 
				
			||||||
import java.util.concurrent.locks.ReentrantLock;
 | 
					import java.util.concurrent.locks.ReentrantLock;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import static ch.zhaw.pm2.multichat.server.ServerConnectionHandler.State.*;
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
public class ServerConnectionHandler extends ConnectionHandler implements Runnable{
 | 
					public class ServerConnectionHandler extends ConnectionHandler implements Runnable{
 | 
				
			||||||
    private static final AtomicInteger connectionCounter = new AtomicInteger(0);
 | 
					    private static final AtomicInteger connectionCounter = new AtomicInteger(0);
 | 
				
			||||||
| 
						 | 
					@ -34,10 +35,6 @@ public class ServerConnectionHandler extends ConnectionHandler implements Runnab
 | 
				
			||||||
        startReceiving();
 | 
					        startReceiving();
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    enum State {
 | 
					 | 
				
			||||||
        NEW, CONNECTED, DISCONNECTED;
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    public ServerConnectionHandler(NetworkHandler.NetworkConnection<String> connection,
 | 
					    public ServerConnectionHandler(NetworkHandler.NetworkConnection<String> connection,
 | 
				
			||||||
                                   Map<String,ServerConnectionHandler> registry, ReentrantLock mutex, Condition nameComplete) {
 | 
					                                   Map<String,ServerConnectionHandler> registry, ReentrantLock mutex, Condition nameComplete) {
 | 
				
			||||||
        super();
 | 
					        super();
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue