Correct IChatID's implementation per bug #181521.

4 files changed, 8 insertions, 25 deletions

diff --git a/providers/bundles/org.eclipse.ecf.provider.msn/src/org/eclipse/ecf/internal/provider/msn/MSNContainer.java b/providers/bundles/org.eclipse.ecf.provider.msn/src/org/eclipse/ecf/internal/provider/msn/MSNContainer.java
index f27d62306..b949cf820 100644
--- a/providers/bundles/org.eclipse.ecf.provider.msn/src/org/eclipse/ecf/internal/provider/msn/MSNContainer.java
+++ b/providers/bundles/org.eclipse.ecf.provider.msn/src/org/eclipse/ecf/internal/provider/msn/MSNContainer.java
@@ -176,7 +176,6 @@ final class MSNContainer implements IContainer, IChatManager,
 							contact.addContactListener(new IContactListener() {
 
 								public void nameChanged(String name) {
-									entry.updateUserName();
 									fireRosterUpdate(entry);
 									fireRosterEntryUpdated(entry);
 								}
@@ -237,7 +236,6 @@ final class MSNContainer implements IContainer, IChatManager,
 			fireContainerEvent(new ContainerConnectingEvent(guid, connectID));
 			client.connect(connectID.getName(), (String) cb[0].getObject());
 			fireContainerEvent(new ContainerConnectedEvent(guid, connectID));
-			connectID.setUserName(client.getDisplayName());
 		} catch (UnsupportedCallbackException e) {
 			e.printStackTrace();
 		} catch (IOException e) {
diff --git a/providers/bundles/org.eclipse.ecf.provider.msn/src/org/eclipse/ecf/internal/provider/msn/MSNID.java b/providers/bundles/org.eclipse.ecf.provider.msn/src/org/eclipse/ecf/internal/provider/msn/MSNID.java
index a94326a52..8bb741235 100644
--- a/providers/bundles/org.eclipse.ecf.provider.msn/src/org/eclipse/ecf/internal/provider/msn/MSNID.java
+++ b/providers/bundles/org.eclipse.ecf.provider.msn/src/org/eclipse/ecf/internal/provider/msn/MSNID.java
@@ -19,22 +19,14 @@ class MSNID implements IChatID, ID {
 	private final Namespace namespace;
 
 	private final String email;
-
-	private String userName;
+	
+	private final String userName;
 
 	MSNID(Namespace namespace, String email) {
 		this.namespace = namespace;
 		this.email = email;
-	}
-
-	MSNID(Namespace namespace, String email, String userName) {
-		this.namespace = namespace;
-		this.email = email;
-		this.userName = userName;
-	}
-
-	void setUserName(String userName) {
-		this.userName = userName;
+		int index = email.indexOf('@');
+		userName = email.substring(0, index);
 	}
 
 	public String getName() {
@@ -66,7 +58,7 @@ class MSNID implements IChatID, ID {
 	}
 
 	public String getUsername() {
-		return userName == null ? email : userName;
+		return userName;
 	}
 
 	public int hashCode() {
diff --git a/providers/bundles/org.eclipse.ecf.provider.msn/src/org/eclipse/ecf/internal/provider/msn/MSNNamespace.java b/providers/bundles/org.eclipse.ecf.provider.msn/src/org/eclipse/ecf/internal/provider/msn/MSNNamespace.java
index 51e69e341..dea94d3df 100644
--- a/providers/bundles/org.eclipse.ecf.provider.msn/src/org/eclipse/ecf/internal/provider/msn/MSNNamespace.java
+++ b/providers/bundles/org.eclipse.ecf.provider.msn/src/org/eclipse/ecf/internal/provider/msn/MSNNamespace.java
@@ -24,9 +24,6 @@ public class MSNNamespace extends Namespace {
 		switch (parameters.length) {
 		case 1:
 			return new MSNID(this, (String) parameters[0]);
-		case 2:
-			return new MSNID(this, (String) parameters[0],
-					(String) parameters[1]);
 		default:
 			throw new IDCreateException();
 		}
diff --git a/providers/bundles/org.eclipse.ecf.provider.msn/src/org/eclipse/ecf/internal/provider/msn/MSNRosterEntry.java b/providers/bundles/org.eclipse.ecf.provider.msn/src/org/eclipse/ecf/internal/provider/msn/MSNRosterEntry.java
index 3db6d94ff..05582a786 100644
--- a/providers/bundles/org.eclipse.ecf.provider.msn/src/org/eclipse/ecf/internal/provider/msn/MSNRosterEntry.java
+++ b/providers/bundles/org.eclipse.ecf.provider.msn/src/org/eclipse/ecf/internal/provider/msn/MSNRosterEntry.java
@@ -49,8 +49,8 @@ final class MSNRosterEntry implements IPresence, IRosterEntry, IUser {
 		groups = Collections.EMPTY_LIST;
 		properties = new HashMap(1);
 		try {
-			id = (MSNID) namespace.createInstance(new Object[] {
-					contact.getEmail(), contact.getDisplayName() });
+			id = (MSNID) namespace.createInstance(new Object[] { contact
+					.getEmail() });
 		} catch (IDCreateException e) {
 			e.printStackTrace();
 		}
@@ -61,7 +61,7 @@ final class MSNRosterEntry implements IPresence, IRosterEntry, IUser {
 		if (message.equals("")) { //$NON-NLS-1$
 			properties.remove("Message");
 		} else {
-			properties.put("Message", message);	
+			properties.put("Message", message);
 		}
 	}
 
@@ -119,10 +119,6 @@ final class MSNRosterEntry implements IPresence, IRosterEntry, IUser {
 		return this;
 	}
 
-	void updateUserName() {
-		id.setUserName(contact.getDisplayName());
-	}
-
 	void setParent(MSNRosterGroup parent) {
 		this.parent = parent;
 		ArrayList list = new ArrayList(1);