From 6ceacef71d982a0e0122e6069e71fdf8f5834d60 Mon Sep 17 00:00:00 2001
From: Phillip <pacardon@u.washington.edu>
Date: Sat, 5 Mar 2011 06:00:05 +0000
Subject: Can't sleep, here are my changes: Chatbox chat name appears as the
 peer coordinates (x, y) Chatbox title changes based upon PeerInformation
 toString from Peer.getMyName(); Added network disconnect above system.exit(0)
 in TesseractUI.

---
 src/tesseract/TesseractUI.java     |  1 +
 src/tesseract/chatbox/Chatbox.java | 32 ++++++++++++++++++++++++--------
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/src/tesseract/TesseractUI.java b/src/tesseract/TesseractUI.java
index 5060e08..1a07883 100644
--- a/src/tesseract/TesseractUI.java
+++ b/src/tesseract/TesseractUI.java
@@ -371,6 +371,7 @@ public class TesseractUI extends JFrame {
 			public void actionPerformed(final ActionEvent e) {
 				// TODO: I feel this is the wrong way of exiting...
 				// TODO: Properly shutdown network connection here!
+				myPeer.disconnectFromNetwork();
 				System.exit(0);
 			}
 		});
diff --git a/src/tesseract/chatbox/Chatbox.java b/src/tesseract/chatbox/Chatbox.java
index 50e2b95..14d5396 100644
--- a/src/tesseract/chatbox/Chatbox.java
+++ b/src/tesseract/chatbox/Chatbox.java
@@ -91,7 +91,7 @@ public class Chatbox extends JFrame implements Observer {
 		scroller = new JScrollPane(chatRoomDisplay);
 		submitButton = new JButton("Submit");
 		chatField = new JTextField(70);
-		this.setName("Chat");
+		this.setTitle("Tesseract Chatbox");
 		chats = new StringBuilder();
 		buildFrame();
 		attachListeners();
@@ -124,11 +124,17 @@ public class Chatbox extends JFrame implements Observer {
 	
 	/**
 	 * Sets name of this client (local use only).
-	 * @param theName of this client
-	 * @return name set.
 	 */
 	public void setMyName() {
 		myName = myPeer.getMyName();
+		StringBuilder split = new StringBuilder();
+		split.append(myName);
+		int start;
+		int end;
+		start = split.indexOf("(");
+		end = split.indexOf(")") + 1;
+		myName = split.substring(start, end);
+		this.setTitle("Tesseract Chatbox @ " + myPeer.getMyName());
 	}
 	
 	/**
@@ -159,9 +165,17 @@ public class Chatbox extends JFrame implements Observer {
 			if (msg.extra.getClass().equals(String.class)) {
 				String incMsg = (String) msg.extra;
 				String source = msg.sender.toString();
+				StringBuilder split = new StringBuilder();
+				split.append(source);
+				int start;
+				int end;
+				start = split.indexOf("(");
+				end = split.indexOf(")") + 1;
+				source = split.substring(start, end);
 				chats.append("\n");
 				chats.append(source + ": " + incMsg);
 				chatRoomDisplay.setText(chats.toString());
+				chatRoomDisplay.setCaretPosition(chats.toString().length() - 1);
 			} else {
 				System.err.println("Message Extra Field is"
 						+ " of unsupported type.");
@@ -197,11 +211,13 @@ public class Chatbox extends JFrame implements Observer {
 		public void keyReleased(final KeyEvent e) {
 				if (e.getKeyCode() == 10) {
 					toSend = chatField.getText();
-					chats.append("\n");
-					chats.append(myName + ": " + toSend);
-					chatRoomDisplay.setText(chats.toString());
-					chatField.setText("");
-					myPeer.sendExtraToAllPeers(toSend);
+					if (!toSend.equals("")) {
+						chats.append("\n");
+						chats.append(myName + ": " + toSend);
+						chatRoomDisplay.setText(chats.toString());
+						chatField.setText("");
+						myPeer.sendExtraToAllPeers(toSend);
+					}
 				}
 		    }
 	}
-- 
cgit v1.2.3