From b48fff6b59100439ab3992208800ff0932f85b02 Mon Sep 17 00:00:00 2001
From: Jesse Morgan <jesse@jesterpm.net>
Date: Wed, 9 Mar 2011 02:44:06 +0000
Subject: Fixing the peer information.

---
 src/common/Peer.java            | 2 +-
 src/common/PeerInformation.java | 2 +-
 src/common/PeerMessage.java     | 3 ---
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/common/Peer.java b/src/common/Peer.java
index 1b57379..5c10e75 100644
--- a/src/common/Peer.java
+++ b/src/common/Peer.java
@@ -544,7 +544,7 @@ public class Peer extends Observable {
 		case EXTRA:
 			logMessage("Received EXTRA message from " + mesg.sender);
 			
-			if (mesg.id != null && mesg.id.equals(PeerMessage.DEFAULT_ID)) {
+			if (mesg.sender.id != null && mesg.sender.id.equals(PeerInformation.DEFAULT_ID)) {
 				setChanged();
 				notifyObservers(mesg);
 			}
diff --git a/src/common/PeerInformation.java b/src/common/PeerInformation.java
index 5721e35..d0bc98e 100644
--- a/src/common/PeerInformation.java
+++ b/src/common/PeerInformation.java
@@ -4,7 +4,7 @@ import java.net.*;
 
 public class PeerInformation implements Serializable {
 	private static final long serialVersionUID = 3667108226485766929L;
-	public static final String DEFAULT_ID = "something unique";
+	public static final String DEFAULT_ID = "Tesseract Project";
 
 	public InetAddress address;
 	public int port;
diff --git a/src/common/PeerMessage.java b/src/common/PeerMessage.java
index 4e292b9..5ef95f8 100644
--- a/src/common/PeerMessage.java
+++ b/src/common/PeerMessage.java
@@ -5,7 +5,6 @@ import java.util.*;
 
 public class PeerMessage implements Serializable {
 	private static final long serialVersionUID = 3667108226485766929L;
-	public static final String DEFAULT_ID = "TesseractProject"; 
 	
 	public enum Type {
 		JOIN, JOIN_RESULT, ADD_PEERS, REMOVE_PEERS, PAYLOAD, EXTRA;
@@ -17,12 +16,10 @@ public class PeerMessage implements Serializable {
 	public ArrayList<PeerInformation> peers;
 	public CollidableObject payload;
 	public Object extra;
-	public String id;
 
 	public PeerMessage(Type type, PeerInformation sender) {
 		this.type = type;
 		this.sender = sender;
 		peers = new ArrayList<PeerInformation>();
-		this.id = DEFAULT_ID;
 	}
 }
-- 
cgit v1.2.3