MetaContactListService integrated

src/net/java/sip/communicator/impl/gui/main/CommunicatorMain.java

@@ -10,7 +10,6 @@
 import java.io.File;
 import java.net.MalformedURLException;
 
-import javax.swing.ImageIcon;
 import javax.swing.JOptionPane;
 import javax.swing.UIManager;
 import javax.swing.plaf.metal.MetalLookAndFeel;
@@ -18,6 +17,7 @@
 
 import net.java.sip.communicator.impl.gui.main.configforms.ConfigurationFrame;
 import net.java.sip.communicator.impl.gui.main.utils.ImageLoader;
+import net.java.sip.communicator.service.contactlist.MetaContactListService;
 
 import com.l2fprod.gui.plaf.skin.Skin;
 import com.l2fprod.gui.plaf.skin.SkinLookAndFeel;
@@ -33,7 +33,7 @@ public class CommunicatorMain {
 
     private MainFrame mainFrame;
 
-    // private MetaContactListService contactList;
+    private MetaContactListService contactList;
 
     public CommunicatorMain() {
 
@@ -41,56 +41,15 @@ public CommunicatorMain() {
 
         ConfigurationFrame configFrame = new ConfigurationFrame();
 
-        mainFrame = new MainFrame(this.getUser(),
-                getContactList());
+        mainFrame = new MainFrame(this.getUser());
 
         mainFrame.setConfigFrame(configFrame);
-
+        
         // In order to have the same icon when using option panes
         JOptionPane.getRootFrame().setIconImage(
                 ImageLoader.getImage(ImageLoader.SIP_LOGO));
     }
-
-    /**
-     * To be removed after the real contact list is implemented.
-     */
-    public ContactList getContactList() {
-
-        ContactList clist = new ContactList();
-
-        ContactItem citem1 = new ContactItem("Ivancho");
-        ContactItem citem2 = new ContactItem("Traiancho");
-        ContactItem citem3 = new ContactItem("Glupancho");
-
-        citem1.setUserIcon(new ImageIcon(ImageLoader
-                .getImage(ImageLoader.USER_ONLINE_ICON)));
-        citem2.setUserIcon(new ImageIcon(ImageLoader
-                .getImage(ImageLoader.USER_ONLINE_ICON)));
-        citem3.setUserIcon(new ImageIcon(ImageLoader
-                .getImage(ImageLoader.USER_ONLINE_ICON)));
-
-        citem1
-                .setPhoto(ImageLoader
-                        .getImage(ImageLoader.DEFAULT_CHAT_USER_PHOTO));
-        citem2
-                .setPhoto(ImageLoader
-                        .getImage(ImageLoader.DEFAULT_CHAT_USER_PHOTO));
-        citem3
-                .setPhoto(ImageLoader
-                        .getImage(ImageLoader.DEFAULT_CHAT_USER_PHOTO));
-
-        clist.addContact(citem1);
-        clist.addContact(citem2);
-        clist.addContact(citem3);
-
-        citem1.setProtocolList(new String[] { "SIP", "ICQ",
-                "MSN" });
-        citem2.setProtocolList(new String[] { "ICQ" });
-        citem3.setProtocolList(new String[] { "SIP", "ICQ",
-                "MSN" });
-
-        return clist;
-    }
+   
 
     public User getUser() {
 
@@ -213,11 +172,5 @@ public static void main(String args[]) {
     public MainFrame getMainFrame() {
         return mainFrame;
     }
-
-    /*
-     * public void setContactList(MetaContactListService contactList) {
-     * this.contactList = contactList;
-     * 
-     * this.mainFrame.setContactList(contactList); }
-     */
+    
 }

src/net/java/sip/communicator/impl/gui/main/ContactRightButtonMenu.java

@@ -25,6 +25,7 @@
 import net.java.sip.communicator.impl.gui.main.message.MessageWindow;
 import net.java.sip.communicator.impl.gui.main.utils.Constants;
 import net.java.sip.communicator.impl.gui.main.utils.ImageLoader;
+import net.java.sip.communicator.service.contactlist.MetaContact;
 
 public class ContactRightButtonMenu extends JPopupMenu implements
 		ActionListener {
@@ -61,11 +62,11 @@ public class ContactRightButtonMenu extends JPopupMenu implements
 			Messages.getString("viewHistory"),
 			new ImageIcon(ImageLoader.getImage(ImageLoader.HISTORY_16x16_ICON)));
 
-	private ContactItem contactItem;
+	private MetaContact contactItem;
 
 	private MainFrame mainFrame;
 
-	public ContactRightButtonMenu(MainFrame mainFrame, ContactItem contactItem) {
+	public ContactRightButtonMenu(MainFrame mainFrame, MetaContact contactItem) {
 		super();
 
 		this.mainFrame = mainFrame;
@@ -174,7 +175,7 @@ else if (itemName.equalsIgnoreCase("removeContact")) {
 			MessageDialog warning = new MessageDialog(this.mainFrame);
 			
 			String message =  "<HTML>Are you sure you want to remove <B>"
-								+ this.contactItem.getNickName()
+								+ this.contactItem.getDisplayName()
 								+"</B><BR>from your contact list?</html>";
 			
 			warning.setMessage(message);

src/net/java/sip/communicator/impl/gui/main/MainFrame.java

@@ -58,9 +58,7 @@ public class MainFrame extends JFrame {
 	private MainTabbedPane tabbedPane;
 
 	private QuickMenu quickMenu;
-
-	private ContactList contactList;
-
+	
 	private User user;
 
     private Map supportedOperationSets;
@@ -72,11 +70,9 @@ public class MainFrame extends JFrame {
     
     private OperationSetPresence presence;
 
-	public MainFrame(User user, ContactList contactList) {
-		
-		this.user = user;
+    private MetaContactListService contactList;
 
-		this.contactList = contactList;
+	public MainFrame(User user) {
 		
 		callPanel = new CallPanel(this);
 		tabbedPane = new MainTabbedPane(this);
@@ -121,14 +117,16 @@ public CallPanel getCallPanel() {
 		return callPanel;
 	}
 
-	public ContactList getContactList() {
+	public MetaContactListService getContactList() {
 		
 		return this.contactList;
 	}
 
-	public void setContactList(ContactList contactList) {
+	public void setContactList(MetaContactListService contactList) {
 		
 		this.contactList = contactList;
+        
+        this.tabbedPane.getContactListPanel().setContactList(contactList);
 	}
 
 	public User getUser() {

src/net/java/sip/communicator/impl/gui/main/MainTabbedPane.java

@@ -33,15 +33,15 @@ public class MainTabbedPane extends JTabbedPane {
 	
 	private DialPanel dialPanel = new DialPanel();
 	
-	private ContactListPanel clistPanel;
+	private ContactListPanel contactListPanel;
 	
 	public MainTabbedPane(MainFrame parent){		
 	
-		clistPanel = new ContactListPanel(parent);
+		contactListPanel = new ContactListPanel(parent);
 		
 		dialPanel.setPhoneNumberCombo(parent.getCallPanel().getPhoneNumberCombo());
 				
-		this.addTab(Messages.getString("contacts"), clistPanel);
+		this.addTab(Messages.getString("contacts"), contactListPanel);
 		this.addTab(Messages.getString("callList"), new JPanel());
 		this.addTab(Messages.getString("dial"), dialPanel);
 	}
@@ -53,4 +53,8 @@ public void paint(Graphics g){
 		super.paint(g);
 	}
 
+    public ContactListPanel getContactListPanel() {
+        return contactListPanel;
+    }
+
 }