Change all contactlist related components to get theirs data from the MetaContactList

1 files changed, 10 insertions, 11 deletions

diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactNode.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactNode.java
index 2121f7c..0648fb3 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactNode.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactNode.java
@@ -7,13 +7,10 @@
 
 package net.java.sip.communicator.impl.gui.main.contactlist;
 
-import java.awt.Cursor;
-
 import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.TreeNode;
 
-import net.java.sip.communicator.impl.gui.main.ContactItem;
-import net.java.sip.communicator.impl.gui.main.GroupItem;
+import net.java.sip.communicator.service.contactlist.MetaContact;
+import net.java.sip.communicator.service.contactlist.MetaContactGroup;
 
 public class ContactNode extends DefaultMutableTreeNode {
 
@@ -32,13 +29,15 @@ public class ContactNode extends DefaultMutableTreeNode {
     	String result = "";
     	
 		if (userObject == null) {
-		    return null;
+		    
+            return null;
+            
 		} else {
-			//TODO: to replace ContactItem with MetaContact and GroupItem with MetaGroup
-			if (userObject instanceof ContactItem)
-				result = ((ContactItem)userObject).getNickName();
-			else if (userObject instanceof GroupItem)
-				result = ((GroupItem)userObject).getGroupName();
+            
+			if (userObject instanceof MetaContact)
+				result = ((MetaContact)userObject).getDisplayName();
+			else if (userObject instanceof MetaContactGroup)
+				result = ((MetaContactGroup)userObject).getGroupName();
 		}
 		
 		return result;