Revert "outdoor users(17)"

This reverts commit 6d384512a6.

src/chat/ClientWindow.java

@@ -137,7 +137,7 @@ public class ClientWindow implements ActionListener {
     	if("".compareTo(message) != 0)
     	{
         	messageField.setText("");
-            network.send(new Message(network.getUser(), message));
+            network.send(new Message(network.getUser(), message, false));
     	}
     }
 }

src/chat/ConnectNotification.java

@@ -1,9 +1,16 @@
 package chat;
 
 public class ConnectNotification extends Notification {
-	ConnectNotification (User in_author)
+	private Boolean outdoor;
+	ConnectNotification (User in_author, Boolean in_redirected, Boolean in_outdoor)
 	{
-		super(in_author);
+		author = in_author;
+		redirected = in_redirected;
+		outdoor = in_outdoor;
 	}
 	
+	public Boolean isOutdoor()
+	{
+		return outdoor;
+	}
 }

src/chat/DisconnectNotification.java

@@ -1,8 +1,9 @@
 package chat;
 
 public class DisconnectNotification extends Notification {
-	DisconnectNotification (User in_author)
+	DisconnectNotification (User in_author, Boolean in_redirected)
 	{
-		super(in_author);
+		author = in_author;
+		redirected = in_redirected;
 	}
 }

src/chat/Message.java

@@ -6,10 +6,11 @@ import java.util.*;
 public class Message extends Notification {
 	private String text;
 	
-	Message (User in_author, String in_text)
+	Message (User in_author, String in_text, Boolean in_redirected)
 	{
-		super(in_author);
+		author = in_author;
 		text = in_text;
+		redirected = in_redirected;
 	}
 	public void setText(String new_text)
 	{

src/chat/NetworkClient.java

@@ -38,7 +38,7 @@ public class NetworkClient {
 	
 	NetworkClient(JTextArea in_chatText, JTextArea in_knownUsersPanel)
 	{
-		user = null;
+		user = new User("");
 		chatText = in_chatText;
 		knownUsersPanel = in_knownUsersPanel;
 		known_users = new ArrayList<User>();
@@ -123,11 +123,11 @@ public class NetworkClient {
             		System.out.println(usernameList.length + " users currently connected");
             		for(String u:usernameList)
                 	{
-                		known_users.add(new User (u, false));
+                		known_users.add(new User (u));
                 	}
             		for(String u:outdoorUsernameList)
                 	{
-                		known_outdoor_users.add(new User (u, true));
+                		known_outdoor_users.add(new User (u));
                 	}
             		for(String a:addressList)
                 	{
@@ -193,9 +193,9 @@ public class NetworkClient {
 	          }
           }
           
-          user = new User(username, outdoor);
+          user.setName(username);
           
-          send(new ConnectNotification(user));
+          send(new ConnectNotification(user, false, outdoor));
       }
       
       return connected;
@@ -229,7 +229,7 @@ public class NetworkClient {
 	
 	void disconnect()
 	{
-		send(new DisconnectNotification(user));
+		send(new DisconnectNotification(user, false));
 		try
 		{
 			Thread.sleep(1000);
@@ -244,16 +244,6 @@ public class NetworkClient {
 			}
 			catch(IOException e){}
 		}
-		for(Socket s:outdoor_dest_sockets)
-		{
-			try
-			{
-				s.close();
-			}
-			catch(IOException e){}
-		}
-		dest_sockets.clear();
-		outdoor_dest_sockets.clear();
 	}
 	
 	User getUser()

src/chat/Notification.java

@@ -4,12 +4,8 @@ import java.io.Serializable;
 
 abstract class Notification implements Serializable{
 
-	private User author;
+	protected User author;
-	
+	protected Boolean redirected;
-	Notification(User in_author)
-	{
-		author = in_author;
-	}
 
 	public void setAuthor(User new_author)
 	{
@@ -19,4 +15,12 @@ abstract class Notification implements Serializable{
 	{
 		return author;
 	}
+	public Boolean isRedirected()
+	{
+		return redirected;
+	}
+	public void setRedirected(Boolean in_redirected)
+	{
+		redirected = in_redirected;
+	}
 }

src/chat/ReceiveThread.java

@@ -37,25 +37,24 @@ class ReceiveThread extends Thread {
 	}
 	public void run()
 	{
-		ObjectInputStream in;
 		boolean exit = false;
-		while(!exit)
-		{
 		try
     	{
-				in = new ObjectInputStream(socket.getInputStream());
+			while(!exit)
+			{
+        			ObjectInputStream in = new ObjectInputStream(socket.getInputStream());
 			        Notification notif = (Notification) in.readObject();
 			        
-		        if(!(notif.getAuthor().equals(user)) && !(notif.getAuthor().isOutdoor() && !isOutdoor))
+			        if(!(notif.getAuthor().equals(user)) && !notif.isRedirected())
 	            	{
 	            		for(Socket s:outdoor_dest_sockets)
 				    	{
 				    		try
 				    		{
 				    			ObjectOutputStream out = new ObjectOutputStream(s.getOutputStream());
-			    			
+				    			notif.setRedirected(true);
 				    		    out.writeObject(notif);
-			    		    
+				    		    notif.setRedirected(false);
 				    		}
 				    		catch(IOException e){}
 				    	}
@@ -68,12 +67,11 @@ class ReceiveThread extends Thread {
 			    			try
 			    			{
 			    				ObjectOutputStream out = new ObjectOutputStream(s.getOutputStream());
-		    				
+			    				notif.setRedirected(true);
 			    			    out.writeObject(notif);
 			    			}
 			    			catch(IOException e){}
 			    		}
-
 		            }
 	            	else
 	            	{
@@ -91,7 +89,7 @@ class ReceiveThread extends Thread {
 				            known_users.remove(dn.getAuthor());
 				            known_outdoor_users.remove(dn.getAuthor());
 				            
-			          if(!dn.getAuthor().equals(user) && !(dn.getAuthor().isOutdoor() && !isOutdoor))
+				            if(!dn.isRedirected() && !dn.getAuthor().equals(user))
 				            {
 				            	exit = true;
 				            	
@@ -108,7 +106,7 @@ class ReceiveThread extends Thread {
 			        		ConnectNotification cn = (ConnectNotification) notif;
 			        		
 				            displayArea.append(cn.getAuthor().getName() + " has joined the chat.\n");
-			            if(cn.getAuthor().isOutdoor())
+				            if(cn.isOutdoor())
 				            {
 				            	if(!known_outdoor_users.contains(cn.getAuthor()))
 				            	{
@@ -139,14 +137,18 @@ class ReceiveThread extends Thread {
 			            displayArea.setCaretPosition(displayArea.getDocument().getLength());
 	            	}
 		      }
+    	}
+		catch(EOFException e) {}
+		catch(SocketException e)
+		{
+            	if(!isOutdoor)
+            	dest_sockets.remove(socket);
+            	else
+            	outdoor_dest_sockets.remove(socket);
+		}
 		catch(Exception e)
     	{
-				in.reset();
     		e.printStackTrace();
-				/*System.out.println("Socket closed");
-	        	dest_sockets.remove(socket);
-	        	outdoor_dest_sockets.remove(socket);*/
-	    	}
     	}
 	}
 }

src/chat/User.java

@@ -6,14 +6,12 @@ import java.util.*;
 public class User implements Comparable<User>, Serializable{
 
 	private String name;
-	private Boolean outdoor;
 //	private String address;
 
 	
-	public User(String in_name, Boolean in_outdoor)
+	public User(String in_name)
 	{
 		name = in_name;
-		outdoor = in_outdoor;
 	//	address = in_address;
 	}
 	
@@ -25,10 +23,6 @@ public class User implements Comparable<User>, Serializable{
 	{
 		return name;
 	}
-	public Boolean isOutdoor()
-	{
-		return outdoor;
-	}
 	/*public void setAddress(String new_address)
 	{
 		name = new_address;
@@ -51,5 +45,4 @@ public class User implements Comparable<User>, Serializable{
 	{
 		return name.compareTo(otherUser.getName());
 	}
-	
 }